Create 5 new protocols & bump version 0.9.8

README.md

@@ -49,7 +49,7 @@ conda env update --file unilabos-[YOUR_OS].yml -n environment_name
 
 # Currently, you need to install the `unilabos_msgs` package
 # You can download the system-specific package from the Release page
-conda install ros-humble-unilabos-msgs-0.9.7-xxxxx.tar.bz2
+conda install ros-humble-unilabos-msgs-0.9.8-xxxxx.tar.bz2
 
 # Install PyLabRobot and other prerequisites
 git clone https://github.com/PyLabRobot/pylabrobot plr_repo

README_zh.md

@@ -49,7 +49,7 @@ conda env update --file unilabos-[YOUR_OS].yml -n 环境名
 
 # 现阶段，需要安装 `unilabos_msgs` 包
 # 可以前往 Release 页面下载系统对应的包进行安装
-conda install ros-humble-unilabos-msgs-0.9.7-xxxxx.tar.bz2
+conda install ros-humble-unilabos-msgs-0.9.8-xxxxx.tar.bz2
 
 # 安装PyLabRobot等前置
 git clone https://github.com/PyLabRobot/pylabrobot plr_repo

recipes/ros-humble-unilabos-msgs/recipe.yaml

@@ -1,6 +1,6 @@
 package:
   name: ros-humble-unilabos-msgs
-  version: 0.9.7
+  version: 0.9.8
 source:
   path: ../../unilabos_msgs
   folder: ros-humble-unilabos-msgs/src/work

recipes/unilabos/recipe.yaml

@@ -1,6 +1,6 @@
 package:
   name: unilabos
-  version: "0.9.7"
+  version: "0.9.8"
 
 source:
   path: ../..

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name=package_name,
-    version='0.9.7',
+    version='0.9.8',
     packages=find_packages(),
     include_package_data=True,
     install_requires=['setuptools'],

test/experiments/comprehensive_protocol/checklist.md

@@ -23,14 +23,21 @@
     HeatChillProtocol: generate_heat_chill_protocol,                                (√)
     HeatChillStartProtocol: generate_heat_chill_start_protocol,                     (√)
     HeatChillStopProtocol: generate_heat_chill_stop_protocol,                       (√)
+    HeatChillToTempProtocol:
     StirProtocol: generate_stir_protocol,                                           (√)
     StartStirProtocol: generate_start_stir_protocol,                                (√)
     StopStirProtocol: generate_stop_stir_protocol,                                  (√)
     这个重复了，删掉TransferProtocol: generate_transfer_protocol,
     CleanVesselProtocol: generate_clean_vessel_protocol,                            (√)
     DissolveProtocol: generate_dissolve_protocol,                                   (√)
     FilterThroughProtocol: generate_filter_through_protocol,                        (√)
-    RunColumnProtocol: generate_run_column_protocol,                        (×)
-    WashSolidProtocol: generate_wash_solid_protocol,                        (×)
+    RunColumnProtocol: generate_run_column_protocol,                                (√)<RunColumn Rf="?" column="column" from_vessel="rotavap" ratio="5:95" solvent1="methanol" solvent2="chloroform" to_vessel="rotavap"/>
 
-上下文体积搜索
+上下文体积搜索
+3. 还没创建的protocol
+    ResetHandling                         写完了                               <ResetHandling solvent="methanol"/>
+    Dry                                  写完了                                 <Dry compound="product" vessel="filter"/>
+    AdjustPH                               写完了                                <AdjustPH pH="8.0" reagent="hydrochloric acid" vessel="main_reactor"/>
+    Recrystallize                          写完了                              <Recrystallize ratio="?" solvent1="dichloromethane" solvent2="methanol" vessel="filter" volume="?"/>
+    TakeSample                                                                  <TakeSample id="a" vessel="rotavap"/>
+    Hydrogenate                                                                 <Hydrogenate temp="45 °C" time="?" vessel="main_reactor"/>

test/experiments/comprehensive_protocol/comprehensive_station.json

@@ -23,8 +23,10 @@
                 "waste_bottle_2",
                 "solenoid_valve_1",
                 "solenoid_valve_2",
+                "solenoid_valve_3",
                 "vacuum_pump_1",
                 "gas_source_1",
+                "h2_gas_source",
                 "filter_1",
                 "column_1",
                 "separator_1",
@@ -60,7 +62,12 @@
                     "HeatChillStartProtocol",
                     "HeatChillStopProtocol",
                     "EvacuateAndRefillProtocol",
-                    "PumpTransferProtocol"
+                    "PumpTransferProtocol",
+                    "AdjustPHProtocol",
+                    "ResetHandlingProtocol",
+                    "DryProtocol",
+                    "HydrogenateProtocol",
+                    "RecrystallizeProtocol"
                 ]
             },
             "data": {}
@@ -461,6 +468,28 @@
                 "is_open": false
             }
         },
+        {
+            "id": "solenoid_valve_3",
+            "name": "氢气电磁阀",
+            "children": [],
+            "parent": "OrganicSynthesisStation",
+            "type": "device",
+            "class": "virtual_solenoid_valve",
+            "position": {
+                "x": 450,
+                "y": 400,
+                "z": 0
+            },
+            "config": {
+                "voltage": 12.0,
+                "response_time": 0.1,
+                "gas_compatible": true
+            },
+            "data": {
+                "valve_state": "Closed",
+                "is_open": false
+            }
+        },
         {
             "id": "vacuum_pump_1",
             "name": "真空泵",
@@ -500,6 +529,29 @@
                 "max_pressure": 5.0
             }
         },
+        {
+            "id": "h2_gas_source",
+            "name": "氢气气源",
+            "children": [],
+            "parent": "OrganicSynthesisStation",
+            "type": "device",
+            "class": "virtual_gas_source",
+            "position": {
+                "x": 500,
+                "y": 350,
+                "z": 0
+            },
+            "config": {
+                "max_pressure": 10.0,
+                "gas_type": "hydrogen"
+            },
+            "data": {
+                "gas_type": "hydrogen",
+                "max_pressure": 10.0,
+                "current_pressure": 0.0,
+                "status": "OFF"
+            }
+        },
         {
             "id": "filter_1",
             "name": "过滤器",
@@ -874,14 +926,14 @@
             }
         },
         {
-        "id": "link_filter_filtrate_to_collection1",
-        "source": "filter_1",
-        "target": "collection_bottle_1",
-        "type": "transport",
-        "port": {
-            "filter_1": "filtrateout",
-            "collection_bottle_1": "top"
-        }
+            "id": "link_filter_filtrate_to_collection1",
+            "source": "filter_1",
+            "target": "collection_bottle_1",
+            "type": "transport",
+            "port": {
+                "filter_1": "filtrateout",
+                "collection_bottle_1": "top"
+            }
         },
         {
             "id": "link_filter_retentate_to_waste1",
@@ -892,6 +944,26 @@
                 "filter_1": "retentateout",
                 "waste_bottle_1": "top"
             }
+        },
+        {
+            "id": "link_h2_gas_to_valve3",
+            "source": "h2_gas_source",
+            "target": "solenoid_valve_3",
+            "type": "fluid",
+            "port": {
+                "h2_gas_source": "gassource",
+                "solenoid_valve_3": "in"
+            }
+        },
+        {
+            "id": "link_valve3_to_reactor",
+            "source": "solenoid_valve_3",
+            "target": "main_reactor",
+            "type": "fluid",
+            "port": {
+                "solenoid_valve_3": "out",
+                "main_reactor": "top"
+            }
         }
     ]
 }

unilabos/compile/__init__.py

@@ -21,24 +21,34 @@
 from .filter_through_protocol import generate_filter_through_protocol
 from .run_column_protocol import generate_run_column_protocol
 from .wash_solid_protocol import generate_wash_solid_protocol
+from .adjustph_protocol import generate_adjust_ph_protocol
+from .reset_handling_protocol import generate_reset_handling_protocol
+from .dry_protocol import generate_dry_protocol
+from .recrystallize_protocol import generate_recrystallize_protocol
+from .hydrogenate_protocol import generate_hydrogenate_protocol
 
 
 # Define a dictionary of protocol generators.
 action_protocol_generators = {
     AddProtocol: generate_add_protocol,
     AGVTransferProtocol: generate_agv_transfer_protocol,
+    AdjustPHProtocol: generate_adjust_ph_protocol,
     CentrifugeProtocol: generate_centrifuge_protocol,
     CleanProtocol: generate_clean_protocol,
     CleanVesselProtocol: generate_clean_vessel_protocol,
     DissolveProtocol: generate_dissolve_protocol,
+    DryProtocol: generate_dry_protocol,
     EvacuateAndRefillProtocol: generate_evacuateandrefill_protocol,
     EvaporateProtocol: generate_evaporate_protocol,
     FilterProtocol: generate_filter_protocol,
     FilterThroughProtocol: generate_filter_through_protocol,
     HeatChillProtocol: generate_heat_chill_protocol,
     HeatChillStartProtocol: generate_heat_chill_start_protocol,
     HeatChillStopProtocol: generate_heat_chill_stop_protocol,
+    HydrogenateProtocol: generate_hydrogenate_protocol,
     PumpTransferProtocol: generate_pump_protocol_with_rinsing,
+    RecrystallizeProtocol: generate_recrystallize_protocol,
+    ResetHandlingProtocol: generate_reset_handling_protocol,
     RunColumnProtocol: generate_run_column_protocol,
     SeparateProtocol: generate_separate_protocol,
     StartStirProtocol: generate_start_stir_protocol,