Improve camera handling and response mapping in server. Get Tests passing again.

Author: CSSFrancis

deapi/client.py

@@ -173,7 +173,12 @@ def connect(self, host: str = "127.0.0.1", port: int = 13240, read_only=False):
         self.socket.setblocking(False)
         self.socket.settimeout(2)
 
-        self.cameras = self.__getStrings(self.LIST_CAMERAS)
+        cameras = self.__getStrings(self.LIST_CAMERAS)
+        if not cameras:
+            raise ValueError("No cameras returned")
+            return
+        else:
+            self.cameras = cameras
         if logLevel == logging.DEBUG:
             log.debug("Available cameras: %s", self.cameras)
         self.currCamera = self.cameras[0]

deapi/simulated_server/fake_server.py

@@ -19,15 +19,15 @@ def add_parameter(ack, value):
     Add a parameter to a protobuffer
     """
     param = ack.parameter.add()
-    if isinstance(value, str):
+    if isinstance(value, bool):  # must be before int — bool is a subclass of int
+        param.type = pb.AnyParameter.P_BOOL
+        param.p_bool = value
+    elif isinstance(value, str):
         param.type = pb.AnyParameter.P_STRING
         param.p_string = value
     elif isinstance(value, int):
         param.type = pb.AnyParameter.P_INT
         param.p_int = value
-    elif isinstance(value, bool):
-        param.type = pb.AnyParameter.P_BOOL
-        param.p_bool = value
     elif isinstance(value, float):
         param.type = pb.AnyParameter.P_FLOAT
         param.p_float = value
@@ -559,23 +559,23 @@ def _fake_get_result(self, command):
         acknowledge_return.type = pb.DEPacket.P_ACKNOWLEDGE
         ack1 = acknowledge_return.acknowledge.add()
         ack1.command_id = command.command[0].command_id
-        frame_type = command.command[0].parameter[0].p_int
-        pixel_format = command.command[0].parameter[1].p_int
-        center_x = command.command[0].parameter[2].p_int
-        center_y = command.command[0].parameter[3].p_int
-        zoom = command.command[0].parameter[4].p_float
-        windowWidth = command.command[0].parameter[5].p_int
-        windowHeight = command.command[0].parameter[6].p_int
-        fft = command.command[0].parameter[7].p_int
-        stretchType = command.command[0].parameter[8].p_int
-        stretch_min = command.command[0].parameter[9].p_float
-        stretch_max = command.command[0].parameter[10].p_float
-        stretch_gama = command.command[0].parameter[11].p_float
-        outlier = command.command[0].parameter[12].p_float
-        timeout = command.command[0].parameter[13].p_int
-        histo_min = command.command[0].parameter[14].p_float
-        histo_max = command.command[0].parameter[15].p_float
-        histo_bins = command.command[0].parameter[16].p_int
+        frame_type = command.command[0].parameter[0].p_int    # [0]  frame_type
+        pixel_format = command.command[0].parameter[1].p_int  # [1]  pixel_format
+        center_x = command.command[0].parameter[2].p_int      # [2]  centerX
+        center_y = command.command[0].parameter[3].p_int      # [3]  centerY
+        zoom = command.command[0].parameter[4].p_float        # [4]  zoom
+        windowWidth = command.command[0].parameter[5].p_int   # [5]  windowWidth
+        windowHeight = command.command[0].parameter[6].p_int  # [6]  windowHeight
+        fft = command.command[0].parameter[7].p_int           # [7]  fft
+        stretchType = command.command[0].parameter[8].p_int   # [8]  stretchType
+        stretch_min = command.command[0].parameter[9].p_float  # [9]  manualStretchMin
+        stretch_max = command.command[0].parameter[10].p_float # [10] manualStretchMax
+        stretch_gama = command.command[0].parameter[11].p_float # [11] manualStretchGamma
+        outlier = command.command[0].parameter[12].p_float    # [12] outlierPercentage
+        timeout = command.command[0].parameter[13].p_int      # [13] timeoutMsec
+        histo_min = command.command[0].parameter[14].p_float  # [14] histo_min
+        histo_max = command.command[0].parameter[15].p_float  # [15] histo_max
+        histo_bins = command.command[0].parameter[16].p_int   # [16] histo_bins
 
         pixel_format_dict = {1: np.int8, 5: np.int16, 13: np.float32}
 
@@ -666,41 +666,41 @@ def _fake_get_result(self, command):
         eps = np.sum(image) / 208 * float(self["Frames Per Second"])
         eppixps = eppix * float(self["Frames Per Second"])
         response_mapping = [
-            int(pixel_format),  # pix format 0
-            int(windowWidth),  # window width 1
-            int(windowHeight),  # window height 2
-            "Test",  # name 3
-            int(0),  # acquisition index 4
-            bool(self.acquisition_status == "Acquiring"),  # status 5
-            int(flat_index),  # frame number 6
-            int(1),  # frame count 7
-            float(0),  # image min 8
-            float(2**15),  # image max 9
-            float(100),  # image mean 10
-            float(5),  # image std 11
-            float(100),  # eppix 12
-            float(1000),  # eps 13
-            float(500),  # eppixps 14
-            0.0,  # epa2 15
-            float(500),  # eppixpf 16
-            0.0,  # eppix_incident 17
-            0.0,  # eps_incident 18
-            0.0,  # eppixps_incident 19
-            0.0,  # epa2_incident 20
-            0.0,  # eppixpf_incident 21
-            0.0,  # red sat warning 22
-            0.0,  # orange sat warning 23
-            0.0,  # saturation 24
-            "2.187026",  # current time 25
-            0.0,  # autoStretchMin 26
-            0.0,  # autoStretchMax 27
-            0.0,  # autoStretchGamma 28
-            0.0,  # histogram min 29
-            float(np.min(image)),  # histogram max 30
-            float(np.max(image)),  # histogram upper local max 31
+            int(pixel_format),  # [0]  pixel_format
+            int(windowWidth),   # [1]  frameWidth
+            int(windowHeight),  # [2]  frameHeight
+            "Test",             # [3]  datasetName
+            int(0),             # [4]  acqIndex
+            bool(self.acquisition_status == "Acquiring"),  # [5]  acqFinished
+            int(flat_index),    # [6]  imageIndex
+            int(1),             # [7]  frameCount
+            float(0),           # [8]  imageMin
+            float(2**15),       # [9]  imageMax
+            float(100),         # [10] imageMean
+            float(5),           # [11] imageStd
+            float(100),         # [12] eppix
+            float(1000),        # [13] eps
+            float(500),         # [14] eppixps
+            0.0,                # [15] epa2
+            float(500),         # [16] eppixpf
+            0.0,                # [17] eppix_incident
+            0.0,                # [18] eps_incident
+            0.0,                # [19] eppixps_incident
+            0.0,                # [20] epa2_incident
+            0.0,                # [21] eppixpf_incident
+            0.0,                # [22] redSatWarningValue
+            0.0,                # [23] orangeSatWarningValue
+            0.0,                # [24] saturation
+            "2.187026",         # [25] timestamp
+            0.0,                # [26] autoStretchMin
+            0.0,                # [27] autoStretchMax
+            0.0,                # [28] autoStretchGamma
+            0.0,                # [29] histogram min
+            float(np.max(image)),  # [30] histogram max  (FIXED: was np.min(image))
+            float(np.max(image)),  # [31] histogram upperMostLocalMaxima
         ]
         for i in range(histo_bins):
-            response_mapping.append(int(0))
+            response_mapping.append(int(0))  # [32..31+histo_bins] histogram data
         # Then histogram...
         for val in response_mapping:
             ack1 = acknowledge_return.acknowledge.add()

deapi/simulated_server/initialize_server.py

@@ -12,20 +12,17 @@
 def main(port=13240):
     parser = argparse.ArgumentParser()
     parser.add_argument("--port", type=int, help="Port to listen on")
-    try:
-        args = parser.parse_args()
-        if args.port:
-            port = args.port
-    except:
-        pass
+    args, _ = parser.parse_known_args()
+    if args.port:
+        port = args.port
 
     HOST = "127.0.0.1"  # Standard loopback interface address (localhost)
     PORT = port  # Port to listen on (non-privileged ports are > 1023)
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as server_socket:
         server_socket.bind((HOST, PORT))
         server_socket.listen()
-        sys.stderr.write("started .... \n\n")
-        sys.stderr.flush()
+        sys.stdout.write("started .... \n\n")
+        sys.stdout.flush()
         sys.stderr.write(
             "Waiting for a Connection to: \n"
             f"    Host: {HOST}\n"