updated logs again

Author: abestroka

src/opentrons_resources.py

@@ -37,7 +37,7 @@ def parse_logfile(self, ot_log):
         if not log_path.exists():
             raise FileNotFoundError(f"Log file not found: {log_path}")
 
-        self.logger.log("Log File" + log_path + " Grabbed")
+        self.logger.log("Log File" + str(log_path) + " Grabbed")
         with open(log_path, 'r') as file:
             ot_log = json.load(file)
 
@@ -107,8 +107,8 @@ def load_labware(self, command, ot_log):
         params = command.get('params', {})
         result = command.get('result', {})
         self.logger.log("LABWARE PARAMS AND RESULT")
-        self.logger.log("PARAMS", params)
-        self.logger.log("RESULT", result)
+        self.logger.log(f"PARAMS: {params}")
+        self.logger.log(f"RESULT, {result}")
 
         #get labware id
         location = params.get('location', {})
@@ -118,9 +118,9 @@ def load_labware(self, command, ot_log):
         slot_name = location.get('slotName', 'unknown')
 
         self.logger.log("LOCATION, LOADNAME, AND SLOT NAME")
-        self.logger.log("LOCATION", location)
-        self.logger.log("LOADNAME", load_name)
-        self.logger.log("SLOTNAME", slot_name)
+        self.logger.log(f"LOCATION, {location}")
+        self.logger.log(f"LOADNAME, {load_name}")
+        self.logger.log(f"SLOTNAME, {slot_name}")
 
         #find matching id
         labware_id = None
@@ -152,18 +152,18 @@ def load_labware(self, command, ot_log):
 
         #get or create labware in deck slot
         self.logger.log("LOOK FOR SLOT NAME IN DECK SLOTS")
-        self.logger.log("SLOT NAME", slot_name)
-        self.logger.log("DECK SLOTS", self.deck_slots)
+        self.logger.log(f"SLOT NAME, {slot_name}")
+        self.logger.log(f"DECK SLOTS, {self.deck_slots}")
         if slot_name in self.deck_slots:
-            self.logger.log("FOUND SLOT RESOURCE", slot_resource)
+            self.logger.log(f"FOUND SLOT RESOURCE, {slot_resource}")
             slot_resource = self.deck_slots[slot_name]
             try:
             #    #check if slot already has labware (child)
             #    # query for existing labware in slot
 
             #    # Grid resource if tip rack
                 self.logger.log("CHECKING IF RESOURCE IS A TIP RACK")
-                self.logger.log("LOAD NAME LOWER", load_name.lower())
+                self.logger.log(f"LOAD NAME LOWER, {load_name.lower()}")
                 if 'tip' in load_name.lower():
                     self.logger.log("IS TIP RACK")
                    #tip rack always 8x12 grid
@@ -180,24 +180,24 @@ def load_labware(self, command, ot_log):
             #        )
             #        labware_resource = self.client.add_resource(labware_resource)
                     self.logger.log("CREATING TIP RACK RESOURCE FROM TEMPLATE")
-                    self.logger.log("TEMPLATE NAME", load_name)
-                    self.logger.log("RESOURCE NAME", labware_id)
+                    self.logger.log(f"TEMPLATE NAME, {load_name}")
+                    self.logger.log(f"RESOURCE NAME, {labware_id}")
                     labware_resource = self.client.create_resource_from_template(
                         template_name = load_name,
                         resource_name = labware_id
                         )
 
 
                     #set as child of the deck slot
-                    self.logger.log("LABWARE RESOURCE", labware_resource)
+                    self.logger.log(f"LABWARE RESOURCE, {labware_resource}")
                     self.logger.log("SETTING LABWARE RESOURCE AS CHILD OF DECK SLOT")
-                    self.logger.log("SLOT RESOURCE", slot_resource)
+                    self.logger.log(f"SLOT RESOURCE, {slot_resource}")
                     self.client.set_child(resource=slot_resource, key="labware", child=labware_resource)
                     self.labware_id_to_resource[labware_id] = labware_resource
 
                 elif 'plate' in load_name.lower() or 'well' in load_name.loawer():
                     self.logger.log("RESOURCE IS A PLATE")
-                    self.logger.log("LOAD NAME LOWER", load_name.lower())
+                    self.logger.log(f"LOAD NAME LOWER, {load_name.lower()}")
                    #plate as grid, either 96 or 384
                     if '96' in load_name:
                        rows, cols = 8, 12
@@ -220,16 +220,16 @@ def load_labware(self, command, ot_log):
                     # )
                     # labware_resource = self.client.add_resource(labware_resource)
                     self.logger.log("CREATING PLATE RESOURCE FROM TEMPLATE")
-                    self.logger.log("TEMPLATE NAME", load_name)
-                    self.logger.log("RESOURCE NAME", labware_id)
+                    self.logger.log(f"TEMPLATE NAME, {load_name}")
+                    self.logger.log(f"RESOURCE NAME, {labware_id}")
                     labware_resource = self.client.create_resource_from_template(
                         template_name = load_name,
                         resource_name = labware_id
                         )
 
-                    self.logger.log("LABWARE RESOURCE", labware_resource)
+                    self.logger.log(f"LABWARE RESOURCE, {labware_resource}")
                     self.logger.log("SETTING LABWARE RESOURCE AS CHILD OF DECK SLOT")
-                    self.logger.log("SLOT RESOURCE", slot_resource)
+                    self.logger.log(f"SLOT RESOURCE, {slot_resource}")
 
                     self.client.set_child(resource=slot_resource, key="labware", child=labware_resource)
                     self.labware_id_to_resource[labware_id] = labware_resource
@@ -266,8 +266,8 @@ def load_pipette(self, command, ot_log):
         result = command.get('result', {})
 
         self.logger.log("PIPETTE PARAMS AND RESULT")
-        self.logger.log("PARAMS", params)
-        self.logger.log("RESULT", result)
+        self.logger.log(f"PARAMS, {params}")
+        self.logger.log(f"RESULT, {result}")
 
         pipette_id = result.get('pipetteId', params.get('pipetteId'))
         mount = params.get('mount', 'unknown')