Merge branch '37-biomek-i5i7' of https://github.com/dptech-corp/Uni-Lab-OS into 37-biomek-i5i7

unilabos/devices/liquid_handling/biomek.py

@@ -37,6 +37,7 @@ class LiquidHandlerBiomek(LiquidHandlerAbstract):
         protocol_version: str,
         protocol_author: str,
         protocol_date: str,
+        protocol_type: str,
         none_keys: List[str] = [],
     ):
         """
@@ -61,6 +62,7 @@ class LiquidHandlerBiomek(LiquidHandlerAbstract):
                 "version": protocol_version,
                 "author": protocol_author,
                 "date": protocol_date,
+                "type": protocol_type,
             },
             "labwares": [],
             "steps": [],

unilabos/registry/devices/liquid_handler.yaml

@@ -245,6 +245,21 @@ liquid_handler:
           target_vols: target_vols
           aspiration_flow_rate: aspiration_flow_rate
           dispense_flow_rates: dispense_flow_rates
+  handles:
+    input:
+    - handler_key: liquid-input
+      label: Liquid Input
+      data_type: resource
+      io_type: target
+      data_source: handle
+      data_key: liquid
+    output:
+    - handler_key: liquid-output
+      label: Liquid Output
+      data_type: resource
+      io_type: source
+      data_source: executor
+      data_key: liquid
   schema:
     type: object
     properties:

unilabos/registry/devices/pump_and_valve.yaml

@@ -23,17 +23,48 @@ syringe_pump_with_valve.runze:
         type: string
         description: The position of the valve
     required:
-      - status
+    - status
-      - position
+    - position
-      - valve_position
+    - valve_position
     additionalProperties: false
 
-
 solenoid_valve.mock:
   description: Mock solenoid valve
   class:
     module: unilabos.devices.pump_and_valve.solenoid_valve_mock:SolenoidValveMock
     type: python
+    status_types:
+      status: String
+      valve_position: String
+    action_value_mappings:
+      open:
+        type: EmptyIn
+        goal: {}
+        feedback: {}
+        result: {}
+      close:
+        type: EmptyIn
+        goal: {}
+        feedback: {}
+        result: {}
+  handles:
+    input:
+    - handler_key: fluid-input
+      label: Fluid Input
+      data_type: fluid
+    output:
+    - handler_key: fluid-output
+      label: Fluid Output
+      data_type: fluid
+  init_param_schema:
+    type: object
+    properties:
+      port:
+        type: string
+        description: "通信端口"
+        default: "COM6"
+    required:
+    - port
 
 solenoid_valve:
   description: Solenoid valve

unilabos/registry/devices/vacuum_and_purge.yaml

@@ -22,9 +22,76 @@ vacuum_pump.mock:
           string: string
         feedback: {}
         result: {}
+  handles:
+    input:
+    - handler_key: fluid-input
+      label: Fluid Input
+      data_type: fluid
+      io_type: target
+      data_source: handle
+      data_key: fluid_in
+    output:
+    - handler_key: fluid-output
+      label: Fluid Output
+      data_type: fluid
+      io_type: source
+      data_source: executor
+      data_key: fluid_out
+  init_param_schema:
+    type: object
+    properties:
+      port:
+        type: string
+        description: "通信端口"
+        default: "COM6"
+    required:
+    - port
 
 gas_source.mock:
   description: Mock gas source
   class:
     module: unilabos.devices.pump_and_valve.vacuum_pump_mock:VacuumPumpMock
     type: python
+    status_types:
+      status: String
+    action_value_mappings:
+      open:
+        type: EmptyIn
+        goal: {}
+        feedback: {}
+        result: {}
+      close:
+        type: EmptyIn
+        goal: {}
+        feedback: {}
+        result: {}
+      set_status:
+        type: StrSingleInput
+        goal:
+          string: string
+        feedback: {}
+        result: {}
+  handles:
+    input:
+    - handler_key: fluid-input
+      label: Fluid Input
+      data_type: fluid
+      io_type: target
+      data_source: handle
+      data_key: fluid_in
+    output:
+    - handler_key: fluid-output
+      label: Fluid Output
+      data_type: fluid
+      io_type: source
+      data_source: executor
+      data_key: fluid_out
+  init_param_schema:
+    type: object
+    properties:
+      port:
+        type: string
+        description: "通信端口"
+        default: "COM6"
+    required:
+    - port

unilabos/registry/registry.py

@@ -25,9 +25,7 @@ class Registry:
         self.ResourceCreateFromOuterEasy = self._replace_type_with_class(
             "ResourceCreateFromOuterEasy", "host_node", f"动作 create_resource"
         )
-        self.EmptyIn = self._replace_type_with_class(
+        self.EmptyIn = self._replace_type_with_class("EmptyIn", "host_node", f"")
-            "EmptyIn", "host_node", f""
-        )
         self.device_type_registry = {}
         self.resource_type_registry = {}
         self._setup_called = False  # 跟踪setup是否已调用
@@ -99,6 +97,8 @@ class Registry:
                     },
                     "icon": "icon_device.webp",
                     "registry_type": "device",
+                    "handles": [],
+                    "init_param_schema": {},
                     "schema": {"properties": {}, "additionalProperties": False, "type": "object"},
                     "file_path": "/",
                 }
@@ -132,6 +132,12 @@ class Registry:
                         resource_info["description"] = ""
                     if "icon" not in resource_info:
                         resource_info["icon"] = ""
+                    if "icon" not in resource_info:
+                        resource_info["icon"] = ""
+                    if "handles" not in resource_info:
+                        resource_info["handles"] = []
+                    if "init_param_schema" not in resource_info:
+                        resource_info["init_param_schema"] = {}
                     resource_info["registry_type"] = "resource"
                 self.resource_type_registry.update(data)
                 logger.debug(
@@ -194,6 +200,10 @@ class Registry:
                         device_config["description"] = ""
                     if "icon" not in device_config:
                         device_config["icon"] = ""
+                    if "handles" not in device_config:
+                        device_config["handles"] = []
+                    if "init_param_schema" not in device_config:
+                        device_config["init_param_schema"] = {}
                     device_config["registry_type"] = "device"
                     if "class" in device_config:
                         # 处理状态类型