fix deck & host_node

set liquid with tube
Merge branch 'dev' into feat/lab_resource
2026-03-24 12:52:56 +00:00 · 2026-02-11 17:33:26 +08:00 · 2026-02-11 16:20:07 +08:00 · 2026-02-11 14:04:49 +08:00 · 2026-02-10 22:45:51 +08:00 · 2026-02-10 22:44:45 +08:00
15 changed files with 10580 additions and 21 deletions
--- a/.conda/base/recipe.yaml
+++ b/.conda/base/recipe.yaml
@@ -3,7 +3,7 @@

 package:
  name: unilabos
-  version: 0.10.18
+  version: 0.10.17

 source:
  path: ../../unilabos
@@ -46,15 +46,13 @@ requirements:
  - jinja2
  - requests
  - uvicorn
-  - if: not osx
-    then:
-    - opcua
+  - opcua # [not osx]
  - pyserial
  - pandas
  - pymodbus
  - matplotlib
  - pylibftdi
-  - uni-lab::unilabos-env ==0.10.18
+  - uni-lab::unilabos-env ==0.10.17

 about:
  repository: https://github.com/deepmodeling/Uni-Lab-OS
--- a/.conda/environment/recipe.yaml
+++ b/.conda/environment/recipe.yaml
@@ -2,7 +2,7 @@

 package:
  name: unilabos-env
-  version: 0.10.18
+  version: 0.10.17

 build:
  noarch: generic
--- a/.conda/full/recipe.yaml
+++ b/.conda/full/recipe.yaml
@@ -3,7 +3,7 @@

 package:
  name: unilabos-full
-  version: 0.10.18
+  version: 0.10.17

 build:
  noarch: generic
@@ -11,7 +11,7 @@ build:
 requirements:
  run:
  # Base unilabos package (includes unilabos-env)
-  - uni-lab::unilabos ==0.10.18
+  - uni-lab::unilabos ==0.10.17
  # Documentation tools
  - sphinx
  - sphinx_rtd_theme
--- a/.github/workflows/conda-pack-build.yml
+++ b/.github/workflows/conda-pack-build.yml
@@ -312,7 +312,7 @@ jobs:

      - name: Upload distribution package
        if: steps.should_build.outputs.should_build == 'true'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: unilab-pack-${{ matrix.platform }}-${{ github.event.inputs.branch }}
          path: dist-package/
--- a/.github/workflows/multi-platform-build.yml
+++ b/.github/workflows/multi-platform-build.yml
@@ -149,7 +149,7 @@ jobs:

      - name: Upload conda package artifacts
        if: steps.should_build.outputs.should_build == 'true'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: conda-package-${{ matrix.platform }}
          path: conda-packages-temp
--- a/.github/workflows/unilabos-conda-build.yml
+++ b/.github/workflows/unilabos-conda-build.yml
@@ -195,7 +195,7 @@ jobs:

      - name: Upload conda package artifacts
        if: steps.should_build.outputs.should_build == 'true'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: conda-package-unilabos-${{ matrix.platform }}
          path: conda-packages-temp
--- a/recipes/msgs/recipe.yaml
+++ b/recipes/msgs/recipe.yaml
@@ -1,6 +1,6 @@
 package:
  name: ros-humble-unilabos-msgs
-  version: 0.10.18
+  version: 0.10.17
 source:
  path: ../../unilabos_msgs
  target_directory: src
--- a/recipes/unilabos/recipe.yaml
+++ b/recipes/unilabos/recipe.yaml
@@ -1,6 +1,6 @@
 package:
  name: unilabos
-  version: "0.10.18"
+  version: "0.10.17"

 source:
  path: ../..
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ package_name = 'unilabos'

 setup(
    name=package_name,
-    version='0.10.18',
+    version='0.10.17',
    packages=find_packages(),
    include_package_data=True,
    install_requires=['setuptools'],
--- a/unilabos/init.py
+++ b/unilabos/init.py
@@ -1 +1 @@
-__version__ = "0.10.18"
+__version__ = "0.10.17"
--- a/unilabos/app/ws_client.py
+++ b/unilabos/app/ws_client.py
@@ -1184,11 +1184,6 @@ class QueueProcessor:
        logger.debug(f"[QueueProcessor] Sending busy status for {len(queued_jobs)} queued jobs")

        for job_info in queued_jobs:
-            # 快照可能已过期：在遍历过程中 end_job() 可能已将此 job 移至 READY，
-            # 此时不应再发送 busy/need_more，否则会覆盖已发出的 free=True 通知
-            if job_info.status != JobStatus.QUEUE:
-                continue
-
            message = {
                "action": "report_action_state",
                "data": {
--- a/unilabos/registry/resources/opentrons/lab.yaml
+++ b/unilabos/registry/resources/opentrons/lab.yaml
--- a/unilabos/resources/lab_resources.py
+++ b/unilabos/resources/lab_resources.py
--- a/unilabos/resources/opentrons_custom_labware_defs.json
+++ b/unilabos/resources/opentrons_custom_labware_defs.json
--- a/unilabos_msgs/package.xml
+++ b/unilabos_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
  <name>unilabos_msgs</name>
-  <version>0.10.18</version>
+  <version>0.10.17</version>
  <description>ROS2 Messages package for unilabos devices</description>
  <maintainer email="changjh@pku.edu.cn">Junhan Chang</maintainer>
  <maintainer email="18435084+Xuwznln@users.noreply.github.com">Xuwznln</maintainer>
Author	SHA1	Message	Date
Xuwznln	45efbfcd12	fix deck & host_node	2026-02-11 17:33:26 +08:00
Xuwznln	8da6fdfd0b	set liquid with tube	2026-02-11 16:20:07 +08:00
Xuwznln	29ea9909a5	Merge branch 'dev' into feat/lab_resource	2026-02-11 14:04:49 +08:00
Xuwznln	ee6307a568	registry update & workflow update	2026-02-10 22:45:51 +08:00
Xuwznln	8a0116c852	add resource	2026-02-10 22:44:45 +08:00