Update workstation code for YB4 0107

合并dev分支

.conda/base/recipe.yaml

@@ -1,60 +0,0 @@
-# unilabos: Production package (depends on unilabos-env + pip unilabos)
-# For production deployment
-
-package:
-  name: unilabos
-  version: 0.10.17
-
-source:
-  path: ../../unilabos
-  target_directory: unilabos
-
-build:
-  python:
-    entry_points:
-    - unilab = unilabos.app.main:main
-  script:
-  - set PIP_NO_INDEX=
-  - if: win
-    then:
-    - copy %RECIPE_DIR%\..\..\MANIFEST.in %SRC_DIR%
-    - copy %RECIPE_DIR%\..\..\setup.cfg %SRC_DIR%
-    - copy %RECIPE_DIR%\..\..\setup.py %SRC_DIR%
-    - pip install %SRC_DIR%
-  - if: unix
-    then:
-    - cp $RECIPE_DIR/../../MANIFEST.in $SRC_DIR
-    - cp $RECIPE_DIR/../../setup.cfg $SRC_DIR
-    - cp $RECIPE_DIR/../../setup.py $SRC_DIR
-    - pip install $SRC_DIR
-
-requirements:
-  host:
-  - python ==3.11.14
-  - pip
-  - setuptools
-  - zstd
-  - zstandard
-  run:
-  - zstd
-  - zstandard
-  - networkx
-  - typing_extensions
-  - websockets
-  - pint
-  - fastapi
-  - jinja2
-  - requests
-  - uvicorn
-  - opcua
-  - pyserial
-  - pandas
-  - pymodbus
-  - matplotlib
-  - pylibftdi
-  - uni-lab::unilabos-env ==0.10.17
-
-about:
-  repository: https://github.com/deepmodeling/Uni-Lab-OS
-  license: GPL-3.0-only
-  description: "UniLabOS - Production package with minimal ROS2 dependencies"

.conda/environment/recipe.yaml

@@ -1,39 +0,0 @@
-# unilabos-env: conda environment dependencies (ROS2 + conda packages)
-
-package:
-  name: unilabos-env
-  version: 0.10.17
-
-build:
-  noarch: generic
-
-requirements:
-  run:
-  # Python
-  - zstd
-  - zstandard
-  - conda-forge::python ==3.11.14
-  - conda-forge::opencv
-  # ROS2 dependencies (from ci-check.yml)
-  - robostack-staging::ros-humble-ros-core
-  - robostack-staging::ros-humble-action-msgs
-  - robostack-staging::ros-humble-std-msgs
-  - robostack-staging::ros-humble-geometry-msgs
-  - robostack-staging::ros-humble-control-msgs
-  - robostack-staging::ros-humble-nav2-msgs
-  - robostack-staging::ros-humble-cv-bridge
-  - robostack-staging::ros-humble-vision-opencv
-  - robostack-staging::ros-humble-tf-transformations
-  - robostack-staging::ros-humble-moveit-msgs
-  - robostack-staging::ros-humble-tf2-ros
-  - robostack-staging::ros-humble-tf2-ros-py
-  - conda-forge::transforms3d
-  - conda-forge::uv
-
-  # UniLabOS custom messages
-  - uni-lab::ros-humble-unilabos-msgs
-
-about:
-  repository: https://github.com/deepmodeling/Uni-Lab-OS
-  license: GPL-3.0-only
-  description: "UniLabOS Environment - ROS2 and conda dependencies"

.conda/full/recipe.yaml

@@ -1,42 +0,0 @@
-# unilabos-full: Full package with all features
-# Depends on unilabos + complete ROS2 desktop + dev tools
-
-package:
-  name: unilabos-full
-  version: 0.10.17
-
-build:
-  noarch: generic
-
-requirements:
-  run:
-  # Base unilabos package (includes unilabos-env)
-  - uni-lab::unilabos ==0.10.17
-  # Documentation tools
-  - sphinx
-  - sphinx_rtd_theme
-  # Web UI
-  - gradio
-  - flask
-  # Interactive development
-  - ipython
-  - jupyter
-  - jupyros
-  - colcon-common-extensions
-  # ROS2 full desktop (includes rviz2, gazebo, etc.)
-  - robostack-staging::ros-humble-desktop-full
-  # Navigation and motion control
-  - ros-humble-navigation2
-  - ros-humble-ros2-control
-  - ros-humble-robot-state-publisher
-  - ros-humble-joint-state-publisher
-  # MoveIt motion planning
-  - ros-humble-moveit
-  - ros-humble-moveit-servo
-  # Simulation
-  - ros-humble-simulation
-
-about:
-  repository: https://github.com/deepmodeling/Uni-Lab-OS
-  license: GPL-3.0-only
-  description: "UniLabOS Full - Complete package with ROS2 Desktop, MoveIt, Navigation2, Gazebo, Jupyter"

.conda/recipe.yaml

@@ -0,0 +1,92 @@
+package:
+  name: unilabos
+  version: 0.10.12
+
+source:
+  path: ../unilabos
+  target_directory: unilabos
+
+build:
+  python:
+    entry_points:
+     - unilab = unilabos.app.main:main
+  script:
+  - set PIP_NO_INDEX=
+  - if: win
+    then:
+    - copy %RECIPE_DIR%\..\MANIFEST.in %SRC_DIR%
+    - copy %RECIPE_DIR%\..\setup.cfg %SRC_DIR%
+    - copy %RECIPE_DIR%\..\setup.py %SRC_DIR%
+    - call %PYTHON% -m pip install %SRC_DIR%
+  - if: unix
+    then:
+    - cp $RECIPE_DIR/../MANIFEST.in $SRC_DIR
+    - cp $RECIPE_DIR/../setup.cfg $SRC_DIR
+    - cp $RECIPE_DIR/../setup.py $SRC_DIR
+    - $PYTHON -m pip install $SRC_DIR
+
+
+requirements:
+  host:
+  - python ==3.11.11
+  - pip
+  - setuptools
+  - zstd
+  - zstandard
+  run:
+  - conda-forge::python ==3.11.11
+  - compilers
+  - cmake
+  - zstd
+  - zstandard
+  - ninja
+  - if: unix
+    then:
+    - make
+  - sphinx
+  - sphinx_rtd_theme
+  - numpy
+  - scipy
+  - pandas
+  - networkx
+  - matplotlib
+  - pint
+  - pyserial
+  - pyusb
+  - pylibftdi
+  - pymodbus
+  - python-can
+  - pyvisa
+  - opencv
+  - pydantic
+  - fastapi
+  - uvicorn
+  - gradio
+  - flask
+  - websockets
+  - ipython
+  - jupyter
+  - jupyros
+  - colcon-common-extensions
+  - robostack-staging::ros-humble-desktop-full
+  - robostack-staging::ros-humble-control-msgs
+  - robostack-staging::ros-humble-sensor-msgs
+  - robostack-staging::ros-humble-trajectory-msgs
+  - ros-humble-navigation2
+  - ros-humble-ros2-control
+  - ros-humble-robot-state-publisher
+  - ros-humble-joint-state-publisher
+  - ros-humble-rosbridge-server
+  - ros-humble-cv-bridge
+  - ros-humble-tf2
+  - ros-humble-moveit
+  - ros-humble-moveit-servo
+  - ros-humble-simulation
+  - ros-humble-tf-transformations
+  - transforms3d
+  - uni-lab::ros-humble-unilabos-msgs
+
+about:
+  repository: https://github.com/dptech-corp/Uni-Lab-OS
+  license: GPL-3.0-only
+  description: "Uni-Lab-OS"

.conda/scripts/post-link.bat

@@ -0,0 +1,9 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM upgrade pip
+"%PREFIX%\python.exe" -m pip install --upgrade pip
+
+REM install extra deps
+"%PREFIX%\python.exe" -m pip install paho-mqtt opentrons_shared_data
+"%PREFIX%\python.exe" -m pip install git+https://github.com/Xuwznln/pylabrobot.git

.conda/scripts/post-link.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+
+# make sure pip is available
+"$PREFIX/bin/python" -m pip install --upgrade pip
+
+# install extra deps
+"$PREFIX/bin/python" -m pip install paho-mqtt opentrons_shared_data
+"$PREFIX/bin/python" -m pip install git+https://github.com/Xuwznln/pylabrobot.git

.github/dependabot.yml

@@ -1,19 +0,0 @@
-version: 2
-updates:
-# GitHub Actions
-- package-ecosystem: "github-actions"
-  directory: "/"
-  target-branch: "dev"
-  schedule:
-    interval: "weekly"
-    day: "monday"
-    time: "06:00"
-  open-pull-requests-limit: 5
-  reviewers:
-  - "msgcenterpy-team"
-  labels:
-  - "dependencies"
-  - "github-actions"
-  commit-message:
-    prefix: "ci"
-    include: "scope"

.github/workflows/ci-check.yml

@@ -1,67 +0,0 @@
-name: CI Check
-
-on:
-  push:
-    branches: [main, dev]
-  pull_request:
-    branches: [main, dev]
-
-jobs:
-  registry-check:
-    runs-on: windows-latest
-
-    env:
-      # Fix Unicode encoding issue on Windows runner (cp1252 -> utf-8)
-      PYTHONIOENCODING: utf-8
-      PYTHONUTF8: 1
-
-    defaults:
-      run:
-        shell: cmd
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Setup Miniforge
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          miniforge-version: latest
-          use-mamba: true
-          channels: robostack-staging,conda-forge,uni-lab
-          channel-priority: flexible
-          activate-environment: check-env
-          auto-update-conda: false
-          show-channel-urls: true
-
-      - name: Install ROS dependencies, uv and unilabos-msgs
-        run: |
-          echo Installing ROS dependencies...
-          mamba install -n check-env conda-forge::uv conda-forge::opencv robostack-staging::ros-humble-ros-core robostack-staging::ros-humble-action-msgs robostack-staging::ros-humble-std-msgs robostack-staging::ros-humble-geometry-msgs robostack-staging::ros-humble-control-msgs robostack-staging::ros-humble-nav2-msgs uni-lab::ros-humble-unilabos-msgs robostack-staging::ros-humble-cv-bridge robostack-staging::ros-humble-vision-opencv robostack-staging::ros-humble-tf-transformations robostack-staging::ros-humble-moveit-msgs robostack-staging::ros-humble-tf2-ros robostack-staging::ros-humble-tf2-ros-py conda-forge::transforms3d -c robostack-staging -c conda-forge -c uni-lab -y
-
-      - name: Install pip dependencies and unilabos
-        run: |
-          call conda activate check-env
-          echo Installing pip dependencies...
-          uv pip install -r unilabos/utils/requirements.txt
-          uv pip install pywinauto git+https://github.com/Xuwznln/pylabrobot.git
-          uv pip uninstall enum34 || echo enum34 not installed, skipping
-          uv pip install .
-
-      - name: Run check mode (complete_registry)
-        run: |
-          call conda activate check-env
-          echo Running check mode...
-          python -m unilabos --check_mode --skip_env_check
-
-      - name: Check for uncommitted changes
-        shell: bash
-        run: |
-          if ! git diff --exit-code; then
-            echo "::error::检测到文件变化！请先在本地运行 'python -m unilabos --complete_registry' 并提交变更"
-            echo "变化的文件:"
-            git diff --name-only
-            exit 1
-          fi
-          echo "检查通过：无文件变化"

.github/workflows/conda-pack-build.yml

@@ -13,11 +13,6 @@ on:
         required: false
         default: 'win-64'
         type: string
-      build_full:
-        description: '是否构建完整版 unilabos-full (默认构建轻量版 unilabos)'
-        required: false
-        default: false
-        type: boolean
 
 jobs:
   build-conda-pack:
@@ -29,7 +24,7 @@ jobs:
             platform: linux-64
             env_file: unilabos-linux-64.yaml
             script_ext: sh
-          - os: macos-15 # Intel (via Rosetta)
+          - os: macos-13 # Intel
             platform: osx-64
             env_file: unilabos-osx-64.yaml
             script_ext: sh
@@ -62,7 +57,7 @@ jobs:
             echo "should_build=false" >> $GITHUB_OUTPUT
           fi
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         if: steps.should_build.outputs.should_build == 'true'
         with:
           ref: ${{ github.event.inputs.branch }}
@@ -74,7 +69,7 @@ jobs:
         with:
           miniforge-version: latest
           use-mamba: true
-          python-version: '3.11.14'
+          python-version: '3.11.11'
           channels: conda-forge,robostack-staging,uni-lab,defaults
           channel-priority: flexible
           activate-environment: unilab
@@ -86,14 +81,7 @@ jobs:
         run: |
           echo Installing unilabos and dependencies to unilab environment...
           echo Using mamba for faster and more reliable dependency resolution...
-          echo Build full: ${{ github.event.inputs.build_full }}
-          if "${{ github.event.inputs.build_full }}"=="true" (
-            echo Installing unilabos-full ^(complete package^)...
-            mamba install -n unilab uni-lab::unilabos-full conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
-          ) else (
-            echo Installing unilabos ^(minimal package^)...
-            mamba install -n unilab uni-lab::unilabos conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
-          )
+          mamba install -n unilab uni-lab::unilabos conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
 
       - name: Install conda-pack, unilabos and dependencies (Unix)
         if: steps.should_build.outputs.should_build == 'true' && matrix.platform != 'win-64'
@@ -101,14 +89,7 @@ jobs:
         run: |
           echo "Installing unilabos and dependencies to unilab environment..."
           echo "Using mamba for faster and more reliable dependency resolution..."
-          echo "Build full: ${{ github.event.inputs.build_full }}"
-          if [[ "${{ github.event.inputs.build_full }}" == "true" ]]; then
-            echo "Installing unilabos-full (complete package)..."
-            mamba install -n unilab uni-lab::unilabos-full conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
-          else
-            echo "Installing unilabos (minimal package)..."
-            mamba install -n unilab uni-lab::unilabos conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
-          fi
+          mamba install -n unilab uni-lab::unilabos conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
 
       - name: Get latest ros-humble-unilabos-msgs version (Windows)
         if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'win-64'
@@ -312,7 +293,7 @@ jobs:
 
       - name: Upload distribution package
         if: steps.should_build.outputs.should_build == 'true'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: unilab-pack-${{ matrix.platform }}-${{ github.event.inputs.branch }}
           path: dist-package/
@@ -327,12 +308,7 @@ jobs:
           echo ==========================================
           echo Platform: ${{ matrix.platform }}
           echo Branch: ${{ github.event.inputs.branch }}
-          echo Python version: 3.11.14
-          if "${{ github.event.inputs.build_full }}"=="true" (
-            echo Package: unilabos-full ^(complete^)
-          ) else (
-            echo Package: unilabos ^(minimal^)
-          )
+          echo Python version: 3.11.11
           echo.
           echo Distribution package contents:
           dir dist-package
@@ -352,12 +328,7 @@ jobs:
           echo "=========================================="
           echo "Platform: ${{ matrix.platform }}"
           echo "Branch: ${{ github.event.inputs.branch }}"
-          echo "Python version: 3.11.14"
-          if [[ "${{ github.event.inputs.build_full }}" == "true" ]]; then
-            echo "Package: unilabos-full (complete)"
-          else
-            echo "Package: unilabos (minimal)"
-          fi
+          echo "Python version: 3.11.11"
           echo ""
           echo "Distribution package contents:"
           ls -lh dist-package/

.github/workflows/deploy-docs.yml

@@ -1,12 +1,10 @@
 name: Deploy Docs
 
 on:
-  # 在 CI Check 成功后自动触发（仅 main 分支）
-  workflow_run:
-    workflows: ["CI Check"]
-    types: [completed]
+  push:
+    branches: [main]
+  pull_request:
     branches: [main]
-  # 手动触发
   workflow_dispatch:
     inputs:
       branch:
@@ -35,19 +33,12 @@ concurrency:
 jobs:
   # Build documentation
   build:
-    # 只在以下情况运行：
-    # 1. workflow_run 触发且 CI Check 成功
-    # 2. 手动触发
-    if: |
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
-          # workflow_run 时使用触发工作流的分支，手动触发时使用输入的分支
-          ref: ${{ github.event.workflow_run.head_branch || github.event.inputs.branch || github.ref }}
+          ref: ${{ github.event.inputs.branch || github.ref }}
           fetch-depth: 0
 
       - name: Setup Miniforge (with mamba)
@@ -55,7 +46,7 @@ jobs:
         with:
           miniforge-version: latest
           use-mamba: true
-          python-version: '3.11.14'
+          python-version: '3.11.11'
           channels: conda-forge,robostack-staging,uni-lab,defaults
           channel-priority: flexible
           activate-environment: unilab
@@ -84,10 +75,8 @@ jobs:
 
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v5
-        if: |
-          github.event.workflow_run.head_branch == 'main' ||
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
+        uses: actions/configure-pages@v4
+        if: github.ref == 'refs/heads/main' || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
 
       - name: Build Sphinx documentation
         run: |
@@ -105,18 +94,14 @@ jobs:
           test -f docs/_build/html/index.html && echo "✓ index.html exists" || echo "✗ index.html missing"
 
       - name: Upload build artifacts
-        uses: actions/upload-pages-artifact@v4
-        if: |
-          github.event.workflow_run.head_branch == 'main' ||
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
+        uses: actions/upload-pages-artifact@v3
+        if: github.ref == 'refs/heads/main' || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
         with:
           path: docs/_build/html
 
   # Deploy to GitHub Pages
   deploy:
-    if: |
-      github.event.workflow_run.head_branch == 'main' ||
-      (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
+    if: github.ref == 'refs/heads/main' || (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

.github/workflows/multi-platform-build.yml

@@ -1,16 +1,11 @@
 name: Multi-Platform Conda Build
 
 on:
-  # 在 CI Check 工作流完成后触发（仅限 main/dev 分支）
-  workflow_run:
-    workflows: ["CI Check"]
-    types:
-      - completed
-    branches: [main, dev]
-  # 支持 tag 推送（不依赖 CI Check）
   push:
+    branches: [main, dev]
     tags: ['v*']
-  # 手动触发
+  pull_request:
+    branches: [main, dev]
   workflow_dispatch:
     inputs:
       platforms:
@@ -22,37 +17,9 @@ on:
         required: false
         default: false
         type: boolean
-      skip_ci_check:
-        description: '跳过等待 CI Check (手动触发时可选)'
-        required: false
-        default: false
-        type: boolean
 
 jobs:
-  # 等待 CI Check 完成的 job (仅用于 workflow_run 触发)
-  wait-for-ci:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_run'
-    outputs:
-      should_continue: ${{ steps.check.outputs.should_continue }}
-    steps:
-      - name: Check CI status
-        id: check
-        run: |
-          if [[ "${{ github.event.workflow_run.conclusion }}" == "success" ]]; then
-            echo "should_continue=true" >> $GITHUB_OUTPUT
-            echo "CI Check passed, proceeding with build"
-          else
-            echo "should_continue=false" >> $GITHUB_OUTPUT
-            echo "CI Check did not succeed (status: ${{ github.event.workflow_run.conclusion }}), skipping build"
-          fi
-
   build:
-    needs: [wait-for-ci]
-    # 运行条件：workflow_run 触发且 CI 成功，或者其他触发方式
-    if: |
-      always() &&
-      (needs.wait-for-ci.result == 'skipped' || needs.wait-for-ci.outputs.should_continue == 'true')
     strategy:
       fail-fast: false
       matrix:
@@ -60,7 +27,7 @@ jobs:
           - os: ubuntu-latest
             platform: linux-64
             env_file: unilabos-linux-64.yaml
-          - os: macos-15 # Intel (via Rosetta)
+          - os: macos-13 # Intel
             platform: osx-64
             env_file: unilabos-osx-64.yaml
           - os: macos-latest # ARM64
@@ -77,10 +44,8 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
-          # 如果是 workflow_run 触发，使用触发 CI Check 的 commit
-          ref: ${{ github.event.workflow_run.head_sha || github.ref }}
           fetch-depth: 0
 
       - name: Check if platform should be built
@@ -104,6 +69,7 @@ jobs:
           channels: conda-forge,robostack-staging,defaults
           channel-priority: strict
           activate-environment: build-env
+          auto-activate-base: false
           auto-update-conda: false
           show-channel-urls: true
 
@@ -149,7 +115,7 @@ jobs:
 
       - name: Upload conda package artifacts
         if: steps.should_build.outputs.should_build == 'true'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: conda-package-${{ matrix.platform }}
           path: conda-packages-temp

.github/workflows/unilabos-conda-build.yml

@@ -1,69 +1,32 @@
 name: UniLabOS Conda Build
 
 on:
-  # 在 CI Check 成功后自动触发
-  workflow_run:
-    workflows: ["CI Check"]
-    types: [completed]
-    branches: [main, dev]
-  # 标签推送时直接触发（发布版本）
   push:
+    branches: [main, dev]
     tags: ['v*']
-  # 手动触发
+  pull_request:
+    branches: [main, dev]
   workflow_dispatch:
     inputs:
       platforms:
         description: '选择构建平台 (逗号分隔): linux-64, osx-64, osx-arm64, win-64'
         required: false
         default: 'linux-64'
-      build_full:
-        description: '是否构建 unilabos-full 完整包 (默认只构建 unilabos 基础包)'
-        required: false
-        default: false
-        type: boolean
       upload_to_anaconda:
         description: '是否上传到Anaconda.org'
         required: false
         default: false
         type: boolean
-      skip_ci_check:
-        description: '跳过等待 CI Check (手动触发时可选)'
-        required: false
-        default: false
-        type: boolean
 
 jobs:
-  # 等待 CI Check 完成的 job (仅用于 workflow_run 触发)
-  wait-for-ci:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_run'
-    outputs:
-      should_continue: ${{ steps.check.outputs.should_continue }}
-    steps:
-      - name: Check CI status
-        id: check
-        run: |
-          if [[ "${{ github.event.workflow_run.conclusion }}" == "success" ]]; then
-            echo "should_continue=true" >> $GITHUB_OUTPUT
-            echo "CI Check passed, proceeding with build"
-          else
-            echo "should_continue=false" >> $GITHUB_OUTPUT
-            echo "CI Check did not succeed (status: ${{ github.event.workflow_run.conclusion }}), skipping build"
-          fi
-
   build:
-    needs: [wait-for-ci]
-    # 运行条件：workflow_run 触发且 CI 成功，或者其他触发方式
-    if: |
-      always() &&
-      (needs.wait-for-ci.result == 'skipped' || needs.wait-for-ci.outputs.should_continue == 'true')
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
             platform: linux-64
-          - os: macos-15 # Intel (via Rosetta)
+          - os: macos-13 # Intel
             platform: osx-64
           - os: macos-latest # ARM64
             platform: osx-arm64
@@ -77,10 +40,8 @@ jobs:
         shell: bash -l {0}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
-          # 如果是 workflow_run 触发，使用触发 CI Check 的 commit
-          ref: ${{ github.event.workflow_run.head_sha || github.ref }}
           fetch-depth: 0
 
       - name: Check if platform should be built
@@ -104,6 +65,7 @@ jobs:
           channels: conda-forge,robostack-staging,uni-lab,defaults
           channel-priority: strict
           activate-environment: build-env
+          auto-activate-base: false
           auto-update-conda: false
           show-channel-urls: true
 
@@ -119,61 +81,12 @@ jobs:
           conda list | grep -E "(rattler-build|anaconda-client)"
           echo "Platform: ${{ matrix.platform }}"
           echo "OS: ${{ matrix.os }}"
-          echo "Build full package: ${{ github.event.inputs.build_full || 'false' }}"
-          echo "Building packages:"
-          echo "  - unilabos-env (environment dependencies)"
-          echo "  - unilabos (with pip package)"
-          if [[ "${{ github.event.inputs.build_full }}" == "true" ]]; then
-            echo "  - unilabos-full (complete package)"
-          fi
+          echo "Building UniLabOS package"
 
-      - name: Build unilabos-env (conda environment only, noarch)
+      - name: Build conda package
         if: steps.should_build.outputs.should_build == 'true'
         run: |
-          echo "Building unilabos-env (conda environment dependencies)..."
-          rattler-build build -r .conda/environment/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge
-
-      - name: Upload unilabos-env to Anaconda.org (if enabled)
-        if: steps.should_build.outputs.should_build == 'true' && github.event.inputs.upload_to_anaconda == 'true'
-        run: |
-          echo "Uploading unilabos-env to uni-lab organization..."
-          for package in $(find ./output -name "unilabos-env*.conda"); do
-            anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
-          done
-
-      - name: Build unilabos (with pip package)
-        if: steps.should_build.outputs.should_build == 'true'
-        run: |
-          echo "Building unilabos package..."
-          # 如果已上传到 Anaconda，从 uni-lab channel 获取 unilabos-env；否则从本地 output 获取
-          rattler-build build -r .conda/base/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge --channel ./output
-
-      - name: Upload unilabos to Anaconda.org (if enabled)
-        if: steps.should_build.outputs.should_build == 'true' && github.event.inputs.upload_to_anaconda == 'true'
-        run: |
-          echo "Uploading unilabos to uni-lab organization..."
-          for package in $(find ./output -name "unilabos-0*.conda" -o -name "unilabos-[0-9]*.conda"); do
-            anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
-          done
-
-      - name: Build unilabos-full - Only when explicitly requested
-        if: |
-          steps.should_build.outputs.should_build == 'true' && 
-          github.event.inputs.build_full == 'true'
-        run: |
-          echo "Building unilabos-full package on ${{ matrix.platform }}..."
-          rattler-build build -r .conda/full/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge --channel ./output
-
-      - name: Upload unilabos-full to Anaconda.org (if enabled)
-        if: |
-          steps.should_build.outputs.should_build == 'true' && 
-          github.event.inputs.build_full == 'true' &&
-          github.event.inputs.upload_to_anaconda == 'true'
-        run: |
-          echo "Uploading unilabos-full to uni-lab organization..."
-          for package in $(find ./output -name "unilabos-full*.conda"); do
-            anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
-          done
+          rattler-build build -r .conda/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge
 
       - name: List built packages
         if: steps.should_build.outputs.should_build == 'true'
@@ -195,9 +108,17 @@ jobs:
 
       - name: Upload conda package artifacts
         if: steps.should_build.outputs.should_build == 'true'
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: conda-package-unilabos-${{ matrix.platform }}
           path: conda-packages-temp
           if-no-files-found: warn
           retention-days: 30
+
+      - name: Upload to Anaconda.org (uni-lab organization)
+        if: github.event.inputs.upload_to_anaconda == 'true'
+        run: |
+          for package in $(find ./output -name "*.conda"); do
+            echo "Uploading $package to uni-lab organization..."
+            anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
+          done

.gitignore

@@ -1,10 +1,8 @@
-cursor_docs/
 configs/
 temp/
 output/
 unilabos_data/
 pyrightconfig.json
-.cursorignore
 ## Python
 
 # Byte-compiled / optimized / DLL files

MANIFEST.in

@@ -1,5 +1,4 @@
 recursive-include unilabos/test *
-recursive-include unilabos/utils *
 recursive-include unilabos/registry *.yaml
 recursive-include unilabos/app/web/static *
 recursive-include unilabos/app/web/templates *

NOTICE

@@ -1,17 +0,0 @@
-# Uni-Lab-OS Licensing Notice
-
-This project uses a dual licensing structure:
-
-## 1. Main Framework - GPL-3.0
-
-- unilabos/ (except unilabos/devices/)
-- docs/
-- tests/
-
-See [LICENSE](LICENSE) for details.
-
-## 2. Device Drivers - DP Technology Proprietary License
-
-- unilabos/devices/
-
-See [unilabos/devices/LICENSE](unilabos/devices/LICENSE) for details.

README.md

@@ -8,13 +8,17 @@
 
 **English** | [中文](README_zh.md)
 
-[![GitHub Stars](https://img.shields.io/github/stars/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/stargazers)
-[![GitHub Forks](https://img.shields.io/github/forks/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/network/members)
-[![GitHub Issues](https://img.shields.io/github/issues/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/issues)
-[![GitHub License](https://img.shields.io/github/license/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/blob/main/LICENSE)
+[![GitHub Stars](https://img.shields.io/github/stars/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/stargazers)
+[![GitHub Forks](https://img.shields.io/github/forks/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/network/members)
+[![GitHub Issues](https://img.shields.io/github/issues/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/issues)
+[![GitHub License](https://img.shields.io/github/license/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/blob/main/LICENSE)
 
 Uni-Lab-OS is a platform for laboratory automation, designed to connect and control various experimental equipment, enabling automation and standardization of experimental workflows.
 
+## 🏆 Competition
+
+Join the [Intelligent Organic Chemistry Synthesis Competition](https://bohrium.dp.tech/competitions/1451645258) to explore automated synthesis with Uni-Lab-OS!
+
 ## Key Features
 
 - Multi-device integration management
@@ -27,89 +31,41 @@ Uni-Lab-OS is a platform for laboratory automation, designed to connect and cont
 
 Detailed documentation can be found at:
 
-- [Online Documentation](https://deepmodeling.github.io/Uni-Lab-OS/)
+- [Online Documentation](https://xuwznln.github.io/Uni-Lab-OS-Doc/)
 
 ## Quick Start
 
-### 1. Setup Conda Environment
-
-Uni-Lab-OS recommends using `mamba` for environment management. Choose the package that fits your needs:
-
-| Package | Use Case | Contents |
-|---------|----------|----------|
-| `unilabos` | **Recommended for most users** | Complete package, ready to use |
-| `unilabos-env` | Developers (editable install) | Environment only, install unilabos via pip |
-| `unilabos-full` | Simulation/Visualization | unilabos + ROS2 Desktop + Gazebo + MoveIt |
+Uni-Lab-OS recommends using `mamba` for environment management. Choose the appropriate environment file for your operating system:
 
 ```bash
 # Create new environment
-mamba create -n unilab python=3.11.14
+mamba create -n unilab python=3.11.11
 mamba activate unilab
-
-# Option A: Standard installation (recommended for most users)
-mamba install uni-lab::unilabos -c robostack-staging -c conda-forge
-
-# Option B: For developers (editable mode development)
-mamba install uni-lab::unilabos-env -c robostack-staging -c conda-forge
-# Then install unilabos and dependencies:
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git && cd Uni-Lab-OS
-pip install -e .
-uv pip install -r unilabos/utils/requirements.txt
-
-# Option C: Full installation (simulation/visualization)
-mamba install uni-lab::unilabos-full -c robostack-staging -c conda-forge
+mamba install -n unilab uni-lab::unilabos -c robostack-staging -c conda-forge
 ```
 
-**When to use which?**
-- **unilabos**: Standard installation for production deployment and general usage (recommended)
-- **unilabos-env**: For developers who need `pip install -e .` editable mode, modify source code
-- **unilabos-full**: For simulation (Gazebo), visualization (rviz2), and Jupyter notebooks
-
-### 2. Clone Repository (Optional, for developers)
+## Install Dev Uni-Lab-OS
 
 ```bash
-# Clone the repository (only needed for development or examples)
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git
+# Clone the repository
+git clone https://github.com/dptech-corp/Uni-Lab-OS.git
 cd Uni-Lab-OS
+
+# Install Uni-Lab-OS
+pip install .
 ```
 
-3. Start Uni-Lab System
+3. Start Uni-Lab System:
 
-Please refer to [Documentation - Boot Examples](https://deepmodeling.github.io/Uni-Lab-OS/boot_examples/index.html)
-
-4. Best Practice
-
-See [Best Practice Guide](https://deepmodeling.github.io/Uni-Lab-OS/user_guide/best_practice.html)
+Please refer to [Documentation - Boot Examples](https://xuwznln.github.io/Uni-Lab-OS-Doc/boot_examples/index.html)
 
 ## Message Format
 
-Uni-Lab-OS uses pre-built `unilabos_msgs` for system communication. You can find the built versions on the [GitHub Releases](https://github.com/deepmodeling/Uni-Lab-OS/releases) page.
-
-## Citation
-
-If you use [Uni-Lab-OS](https://arxiv.org/abs/2512.21766) in academic research, please cite:
-
-```bibtex
-@article{gao2025unilabos,
-    title = {UniLabOS: An AI-Native Operating System for Autonomous Laboratories},
-    doi = {10.48550/arXiv.2512.21766},
-    publisher = {arXiv},
-    author = {Gao, Jing and Chang, Junhan and Que, Haohui and Xiong, Yanfei and
-              Zhang, Shixiang and Qi, Xianwei and Liu, Zhen and Wang, Jun-Jie and
-              Ding, Qianjun and Li, Xinyu and Pan, Ziwei and Xie, Qiming and
-              Yan, Zhuang and Yan, Junchi and Zhang, Linfeng},
-    year = {2025}
-}
-```
+Uni-Lab-OS uses pre-built `unilabos_msgs` for system communication. You can find the built versions on the [GitHub Releases](https://github.com/dptech-corp/Uni-Lab-OS/releases) page.
 
 ## License
 
-This project uses a dual licensing structure:
-
-- **Main Framework**: GPL-3.0 - see [LICENSE](LICENSE)
-- **Device Drivers** (`unilabos/devices/`): DP Technology Proprietary License
-
-See [NOTICE](NOTICE) for complete licensing details.
+This project is licensed under GPL-3.0 - see the [LICENSE](LICENSE) file for details.
 
 ## Project Statistics
 
@@ -121,4 +77,4 @@ See [NOTICE](NOTICE) for complete licensing details.
 
 ## Contact Us
 
-- GitHub Issues: [https://github.com/deepmodeling/Uni-Lab-OS/issues](https://github.com/deepmodeling/Uni-Lab-OS/issues)
+- GitHub Issues: [https://github.com/dptech-corp/Uni-Lab-OS/issues](https://github.com/dptech-corp/Uni-Lab-OS/issues)

README_zh.md

@@ -8,13 +8,17 @@
 
 [English](README.md) | **中文**
 
-[![GitHub Stars](https://img.shields.io/github/stars/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/stargazers)
-[![GitHub Forks](https://img.shields.io/github/forks/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/network/members)
-[![GitHub Issues](https://img.shields.io/github/issues/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/issues)
-[![GitHub License](https://img.shields.io/github/license/dptech-corp/Uni-Lab-OS.svg)](https://github.com/deepmodeling/Uni-Lab-OS/blob/main/LICENSE)
+[![GitHub Stars](https://img.shields.io/github/stars/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/stargazers)
+[![GitHub Forks](https://img.shields.io/github/forks/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/network/members)
+[![GitHub Issues](https://img.shields.io/github/issues/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/issues)
+[![GitHub License](https://img.shields.io/github/license/dptech-corp/Uni-Lab-OS.svg)](https://github.com/dptech-corp/Uni-Lab-OS/blob/main/LICENSE)
 
 Uni-Lab-OS 是一个用于实验室自动化的综合平台，旨在连接和控制各种实验设备，实现实验流程的自动化和标准化。
 
+## 🏆 比赛
+
+欢迎参加[有机化学合成智能实验大赛](https://bohrium.dp.tech/competitions/1451645258)，使用 Uni-Lab-OS 探索自动化合成！
+
 ## 核心特点
 
 - 多设备集成管理
@@ -27,89 +31,43 @@ Uni-Lab-OS 是一个用于实验室自动化的综合平台，旨在连接和控
 
 详细文档可在以下位置找到:
 
-- [在线文档](https://deepmodeling.github.io/Uni-Lab-OS/)
+- [在线文档](https://xuwznln.github.io/Uni-Lab-OS-Doc/)
 
 ## 快速开始
 
-### 1. 配置 Conda 环境
+1. 配置 Conda 环境
 
-Uni-Lab-OS 建议使用 `mamba` 管理环境。根据您的需求选择合适的安装包：
-
-| 安装包 | 适用场景 | 包含内容 |
-|--------|----------|----------|
-| `unilabos` | **推荐大多数用户** | 完整安装包，开箱即用 |
-| `unilabos-env` | 开发者（可编辑安装） | 仅环境依赖，通过 pip 安装 unilabos |
-| `unilabos-full` | 仿真/可视化 | unilabos + ROS2 桌面版 + Gazebo + MoveIt |
+Uni-Lab-OS 建议使用 `mamba` 管理环境。根据您的操作系统选择适当的环境文件:
 
 ```bash
 # 创建新环境
-mamba create -n unilab python=3.11.14
+mamba create -n unilab python=3.11.11
 mamba activate unilab
-
-# 方案 A：标准安装（推荐大多数用户）
-mamba install uni-lab::unilabos -c robostack-staging -c conda-forge
-
-# 方案 B：开发者环境（可编辑模式开发）
-mamba install uni-lab::unilabos-env -c robostack-staging -c conda-forge
-# 然后安装 unilabos 和依赖：
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git && cd Uni-Lab-OS
-pip install -e .
-uv pip install -r unilabos/utils/requirements.txt
-
-# 方案 C：完整安装（仿真/可视化）
-mamba install uni-lab::unilabos-full -c robostack-staging -c conda-forge
+mamba install -n unilab uni-lab::unilabos -c robostack-staging -c conda-forge
 ```
 
-**如何选择？**
-- **unilabos**：标准安装，适用于生产部署和日常使用（推荐）
-- **unilabos-env**：开发者使用，支持 `pip install -e .` 可编辑模式，可修改源代码
-- **unilabos-full**：需要仿真（Gazebo）、可视化（rviz2）或 Jupyter Notebook
-
-### 2. 克隆仓库（可选，供开发者使用）
+2. 安装开发版 Uni-Lab-OS:
 
 ```bash
-# 克隆仓库（仅开发或查看示例时需要）
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git
+# 克隆仓库
+git clone https://github.com/dptech-corp/Uni-Lab-OS.git
 cd Uni-Lab-OS
+
+# 安装 Uni-Lab-OS
+pip install .
 ```
 
-3. 启动 Uni-Lab 系统
+3. 启动 Uni-Lab 系统:
 
-请见[文档-启动样例](https://deepmodeling.github.io/Uni-Lab-OS/boot_examples/index.html)
-
-4. 最佳实践
-
-请见[最佳实践指南](https://deepmodeling.github.io/Uni-Lab-OS/user_guide/best_practice.html)
+请见[文档-启动样例](https://xuwznln.github.io/Uni-Lab-OS-Doc/boot_examples/index.html)
 
 ## 消息格式
 
-Uni-Lab-OS 使用预构建的 `unilabos_msgs` 进行系统通信。您可以在 [GitHub Releases](https://github.com/deepmodeling/Uni-Lab-OS/releases) 页面找到已构建的版本。
-
-## 引用
-
-如果您在学术研究中使用 [Uni-Lab-OS](https://arxiv.org/abs/2512.21766)，请引用：
-
-```bibtex
-@article{gao2025unilabos,
-    title = {UniLabOS: An AI-Native Operating System for Autonomous Laboratories},
-    doi = {10.48550/arXiv.2512.21766},
-    publisher = {arXiv},
-    author = {Gao, Jing and Chang, Junhan and Que, Haohui and Xiong, Yanfei and
-              Zhang, Shixiang and Qi, Xianwei and Liu, Zhen and Wang, Jun-Jie and
-              Ding, Qianjun and Li, Xinyu and Pan, Ziwei and Xie, Qiming and
-              Yan, Zhuang and Yan, Junchi and Zhang, Linfeng},
-    year = {2025}
-}
-```
+Uni-Lab-OS 使用预构建的 `unilabos_msgs` 进行系统通信。您可以在 [GitHub Releases](https://github.com/dptech-corp/Uni-Lab-OS/releases) 页面找到已构建的版本。
 
 ## 许可证
 
-本项目采用双许可证结构：
-
-- **主框架**：GPL-3.0 - 详见 [LICENSE](LICENSE)
-- **设备驱动** (`unilabos/devices/`)：深势科技专有许可证
-
-完整许可证说明请参阅 [NOTICE](NOTICE)。
+此项目采用 GPL-3.0 许可 - 详情请参阅 [LICENSE](LICENSE) 文件。
 
 ## 项目统计
 
@@ -121,4 +79,4 @@ Uni-Lab-OS 使用预构建的 `unilabos_msgs` 进行系统通信。您可以在
 
 ## 联系我们
 
-- GitHub Issues: [https://github.com/deepmodeling/Uni-Lab-OS/issues](https://github.com/deepmodeling/Uni-Lab-OS/issues)
+- GitHub Issues: [https://github.com/dptech-corp/Uni-Lab-OS/issues](https://github.com/dptech-corp/Uni-Lab-OS/issues)

docs/conf.py

@@ -24,7 +24,7 @@ extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.napoleon",  # 如果您使用 Google 或 NumPy 风格的 docstrings
     "sphinx_rtd_theme",
-    "sphinxcontrib.mermaid",
+    "sphinxcontrib.mermaid"
 ]
 
 source_suffix = {
@@ -58,7 +58,7 @@ html_theme = "sphinx_rtd_theme"
 
 # sphinx-book-theme 主题选项
 html_theme_options = {
-    "repository_url": "https://github.com/deepmodeling/Uni-Lab-OS",
+    "repository_url": "https://github.com/用户名/Uni-Lab",
     "use_repository_button": True,
     "use_issues_button": True,
     "use_edit_page_button": True,

docs/requirements.txt

@@ -12,7 +12,3 @@ sphinx-copybutton>=0.5.0
 
 # 用于自动摘要生成
 sphinx-autobuild>=2024.2.4
-
-# 用于PDF导出 (rinohtype方案，纯Python无需LaTeX)
-rinohtype>=0.5.4
-sphinx-simplepdf>=1.6.0

docs/user_guide/best_practice.md

@@ -31,14 +31,6 @@
 
 详细的安装步骤请参考 [安装指南](installation.md)。
 
-**选择合适的安装包：**
-
-| 安装包 | 适用场景 | 包含组件 |
-|--------|----------|----------|
-| `unilabos` | **推荐大多数用户**，生产部署 | 完整安装包，开箱即用 |
-| `unilabos-env` | 开发者（可编辑安装） | 仅环境依赖，通过 pip 安装 unilabos |
-| `unilabos-full` | 仿真/可视化 | unilabos + 完整 ROS2 桌面版 + Gazebo + MoveIt |
-
 **关键步骤：**
 
 ```bash
@@ -46,30 +38,15 @@
 # 下载 Miniforge: https://github.com/conda-forge/miniforge/releases
 
 # 2. 创建 Conda 环境
-mamba create -n unilab python=3.11.14
+mamba create -n unilab python=3.11.11
 
 # 3. 激活环境
 mamba activate unilab
 
-# 4. 安装 Uni-Lab-OS（选择其一）
-
-# 方案 A：标准安装（推荐大多数用户）
+# 4. 安装 Uni-Lab-OS
 mamba install uni-lab::unilabos -c robostack-staging -c conda-forge
-
-# 方案 B：开发者环境（可编辑模式开发）
-mamba install uni-lab::unilabos-env -c robostack-staging -c conda-forge
-pip install -e /path/to/Uni-Lab-OS  # 可编辑安装
-uv pip install -r unilabos/utils/requirements.txt  # 安装 pip 依赖
-
-# 方案 C：完整版（仿真/可视化）
-mamba install uni-lab::unilabos-full -c robostack-staging -c conda-forge
 ```
 
-**选择建议：**
-- **日常使用/生产部署**：使用 `unilabos`（推荐），完整功能，开箱即用
-- **开发者**：使用 `unilabos-env` + `pip install -e .` + `uv pip install -r unilabos/utils/requirements.txt`，代码修改立即生效
-- **仿真/可视化**：使用 `unilabos-full`，含 Gazebo、rviz2、MoveIt
-
 #### 1.2 验证安装
 
 ```bash
@@ -439,9 +416,6 @@ unilab --ak your_ak --sk your_sk -g test/experiments/mock_devices/mock_all.json
 1. 访问 Web 界面，进入"仪器耗材"模块
 2. 在"仪器设备"区域找到并添加上述设备
 3. 在"物料耗材"区域找到并添加容器
-4. 在workstation中配置protocol_type包含PumpTransferProtocol
-
-![添加Protocol类型](image/add_protocol.png)
 
 ![物料列表](image/material.png)
 
@@ -794,43 +768,7 @@ Waiting for host service...
 
 详细的设备驱动编写指南请参考 [添加设备驱动](../developer_guide/add_device.md)。
 
-#### 9.1 开发环境准备
-
-**推荐使用 `unilabos-env` + `pip install -e .` + `uv pip install`** 进行设备开发：
-
-```bash
-# 1. 创建环境并安装 unilabos-env（ROS2 + conda 依赖 + uv）
-mamba create -n unilab python=3.11.14
-conda activate unilab
-mamba install uni-lab::unilabos-env -c robostack-staging -c conda-forge
-
-# 2. 克隆代码
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git
-cd Uni-Lab-OS
-
-# 3. 以可编辑模式安装（推荐使用脚本，自动检测中文环境）
-python scripts/dev_install.py
-
-# 或手动安装：
-pip install -e .
-uv pip install -r unilabos/utils/requirements.txt
-```
-
-**为什么使用这种方式？**
-- `unilabos-env` 提供 ROS2 核心组件和 uv（通过 conda 安装，避免编译）
-- `unilabos/utils/requirements.txt` 包含所有运行时需要的 pip 依赖
-- `dev_install.py` 自动检测中文环境，中文系统自动使用清华镜像
-- 使用 `uv` 替代 `pip`，安装速度更快
-- 可编辑模式：代码修改**立即生效**，无需重新安装
-
-**如果安装失败或速度太慢**，可以手动执行（使用清华镜像）：
-
-```bash
-pip install -e . -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
-uv pip install -r unilabos/utils/requirements.txt -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
-```
-
-#### 9.2 为什么需要自定义设备？
+#### 9.1 为什么需要自定义设备？
 
 Uni-Lab-OS 内置了常见设备，但您的实验室可能有特殊设备需要集成：
 
@@ -839,7 +777,7 @@ Uni-Lab-OS 内置了常见设备，但您的实验室可能有特殊设备需要
 - 特殊的实验流程
 - 第三方设备集成
 
-#### 9.3 创建 Python 包
+#### 9.2 创建 Python 包
 
 为了方便开发和管理，建议为您的实验室创建独立的 Python 包。
 
@@ -876,7 +814,7 @@ touch my_lab_devices/my_lab_devices/__init__.py
 touch my_lab_devices/my_lab_devices/devices/__init__.py
 ```
 
-#### 9.4 创建 setup.py
+#### 9.3 创建 setup.py
 
 ```python
 # my_lab_devices/setup.py
@@ -907,7 +845,7 @@ setup(
 )
 ```
 
-#### 9.5 开发安装
+#### 9.4 开发安装
 
 使用 `-e` 参数进行可编辑安装，这样代码修改后立即生效：
 
@@ -922,7 +860,7 @@ pip install -e . -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
 - 方便调试和测试
 - 支持版本控制（git）
 
-#### 9.6 编写设备驱动
+#### 9.5 编写设备驱动
 
 创建设备驱动文件：
 
@@ -1063,7 +1001,7 @@ class MyPump:
 - **返回 Dict**：所有动作方法返回字典类型
 - **文档字符串**：详细说明参数和功能
 
-#### 9.7 测试设备驱动
+#### 9.6 测试设备驱动
 
 创建简单的测试脚本：
 
@@ -1869,7 +1807,7 @@ unilab --ak your_ak --sk your_sk -g graph.json \
 
 #### 14.5 社区支持
 
-- **GitHub Issues**：[https://github.com/deepmodeling/Uni-Lab-OS/issues](https://github.com/deepmodeling/Uni-Lab-OS/issues)
+- **GitHub Issues**：[https://github.com/dptech-corp/Uni-Lab-OS/issues](https://github.com/dptech-corp/Uni-Lab-OS/issues)
 - **官方网站**：[https://uni-lab.bohrium.com](https://uni-lab.bohrium.com)
 
 ---

docs/user_guide/graph_files.md

@@ -463,7 +463,7 @@ Uni-Lab 使用 `ResourceDictInstance.get_resource_instance_from_dict()` 方法
 ### 使用示例
 
 ```python
-from unilabos.resources.resource_tracker import ResourceDictInstance
+from unilabos.ros.nodes.resource_tracker import ResourceDictInstance
 
 # 旧格式节点
 old_format_node = {
@@ -477,10 +477,10 @@ old_format_node = {
 instance = ResourceDictInstance.get_resource_instance_from_dict(old_format_node)
 
 # 访问标准化后的数据
-print(instance.res_content.id)  # "pump_1"
-print(instance.res_content.uuid)  # 自动生成的 UUID
+print(instance.res_content.id)      # "pump_1"
+print(instance.res_content.uuid)    # 自动生成的 UUID
 print(instance.res_content.config)  # {}
-print(instance.res_content.data)  # {}
+print(instance.res_content.data)    # {}
 ```
 
 ### 格式迁移建议
@@ -857,4 +857,4 @@ class ResourceDictPosition(BaseModel):
 - 在 Web 界面中使用模板创建
 - 参考示例文件：`test/experiments/` 目录
 - 查看 ResourceDict 源码了解完整定义
-- [GitHub 讨论区](https://github.com/deepmodeling/Uni-Lab-OS/discussions)
+- [GitHub 讨论区](https://github.com/dptech-corp/Uni-Lab-OS/discussions)

docs/user_guide/installation.md

@@ -13,26 +13,15 @@
   - 开发者需要 Git 和基本的 Python 开发知识
   - 自定义 msgs 需要 GitHub 账号
 
-## 安装包选择
-
-Uni-Lab-OS 提供三个安装包版本，根据您的需求选择：
-
-| 安装包 | 适用场景 | 包含组件 | 磁盘占用 |
-|--------|----------|----------|----------|
-| **unilabos** | **推荐大多数用户**，生产部署 | 完整安装包，开箱即用 | ~2-3 GB |
-| **unilabos-env** | 开发者环境（可编辑安装） | 仅环境依赖，通过 pip 安装 unilabos | ~2 GB |
-| **unilabos-full** | 仿真可视化、完整功能体验 | unilabos + 完整 ROS2 桌面版 + Gazebo + MoveIt | ~8-10 GB |
-
 ## 安装方式选择
 
 根据您的使用场景，选择合适的安装方式：
 
-| 安装方式               | 适用人群             | 推荐安装包        | 特点                           | 安装时间                     |
-| ---------------------- | -------------------- | ----------------- | ------------------------------ | ---------------------------- |
-| **方式一：一键安装**   | 快速体验、演示       | 预打包环境        | 离线可用，无需配置             | 5-10 分钟 (网络良好的情况下) |
-| **方式二：手动安装**   | **大多数用户**       | `unilabos`        | 完整功能，开箱即用             | 10-20 分钟                   |
-| **方式三：开发者安装** | 开发者、需要修改源码 | `unilabos-env`    | 可编辑模式，支持自定义开发     | 20-30 分钟                   |
-| **仿真/可视化**        | 仿真测试、可视化调试 | `unilabos-full`   | 含 Gazebo、rviz2、MoveIt       | 30-60 分钟                   |
+| 安装方式               | 适用人群             | 特点                           | 安装时间                     |
+| ---------------------- | -------------------- | ------------------------------ | ---------------------------- |
+| **方式一：一键安装**   | 实验室用户、快速体验 | 预打包环境，离线可用，无需配置 | 5-10 分钟 (网络良好的情况下) |
+| **方式二：手动安装**   | 标准用户、生产环境   | 灵活配置，版本可控             | 10-20 分钟                   |
+| **方式三：开发者安装** | 开发者、需要修改源码 | 可编辑模式，支持自定义 msgs    | 20-30 分钟                   |
 
 ---
 
@@ -48,7 +37,7 @@ Uni-Lab-OS 提供三个安装包版本，根据您的需求选择：
 
 #### 第一步：下载预打包环境
 
-1. 访问 [GitHub Actions - Conda Pack Build](https://github.com/deepmodeling/Uni-Lab-OS/actions/workflows/conda-pack-build.yml)
+1. 访问 [GitHub Actions - Conda Pack Build](https://github.com/dptech-corp/Uni-Lab-OS/actions/workflows/conda-pack-build.yml)
 
 2. 选择最新的成功构建记录（绿色勾号 ✓）
 
@@ -155,38 +144,17 @@ bash Miniforge3-$(uname)-$(uname -m).sh
 使用以下命令创建 Uni-Lab 专用环境：
 
 ```bash
-mamba create -n unilab python=3.11.14  # 目前ros2组件依赖版本大多为3.11.14
+mamba create -n unilab python=3.11.11  # 目前ros2组件依赖版本大多为3.11.11
 mamba activate unilab
-
-# 选择安装包（三选一）：
-
-# 方案 A：标准安装（推荐大多数用户）
-mamba install uni-lab::unilabos -c robostack-staging -c conda-forge
-
-# 方案 B：开发者环境（可编辑模式开发）
-mamba install uni-lab::unilabos-env -c robostack-staging -c conda-forge
-# 然后安装 unilabos 和 pip 依赖：
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git && cd Uni-Lab-OS
-pip install -e .
-uv pip install -r unilabos/utils/requirements.txt
-
-# 方案 C：完整版（含仿真和可视化工具）
-mamba install uni-lab::unilabos-full -c robostack-staging -c conda-forge
+mamba install -n unilab uni-lab::unilabos -c robostack-staging -c conda-forge
 ```
 
 **参数说明**:
 
 - `-n unilab`: 创建名为 "unilab" 的环境
-- `uni-lab::unilabos`: 安装 unilabos 完整包，开箱即用（推荐）
-- `uni-lab::unilabos-env`: 仅安装环境依赖，适合开发者使用 `pip install -e .`
-- `uni-lab::unilabos-full`: 安装完整包（含 ROS2 Desktop、Gazebo、MoveIt 等）
+- `uni-lab::unilabos`: 从 uni-lab channel 安装 unilabos 包
 - `-c robostack-staging -c conda-forge`: 添加额外的软件源
 
-**包选择建议**：
-- **日常使用/生产部署**：安装 `unilabos`（推荐，完整功能，开箱即用）
-- **开发者**：安装 `unilabos-env`，然后使用 `uv pip install -r unilabos/utils/requirements.txt` 安装依赖，再 `pip install -e .` 进行可编辑安装
-- **仿真/可视化**：安装 `unilabos-full`（Gazebo、rviz2、MoveIt）
-
 **如果遇到网络问题**，可以使用清华镜像源加速下载：
 
 ```bash
@@ -195,14 +163,8 @@ mamba config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/m
 mamba config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free/
 mamba config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge/
 
-# 然后重新执行安装命令（推荐标准安装）
+# 然后重新执行安装命令
 mamba create -n unilab uni-lab::unilabos -c robostack-staging
-
-# 或完整版（仿真/可视化）
-mamba create -n unilab uni-lab::unilabos-full -c robostack-staging
-
-# pip 安装时使用清华镜像（开发者安装时使用）
-uv pip install -r unilabos/utils/requirements.txt -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
 ```
 
 ### 第三步：激活环境
@@ -227,13 +189,13 @@ conda activate unilab
 ### 第一步：克隆仓库
 
 ```bash
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git
+git clone https://github.com/dptech-corp/Uni-Lab-OS.git
 cd Uni-Lab-OS
 ```
 
 如果您需要贡献代码，建议先 Fork 仓库：
 
-1. 访问 https://github.com/deepmodeling/Uni-Lab-OS
+1. 访问 https://github.com/dptech-corp/Uni-Lab-OS
 2. 点击右上角的 "Fork" 按钮
 3. Clone 您的 Fork 版本：
    ```bash
@@ -241,87 +203,58 @@ cd Uni-Lab-OS
    cd Uni-Lab-OS
    ```
 
-### 第二步：安装开发环境（unilabos-env）
+### 第二步：安装基础环境
 
-**重要**：开发者请使用 `unilabos-env` 包，它专为开发者设计：
-- 包含 ROS2 核心组件和消息包（ros-humble-ros-core、std-msgs、geometry-msgs 等）
-- 包含 transforms3d、cv-bridge、tf2 等 conda 依赖
-- 包含 `uv` 工具，用于快速安装 pip 依赖
-- **不包含** pip 依赖和 unilabos 包（由 `pip install -e .` 和 `uv pip install` 安装）
+**推荐方式**：先通过**方式一（一键安装）**或**方式二（手动安装）**完成基础环境的安装，这将包含所有必需的依赖项（ROS2、msgs 等）。
+
+#### 选项 A：通过一键安装（推荐）
+
+参考上文"方式一：一键安装"，完成基础环境的安装后，激活环境：
 
 ```bash
-# 创建并激活环境
-mamba create -n unilab python=3.11.14
 conda activate unilab
-
-# 安装开发者环境包（ROS2 + conda 依赖 + uv）
-mamba install uni-lab::unilabos-env -c robostack-staging -c conda-forge
 ```
 
-### 第三步：安装 pip 依赖和可编辑模式安装
+#### 选项 B：通过手动安装
 
-克隆代码并安装依赖：
+参考上文"方式二：手动安装"，创建并安装环境：
+
+```bash
+mamba create -n unilab python=3.11.11
+conda activate unilab
+mamba install -n unilab uni-lab::unilabos -c robostack-staging -c conda-forge
+```
+
+**说明**：这会安装包括 Python 3.11.11、ROS2 Humble、ros-humble-unilabos-msgs 和所有必需依赖
+
+### 第三步：切换到开发版本
+
+现在你已经有了一个完整可用的 Uni-Lab 环境，接下来将 unilabos 包切换为开发版本：
 
 ```bash
 # 确保环境已激活
 conda activate unilab
 
-# 克隆仓库（如果还未克隆）
-git clone https://github.com/deepmodeling/Uni-Lab-OS.git
-cd Uni-Lab-OS
+# 卸载 pip 安装的 unilabos（保留所有 conda 依赖）
+pip uninstall unilabos -y
 
-# 切换到 dev 分支（可选）
+# 克隆 dev 分支（如果还未克隆）
+cd /path/to/your/workspace
+git clone -b dev https://github.com/dptech-corp/Uni-Lab-OS.git
+# 或者如果已经克隆，切换到 dev 分支
+cd Uni-Lab-OS
 git checkout dev
 git pull
-```
 
-**推荐：使用安装脚本**（自动检测中文环境，使用 uv 加速）：
-
-```bash
-# 自动检测中文环境，如果是中文系统则使用清华镜像
-python scripts/dev_install.py
-
-# 或者手动指定：
-python scripts/dev_install.py --china     # 强制使用清华镜像
-python scripts/dev_install.py --no-mirror # 强制使用 PyPI
-python scripts/dev_install.py --skip-deps # 跳过 pip 依赖安装
-python scripts/dev_install.py --use-pip   # 使用 pip 而非 uv
-```
-
-**手动安装**（如果脚本安装失败或速度太慢）：
-
-```bash
-# 1. 安装 unilabos（可编辑模式）
-pip install -e .
-
-# 2. 使用 uv 安装 pip 依赖（推荐，速度更快）
-uv pip install -r unilabos/utils/requirements.txt
-
-# 国内用户使用清华镜像：
+# 以可编辑模式安装开发版 unilabos
 pip install -e . -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
-uv pip install -r unilabos/utils/requirements.txt -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
 ```
 
-**注意**：
-- `uv` 已包含在 `unilabos-env` 中，无需单独安装
-- `unilabos/utils/requirements.txt` 包含运行 unilabos 所需的所有 pip 依赖
-- 部分特殊包（如 pylabrobot）会在运行时由 unilabos 自动检测并安装
+**参数说明**：
 
-**为什么使用可编辑模式？**
-
-- `-e` (editable mode)：代码修改**立即生效**，无需重新安装
-- 适合开发调试：修改代码后直接运行测试
-- 与 `unilabos-env` 配合：环境依赖由 conda 管理，unilabos 代码由 pip 管理
-
-**验证安装**：
-
-```bash
-# 检查 unilabos 版本
-python -c "import unilabos; print(unilabos.__version__)"
-
-# 检查安装位置（应该指向你的代码目录）
-pip show unilabos | grep Location
-```
+- `-e`: editable mode（可编辑模式），代码修改立即生效，无需重新安装
+- `-i`: 使用清华镜像源加速下载
+- `pip uninstall unilabos`: 只卸载 pip 安装的 unilabos 包，不影响 conda 安装的其他依赖（如 ROS2、msgs 等）
 
 ### 第四步：安装或自定义 ros-humble-unilabos-msgs（可选）
 
@@ -531,45 +464,7 @@ cd $CONDA_PREFIX/envs/unilab
 
 ### 问题 8: 环境很大，有办法减小吗？
 
-**解决方案**: 
-
-1. **使用 `unilabos` 标准版**（推荐大多数用户）：
-   ```bash
-   mamba install uni-lab::unilabos -c robostack-staging -c conda-forge
-   ```
-   标准版包含完整功能，环境大小约 2-3GB（相比完整版的 8-10GB）。
-
-2. **使用 `unilabos-env` 开发者版**（最小化）：
-   ```bash
-   mamba install uni-lab::unilabos-env -c robostack-staging -c conda-forge
-   # 然后手动安装依赖
-   pip install -e .
-   uv pip install -r unilabos/utils/requirements.txt
-   ```
-   开发者版只包含环境依赖，体积最小约 2GB。
-
-3. **按需安装额外组件**：
-   如果后续需要特定功能，可以单独安装：
-   ```bash
-   # 需要 Jupyter
-   mamba install jupyter jupyros
-   
-   # 需要可视化
-   mamba install matplotlib opencv
-   
-   # 需要仿真（注意：这会安装大量依赖）
-   mamba install ros-humble-gazebo-ros
-   ```
-
-4. **预打包环境问题**：
-   预打包环境（方式一）包含所有依赖，通常较大（压缩后 2-5GB）。这是为了确保离线安装和完整功能。
-
-**包选择建议**：
-| 需求 | 推荐包 | 预估大小 |
-|------|--------|----------|
-| 日常使用/生产部署 | `unilabos` | ~2-3 GB |
-| 开发调试（可编辑模式） | `unilabos-env` | ~2 GB |
-| 仿真/可视化 | `unilabos-full` | ~8-10 GB |
+**解决方案**: 预打包的环境包含所有依赖，通常较大（压缩后 2-5GB）。这是为了确保离线安装和完整功能。如果空间有限，考虑使用方式二手动安装，只安装需要的组件。
 
 ### 问题 9: 如何更新到最新版本？
 
@@ -608,15 +503,14 @@ mamba update ros-humble-unilabos-msgs -c uni-lab -c robostack-staging -c conda-f
 ## 需要帮助？
 
 - **故障排查**: 查看更详细的故障排查信息
-- **GitHub Issues**: [报告问题](https://github.com/deepmodeling/Uni-Lab-OS/issues)
+- **GitHub Issues**: [报告问题](https://github.com/dptech-corp/Uni-Lab-OS/issues)
 - **开发者文档**: 查看开发者指南获取更多技术细节
-- **社区讨论**: [GitHub Discussions](https://github.com/deepmodeling/Uni-Lab-OS/discussions)
+- **社区讨论**: [GitHub Discussions](https://github.com/dptech-corp/Uni-Lab-OS/discussions)
 
 ---
 
 **提示**:
 
-- **大多数用户**推荐使用方式二（手动安装）的 `unilabos` 标准版
-- **开发者**推荐使用方式三（开发者安装），安装 `unilabos-env` 后使用 `uv pip install -r unilabos/utils/requirements.txt` 安装依赖
-- **仿真/可视化**推荐安装 `unilabos-full` 完整版
-- **快速体验和演示**推荐使用方式一（一键安装）
+- 生产环境推荐使用方式二（手动安装）的稳定版本
+- 开发和测试推荐使用方式三（开发者安装）
+- 快速体验和演示推荐使用方式一（一键安装）

fix_datatype.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import re
+
+filepath = r'd:\UniLab\Uni-Lab-OS\unilabos\device_comms\modbus_plc\modbus.py'
+
+with open(filepath, 'r', encoding='utf-8') as f:
+    content = f.read()
+
+# Replace the DataType placeholder with actual enum
+find_pattern = r'# DataType will be accessed via client instance.*?DataType = None  # Placeholder.*?\n'
+replacement = '''# Define DataType enum for pymodbus 2.5.3 compatibility
+class DataType(Enum):
+    INT16 = "int16"
+    UINT16 = "uint16"
+    INT32 = "int32"
+    UINT32 = "uint32"
+    INT64 = "int64"
+    UINT64 = "uint64"
+    FLOAT32 = "float32"
+    FLOAT64 = "float64"
+    STRING = "string"
+    BOOL = "bool"
+
+'''
+
+new_content = re.sub(find_pattern, replacement, content, flags=re.DOTALL)
+
+with open(filepath, 'w', encoding='utf-8') as f:
+    f.write(new_content)
+
+print('File updated successfully!')

new_cellconfig.json

@@ -0,0 +1,54 @@
+{
+  "nodes": [
+    {
+      "id": "BatteryStation",
+      "name": "扣电工作站",
+      "parent": null,
+      "children": [
+        "coin_cell_deck"
+      ],
+      "type": "device",
+      "class":"coincellassemblyworkstation_device",
+      "position": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "config": {
+        "deck": {
+          "data": {
+            "_resource_child_name": "YB_YH_Deck",
+            "_resource_type": "unilabos.devices.workstation.coin_cell_assembly.YB_YH_materials:CoincellDeck"
+          }
+        },
+        "debug_mode": true,
+        "protocol_type": []
+      }
+    },
+    {
+      "id": "YB_YH_Deck",
+      "name": "YB_YH_Deck",
+      "children": [],
+      "parent": "BatteryStation",
+      "type": "deck",
+      "class": "CoincellDeck",
+      "position": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "config": {
+        "type": "CoincellDeck",
+        "setup": true,
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0,
+          "type": "Rotation"
+        }
+      },
+      "data": {}
+    }
+  ],
+  "links": []
+}

new_cellconfig3c.json

@@ -0,0 +1,98 @@
+      
+{
+  "nodes": [
+    {
+      "id": "bioyond_cell_workstation",
+      "name": "配液分液工站",
+      "parent": null,
+      "children": [
+        "YB_Bioyond_Deck"
+      ],
+      "type": "device",
+      "class": "bioyond_cell",
+      "config": {
+        "deck": {
+          "data": {
+            "_resource_child_name": "YB_Bioyond_Deck",
+            "_resource_type": "unilabos.resources.bioyond.decks:BIOYOND_YB_Deck"
+          }
+        },
+        "protocol_type": []
+      },
+      "data": {}
+    },
+    {
+      "id": "YB_Bioyond_Deck",
+      "name": "YB_Bioyond_Deck",
+      "children": [],
+      "parent": "bioyond_cell_workstation",
+      "type": "deck",
+      "class": "BIOYOND_YB_Deck",
+      "position": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "config": {
+        "type": "BIOYOND_YB_Deck",
+        "setup": true,
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0,
+          "type": "Rotation"
+        }
+      },
+      "data": {}
+    },
+    {
+      "id": "BatteryStation",
+      "name": "扣电工作站",
+      "parent": null,
+      "children": [
+        "coin_cell_deck"
+      ],
+      "type": "device",
+      "class":"coincellassemblyworkstation_device",
+      "config": {
+        "deck": {
+          "data": {
+            "_resource_child_name": "YB_YH_Deck",
+            "_resource_type": "unilabos.devices.workstation.coin_cell_assembly.YB_YH_materials:CoincellDeck"
+          }
+        },
+        "protocol_type": []
+      },
+      "position": {
+        "size": {"height": 1450, "width": 1450, "depth": 2100},
+        "position": {
+          "x": -1500,
+          "y": 0,
+          "z": 0
+        }
+      }
+    },
+    {
+      "id": "YB_YH_Deck",
+      "name": "YB_YH_Deck",
+      "children": [],
+      "parent": "BatteryStation",
+      "type": "deck",
+      "class": "CoincellDeck",
+      "config": {
+        "type": "CoincellDeck",
+        "setup": true,
+        "rotation": {
+          "x": 0,
+          "y": 0,
+          "z": 0,
+          "type": "Rotation"
+        }
+      },
+      "data": {}
+    }
+  ],
+  "links": []
+}
+
+    

recipes/msgs/recipe.yaml

@@ -1,6 +1,6 @@
 package:
   name: ros-humble-unilabos-msgs
-  version: 0.10.17
+  version: 0.10.12
 source:
   path: ../../unilabos_msgs
   target_directory: src
@@ -17,7 +17,7 @@ build:
     - bash $SRC_DIR/build_ament_cmake.sh
 
 about:
-  repository: https://github.com/deepmodeling/Uni-Lab-OS
+  repository: https://github.com/dptech-corp/Uni-Lab-OS
   license: BSD-3-Clause
   description: "ros-humble-unilabos-msgs is a package that provides message definitions for Uni-Lab-OS."
 
@@ -25,7 +25,7 @@ requirements:
   build:
   - ${{ compiler('cxx') }}
   - ${{ compiler('c') }}
-  - python ==3.11.14
+  - python ==3.11.11
   - numpy
   - if: build_platform != target_platform
     then:
@@ -63,14 +63,14 @@ requirements:
   - robostack-staging::ros-humble-rosidl-default-generators
   - robostack-staging::ros-humble-std-msgs
   - robostack-staging::ros-humble-geometry-msgs
-  - robostack-staging::ros2-distro-mutex=0.7
+  - robostack-staging::ros2-distro-mutex=0.6
   run:
   - robostack-staging::ros-humble-action-msgs
   - robostack-staging::ros-humble-ros-workspace
   - robostack-staging::ros-humble-rosidl-default-runtime
   - robostack-staging::ros-humble-std-msgs
   - robostack-staging::ros-humble-geometry-msgs
-  - robostack-staging::ros2-distro-mutex=0.7
+  - robostack-staging::ros2-distro-mutex=0.6
   - if: osx and x86_64
     then:
     - __osx >=${{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}

recipes/unilabos/recipe.yaml

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

scripts/create_readme.py

@@ -85,7 +85,7 @@ Verification:
 -------------
 
 The verify_installation.py script will check:
-  - Python version (3.11.14)
+  - Python version (3.11.11)
   - ROS2 rclpy installation
   - UniLabOS installation and dependencies
 
@@ -104,7 +104,7 @@ Build Information:
 
   Branch:   {branch}
   Platform: {platform}
-  Python:   3.11.14
+  Python:   3.11.11
   Date:     {build_date}
 
 Troubleshooting:
@@ -126,7 +126,7 @@ If installation fails:
 For more help:
   - Documentation: docs/user_guide/installation.md
   - Quick Start: QUICK_START_CONDA_PACK.md
-  - Issues: https://github.com/deepmodeling/Uni-Lab-OS/issues
+  - Issues: https://github.com/dptech-corp/Uni-Lab-OS/issues
 
 License:
 --------
@@ -134,7 +134,7 @@ License:
 UniLabOS is licensed under GPL-3.0-only.
 See LICENSE file for details.
 
-Repository: https://github.com/deepmodeling/Uni-Lab-OS
+Repository: https://github.com/dptech-corp/Uni-Lab-OS
 """
 
     return readme

scripts/dev_install.py

@@ -1,214 +0,0 @@
-#!/usr/bin/env python3
-"""
-Development installation script for UniLabOS.
-Auto-detects Chinese locale and uses appropriate mirror.
-
-Usage:
-    python scripts/dev_install.py
-    python scripts/dev_install.py --no-mirror  # Force no mirror
-    python scripts/dev_install.py --china      # Force China mirror
-    python scripts/dev_install.py --skip-deps  # Skip pip dependencies installation
-
-Flow:
-    1. pip install -e . (install unilabos in editable mode)
-    2. Detect Chinese locale
-    3. Use uv to install pip dependencies from requirements.txt
-    4. Special packages (like pylabrobot) are handled by environment_check.py at runtime
-"""
-
-import locale
-import subprocess
-import sys
-import argparse
-from pathlib import Path
-
-# Tsinghua mirror URL
-TSINGHUA_MIRROR = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
-
-
-def is_chinese_locale() -> bool:
-    """
-    Detect if system is in Chinese locale.
-    Same logic as EnvironmentChecker._is_chinese_locale()
-    """
-    try:
-        lang = locale.getdefaultlocale()[0]
-        if lang and ("zh" in lang.lower() or "chinese" in lang.lower()):
-            return True
-    except Exception:
-        pass
-    return False
-
-
-def run_command(cmd: list, description: str, retry: int = 2) -> bool:
-    """Run command with retry support."""
-    print(f"[INFO] {description}")
-    print(f"[CMD] {' '.join(cmd)}")
-
-    for attempt in range(retry + 1):
-        try:
-            result = subprocess.run(cmd, check=True, timeout=600)
-            print(f"[OK] {description}")
-            return True
-        except subprocess.CalledProcessError as e:
-            if attempt < retry:
-                print(f"[WARN] Attempt {attempt + 1} failed, retrying...")
-            else:
-                print(f"[ERROR] {description} failed: {e}")
-                return False
-        except subprocess.TimeoutExpired:
-            print(f"[ERROR] {description} timed out")
-            return False
-    return False
-
-
-def install_editable(project_root: Path, use_mirror: bool) -> bool:
-    """Install unilabos in editable mode using pip."""
-    cmd = [sys.executable, "-m", "pip", "install", "-e", str(project_root)]
-    if use_mirror:
-        cmd.extend(["-i", TSINGHUA_MIRROR])
-
-    return run_command(cmd, "Installing unilabos in editable mode")
-
-
-def install_requirements_uv(requirements_file: Path, use_mirror: bool) -> bool:
-    """Install pip dependencies using uv (installed via conda-forge::uv)."""
-    cmd = ["uv", "pip", "install", "-r", str(requirements_file)]
-    if use_mirror:
-        cmd.extend(["-i", TSINGHUA_MIRROR])
-
-    return run_command(cmd, "Installing pip dependencies with uv", retry=2)
-
-
-def install_requirements_pip(requirements_file: Path, use_mirror: bool) -> bool:
-    """Fallback: Install pip dependencies using pip."""
-    cmd = [sys.executable, "-m", "pip", "install", "-r", str(requirements_file)]
-    if use_mirror:
-        cmd.extend(["-i", TSINGHUA_MIRROR])
-
-    return run_command(cmd, "Installing pip dependencies with pip", retry=2)
-
-
-def check_uv_available() -> bool:
-    """Check if uv is available (installed via conda-forge::uv)."""
-    try:
-        subprocess.run(["uv", "--version"], capture_output=True, check=True)
-        return True
-    except (subprocess.CalledProcessError, FileNotFoundError):
-        return False
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Development installation script for UniLabOS")
-    parser.add_argument("--china", action="store_true", help="Force use China mirror (Tsinghua)")
-    parser.add_argument("--no-mirror", action="store_true", help="Force use default PyPI (no mirror)")
-    parser.add_argument(
-        "--skip-deps", action="store_true", help="Skip pip dependencies installation (only install unilabos)"
-    )
-    parser.add_argument("--use-pip", action="store_true", help="Use pip instead of uv for dependencies")
-    args = parser.parse_args()
-
-    # Determine project root
-    script_dir = Path(__file__).parent
-    project_root = script_dir.parent
-    requirements_file = project_root / "unilabos" / "utils" / "requirements.txt"
-
-    if not (project_root / "setup.py").exists():
-        print(f"[ERROR] setup.py not found in {project_root}")
-        sys.exit(1)
-
-    print("=" * 60)
-    print("UniLabOS Development Installation")
-    print("=" * 60)
-    print(f"Project root: {project_root}")
-    print()
-
-    # Determine mirror usage based on locale
-    if args.no_mirror:
-        use_mirror = False
-        print("[INFO] Mirror disabled by --no-mirror flag")
-    elif args.china:
-        use_mirror = True
-        print("[INFO] China mirror enabled by --china flag")
-    else:
-        use_mirror = is_chinese_locale()
-        if use_mirror:
-            print("[INFO] Chinese locale detected, using Tsinghua mirror")
-        else:
-            print("[INFO] Non-Chinese locale detected, using default PyPI")
-
-    print()
-
-    # Step 1: Install unilabos in editable mode
-    print("[STEP 1] Installing unilabos in editable mode...")
-    if not install_editable(project_root, use_mirror):
-        print("[ERROR] Failed to install unilabos")
-        print()
-        print("Manual fallback:")
-        if use_mirror:
-            print(f"  pip install -e {project_root} -i {TSINGHUA_MIRROR}")
-        else:
-            print(f"  pip install -e {project_root}")
-        sys.exit(1)
-
-    print()
-
-    # Step 2: Install pip dependencies
-    if args.skip_deps:
-        print("[INFO] Skipping pip dependencies installation (--skip-deps)")
-    else:
-        print("[STEP 2] Installing pip dependencies...")
-
-        if not requirements_file.exists():
-            print(f"[WARN] Requirements file not found: {requirements_file}")
-            print("[INFO] Skipping dependencies installation")
-        else:
-            # Try uv first (faster), fallback to pip
-            if args.use_pip:
-                print("[INFO] Using pip (--use-pip flag)")
-                success = install_requirements_pip(requirements_file, use_mirror)
-            elif check_uv_available():
-                print("[INFO] Using uv (installed via conda-forge::uv)")
-                success = install_requirements_uv(requirements_file, use_mirror)
-                if not success:
-                    print("[WARN] uv failed, falling back to pip...")
-                    success = install_requirements_pip(requirements_file, use_mirror)
-            else:
-                print("[WARN] uv not available (should be installed via: mamba install conda-forge::uv)")
-                print("[INFO] Falling back to pip...")
-                success = install_requirements_pip(requirements_file, use_mirror)
-
-            if not success:
-                print()
-                print("[WARN] Failed to install some dependencies automatically.")
-                print("You can manually install them:")
-                if use_mirror:
-                    print(f"  uv pip install -r {requirements_file} -i {TSINGHUA_MIRROR}")
-                    print("  or:")
-                    print(f"  pip install -r {requirements_file} -i {TSINGHUA_MIRROR}")
-                else:
-                    print(f"  uv pip install -r {requirements_file}")
-                    print("  or:")
-                    print(f"  pip install -r {requirements_file}")
-
-    print()
-    print("=" * 60)
-    print("Installation complete!")
-    print("=" * 60)
-    print()
-    print("Note: Some special packages (like pylabrobot) are installed")
-    print("automatically at runtime by unilabos if needed.")
-    print()
-    print("Verify installation:")
-    print('  python -c "import unilabos; print(unilabos.__version__)"')
-    print()
-    print("If you encounter issues, you can manually install dependencies:")
-    if use_mirror:
-        print(f"  uv pip install -r unilabos/utils/requirements.txt -i {TSINGHUA_MIRROR}")
-    else:
-        print("  uv pip install -r unilabos/utils/requirements.txt")
-    print()
-
-
-if __name__ == "__main__":
-    main()

scripts/workflow.py

@@ -2,7 +2,6 @@ import json
 import logging
 import traceback
 import uuid
-import xml.etree.ElementTree as ET
 from typing import Any, Dict, List
 
 import networkx as nx
@@ -25,7 +24,15 @@ class SimpleGraph:
 
     def add_edge(self, source, target, **attrs):
         """添加边"""
-        edge = {"source": source, "target": target, **attrs}
+        # edge = {"source": source, "target": target, **attrs}
+        edge = {
+            "source": source, "target": target,
+            "source_node_uuid": source,
+            "target_node_uuid": target,
+            "source_handle_io": "source",
+            "target_handle_io": "target",
+            **attrs
+        }
         self.edges.append(edge)
 
     def to_dict(self):
@@ -42,6 +49,7 @@ class SimpleGraph:
             "multigraph": False,
             "graph": {},
             "nodes": nodes_list,
+            "edges": self.edges,
             "links": self.edges,
         }
 
@@ -58,495 +66,8 @@ def extract_json_from_markdown(text: str) -> str:
     return text
 
 
-def convert_to_type(val: str) -> Any:
-    """将字符串值转换为适当的数据类型"""
-    if val == "True":
-        return True
-    if val == "False":
-        return False
-    if val == "?":
-        return None
-    if val.endswith(" g"):
-        return float(val.split(" ")[0])
-    if val.endswith("mg"):
-        return float(val.split("mg")[0])
-    elif val.endswith("mmol"):
-        return float(val.split("mmol")[0]) / 1000
-    elif val.endswith("mol"):
-        return float(val.split("mol")[0])
-    elif val.endswith("ml"):
-        return float(val.split("ml")[0])
-    elif val.endswith("RPM"):
-        return float(val.split("RPM")[0])
-    elif val.endswith(" °C"):
-        return float(val.split(" ")[0])
-    elif val.endswith(" %"):
-        return float(val.split(" ")[0])
-    return val
 
 
-def refactor_data(data: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
-    """统一的数据重构函数，根据操作类型自动选择模板"""
-    refactored_data = []
-
-    # 定义操作映射，包含生物实验和有机化学的所有操作
-    OPERATION_MAPPING = {
-        # 生物实验操作
-        "transfer_liquid": "SynBioFactory-liquid_handler.prcxi-transfer_liquid",
-        "transfer": "SynBioFactory-liquid_handler.biomek-transfer",
-        "incubation": "SynBioFactory-liquid_handler.biomek-incubation",
-        "move_labware": "SynBioFactory-liquid_handler.biomek-move_labware",
-        "oscillation": "SynBioFactory-liquid_handler.biomek-oscillation",
-        # 有机化学操作
-        "HeatChillToTemp": "SynBioFactory-workstation-HeatChillProtocol",
-        "StopHeatChill": "SynBioFactory-workstation-HeatChillStopProtocol",
-        "StartHeatChill": "SynBioFactory-workstation-HeatChillStartProtocol",
-        "HeatChill": "SynBioFactory-workstation-HeatChillProtocol",
-        "Dissolve": "SynBioFactory-workstation-DissolveProtocol",
-        "Transfer": "SynBioFactory-workstation-TransferProtocol",
-        "Evaporate": "SynBioFactory-workstation-EvaporateProtocol",
-        "Recrystallize": "SynBioFactory-workstation-RecrystallizeProtocol",
-        "Filter": "SynBioFactory-workstation-FilterProtocol",
-        "Dry": "SynBioFactory-workstation-DryProtocol",
-        "Add": "SynBioFactory-workstation-AddProtocol",
-    }
-
-    UNSUPPORTED_OPERATIONS = ["Purge", "Wait", "Stir", "ResetHandling"]
-
-    for step in data:
-        operation = step.get("action")
-        if not operation or operation in UNSUPPORTED_OPERATIONS:
-            continue
-
-        # 处理重复操作
-        if operation == "Repeat":
-            times = step.get("times", step.get("parameters", {}).get("times", 1))
-            sub_steps = step.get("steps", step.get("parameters", {}).get("steps", []))
-            for i in range(int(times)):
-                sub_data = refactor_data(sub_steps)
-                refactored_data.extend(sub_data)
-            continue
-
-        # 获取模板名称
-        template = OPERATION_MAPPING.get(operation)
-        if not template:
-            # 自动推断模板类型
-            if operation.lower() in ["transfer", "incubation", "move_labware", "oscillation"]:
-                template = f"SynBioFactory-liquid_handler.biomek-{operation}"
-            else:
-                template = f"SynBioFactory-workstation-{operation}Protocol"
-
-        # 创建步骤数据
-        step_data = {
-            "template": template,
-            "description": step.get("description", step.get("purpose", f"{operation} operation")),
-            "lab_node_type": "Device",
-            "parameters": step.get("parameters", step.get("action_args", {})),
-        }
-        refactored_data.append(step_data)
-
-    return refactored_data
-
-
-def build_protocol_graph(
-    labware_info: List[Dict[str, Any]], protocol_steps: List[Dict[str, Any]], workstation_name: str
-) -> SimpleGraph:
-    """统一的协议图构建函数，根据设备类型自动选择构建逻辑"""
-    G = SimpleGraph()
-    resource_last_writer = {}
-    LAB_NAME = "SynBioFactory"
-
-    protocol_steps = refactor_data(protocol_steps)
-
-    # 检查协议步骤中的模板来判断协议类型
-    has_biomek_template = any(
-        ("biomek" in step.get("template", "")) or ("prcxi" in step.get("template", ""))
-        for step in protocol_steps
-    )
-
-    if has_biomek_template:
-        # 生物实验协议图构建
-        for labware_id, labware in labware_info.items():
-            node_id = str(uuid.uuid4())
-
-            labware_attrs = labware.copy()
-            labware_id = labware_attrs.pop("id", labware_attrs.get("name", f"labware_{uuid.uuid4()}"))
-            labware_attrs["description"] = labware_id
-            labware_attrs["lab_node_type"] = (
-                "Reagent" if "Plate" in str(labware_id) else "Labware" if "Rack" in str(labware_id) else "Sample"
-            )
-            labware_attrs["device_id"] = workstation_name
-
-            G.add_node(node_id, template=f"{LAB_NAME}-host_node-create_resource", **labware_attrs)
-            resource_last_writer[labware_id] = f"{node_id}:labware"
-
-        # 处理协议步骤
-        prev_node = None
-        for i, step in enumerate(protocol_steps):
-            node_id = str(uuid.uuid4())
-            G.add_node(node_id, **step)
-
-            # 添加控制流边
-            if prev_node is not None:
-                G.add_edge(prev_node, node_id, source_port="ready", target_port="ready")
-            prev_node = node_id
-
-            # 处理物料流
-            params = step.get("parameters", {})
-            if "sources" in params and params["sources"] in resource_last_writer:
-                source_node, source_port = resource_last_writer[params["sources"]].split(":")
-                G.add_edge(source_node, node_id, source_port=source_port, target_port="labware")
-
-            if "targets" in params:
-                resource_last_writer[params["targets"]] = f"{node_id}:labware"
-
-        # 添加协议结束节点
-        end_id = str(uuid.uuid4())
-        G.add_node(end_id, template=f"{LAB_NAME}-liquid_handler.biomek-run_protocol")
-        if prev_node is not None:
-            G.add_edge(prev_node, end_id, source_port="ready", target_port="ready")
-
-    else:
-        # 有机化学协议图构建
-        WORKSTATION_ID = workstation_name
-
-        # 为所有labware创建资源节点
-        for item_id, item in labware_info.items():
-            # item_id = item.get("id") or item.get("name", f"item_{uuid.uuid4()}")
-            node_id = str(uuid.uuid4())
-
-            # 判断节点类型
-            if item.get("type") == "hardware" or "reactor" in str(item_id).lower():
-                if "reactor" not in str(item_id).lower():
-                    continue
-                lab_node_type = "Sample"
-                description = f"Prepare Reactor: {item_id}"
-                liquid_type = []
-                liquid_volume = []
-            else:
-                lab_node_type = "Reagent"
-                description = f"Add Reagent to Flask: {item_id}"
-                liquid_type = [item_id]
-                liquid_volume = [1e5]
-
-            G.add_node(
-                node_id,
-                template=f"{LAB_NAME}-host_node-create_resource",
-                description=description,
-                lab_node_type=lab_node_type,
-                res_id=item_id,
-                device_id=WORKSTATION_ID,
-                class_name="container",
-                parent=WORKSTATION_ID,
-                bind_locations={"x": 0.0, "y": 0.0, "z": 0.0},
-                liquid_input_slot=[-1],
-                liquid_type=liquid_type,
-                liquid_volume=liquid_volume,
-                slot_on_deck="",
-                role=item.get("role", ""),
-            )
-            resource_last_writer[item_id] = f"{node_id}:labware"
-
-        last_control_node_id = None
-
-        # 处理协议步骤
-        for step in protocol_steps:
-            node_id = str(uuid.uuid4())
-            G.add_node(node_id, **step)
-
-            # 控制流
-            if last_control_node_id is not None:
-                G.add_edge(last_control_node_id, node_id, source_port="ready", target_port="ready")
-            last_control_node_id = node_id
-
-            # 物料流
-            params = step.get("parameters", {})
-            input_resources = {
-                "Vessel": params.get("vessel"),
-                "ToVessel": params.get("to_vessel"),
-                "FromVessel": params.get("from_vessel"),
-                "reagent": params.get("reagent"),
-                "solvent": params.get("solvent"),
-                "compound": params.get("compound"),
-                "sources": params.get("sources"),
-                "targets": params.get("targets"),
-            }
-
-            for target_port, resource_name in input_resources.items():
-                if resource_name and resource_name in resource_last_writer:
-                    source_node, source_port = resource_last_writer[resource_name].split(":")
-                    G.add_edge(source_node, node_id, source_port=source_port, target_port=target_port)
-
-            output_resources = {
-                "VesselOut": params.get("vessel"),
-                "FromVesselOut": params.get("from_vessel"),
-                "ToVesselOut": params.get("to_vessel"),
-                "FiltrateOut": params.get("filtrate_vessel"),
-                "reagent": params.get("reagent"),
-                "solvent": params.get("solvent"),
-                "compound": params.get("compound"),
-                "sources_out": params.get("sources"),
-                "targets_out": params.get("targets"),
-            }
-
-            for source_port, resource_name in output_resources.items():
-                if resource_name:
-                    resource_last_writer[resource_name] = f"{node_id}:{source_port}"
-
-    return G
-
-
-def draw_protocol_graph(protocol_graph: SimpleGraph, output_path: str):
-    """
-    (辅助功能) 使用 networkx 和 matplotlib 绘制协议工作流图，用于可视化。
-    """
-    if not protocol_graph:
-        print("Cannot draw graph: Graph object is empty.")
-        return
-
-    G = nx.DiGraph()
-
-    for node_id, attrs in protocol_graph.nodes.items():
-        label = attrs.get("description", attrs.get("template", node_id[:8]))
-        G.add_node(node_id, label=label, **attrs)
-
-    for edge in protocol_graph.edges:
-        G.add_edge(edge["source"], edge["target"])
-
-    plt.figure(figsize=(20, 15))
-    try:
-        pos = nx.nx_agraph.graphviz_layout(G, prog="dot")
-    except Exception:
-        pos = nx.shell_layout(G)  # Fallback layout
-
-    node_labels = {node: data["label"] for node, data in G.nodes(data=True)}
-    nx.draw(
-        G,
-        pos,
-        with_labels=False,
-        node_size=2500,
-        node_color="skyblue",
-        node_shape="o",
-        edge_color="gray",
-        width=1.5,
-        arrowsize=15,
-    )
-    nx.draw_networkx_labels(G, pos, labels=node_labels, font_size=8, font_weight="bold")
-
-    plt.title("Chemical Protocol Workflow Graph", size=15)
-    plt.savefig(output_path, dpi=300, bbox_inches="tight")
-    plt.close()
-    print(f"  - Visualization saved to '{output_path}'")
-
-
-from networkx.drawing.nx_agraph import to_agraph
-import re
-
-COMPASS = {"n","e","s","w","ne","nw","se","sw","c"}
-
-def _is_compass(port: str) -> bool:
-    return isinstance(port, str) and port.lower() in COMPASS
-
-def draw_protocol_graph_with_ports(protocol_graph, output_path: str, rankdir: str = "LR"):
-    """
-    使用 Graphviz 端口语法绘制协议工作流图。
-    - 若边上的 source_port/target_port 是 compass（n/e/s/w/...），直接用 compass。
-    - 否则自动为节点创建 record 形状并定义命名端口 <portname>。
-    最终由 PyGraphviz 渲染并输出到 output_path（后缀决定格式，如 .png/.svg/.pdf）。
-    """
-    if not protocol_graph:
-        print("Cannot draw graph: Graph object is empty.")
-        return
-
-    # 1) 先用 networkx 搭建有向图，保留端口属性
-    G = nx.DiGraph()
-    for node_id, attrs in protocol_graph.nodes.items():
-        label = attrs.get("description", attrs.get("template", node_id[:8]))
-        # 保留一个干净的“中心标签”，用于放在 record 的中间槽
-        G.add_node(node_id, _core_label=str(label), **{k:v for k,v in attrs.items() if k not in ("label",)})
-
-    edges_data = []
-    in_ports_by_node  = {}  # 收集命名输入端口
-    out_ports_by_node = {}  # 收集命名输出端口
-
-    for edge in protocol_graph.edges:
-        u = edge["source"]
-        v = edge["target"]
-        sp = edge.get("source_port")
-        tp = edge.get("target_port")
-
-        # 记录到图里（保留原始端口信息）
-        G.add_edge(u, v, source_port=sp, target_port=tp)
-        edges_data.append((u, v, sp, tp))
-
-        # 如果不是 compass，就按“命名端口”先归类，等会儿给节点造 record
-        if sp and not _is_compass(sp):
-            out_ports_by_node.setdefault(u, set()).add(str(sp))
-        if tp and not _is_compass(tp):
-            in_ports_by_node.setdefault(v, set()).add(str(tp))
-
-    # 2) 转为 AGraph，使用 Graphviz 渲染
-    A = to_agraph(G)
-    A.graph_attr.update(rankdir=rankdir, splines="true", concentrate="false", fontsize="10")
-    A.node_attr.update(shape="box", style="rounded,filled", fillcolor="lightyellow", color="#999999", fontname="Helvetica")
-    A.edge_attr.update(arrowsize="0.8", color="#666666")
-
-    # 3) 为需要命名端口的节点设置 record 形状与 label
-    #    左列 = 输入端口；中间 = 核心标签；右列 = 输出端口
-    for n in A.nodes():
-        node = A.get_node(n)
-        core = G.nodes[n].get("_core_label", n)
-
-        in_ports  = sorted(in_ports_by_node.get(n, []))
-        out_ports = sorted(out_ports_by_node.get(n, []))
-
-        # 如果该节点涉及命名端口，则用 record；否则保留原 box
-        if in_ports or out_ports:
-            def port_fields(ports):
-                if not ports:
-                    return " "  # 必须留一个空槽占位
-                # 每个端口一个小格子，<p> name
-                return "|".join(f"<{re.sub(r'[^A-Za-z0-9_:.|-]', '_', p)}> {p}" for p in ports)
-
-            left  = port_fields(in_ports)
-            right = port_fields(out_ports)
-
-            # 三栏：左(入) | 中(节点名) | 右(出)
-            record_label = f"{{ {left} | {core} | {right} }}"
-            node.attr.update(shape="record", label=record_label)
-        else:
-            # 没有命名端口：普通盒子，显示核心标签
-            node.attr.update(label=str(core))
-
-    # 4) 给边设置 headport / tailport
-    #    - 若端口为 compass：直接用 compass（e.g., headport="e"）
-    #    - 若端口为命名端口：使用在 record 中定义的 <port> 名（同名即可）
-    for (u, v, sp, tp) in edges_data:
-        e = A.get_edge(u, v)
-
-        # Graphviz 属性：tail 是源，head 是目标
-        if sp:
-            if _is_compass(sp):
-                e.attr["tailport"] = sp.lower()
-            else:
-                # 与 record label 中 <port> 名一致；特殊字符已在 label 中做了清洗
-                e.attr["tailport"] = re.sub(r'[^A-Za-z0-9_:.|-]', '_', str(sp))
-
-        if tp:
-            if _is_compass(tp):
-                e.attr["headport"] = tp.lower()
-            else:
-                e.attr["headport"] = re.sub(r'[^A-Za-z0-9_:.|-]', '_', str(tp))
-
-        # 可选：若想让边更贴边缘，可设置 constraint/spline 等
-        # e.attr["arrowhead"] = "vee"
-
-    # 5) 输出
-    A.draw(output_path, prog="dot")
-    print(f"  - Port-aware workflow rendered to '{output_path}'")
-
-
-def flatten_xdl_procedure(procedure_elem: ET.Element) -> List[ET.Element]:
-    """展平嵌套的XDL程序结构"""
-    flattened_operations = []
-    TEMP_UNSUPPORTED_PROTOCOL = ["Purge", "Wait", "Stir", "ResetHandling"]
-
-    def extract_operations(element: ET.Element):
-        if element.tag not in ["Prep", "Reaction", "Workup", "Purification", "Procedure"]:
-            if element.tag not in TEMP_UNSUPPORTED_PROTOCOL:
-                flattened_operations.append(element)
-
-        for child in element:
-            extract_operations(child)
-
-    for child in procedure_elem:
-        extract_operations(child)
-
-    return flattened_operations
-
-
-def parse_xdl_content(xdl_content: str) -> tuple:
-    """解析XDL内容"""
-    try:
-        xdl_content_cleaned = "".join(c for c in xdl_content if c.isprintable())
-        root = ET.fromstring(xdl_content_cleaned)
-
-        synthesis_elem = root.find("Synthesis")
-        if synthesis_elem is None:
-            return None, None, None
-
-        # 解析硬件组件
-        hardware_elem = synthesis_elem.find("Hardware")
-        hardware = []
-        if hardware_elem is not None:
-            hardware = [{"id": c.get("id"), "type": c.get("type")} for c in hardware_elem.findall("Component")]
-
-        # 解析试剂
-        reagents_elem = synthesis_elem.find("Reagents")
-        reagents = []
-        if reagents_elem is not None:
-            reagents = [{"name": r.get("name"), "role": r.get("role", "")} for r in reagents_elem.findall("Reagent")]
-
-        # 解析程序
-        procedure_elem = synthesis_elem.find("Procedure")
-        if procedure_elem is None:
-            return None, None, None
-
-        flattened_operations = flatten_xdl_procedure(procedure_elem)
-        return hardware, reagents, flattened_operations
-
-    except ET.ParseError as e:
-        raise ValueError(f"Invalid XDL format: {e}")
-
-
-def convert_xdl_to_dict(xdl_content: str) -> Dict[str, Any]:
-    """
-    将XDL XML格式转换为标准的字典格式
-
-    Args:
-        xdl_content: XDL XML内容
-
-    Returns:
-        转换结果，包含步骤和器材信息
-    """
-    try:
-        hardware, reagents, flattened_operations = parse_xdl_content(xdl_content)
-        if hardware is None:
-            return {"error": "Failed to parse XDL content", "success": False}
-
-        # 将XDL元素转换为字典格式
-        steps_data = []
-        for elem in flattened_operations:
-            # 转换参数类型
-            parameters = {}
-            for key, val in elem.attrib.items():
-                converted_val = convert_to_type(val)
-                if converted_val is not None:
-                    parameters[key] = converted_val
-
-            step_dict = {
-                "operation": elem.tag,
-                "parameters": parameters,
-                "description": elem.get("purpose", f"Operation: {elem.tag}"),
-            }
-            steps_data.append(step_dict)
-
-        # 合并硬件和试剂为统一的labware_info格式
-        labware_data = []
-        labware_data.extend({"id": hw["id"], "type": "hardware", **hw} for hw in hardware)
-        labware_data.extend({"name": reagent["name"], "type": "reagent", **reagent} for reagent in reagents)
-
-        return {
-            "success": True,
-            "steps": steps_data,
-            "labware": labware_data,
-            "message": f"Successfully converted XDL to dict format. Found {len(steps_data)} steps and {len(labware_data)} labware items.",
-        }
-
-    except Exception as e:
-        error_msg = f"XDL conversion failed: {str(e)}"
-        logger.error(error_msg)
-        return {"error": error_msg, "success": False}
 
 
 def create_workflow(

setup.py

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

test/experiments/reaction_station_bioyond.json

@@ -0,0 +1,72 @@
+{
+    "nodes": [
+        {
+            "id": "reaction_station_bioyond",
+            "name": "reaction_station_bioyond",
+            "parent": null,
+            "children": [
+                "Bioyond_Deck"
+            ],
+            "type": "device",
+            "class": "reaction_station.bioyond",
+            "config": {
+                "config": {
+                    "api_key": "DE9BDDA0",
+                    "api_host": "http://192.168.1.200:44402",
+                    "workflow_mappings": {
+                        "reactor_taken_out": "3a16081e-4788-ca37-eff4-ceed8d7019d1",
+                        "reactor_taken_in": "3a160df6-76b3-0957-9eb0-cb496d5721c6",
+                        "Solid_feeding_vials": "3a160877-87e7-7699-7bc6-ec72b05eb5e6",
+                        "Liquid_feeding_vials(non-titration)": "3a167d99-6158-c6f0-15b5-eb030f7d8e47",
+                        "Liquid_feeding_solvents": "3a160824-0665-01ed-285a-51ef817a9046",
+                        "Liquid_feeding(titration)": "3a16082a-96ac-0449-446a-4ed39f3365b6",
+                        "liquid_feeding_beaker": "3a16087e-124f-8ddb-8ec1-c2dff09ca784",
+                        "Drip_back": "3a162cf9-6aac-565a-ddd7-682ba1796a4a"
+                    },
+                    "material_type_mappings": {
+                        "烧杯": ["YB_1FlaskCarrier", "3a14196b-24f2-ca49-9081-0cab8021bf1a"],
+                        "试剂瓶": ["YB_1BottleCarrier", ""],
+                        "样品板": ["YB_6StockCarrier", "3a14196e-b7a0-a5da-1931-35f3000281e9"],
+                        "分装板": ["YB_6VialCarrier", "3a14196e-5dfe-6e21-0c79-fe2036d052c4"],
+                        "样品瓶": ["YB_Solid_Stock", "3a14196a-cf7d-8aea-48d8-b9662c7dba94"],
+                        "90%分装小瓶": ["YB_Solid_Vial", "3a14196c-cdcf-088d-dc7d-5cf38f0ad9ea"],
+                        "10%分装小瓶": ["YB_Liquid_Vial", "3a14196c-76be-2279-4e22-7310d69aed68"]
+                    }
+                },
+                "deck": {
+                    "data": {
+                        "_resource_child_name": "Bioyond_Deck",
+                        "_resource_type": "unilabos.resources.bioyond.decks:BIOYOND_PolymerReactionStation_Deck"
+                    }
+                },
+                "protocol_type": []
+            },
+            "data": {}
+        },
+        {
+            "id": "Bioyond_Deck",
+            "name": "Bioyond_Deck",
+            "children": [
+            ],
+            "parent": "reaction_station_bioyond",
+            "type": "deck",
+            "class": "BIOYOND_PolymerReactionStation_Deck",
+            "position": {
+                "x": 0,
+                "y": 0,
+                "z": 0
+            },
+            "config": {
+                "type": "BIOYOND_PolymerReactionStation_Deck",
+                "setup": true,
+                "rotation": {
+                    "x": 0,
+                    "y": 0,
+                    "z": 0,
+                    "type": "Rotation"
+                }
+            },
+            "data": {}
+        }
+    ]
+}

test/resources/YB_materials_info.json

@@ -0,0 +1,52 @@
+[
+    {
+        "id": "3a1d377b-299d-d0f2-ced9-48257f60dfad",
+        "typeName": "加样头(大)",
+        "code": "0005-00145",
+        "barCode": "",
+        "name": "LiDFOB",
+        "quantity": 9999.0,
+        "lockQuantity": 0.0,
+        "unit": "个",
+        "status": 1,
+        "isUse": false,
+        "locations": [
+            {
+                "id": "3a19da56-1379-ff7c-1745-07e200b44ce2",
+                "whid": "3a19da56-1378-613b-29f2-871e1a287aa5",
+                "whName": "粉末加样头堆栈",
+                "code": "0005-0001",
+                "x": 1,
+                "y": 1,
+                "z": 1,
+                "quantity": 0
+            }
+        ],
+        "detail": []
+    },
+    {
+        "id": "3a1d377b-6a81-6a7e-147c-f89f6463656d",
+        "typeName": "液",
+        "code": "0006-00141",
+        "barCode": "",
+        "name": "EMC",
+        "quantity": 99999.0,
+        "lockQuantity": 0.0,
+        "unit": "g",
+        "status": 1,
+        "isUse": false,
+        "locations": [
+            {
+                "id": "3a1baa20-a7b1-c665-8b9c-d8099d07d2f6",
+                "whid": "3a1baa20-a7b0-5c19-8844-5de8924d4e78",
+                "whName": "4号手套箱内部堆栈",
+                "code": "0015-0001",
+                "x": 1,
+                "y": 1,
+                "z": 1,
+                "quantity": 0
+            }
+        ],
+        "detail": []
+    }
+]

test/resources/test copy.json

@@ -0,0 +1,99 @@
+ {
+        "typeId": "3a190c8b-3284-af78-d29f-9a69463ad047",
+        "code": "",
+        "barCode": "",
+        "name": "test",
+        "unit": "",
+        "parameters": "{}",
+        "quantity": "",
+        "details": [
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)11",
+                "quantity": "1",
+                "x": 1,
+                "y": 1,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            },
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)21",
+                "quantity": "1",
+                "x": 2,
+                "y": 1,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            },
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)12",
+                "quantity": "1",
+                "x": 1,
+                "y": 2,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            },
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)22",
+                "quantity": "1",
+                "x": 2,
+                "y": 2,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            },
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)13",
+                "quantity": "1",
+                "x": 1,
+                "y": 3,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            },
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)23",
+                "quantity": "1",
+                "x": 2,
+                "y": 3,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            },
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)14",
+                "quantity": "1",
+                "x": 1,
+                "y": 4,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            },
+            {
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb",
+                "code": "",
+                "name": "配液瓶(小)24",
+                "quantity": "1",
+                "x": 2,
+                "y": 4,
+                "z": 1,
+                "unit": "",
+                "parameters": "{}"
+            }
+        ]
+    }

test/resources/test.json

@@ -0,0 +1,148 @@
+[
+    {
+        "id": "3a1d4c14-a9fb-d7dc-9e96-7a3ad6e50219",
+        "typeName": "配液瓶(小)板",
+        "code": "0001-00093",
+        "barCode": "",
+        "name": "test",
+        "quantity": 2.0,
+        "lockQuantity": 0.0,
+        "unit": "块",
+        "status": 1,
+        "isUse": false,
+        "locations": [
+            {
+                "id": "3a19deae-2c7a-36f5-5e41-02c5b66feaea",
+                "whid": "3a19deae-2c79-05a3-9c76-8e6760424841",
+                "whName": "手动堆栈",
+                "code": "1",
+                "x": 1,
+                "y": 1,
+                "z": 1,
+                "quantity": 0
+            }
+        ],
+        "detail": [
+            {
+                "id": "3a1d4c14-a9fc-1daa-71fa-146cb1ccb930",
+                "detailMaterialId": "3a1d4c14-a9fc-4f38-4c48-68486c391c42",
+                "code": "0001-00093 - 05",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 1,
+                "y": 3,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            },
+            {
+                "id": "3a1d4c14-a9fc-3659-ea61-cd587da9e131",
+                "detailMaterialId": "3a1d4c14-a9fc-018f-93e5-c49343d37758",
+                "code": "0001-00093 - 08",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 2,
+                "y": 4,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            },
+            {
+                "id": "3a1d4c14-a9fc-3f94-de83-979d2646e313",
+                "detailMaterialId": "3a1d4c14-a9fc-9987-c0ef-4b7cbad49e6b",
+                "code": "0001-00093 - 01",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 1,
+                "y": 1,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            },
+            {
+                "id": "3a1d4c14-a9fc-8c35-6b25-913b11dbaf4e",
+                "detailMaterialId": "3a1d4c14-a9fc-9a83-865b-0c26ea5e8cc4",
+                "code": "0001-00093 - 03",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 1,
+                "y": 2,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            },
+            {
+                "id": "3a1d4c14-a9fc-b41f-e968-64953bfddccd",
+                "detailMaterialId": "3a1d4c14-a9fc-daf7-9d64-e5ec8d3ae0e2",
+                "code": "0001-00093 - 07",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 1,
+                "y": 4,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            },
+            {
+                "id": "3a1d4c14-a9fc-c20f-c26e-b1bb2cdc3bca",
+                "detailMaterialId": "3a1d4c14-a9fc-673b-ac83-aaaf71287f1f",
+                "code": "0001-00093 - 06",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 2,
+                "y": 3,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            },
+            {
+                "id": "3a1d4c14-a9fc-cf21-059c-fde361d82b6f",
+                "detailMaterialId": "3a1d4c14-a9fc-25b1-e736-6b0d8dac0fae",
+                "code": "0001-00093 - 02",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 2,
+                "y": 1,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            },
+            {
+                "id": "3a1d4c14-a9fc-d732-2b93-9b2bd2bf581b",
+                "detailMaterialId": "3a1d4c14-a9fc-7f5d-b6b6-8bcb2e15f320",
+                "code": "0001-00093 - 04",
+                "name": "配液瓶(小)",
+                "quantity": "1",
+                "lockQuantity": "0",
+                "unit": "个",
+                "x": 2,
+                "y": 2,
+                "z": 1,
+                "associateId": null,
+                "typeName": "配液瓶(小)",
+                "typeId": "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"
+            }
+        ]
+    }
+]

test/resources/test_bottle_carrier.py

@@ -1,7 +1,7 @@
 import pytest
 
 from unilabos.resources.bioyond.bottle_carriers import BIOYOND_Electrolyte_6VialCarrier, BIOYOND_Electrolyte_1BottleCarrier
-from unilabos.resources.bioyond.bottles import BIOYOND_PolymerStation_Solid_Vial, BIOYOND_PolymerStation_Solution_Beaker, BIOYOND_PolymerStation_Reagent_Bottle
+from unilabos.resources.bioyond.bottles import YB_Solid_Vial, YB_Solution_Beaker, YB_Reagent_Bottle
 
 
 def test_bottle_carrier() -> "BottleCarrier":
@@ -16,9 +16,9 @@ def test_bottle_carrier() -> "BottleCarrier":
     print(f"1烧杯载架: {beaker_carrier.name}, 位置数: {len(beaker_carrier.sites)}")
 
     # 创建瓶子和烧杯
-    powder_bottle = BIOYOND_PolymerStation_Solid_Vial("powder_bottle_01")
-    solution_beaker = BIOYOND_PolymerStation_Solution_Beaker("solution_beaker_01")
-    reagent_bottle = BIOYOND_PolymerStation_Reagent_Bottle("reagent_bottle_01")
+    powder_bottle = YB_Solid_Vial("powder_bottle_01")
+    solution_beaker = YB_Solution_Beaker("solution_beaker_01")
+    reagent_bottle = YB_Reagent_Bottle("reagent_bottle_01")
 
     print(f"\n创建的物料:")
     print(f"粉末瓶: {powder_bottle.name} - {powder_bottle.diameter}mm x {powder_bottle.height}mm, {powder_bottle.max_volume}μL")

test/resources/test_converter_bioyond.py

@@ -12,13 +12,13 @@ lab_registry.setup()
 
 
 type_mapping = {
-    "烧杯": ("BIOYOND_PolymerStation_1FlaskCarrier", "3a14196b-24f2-ca49-9081-0cab8021bf1a"),
-    "试剂瓶": ("BIOYOND_PolymerStation_1BottleCarrier", ""),
-    "样品板": ("BIOYOND_PolymerStation_6StockCarrier", "3a14196e-b7a0-a5da-1931-35f3000281e9"),
-    "分装板": ("BIOYOND_PolymerStation_6VialCarrier", "3a14196e-5dfe-6e21-0c79-fe2036d052c4"),
-    "样品瓶": ("BIOYOND_PolymerStation_Solid_Stock", "3a14196a-cf7d-8aea-48d8-b9662c7dba94"),
-    "90%分装小瓶": ("BIOYOND_PolymerStation_Solid_Vial", "3a14196c-cdcf-088d-dc7d-5cf38f0ad9ea"),
-    "10%分装小瓶": ("BIOYOND_PolymerStation_Liquid_Vial", "3a14196c-76be-2279-4e22-7310d69aed68"),
+    "烧杯": ("YB_1FlaskCarrier", "3a14196b-24f2-ca49-9081-0cab8021bf1a"),
+    "试剂瓶": ("YB_1BottleCarrier", ""),
+    "样品板": ("YB_6StockCarrier", "3a14196e-b7a0-a5da-1931-35f3000281e9"),
+    "分装板": ("YB_6VialCarrier", "3a14196e-5dfe-6e21-0c79-fe2036d052c4"),
+    "样品瓶": ("YB_Solid_Stock", "3a14196a-cf7d-8aea-48d8-b9662c7dba94"),
+    "90%分装小瓶": ("YB_Solid_Vial", "3a14196c-cdcf-088d-dc7d-5cf38f0ad9ea"),
+    "10%分装小瓶": ("YB_Liquid_Vial", "3a14196c-76be-2279-4e22-7310d69aed68"),
 }
 
 

test/resources/test_resourcetreeset.py

@@ -1,24 +1,24 @@
+from ast import If
 import pytest
 import json
 import os
 
+from pylabrobot.resources import Resource as ResourcePLR
 from unilabos.resources.graphio import resource_bioyond_to_plr
-from unilabos.resources.resource_tracker import ResourceTreeSet
+from unilabos.ros.nodes.resource_tracker import ResourceTreeSet
 from unilabos.registry.registry import lab_registry
 
 from unilabos.resources.bioyond.decks import BIOYOND_PolymerReactionStation_Deck
+from unilabos.resources.bioyond.decks import YB_Deck
 
 lab_registry.setup()
 
 
 type_mapping = {
-    "烧杯": ("BIOYOND_PolymerStation_1FlaskCarrier", "3a14196b-24f2-ca49-9081-0cab8021bf1a"),
-    "试剂瓶": ("BIOYOND_PolymerStation_1BottleCarrier", ""),
-    "样品板": ("BIOYOND_PolymerStation_6StockCarrier", "3a14196e-b7a0-a5da-1931-35f3000281e9"),
-    "分装板": ("BIOYOND_PolymerStation_6VialCarrier", "3a14196e-5dfe-6e21-0c79-fe2036d052c4"),
-    "样品瓶": ("BIOYOND_PolymerStation_Solid_Stock", "3a14196a-cf7d-8aea-48d8-b9662c7dba94"),
-    "90%分装小瓶": ("BIOYOND_PolymerStation_Solid_Vial", "3a14196c-cdcf-088d-dc7d-5cf38f0ad9ea"),
-    "10%分装小瓶": ("BIOYOND_PolymerStation_Liquid_Vial", "3a14196c-76be-2279-4e22-7310d69aed68"),
+    "加样头(大)": ("YB_jia_yang_tou_da", "3a190ca0-b2f6-9aeb-8067-547e72c11469"),
+    "液": ("YB_1BottleCarrier", "3a190ca1-2add-2b23-f8e1-bbd348b7f790"),
+    "配液瓶(小)板": ("YB_peiyepingxiaoban", "3a190c8b-3284-af78-d29f-9a69463ad047"),
+    "配液瓶(小)": ("YB_pei_ye_xiao_Bottler", "3a190c8c-fe8f-bf48-0dc3-97afc7f508eb"),
 }
 
 
@@ -56,12 +56,20 @@ def bioyond_materials_liquidhandling_2() -> list[dict]:
     "bioyond_materials_reaction",
     "bioyond_materials_liquidhandling_1",
 ])
-def test_resourcetreeset_from_plr(materials_fixture, request) -> list[dict]:
-    materials = request.getfixturevalue(materials_fixture)
-    deck = BIOYOND_PolymerReactionStation_Deck("test_deck")
+def test_resourcetreeset_from_plr() -> list[dict]:
+    # 直接加载 bioyond_materials_reaction.json 文件
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    json_path = os.path.join(current_dir, "test.json")
+    with open(json_path, "r", encoding="utf-8") as f:
+        materials = json.load(f)
+    deck = YB_Deck("test_deck")
     output = resource_bioyond_to_plr(materials, type_mapping=type_mapping, deck=deck)
-    print(deck.summary())
+    print(output)
+    # print(deck.summary())
 
     r = ResourceTreeSet.from_plr_resources([deck])
     print(r.dump())
     # json.dump(deck.serialize(), open("test.json", "w", encoding="utf-8"), indent=4)
+
+if __name__ == "__main__":
+    test_resourcetreeset_from_plr()

test/ros/msgs/test_runner.py

@@ -11,10 +11,10 @@ import os
 # 添加项目根目录到路径
 sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
 
-# 导入测试模块（统一从 tests 包获取）
-from tests.ros.msgs.test_basic import TestBasicFunctionality
-from tests.ros.msgs.test_conversion import TestBasicConversion, TestMappingConversion
-from tests.ros.msgs.test_mapping import TestTypeMapping, TestFieldMapping
+# 导入测试模块
+from test.ros.msgs.test_basic import TestBasicFunctionality
+from test.ros.msgs.test_conversion import TestBasicConversion, TestMappingConversion
+from test.ros.msgs.test_mapping import TestTypeMapping, TestFieldMapping
 
 
 def run_tests():

tests/__init__.py

@@ -1,7 +0,0 @@
-"""
-测试包根目录。
-
-让 `tests.*` 模块可以被正常 import（例如给 `unilabos` 下的测试入口使用）。
-"""
-
-

tests/devices/__init__.py

@@ -1 +0,0 @@
-

tests/devices/liquid_handling/__init__.py

@@ -1,5 +0,0 @@
-"""
-液体处理设备相关测试。
-"""
-
-

tests/devices/liquid_handling/test_transfer_liquid.py

@@ -1,505 +0,0 @@
-import asyncio
-from dataclasses import dataclass
-from typing import Any, Iterable, List, Optional, Sequence, Tuple
-
-import pytest
-
-from unilabos.devices.liquid_handling.liquid_handler_abstract import LiquidHandlerAbstract
-
-
-@dataclass(frozen=True)
-class DummyContainer:
-    name: str
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return f"DummyContainer({self.name})"
-
-
-@dataclass(frozen=True)
-class DummyTipSpot:
-    name: str
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return f"DummyTipSpot({self.name})"
-
-
-def make_tip_iter(n: int = 256) -> Iterable[List[DummyTipSpot]]:
-    """Yield lists so code can safely call `tip.extend(next(self.current_tip))`."""
-    for i in range(n):
-        yield [DummyTipSpot(f"tip_{i}")]
-
-
-class FakeLiquidHandler(LiquidHandlerAbstract):
-    """不初始化真实 backend/deck；仅用来记录 transfer_liquid 内部调用序列。"""
-
-    def __init__(self, channel_num: int = 8):
-        # 不调用 super().__init__，避免真实硬件/后端依赖
-        self.channel_num = channel_num
-        self.support_touch_tip = True
-        self.current_tip = iter(make_tip_iter())
-        self.calls: List[Tuple[str, Any]] = []
-
-    async def pick_up_tips(self, tip_spots, use_channels=None, offsets=None, **backend_kwargs):
-        self.calls.append(("pick_up_tips", {"tips": list(tip_spots), "use_channels": use_channels}))
-
-    async def aspirate(
-        self,
-        resources: Sequence[Any],
-        vols: List[float],
-        use_channels: Optional[List[int]] = None,
-        flow_rates: Optional[List[Optional[float]]] = None,
-        offsets: Any = None,
-        liquid_height: Any = None,
-        blow_out_air_volume: Any = None,
-        spread: str = "wide",
-        **backend_kwargs,
-    ):
-        self.calls.append(
-            (
-                "aspirate",
-                {
-                    "resources": list(resources),
-                    "vols": list(vols),
-                    "use_channels": list(use_channels) if use_channels is not None else None,
-                    "flow_rates": list(flow_rates) if flow_rates is not None else None,
-                    "offsets": list(offsets) if offsets is not None else None,
-                    "liquid_height": list(liquid_height) if liquid_height is not None else None,
-                    "blow_out_air_volume": list(blow_out_air_volume) if blow_out_air_volume is not None else None,
-                },
-            )
-        )
-
-    async def dispense(
-        self,
-        resources: Sequence[Any],
-        vols: List[float],
-        use_channels: Optional[List[int]] = None,
-        flow_rates: Optional[List[Optional[float]]] = None,
-        offsets: Any = None,
-        liquid_height: Any = None,
-        blow_out_air_volume: Any = None,
-        spread: str = "wide",
-        **backend_kwargs,
-    ):
-        self.calls.append(
-            (
-                "dispense",
-                {
-                    "resources": list(resources),
-                    "vols": list(vols),
-                    "use_channels": list(use_channels) if use_channels is not None else None,
-                    "flow_rates": list(flow_rates) if flow_rates is not None else None,
-                    "offsets": list(offsets) if offsets is not None else None,
-                    "liquid_height": list(liquid_height) if liquid_height is not None else None,
-                    "blow_out_air_volume": list(blow_out_air_volume) if blow_out_air_volume is not None else None,
-                },
-            )
-        )
-
-    async def discard_tips(self, use_channels=None, *args, **kwargs):
-        # 有的分支是 discard_tips(use_channels=[0])，有的分支是 discard_tips([0..7])（位置参数）
-        self.calls.append(("discard_tips", {"use_channels": list(use_channels) if use_channels is not None else None}))
-
-    async def custom_delay(self, seconds=0, msg=None):
-        self.calls.append(("custom_delay", {"seconds": seconds, "msg": msg}))
-
-    async def touch_tip(self, targets):
-        # 原实现会访问 targets.get_size_x() 等；测试里只记录调用
-        self.calls.append(("touch_tip", {"targets": targets}))
-
-    async def mix(self, targets, mix_time=None, mix_vol=None, height_to_bottom=None, offsets=None, mix_rate=None, none_keys=None):
-        self.calls.append(
-            (
-                "mix",
-                {
-                    "targets": targets,
-                    "mix_time": mix_time,
-                    "mix_vol": mix_vol,
-                },
-            )
-        )
-
-
-def run(coro):
-    return asyncio.run(coro)
-
-
-def test_one_to_one_single_channel_basic_calls():
-    lh = FakeLiquidHandler(channel_num=1)
-    lh.current_tip = iter(make_tip_iter(64))
-
-    sources = [DummyContainer(f"S{i}") for i in range(3)]
-    targets = [DummyContainer(f"T{i}") for i in range(3)]
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=targets,
-            tip_racks=[],
-            use_channels=[0],
-            asp_vols=[1, 2, 3],
-            dis_vols=[4, 5, 6],
-            mix_times=None,  # 应该仍能执行（不 mix）
-        )
-    )
-
-    assert [c[0] for c in lh.calls].count("pick_up_tips") == 3
-    assert [c[0] for c in lh.calls].count("aspirate") == 3
-    assert [c[0] for c in lh.calls].count("dispense") == 3
-    assert [c[0] for c in lh.calls].count("discard_tips") == 3
-
-    # 每次 aspirate/dispense 都是单孔列表
-    aspirates = [payload for name, payload in lh.calls if name == "aspirate"]
-    assert aspirates[0]["resources"] == [sources[0]]
-    assert aspirates[0]["vols"] == [1.0]
-
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert dispenses[2]["resources"] == [targets[2]]
-    assert dispenses[2]["vols"] == [6.0]
-
-
-def test_one_to_one_single_channel_before_stage_mixes_prior_to_aspirate():
-    lh = FakeLiquidHandler(channel_num=1)
-    lh.current_tip = iter(make_tip_iter(16))
-
-    source = DummyContainer("S0")
-    target = DummyContainer("T0")
-
-    run(
-        lh.transfer_liquid(
-            sources=[source],
-            targets=[target],
-            tip_racks=[],
-            use_channels=[0],
-            asp_vols=[5],
-            dis_vols=[5],
-            mix_stage="before",
-            mix_times=1,
-            mix_vol=3,
-        )
-    )
-
-    names = [name for name, _ in lh.calls]
-    assert names.count("mix") == 1
-    assert names.index("mix") < names.index("aspirate")
-
-
-def test_one_to_one_eight_channel_groups_by_8():
-    lh = FakeLiquidHandler(channel_num=8)
-    lh.current_tip = iter(make_tip_iter(256))
-
-    sources = [DummyContainer(f"S{i}") for i in range(16)]
-    targets = [DummyContainer(f"T{i}") for i in range(16)]
-    asp_vols = list(range(1, 17))
-    dis_vols = list(range(101, 117))
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=targets,
-            tip_racks=[],
-            use_channels=list(range(8)),
-            asp_vols=asp_vols,
-            dis_vols=dis_vols,
-            mix_times=0,  # 触发逻辑但不 mix
-        )
-    )
-
-    # 16 个任务 -> 2 组，每组 8 通道一起做
-    assert [c[0] for c in lh.calls].count("pick_up_tips") == 2
-    aspirates = [payload for name, payload in lh.calls if name == "aspirate"]
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert len(aspirates) == 2
-    assert len(dispenses) == 2
-
-    assert aspirates[0]["resources"] == sources[0:8]
-    assert aspirates[0]["vols"] == [float(v) for v in asp_vols[0:8]]
-    assert dispenses[1]["resources"] == targets[8:16]
-    assert dispenses[1]["vols"] == [float(v) for v in dis_vols[8:16]]
-
-
-def test_one_to_one_eight_channel_requires_multiple_of_8_targets():
-    lh = FakeLiquidHandler(channel_num=8)
-    lh.current_tip = iter(make_tip_iter(64))
-
-    sources = [DummyContainer(f"S{i}") for i in range(9)]
-    targets = [DummyContainer(f"T{i}") for i in range(9)]
-
-    with pytest.raises(ValueError, match="multiple of 8"):
-        run(
-            lh.transfer_liquid(
-                sources=sources,
-                targets=targets,
-                tip_racks=[],
-                use_channels=list(range(8)),
-                asp_vols=[1] * 9,
-                dis_vols=[1] * 9,
-                mix_times=0,
-            )
-        )
-
-
-def test_one_to_one_eight_channel_parameter_lists_are_chunked_per_8():
-    lh = FakeLiquidHandler(channel_num=8)
-    lh.current_tip = iter(make_tip_iter(512))
-
-    sources = [DummyContainer(f"S{i}") for i in range(16)]
-    targets = [DummyContainer(f"T{i}") for i in range(16)]
-    asp_vols = [i + 1 for i in range(16)]
-    dis_vols = [200 + i for i in range(16)]
-    asp_flow_rates = [0.1 * (i + 1) for i in range(16)]
-    dis_flow_rates = [0.2 * (i + 1) for i in range(16)]
-    offsets = [f"offset_{i}" for i in range(16)]
-    liquid_heights = [i * 0.5 for i in range(16)]
-    blow_out_air_volume = [i + 0.05 for i in range(16)]
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=targets,
-            tip_racks=[],
-            use_channels=list(range(8)),
-            asp_vols=asp_vols,
-            dis_vols=dis_vols,
-            asp_flow_rates=asp_flow_rates,
-            dis_flow_rates=dis_flow_rates,
-            offsets=offsets,
-            liquid_height=liquid_heights,
-            blow_out_air_volume=blow_out_air_volume,
-            mix_times=0,
-        )
-    )
-
-    aspirates = [payload for name, payload in lh.calls if name == "aspirate"]
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert len(aspirates) == len(dispenses) == 2
-
-    for batch_idx in range(2):
-        start = batch_idx * 8
-        end = start + 8
-        asp_call = aspirates[batch_idx]
-        dis_call = dispenses[batch_idx]
-        assert asp_call["resources"] == sources[start:end]
-        assert asp_call["flow_rates"] == asp_flow_rates[start:end]
-        assert asp_call["offsets"] == offsets[start:end]
-        assert asp_call["liquid_height"] == liquid_heights[start:end]
-        assert asp_call["blow_out_air_volume"] == blow_out_air_volume[start:end]
-        assert dis_call["flow_rates"] == dis_flow_rates[start:end]
-        assert dis_call["offsets"] == offsets[start:end]
-        assert dis_call["liquid_height"] == liquid_heights[start:end]
-        assert dis_call["blow_out_air_volume"] == blow_out_air_volume[start:end]
-
-
-def test_one_to_one_eight_channel_handles_32_tasks_four_batches():
-    lh = FakeLiquidHandler(channel_num=8)
-    lh.current_tip = iter(make_tip_iter(1024))
-
-    sources = [DummyContainer(f"S{i}") for i in range(32)]
-    targets = [DummyContainer(f"T{i}") for i in range(32)]
-    asp_vols = [i + 1 for i in range(32)]
-    dis_vols = [300 + i for i in range(32)]
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=targets,
-            tip_racks=[],
-            use_channels=list(range(8)),
-            asp_vols=asp_vols,
-            dis_vols=dis_vols,
-            mix_times=0,
-        )
-    )
-
-    pick_calls = [name for name, _ in lh.calls if name == "pick_up_tips"]
-    aspirates = [payload for name, payload in lh.calls if name == "aspirate"]
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert len(pick_calls) == 4
-    assert len(aspirates) == len(dispenses) == 4
-    assert aspirates[0]["resources"] == sources[0:8]
-    assert aspirates[-1]["resources"] == sources[24:32]
-    assert dispenses[0]["resources"] == targets[0:8]
-    assert dispenses[-1]["resources"] == targets[24:32]
-
-
-def test_one_to_many_single_channel_aspirates_total_when_asp_vol_too_small():
-    lh = FakeLiquidHandler(channel_num=1)
-    lh.current_tip = iter(make_tip_iter(64))
-
-    source = DummyContainer("SRC")
-    targets = [DummyContainer(f"T{i}") for i in range(3)]
-    dis_vols = [10, 20, 30]  # sum=60
-
-    run(
-        lh.transfer_liquid(
-            sources=[source],
-            targets=targets,
-            tip_racks=[],
-            use_channels=[0],
-            asp_vols=10,  # 小于 sum(dis_vols) -> 应吸 60
-            dis_vols=dis_vols,
-            mix_times=0,
-        )
-    )
-
-    aspirates = [payload for name, payload in lh.calls if name == "aspirate"]
-    assert len(aspirates) == 1
-    assert aspirates[0]["resources"] == [source]
-    assert aspirates[0]["vols"] == [60.0]
-    assert aspirates[0]["use_channels"] == [0]
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert [d["vols"][0] for d in dispenses] == [10.0, 20.0, 30.0]
-
-
-def test_one_to_many_eight_channel_basic():
-    lh = FakeLiquidHandler(channel_num=8)
-    lh.current_tip = iter(make_tip_iter(128))
-
-    source = DummyContainer("SRC")
-    targets = [DummyContainer(f"T{i}") for i in range(8)]
-    dis_vols = [i + 1 for i in range(8)]
-
-    run(
-        lh.transfer_liquid(
-            sources=[source],
-            targets=targets,
-            tip_racks=[],
-            use_channels=list(range(8)),
-            asp_vols=999,  # one-to-many 8ch 会按 dis_vols 吸（每通道各自）
-            dis_vols=dis_vols,
-            mix_times=0,
-        )
-    )
-
-    aspirates = [payload for name, payload in lh.calls if name == "aspirate"]
-    assert aspirates[0]["resources"] == [source] * 8
-    assert aspirates[0]["vols"] == [float(v) for v in dis_vols]
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert dispenses[0]["resources"] == targets
-    assert dispenses[0]["vols"] == [float(v) for v in dis_vols]
-
-
-def test_many_to_one_single_channel_standard_dispense_equals_asp_by_default():
-    lh = FakeLiquidHandler(channel_num=1)
-    lh.current_tip = iter(make_tip_iter(128))
-
-    sources = [DummyContainer(f"S{i}") for i in range(3)]
-    target = DummyContainer("T")
-    asp_vols = [5, 6, 7]
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=[target],
-            tip_racks=[],
-            use_channels=[0],
-            asp_vols=asp_vols,
-            dis_vols=1,  # many-to-one 允许标量；非比例模式下实际每次分液=对应 asp_vol
-            mix_times=0,
-        )
-    )
-
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert [d["vols"][0] for d in dispenses] == [float(v) for v in asp_vols]
-    assert all(d["resources"] == [target] for d in dispenses)
-
-
-def test_many_to_one_single_channel_before_stage_mixes_target_once():
-    lh = FakeLiquidHandler(channel_num=1)
-    lh.current_tip = iter(make_tip_iter(128))
-
-    sources = [DummyContainer("S0"), DummyContainer("S1")]
-    target = DummyContainer("T")
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=[target],
-            tip_racks=[],
-            use_channels=[0],
-            asp_vols=[5, 6],
-            dis_vols=1,
-            mix_stage="before",
-            mix_times=2,
-            mix_vol=4,
-        )
-    )
-
-    names = [name for name, _ in lh.calls]
-    assert names[0] == "mix"
-    assert names.count("mix") == 1
-
-
-def test_many_to_one_single_channel_proportional_mixing_uses_dis_vols_per_source():
-    lh = FakeLiquidHandler(channel_num=1)
-    lh.current_tip = iter(make_tip_iter(128))
-
-    sources = [DummyContainer(f"S{i}") for i in range(3)]
-    target = DummyContainer("T")
-    asp_vols = [5, 6, 7]
-    dis_vols = [1, 2, 3]
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=[target],
-            tip_racks=[],
-            use_channels=[0],
-            asp_vols=asp_vols,
-            dis_vols=dis_vols,  # 比例模式
-            mix_times=0,
-        )
-    )
-
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert [d["vols"][0] for d in dispenses] == [float(v) for v in dis_vols]
-
-
-def test_many_to_one_eight_channel_basic():
-    lh = FakeLiquidHandler(channel_num=8)
-    lh.current_tip = iter(make_tip_iter(256))
-
-    sources = [DummyContainer(f"S{i}") for i in range(8)]
-    target = DummyContainer("T")
-    asp_vols = [10 + i for i in range(8)]
-
-    run(
-        lh.transfer_liquid(
-            sources=sources,
-            targets=[target],
-            tip_racks=[],
-            use_channels=list(range(8)),
-            asp_vols=asp_vols,
-            dis_vols=999,  # 非比例模式下每通道分液=对应 asp_vol
-            mix_times=0,
-        )
-    )
-
-    aspirates = [payload for name, payload in lh.calls if name == "aspirate"]
-    dispenses = [payload for name, payload in lh.calls if name == "dispense"]
-    assert aspirates[0]["resources"] == sources
-    assert aspirates[0]["vols"] == [float(v) for v in asp_vols]
-    assert dispenses[0]["resources"] == [target] * 8
-    assert dispenses[0]["vols"] == [float(v) for v in asp_vols]
-
-
-def test_transfer_liquid_mode_detection_unsupported_shape_raises():
-    lh = FakeLiquidHandler(channel_num=8)
-    lh.current_tip = iter(make_tip_iter(64))
-
-    sources = [DummyContainer("S0"), DummyContainer("S1")]
-    targets = [DummyContainer("T0"), DummyContainer("T1"), DummyContainer("T2")]
-
-    with pytest.raises(ValueError, match="Unsupported transfer mode"):
-        run(
-            lh.transfer_liquid(
-                sources=sources,
-                targets=targets,
-                tip_racks=[],
-                use_channels=[0],
-                asp_vols=[1, 1],
-                dis_vols=[1, 1, 1],
-                mix_times=0,
-            )
-        )
-

tests/workflow/test.json

@@ -1,213 +0,0 @@
-{
-  "workflow": [
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines",
-        "targets": "Liquid_1",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines",
-        "targets": "Liquid_2",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines",
-        "targets": "Liquid_3",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines_2",
-        "targets": "Liquid_4",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines_2",
-        "targets": "Liquid_5",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines_2",
-        "targets": "Liquid_6",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines_3",
-        "targets": "dest_set",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines_3",
-        "targets": "dest_set_2",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    },
-    {
-      "action": "transfer_liquid",
-      "action_args": {
-        "sources": "cell_lines_3",
-        "targets": "dest_set_3",
-        "asp_vol": 100.0,
-        "dis_vol": 74.75,
-        "asp_flow_rate": 94.0,
-        "dis_flow_rate": 95.5
-      }
-    }
-  ],
-  "reagent": {
-    "Liquid_1": {
-      "slot": 1,
-      "well": [
-        "A4",
-        "A7",
-        "A10"
-      ],
-      "labware": "rep 1"
-    },
-    "Liquid_4": {
-      "slot": 1,
-      "well": [
-        "A4",
-        "A7",
-        "A10"
-      ],
-      "labware": "rep 1"
-    },
-    "dest_set": {
-      "slot": 1,
-      "well": [
-        "A4",
-        "A7",
-        "A10"
-      ],
-      "labware": "rep 1"
-    },
-    "Liquid_2": {
-      "slot": 2,
-      "well": [
-        "A3",
-        "A5",
-        "A8"
-      ],
-      "labware": "rep 2"
-    },
-    "Liquid_5": {
-      "slot": 2,
-      "well": [
-        "A3",
-        "A5",
-        "A8"
-      ],
-      "labware": "rep 2"
-    },
-    "dest_set_2": {
-      "slot": 2,
-      "well": [
-        "A3",
-        "A5",
-        "A8"
-      ],
-      "labware": "rep 2"
-    },
-    "Liquid_3": {
-      "slot": 3,
-      "well": [
-        "A4",
-        "A6",
-        "A10"
-      ],
-      "labware": "rep 3"
-    },
-    "Liquid_6": {
-      "slot": 3,
-      "well": [
-        "A4",
-        "A6",
-        "A10"
-      ],
-      "labware": "rep 3"
-    },
-    "dest_set_3": {
-      "slot": 3,
-      "well": [
-        "A4",
-        "A6",
-        "A10"
-      ],
-      "labware": "rep 3"
-    },
-    "cell_lines": {
-      "slot": 4,
-      "well": [
-        "A1",
-        "A3",
-        "A5"
-      ],
-      "labware": "DRUG + YOYO-MEDIA"
-    },
-    "cell_lines_2": {
-      "slot": 4,
-      "well": [
-        "A1",
-        "A3",
-        "A5"
-      ],
-      "labware": "DRUG + YOYO-MEDIA"
-    },
-    "cell_lines_3": {
-      "slot": 4,
-      "well": [
-        "A1",
-        "A3",
-        "A5"
-      ],
-      "labware": "DRUG + YOYO-MEDIA"
-    }
-  }
-}

unilabos/__init__.py

@@ -1 +1 @@
-__version__ = "0.10.17"
+__version__ = "0.10.12"

unilabos/__main__.py

@@ -1,6 +0,0 @@
-"""Entry point for `python -m unilabos`."""
-
-from unilabos.app.main import main
-
-if __name__ == "__main__":
-    main()

unilabos/app/backend.py

@@ -1,6 +1,6 @@
 import threading
 
-from unilabos.resources.resource_tracker import ResourceTreeSet
+from unilabos.ros.nodes.resource_tracker import ResourceTreeSet
 from unilabos.utils import logger
 
 

unilabos/app/main.py

@@ -7,6 +7,7 @@ import sys
 import threading
 import time
 from typing import Dict, Any, List
+
 import networkx as nx
 import yaml
 
@@ -16,14 +17,9 @@ unilabos_dir = os.path.dirname(os.path.dirname(current_dir))
 if unilabos_dir not in sys.path:
     sys.path.append(unilabos_dir)
 
-from unilabos.app.utils import cleanup_for_restart
 from unilabos.utils.banner_print import print_status, print_unilab_banner
 from unilabos.config.config import load_config, BasicConfig, HTTPConfig
 
-# Global restart flags (used by ws_client and web/server)
-_restart_requested: bool = False
-_restart_reason: str = ""
-
 
 def load_config_from_file(config_path):
     if config_path is None:
@@ -160,17 +156,6 @@ def parse_args():
         default=False,
         help="Complete registry information",
     )
-    parser.add_argument(
-        "--check_mode",
-        action="store_true",
-        default=False,
-        help="Run in check mode for CI: validates registry imports and ensures no file changes",
-    )
-    parser.add_argument(
-        "--no_update_feedback",
-        action="store_true",
-        help="Disable sending update feedback to server",
-    )
     # workflow upload subcommand
     workflow_parser = subparsers.add_parser(
         "workflow_upload",
@@ -216,10 +201,7 @@ def main():
     args_dict = vars(args)
 
     # 环境检查 - 检查并自动安装必需的包 (可选)
-    skip_env_check = args_dict.get("skip_env_check", False)
-    check_mode = args_dict.get("check_mode", False)
-
-    if not skip_env_check:
+    if not args_dict.get("skip_env_check", False):
         from unilabos.utils.environment_check import check_environment
 
         if not check_environment(auto_install=True):
@@ -230,21 +212,7 @@ def main():
 
     # 加载配置文件，优先加载config，然后从env读取
     config_path = args_dict.get("config")
-
-    if check_mode:
-        args_dict["working_dir"] = os.path.abspath(os.getcwd())
-    # 当 skip_env_check 时，默认使用当前目录作为 working_dir
-    if skip_env_check and not args_dict.get("working_dir") and not config_path:
-        working_dir = os.path.abspath(os.getcwd())
-        print_status(f"跳过环境检查模式：使用当前目录作为工作目录 {working_dir}", "info")
-        # 检查当前目录是否有 local_config.py
-        local_config_in_cwd = os.path.join(working_dir, "local_config.py")
-        if os.path.exists(local_config_in_cwd):
-            config_path = local_config_in_cwd
-            print_status(f"发现本地配置文件: {config_path}", "info")
-        else:
-            print_status(f"未指定config路径，可通过 --config 传入 local_config.py 文件路径", "info")
-    elif os.getcwd().endswith("unilabos_data"):
+    if os.getcwd().endswith("unilabos_data"):
         working_dir = os.path.abspath(os.getcwd())
     else:
         working_dir = os.path.abspath(os.path.join(os.getcwd(), "unilabos_data"))
@@ -263,7 +231,7 @@ def main():
         working_dir = os.path.dirname(config_path)
     elif os.path.exists(working_dir) and os.path.exists(os.path.join(working_dir, "local_config.py")):
         config_path = os.path.join(working_dir, "local_config.py")
-    elif not skip_env_check and not config_path and (
+    elif not config_path and (
         not os.path.exists(working_dir) or not os.path.exists(os.path.join(working_dir, "local_config.py"))
     ):
         print_status(f"未指定config路径，可通过 --config 传入 local_config.py 文件路径", "info")
@@ -277,11 +245,9 @@ def main():
             print_status(f"已创建 local_config.py 路径： {config_path}", "info")
         else:
             os._exit(1)
-
-    # 加载配置文件 (check_mode 跳过)
+    # 加载配置文件
     print_status(f"当前工作目录为 {working_dir}", "info")
-    if not check_mode:
-        load_config_from_file(config_path)
+    load_config_from_file(config_path)
 
     # 根据配置重新设置日志级别
     from unilabos.utils.log import configure_logger, logger
@@ -331,13 +297,11 @@ def main():
     BasicConfig.is_host_mode = not args_dict.get("is_slave", False)
     BasicConfig.slave_no_host = args_dict.get("slave_no_host", False)
     BasicConfig.upload_registry = args_dict.get("upload_registry", False)
-    BasicConfig.no_update_feedback = args_dict.get("no_update_feedback", False)
     BasicConfig.communication_protocol = "websocket"
     machine_name = os.popen("hostname").read().strip()
     machine_name = "".join([c if c.isalnum() or c == "_" else "_" for c in machine_name])
     BasicConfig.machine_name = machine_name
     BasicConfig.vis_2d_enable = args_dict["2d_vis"]
-    BasicConfig.check_mode = check_mode
 
     from unilabos.resources.graphio import (
         read_node_link_json,
@@ -351,19 +315,15 @@ def main():
     from unilabos.app.web import start_server
     from unilabos.app.register import register_devices_and_resources
     from unilabos.resources.graphio import modify_to_backend_format
-    from unilabos.resources.resource_tracker import ResourceTreeSet, ResourceDict
+    from unilabos.ros.nodes.resource_tracker import ResourceTreeSet, ResourceDict
 
     # 显示启动横幅
     print_unilab_banner(args_dict)
 
-    # 注册表 - check_mode 时强制启用 complete_registry
-    complete_registry = args_dict.get("complete_registry", False) or check_mode
-    lab_registry = build_registry(args_dict["registry_path"], complete_registry, BasicConfig.upload_registry)
-
-    # Check mode: complete_registry 完成后直接退出，git diff 检测由 CI workflow 执行
-    if check_mode:
-        print_status("Check mode: complete_registry 完成，退出", "info")
-        os._exit(0)
+    # 注册表
+    lab_registry = build_registry(
+        args_dict["registry_path"], args_dict.get("complete_registry", False), BasicConfig.upload_registry
+    )
 
     if BasicConfig.upload_registry:
         # 设备注册到服务端 - 需要 ak 和 sk
@@ -428,10 +388,6 @@ def main():
     for ind, i in enumerate(resource_edge_info[::-1]):
         source_node: ResourceDict = nodes[i["source"]]
         target_node: ResourceDict = nodes[i["target"]]
-        if "sourceHandle" not in source_node:
-            continue
-        if "targetHandle" not in target_node:
-            continue
         source_handle = i["sourceHandle"]
         target_handle = i["targetHandle"]
         source_handler_keys = [
@@ -458,7 +414,7 @@ def main():
     # 如果从远端获取了物料信息，则与本地物料进行同步
     if request_startup_json and "nodes" in request_startup_json:
         print_status("开始同步远端物料到本地...", "info")
-        remote_tree_set = ResourceTreeSet.from_raw_dict_list(request_startup_json["nodes"])
+        remote_tree_set = ResourceTreeSet.from_raw_list(request_startup_json["nodes"])
         resource_tree_set.merge_remote_resources(remote_tree_set)
         print_status("远端物料同步完成", "info")
 
@@ -537,19 +493,13 @@ def main():
                 time.sleep(1)
         else:
             start_backend(**args_dict)
-            restart_requested = start_server(
+            start_server(
                 open_browser=not args_dict["disable_browser"],
                 port=BasicConfig.port,
             )
-            if restart_requested:
-                print_status("[Main] Restart requested, cleaning up...", "info")
-                cleanup_for_restart()
-                return
     else:
         start_backend(**args_dict)
-
-        # 启动服务器（默认支持WebSocket触发重启）
-        restart_requested = start_server(
+        start_server(
             open_browser=not args_dict["disable_browser"],
             port=BasicConfig.port,
         )

unilabos/app/utils.py

@@ -1,176 +0,0 @@
-"""
-UniLabOS 应用工具函数
-
-提供清理、重启等工具函数
-"""
-
-import glob
-import os
-import shutil
-import sys
-
-
-def patch_rclpy_dll_windows():
-    """在 Windows + conda 环境下为 rclpy 打 DLL 加载补丁"""
-    if sys.platform != "win32" or not os.environ.get("CONDA_PREFIX"):
-        return
-    try:
-        import rclpy
-
-        return
-    except ImportError as e:
-        if not str(e).startswith("DLL load failed"):
-            return
-    cp = os.environ["CONDA_PREFIX"]
-    impl = os.path.join(cp, "Lib", "site-packages", "rclpy", "impl", "implementation_singleton.py")
-    pyd = glob.glob(os.path.join(cp, "Lib", "site-packages", "rclpy", "_rclpy_pybind11*.pyd"))
-    if not os.path.exists(impl) or not pyd:
-        return
-    with open(impl, "r", encoding="utf-8") as f:
-        content = f.read()
-    lib_bin = os.path.join(cp, "Library", "bin").replace("\\", "/")
-    patch = f'# UniLabOS DLL Patch\nimport os,ctypes\nos.add_dll_directory("{lib_bin}") if hasattr(os,"add_dll_directory") else None\ntry: ctypes.CDLL("{pyd[0].replace(chr(92),"/")}")\nexcept: pass\n# End Patch\n'
-    shutil.copy2(impl, impl + ".bak")
-    with open(impl, "w", encoding="utf-8") as f:
-        f.write(patch + content)
-
-
-patch_rclpy_dll_windows()
-
-import gc
-import threading
-import time
-
-from unilabos.utils.banner_print import print_status
-
-
-def cleanup_for_restart() -> bool:
-    """
-    Clean up all resources for restart without exiting the process.
-
-    This function prepares the system for re-initialization by:
-    1. Stopping all communication clients
-    2. Destroying ROS nodes
-    3. Resetting singletons
-    4. Waiting for threads to finish
-
-    Returns:
-        bool: True if cleanup was successful, False otherwise
-    """
-    print_status("[Restart] Starting cleanup for restart...", "info")
-
-    # Step 1: Stop WebSocket communication client
-    print_status("[Restart] Step 1: Stopping WebSocket client...", "info")
-    try:
-        from unilabos.app.communication import get_communication_client
-
-        comm_client = get_communication_client()
-        if comm_client is not None:
-            comm_client.stop()
-            print_status("[Restart] WebSocket client stopped", "info")
-    except Exception as e:
-        print_status(f"[Restart] Error stopping WebSocket: {e}", "warning")
-
-    # Step 2: Get HostNode and cleanup ROS
-    print_status("[Restart] Step 2: Cleaning up ROS nodes...", "info")
-    try:
-        from unilabos.ros.nodes.presets.host_node import HostNode
-        import rclpy
-        from rclpy.timer import Timer
-
-        host_instance = HostNode.get_instance(timeout=5)
-        if host_instance is not None:
-            print_status(f"[Restart] Found HostNode: {host_instance.device_id}", "info")
-
-            # Gracefully shutdown background threads
-            print_status("[Restart] Shutting down background threads...", "info")
-            HostNode.shutdown_background_threads(timeout=5.0)
-            print_status("[Restart] Background threads shutdown complete", "info")
-
-            # Stop discovery timer
-            if hasattr(host_instance, "_discovery_timer") and isinstance(host_instance._discovery_timer, Timer):
-                host_instance._discovery_timer.cancel()
-                print_status("[Restart] Discovery timer cancelled", "info")
-
-            # Destroy device nodes
-            device_count = len(host_instance.devices_instances)
-            print_status(f"[Restart] Destroying {device_count} device instances...", "info")
-            for device_id, device_node in list(host_instance.devices_instances.items()):
-                try:
-                    if hasattr(device_node, "ros_node_instance") and device_node.ros_node_instance is not None:
-                        device_node.ros_node_instance.destroy_node()
-                        print_status(f"[Restart] Device {device_id} destroyed", "info")
-                except Exception as e:
-                    print_status(f"[Restart] Error destroying device {device_id}: {e}", "warning")
-
-            # Clear devices instances
-            host_instance.devices_instances.clear()
-            host_instance.devices_names.clear()
-
-            # Destroy host node
-            try:
-                host_instance.destroy_node()
-                print_status("[Restart] HostNode destroyed", "info")
-            except Exception as e:
-                print_status(f"[Restart] Error destroying HostNode: {e}", "warning")
-
-            # Reset HostNode state
-            HostNode.reset_state()
-            print_status("[Restart] HostNode state reset", "info")
-
-        # Shutdown executor first (to stop executor.spin() gracefully)
-        if hasattr(rclpy, "__executor") and rclpy.__executor is not None:
-            try:
-                rclpy.__executor.shutdown()
-                rclpy.__executor = None  # Clear for restart
-                print_status("[Restart] ROS executor shutdown complete", "info")
-            except Exception as e:
-                print_status(f"[Restart] Error shutting down executor: {e}", "warning")
-
-        # Shutdown rclpy
-        if rclpy.ok():
-            rclpy.shutdown()
-            print_status("[Restart] rclpy shutdown complete", "info")
-
-    except ImportError as e:
-        print_status(f"[Restart] ROS modules not available: {e}", "warning")
-    except Exception as e:
-        print_status(f"[Restart] Error in ROS cleanup: {e}", "warning")
-        return False
-
-    # Step 3: Reset communication client singleton
-    print_status("[Restart] Step 3: Resetting singletons...", "info")
-    try:
-        from unilabos.app import communication
-
-        if hasattr(communication, "_communication_client"):
-            communication._communication_client = None
-            print_status("[Restart] Communication client singleton reset", "info")
-    except Exception as e:
-        print_status(f"[Restart] Error resetting communication singleton: {e}", "warning")
-
-    # Step 4: Wait for threads to finish
-    print_status("[Restart] Step 4: Waiting for threads to finish...", "info")
-    time.sleep(3)  # Give threads time to finish
-
-    # Check remaining threads
-    remaining_threads = []
-    for t in threading.enumerate():
-        if t.name != "MainThread" and t.is_alive():
-            remaining_threads.append(t.name)
-
-    if remaining_threads:
-        print_status(
-            f"[Restart] Warning: {len(remaining_threads)} threads still running: {remaining_threads}", "warning"
-        )
-    else:
-        print_status("[Restart] All threads stopped", "info")
-
-    # Step 5: Force garbage collection
-    print_status("[Restart] Step 5: Running garbage collection...", "info")
-    gc.collect()
-    gc.collect()  # Run twice for weak references
-    print_status("[Restart] Garbage collection complete", "info")
-
-    print_status("[Restart] Cleanup complete. Ready for re-initialization.", "info")
-    return True

unilabos/app/web/client.py

@@ -6,10 +6,12 @@ HTTP客户端模块
 
 import json
 import os
+import time
+from threading import Thread
 from typing import List, Dict, Any, Optional
 
 import requests
-from unilabos.resources.resource_tracker import ResourceTreeSet
+from unilabos.ros.nodes.resource_tracker import ResourceTreeSet
 from unilabos.utils.log import info
 from unilabos.config.config import HTTPConfig, BasicConfig
 from unilabos.utils import logger
@@ -298,10 +300,6 @@ class HTTPClient:
         )
         if response.status_code not in [200, 201]:
             logger.error(f"注册资源失败: {response.status_code}, {response.text}")
-        if response.status_code == 200:
-            res = response.json()
-            if "code" in res and res["code"] != 0:
-                logger.error(f"注册资源失败: {response.text}")
         return response
 
     def request_startup_json(self) -> Optional[Dict[str, Any]]:
@@ -359,7 +357,9 @@ class HTTPClient:
         Returns:
             Dict: API响应数据，包含 code 和 data (uuid, name)
         """
+        # target_lab_uuid 暂时使用默认值，后续由后端根据 ak/sk 获取
         payload = {
+            "target_lab_uuid": "28c38bb0-63f6-4352-b0d8-b5b8eb1766d5",
             "name": name,
             "data": {
                 "workflow_uuid": workflow_uuid,

unilabos/app/web/controller.py

@@ -58,14 +58,14 @@ class JobResultStore:
                 feedback=feedback or {},
                 timestamp=time.time(),
             )
-            logger.trace(f"[JobResultStore] Stored result for job {job_id[:8]}, status={status}")
+            logger.debug(f"[JobResultStore] Stored result for job {job_id[:8]}, status={status}")
 
     def get_and_remove(self, job_id: str) -> Optional[JobResult]:
         """获取并删除任务结果"""
         with self._results_lock:
             result = self._results.pop(job_id, None)
             if result:
-                logger.trace(f"[JobResultStore] Retrieved and removed result for job {job_id[:8]}")
+                logger.debug(f"[JobResultStore] Retrieved and removed result for job {job_id[:8]}")
             return result
 
     def get_result(self, job_id: str) -> Optional[JobResult]:

unilabos/app/web/server.py

@@ -6,6 +6,7 @@ Web服务器模块
 
 import webbrowser
 
+import uvicorn
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from starlette.responses import Response
@@ -95,7 +96,7 @@ def setup_server() -> FastAPI:
     return app
 
 
-def start_server(host: str = "0.0.0.0", port: int = 8002, open_browser: bool = True) -> bool:
+def start_server(host: str = "0.0.0.0", port: int = 8002, open_browser: bool = True) -> None:
     """
     启动服务器
 
@@ -103,14 +104,7 @@ def start_server(host: str = "0.0.0.0", port: int = 8002, open_browser: bool = T
         host: 服务器主机
         port: 服务器端口
         open_browser: 是否自动打开浏览器
-
-    Returns:
-        bool: True if restart was requested, False otherwise
     """
-    import threading
-    import time
-    from uvicorn import Config, Server
-
     # 设置服务器
     setup_server()
 
@@ -129,37 +123,7 @@ def start_server(host: str = "0.0.0.0", port: int = 8002, open_browser: bool = T
 
     # 启动服务器
     info(f"[Web] 启动FastAPI服务器: {host}:{port}")
-
-    # 使用支持重启的模式
-    config = Config(app=app, host=host, port=port, log_config=log_config)
-    server = Server(config)
-
-    # 启动服务器线程
-    server_thread = threading.Thread(target=server.run, daemon=True, name="uvicorn_server")
-    server_thread.start()
-
-    info("[Web] Server started, monitoring for restart requests...")
-
-    # 监控重启标志
-    import unilabos.app.main as main_module
-
-    while server_thread.is_alive():
-        if hasattr(main_module, "_restart_requested") and main_module._restart_requested:
-            info(
-                f"[Web] Restart requested via WebSocket, reason: {getattr(main_module, '_restart_reason', 'unknown')}"
-            )
-            main_module._restart_requested = False
-
-            # 停止服务器
-            server.should_exit = True
-            server_thread.join(timeout=5)
-
-            info("[Web] Server stopped, ready for restart")
-            return True
-
-        time.sleep(1)
-
-    return False
+    uvicorn.run(app, host=host, port=port, log_config=log_config)
 
 
 # 当脚本直接运行时启动服务器

unilabos/app/ws_client.py

@@ -23,7 +23,7 @@ from typing import Optional, Dict, Any, List
 from urllib.parse import urlparse
 from enum import Enum
 
-from typing_extensions import TypedDict
+from jedi.inference.gradual.typing import TypedDict
 
 from unilabos.app.model import JobAddReq
 from unilabos.ros.nodes.presets.host_node import HostNode
@@ -154,7 +154,7 @@ class DeviceActionManager:
             job_info.set_ready_timeout(10)  # 设置10秒超时
             self.active_jobs[device_key] = job_info
             job_log = format_job_log(job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name)
-            logger.trace(f"[DeviceActionManager] Job {job_log} can start immediately for {device_key}")
+            logger.info(f"[DeviceActionManager] Job {job_log} can start immediately for {device_key}")
             return True
 
     def start_job(self, job_id: str) -> bool:
@@ -210,9 +210,8 @@ class DeviceActionManager:
                 job_info.update_timestamp()
                 # 从all_jobs中移除已结束的job
                 del self.all_jobs[job_id]
-                # job_log = format_job_log(job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name)
-                # logger.debug(f"[DeviceActionManager] Job {job_log} ended for {device_key}")
-                pass
+                job_log = format_job_log(job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name)
+                logger.info(f"[DeviceActionManager] Job {job_log} ended for {device_key}")
             else:
                 job_log = format_job_log(job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name)
                 logger.warning(f"[DeviceActionManager] Job {job_log} was not active for {device_key}")
@@ -228,7 +227,7 @@ class DeviceActionManager:
                 next_job_log = format_job_log(
                     next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name
                 )
-                logger.trace(f"[DeviceActionManager] Next job {next_job_log} can start for {device_key}")
+                logger.info(f"[DeviceActionManager] Next job {next_job_log} can start for {device_key}")
                 return next_job
 
             return None
@@ -269,7 +268,7 @@ class DeviceActionManager:
                 # 从all_jobs中移除
                 del self.all_jobs[job_id]
                 job_log = format_job_log(job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name)
-                logger.trace(f"[DeviceActionManager] Active job {job_log} cancelled for {device_key}")
+                logger.info(f"[DeviceActionManager] Active job {job_log} cancelled for {device_key}")
 
                 # 启动下一个任务
                 if device_key in self.device_queues and self.device_queues[device_key]:
@@ -282,7 +281,7 @@ class DeviceActionManager:
                     next_job_log = format_job_log(
                         next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name
                     )
-                    logger.trace(f"[DeviceActionManager] Next job {next_job_log} can start after cancel")
+                    logger.info(f"[DeviceActionManager] Next job {next_job_log} can start after cancel")
                 return True
 
             # 如果是排队中的任务
@@ -296,7 +295,7 @@ class DeviceActionManager:
                     job_log = format_job_log(
                         job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name
                     )
-                    logger.trace(f"[DeviceActionManager] Queued job {job_log} cancelled for {device_key}")
+                    logger.info(f"[DeviceActionManager] Queued job {job_log} cancelled for {device_key}")
                     return True
 
             job_log = format_job_log(job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name)
@@ -360,7 +359,7 @@ class MessageProcessor:
         self.device_manager = device_manager
         self.queue_processor = None  # 延迟设置
         self.websocket_client = None  # 延迟设置
-        self.session_id = str(uuid.uuid4())[:6]  # 产生一个随机的session_id
+        self.session_id = ""
 
         # WebSocket连接
         self.websocket = None
@@ -422,7 +421,7 @@ class MessageProcessor:
                     ssl_context = ssl_module.create_default_context()
 
                 ws_logger = logging.getLogger("websockets.client")
-                ws_logger.setLevel(logging.INFO)
+                # 日志级别已在 unilabos.utils.log 中统一配置为 WARNING
 
                 async with websockets.connect(
                     self.websocket_url,
@@ -439,7 +438,7 @@ class MessageProcessor:
                     self.connected = True
                     self.reconnect_count = 0
 
-                    logger.info(f"[MessageProcessor] Connected to {self.websocket_url}")
+                    logger.trace(f"[MessageProcessor] Connected to {self.websocket_url}")
 
                     # 启动发送协程
                     send_task = asyncio.create_task(self._send_handler())
@@ -489,20 +488,7 @@ class MessageProcessor:
             async for message in self.websocket:
                 try:
                     data = json.loads(message)
-                    message_type = data.get("action", "")
-                    message_data = data.get("data")
-                    if self.session_id and self.session_id == data.get("edge_session"):
-                        await self._process_message(message_type, message_data)
-                    else:
-                        if message_type.endswith("_material"):
-                            logger.trace(
-                                f"[MessageProcessor] 收到一条归属 {data.get('edge_session')} 的旧消息：{data}"
-                            )
-                            logger.debug(
-                                f"[MessageProcessor] 跳过了一条归属 {data.get('edge_session')} 的旧消息: {data.get('action')}"
-                            )
-                        else:
-                            await self._process_message(message_type, message_data)
+                    await self._process_message(data)
                 except json.JSONDecodeError:
                     logger.error(f"[MessageProcessor] Invalid JSON received: {message}")
                 except Exception as e:
@@ -517,7 +503,7 @@ class MessageProcessor:
 
     async def _send_handler(self):
         """处理发送队列中的消息"""
-        logger.debug("[MessageProcessor] Send handler started")
+        logger.trace("[MessageProcessor] Send handler started")
 
         try:
             while self.connected and self.websocket:
@@ -568,9 +554,12 @@ class MessageProcessor:
         finally:
             logger.debug("[MessageProcessor] Send handler stopped")
 
-    async def _process_message(self, message_type: str, message_data: Dict[str, Any]):
+    async def _process_message(self, data: Dict[str, Any]):
         """处理收到的消息"""
-        logger.trace(f"[MessageProcessor] Processing message: {message_type}")
+        message_type = data.get("action", "")
+        message_data = data.get("data")
+
+        logger.debug(f"[MessageProcessor] Processing message: {message_type}")
 
         try:
             if message_type == "pong":
@@ -582,19 +571,14 @@ class MessageProcessor:
             elif message_type == "cancel_action" or message_type == "cancel_task":
                 await self._handle_cancel_action(message_data)
             elif message_type == "add_material":
-                # noinspection PyTypeChecker
                 await self._handle_resource_tree_update(message_data, "add")
             elif message_type == "update_material":
-                # noinspection PyTypeChecker
                 await self._handle_resource_tree_update(message_data, "update")
             elif message_type == "remove_material":
-                # noinspection PyTypeChecker
                 await self._handle_resource_tree_update(message_data, "remove")
-            # elif message_type == "session_id":
-            #     self.session_id = message_data.get("session_id")
-            #     logger.info(f"[MessageProcessor] Session ID: {self.session_id}")
-            elif message_type == "request_restart":
-                await self._handle_request_restart(message_data)
+            elif message_type == "session_id":
+                self.session_id = message_data.get("session_id")
+                logger.info(f"[MessageProcessor] Session ID: {self.session_id}")
             else:
                 logger.debug(f"[MessageProcessor] Unknown message type: {message_type}")
 
@@ -642,13 +626,13 @@ class MessageProcessor:
             await self._send_action_state_response(
                 device_id, action_name, task_id, job_id, "query_action_status", True, 0
             )
-            logger.trace(f"[MessageProcessor] Job {job_log} can start immediately")
+            logger.info(f"[MessageProcessor] Job {job_log} can start immediately")
         else:
             # 需要排队
             await self._send_action_state_response(
                 device_id, action_name, task_id, job_id, "query_action_status", False, 10
             )
-            logger.trace(f"[MessageProcessor] Job {job_log} queued")
+            logger.info(f"[MessageProcessor] Job {job_log} queued")
 
             # 通知QueueProcessor有新的队列更新
             if self.queue_processor:
@@ -852,7 +836,9 @@ class MessageProcessor:
                         device_action_groups[key_add] = []
                     device_action_groups[key_add].append(item["uuid"])
 
-                    logger.info(f"[资源同步] 跨站Transfer: {item['uuid'][:8]} from {device_old_id} to {device_id}")
+                    logger.info(
+                        f"[MessageProcessor] Resource migrated: {item['uuid'][:8]} from {device_old_id} to {device_id}"
+                    )
                 else:
                     # 正常update
                     key = (device_id, "update")
@@ -866,13 +852,11 @@ class MessageProcessor:
                     device_action_groups[key] = []
                 device_action_groups[key].append(item["uuid"])
 
-        logger.trace(
-            f"[资源同步] 动作 {action} 分组数量: {len(device_action_groups)}, 总数量: {len(resource_uuid_list)}"
-        )
+        logger.info(f"触发物料更新 {action} 分组数量: {len(device_action_groups)}, 总数量: {len(resource_uuid_list)}")
 
         # 为每个(device_id, action)创建独立的更新线程
         for (device_id, actual_action), items in device_action_groups.items():
-            logger.trace(f"[资源同步] {device_id} 物料动作 {actual_action} 数量: {len(items)}")
+            logger.info(f"设备 {device_id} 物料更新 {actual_action} 数量: {len(items)}")
 
             def _notify_resource_tree(dev_id, act, item_list):
                 try:
@@ -904,51 +888,6 @@ class MessageProcessor:
             )
             thread.start()
 
-    async def _handle_request_restart(self, data: Dict[str, Any]):
-        """
-        处理重启请求
-
-        当LabGo发送request_restart时，执行清理并触发重启
-        """
-        reason = data.get("reason", "unknown")
-        delay = data.get("delay", 2)  # 默认延迟2秒
-        logger.info(f"[MessageProcessor] Received restart request, reason: {reason}, delay: {delay}s")
-
-        # 发送确认消息
-        if self.websocket_client:
-            await self.websocket_client.send_message(
-                {"action": "restart_acknowledged", "data": {"reason": reason, "delay": delay}}
-            )
-
-        # 设置全局重启标志
-        import unilabos.app.main as main_module
-
-        main_module._restart_requested = True
-        main_module._restart_reason = reason
-
-        # 延迟后执行清理
-        await asyncio.sleep(delay)
-
-        # 在新线程中执行清理，避免阻塞当前事件循环
-        def do_cleanup():
-            import time
-
-            time.sleep(0.5)  # 给当前消息处理完成的时间
-            logger.info(f"[MessageProcessor] Starting cleanup for restart, reason: {reason}")
-            try:
-                from unilabos.app.utils import cleanup_for_restart
-
-                if cleanup_for_restart():
-                    logger.info("[MessageProcessor] Cleanup successful, main() will restart")
-                else:
-                    logger.error("[MessageProcessor] Cleanup failed")
-            except Exception as e:
-                logger.error(f"[MessageProcessor] Error during cleanup: {e}")
-
-        cleanup_thread = threading.Thread(target=do_cleanup, name="RestartCleanupThread", daemon=True)
-        cleanup_thread.start()
-        logger.info(f"[MessageProcessor] Restart cleanup scheduled")
-
     async def _send_action_state_response(
         self, device_id: str, action_name: str, task_id: str, job_id: str, typ: str, free: bool, need_more: int
     ):
@@ -1026,7 +965,7 @@ class QueueProcessor:
 
     def _run(self):
         """运行队列处理主循环"""
-        logger.debug("[QueueProcessor] Queue processor started")
+        logger.trace("[QueueProcessor] Queue processor started")
 
         while self.is_running:
             try:
@@ -1135,7 +1074,7 @@ class QueueProcessor:
             success = self.message_processor.send_message(message)
             job_log = format_job_log(job_info.job_id, job_info.task_id, job_info.device_id, job_info.action_name)
             if success:
-                logger.trace(f"[QueueProcessor] Sent busy/need_more for queued job {job_log}")
+                logger.debug(f"[QueueProcessor] Sent busy/need_more for queued job {job_log}")
             else:
                 logger.warning(f"[QueueProcessor] Failed to send busy status for job {job_log}")
 
@@ -1158,7 +1097,7 @@ class QueueProcessor:
             job_info.action_name,
         )
 
-        logger.trace(f"[QueueProcessor] Job {job_log} completed with status: {status}")
+        logger.info(f"[QueueProcessor] Job {job_log} completed with status: {status}")
 
         # 结束任务，获取下一个可执行的任务
         next_job = self.device_manager.end_job(job_id)
@@ -1178,8 +1117,8 @@ class QueueProcessor:
                 },
             }
             self.message_processor.send_message(message)
-            # next_job_log = format_job_log(next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name)
-            # logger.debug(f"[QueueProcessor] Notified next job {next_job_log} can start")
+            next_job_log = format_job_log(next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name)
+            logger.info(f"[QueueProcessor] Notified next job {next_job_log} can start")
 
             # 立即触发下一轮状态检查
             self.notify_queue_update()
@@ -1236,7 +1175,6 @@ class WebSocketClient(BaseCommunicationClient):
         else:
             url = f"{scheme}://{parsed.netloc}/api/v1/ws/schedule"
 
-        logger.debug(f"[WebSocketClient] URL: {url}")
         return url
 
     def start(self) -> None:
@@ -1249,13 +1187,11 @@ class WebSocketClient(BaseCommunicationClient):
             logger.error("[WebSocketClient] WebSocket URL not configured")
             return
 
-        logger.info(f"[WebSocketClient] Starting connection to {self.websocket_url}")
-
         # 启动两个核心线程
         self.message_processor.start()
         self.queue_processor.start()
 
-        logger.info("[WebSocketClient] All threads started")
+        logger.trace("[WebSocketClient] All threads started")
 
     def stop(self) -> None:
         """停止WebSocket客户端"""
@@ -1324,7 +1260,7 @@ class WebSocketClient(BaseCommunicationClient):
                 except (KeyError, AttributeError):
                     logger.warning(f"[WebSocketClient] Failed to remove job {item.job_id} from HostNode status")
 
-            # logger.debug(f"[WebSocketClient] Intercepting final status for job_id: {item.job_id} - {status}")
+            logger.info(f"[WebSocketClient] Intercepting final status for job_id: {item.job_id} - {status}")
 
             # 通知队列处理器job完成（包括timeout的job）
             self.queue_processor.handle_job_completed(item.job_id, status)
@@ -1346,7 +1282,7 @@ class WebSocketClient(BaseCommunicationClient):
         self.message_processor.send_message(message)
 
         job_log = format_job_log(item.job_id, item.task_id, item.device_id, item.action_name)
-        logger.trace(f"[WebSocketClient] Job status published: {job_log} - {status}")
+        logger.debug(f"[WebSocketClient] Job status published: {job_log} - {status}")
 
     def send_ping(self, ping_id: str, timestamp: float) -> None:
         """发送ping消息"""
@@ -1377,59 +1313,17 @@ class WebSocketClient(BaseCommunicationClient):
             logger.warning(f"[WebSocketClient] Failed to cancel job {job_log}")
 
     def publish_host_ready(self) -> None:
-        """发布host_node ready信号，包含设备和动作信息"""
+        """发布host_node ready信号"""
         if self.is_disabled or not self.is_connected():
             logger.debug("[WebSocketClient] Not connected, cannot publish host ready signal")
             return
 
-        # 收集设备信息
-        devices = []
-        machine_name = BasicConfig.machine_name
-
-        try:
-            host_node = HostNode.get_instance(0)
-            if host_node:
-                # 获取设备信息
-                for device_id, namespace in host_node.devices_names.items():
-                    device_key = (
-                        f"{namespace}/{device_id}" if namespace.startswith("/") else f"/{namespace}/{device_id}"
-                    )
-                    is_online = device_key in host_node._online_devices
-
-                    # 获取设备的动作信息
-                    actions = {}
-                    for action_id, client in host_node._action_clients.items():
-                        # action_id 格式: /namespace/device_id/action_name
-                        if device_id in action_id:
-                            action_name = action_id.split("/")[-1]
-                            actions[action_name] = {
-                                "action_path": action_id,
-                                "action_type": str(type(client).__name__),
-                            }
-
-                    devices.append(
-                        {
-                            "device_id": device_id,
-                            "namespace": namespace,
-                            "device_key": device_key,
-                            "is_online": is_online,
-                            "machine_name": host_node.device_machine_names.get(device_id, machine_name),
-                            "actions": actions,
-                        }
-                    )
-
-                logger.info(f"[WebSocketClient] Collected {len(devices)} devices for host_ready")
-        except Exception as e:
-            logger.warning(f"[WebSocketClient] Error collecting device info: {e}")
-
         message = {
             "action": "host_node_ready",
             "data": {
                 "status": "ready",
                 "timestamp": time.time(),
-                "machine_name": machine_name,
-                "devices": devices,
             },
         }
         self.message_processor.send_message(message)
-        logger.info(f"[WebSocketClient] Host node ready signal published with {len(devices)} devices")
+        logger.info("[WebSocketClient] Host node ready signal published")

unilabos/config/config.py

@@ -16,13 +16,11 @@ class BasicConfig:
     upload_registry = False
     machine_name = "undefined"
     vis_2d_enable = False
-    no_update_feedback = False
     enable_resource_load = True
     communication_protocol = "websocket"
     startup_json_path = None  # 填写绝对路径
     disable_browser = False  # 禁止浏览器自动打开
     port = 8002  # 本地HTTP服务
-    check_mode = False  # CI 检查模式，用于验证 registry 导入和文件一致性
     # 'TRACE', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'
     log_level: Literal["TRACE", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "DEBUG"
 

unilabos/device_comms/coin_cell_assembly_workstation.py

@@ -6,7 +6,7 @@ Coin Cell Assembly Workstation
 """
 from typing import Dict, Any, List, Optional, Union
 
-from unilabos.resources.resource_tracker import DeviceNodeResourceTracker
+from unilabos.ros.nodes.resource_tracker import DeviceNodeResourceTracker
 from unilabos.device_comms.workstation_base import WorkstationBase, WorkflowInfo
 from unilabos.device_comms.workstation_communication import (
     WorkstationCommunicationBase, CommunicationConfig, CommunicationProtocol, CoinCellCommunication
@@ -61,7 +61,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         
         # 创建资源跟踪器（如果没有提供）
         if resource_tracker is None:
-            from unilabos.resources.resource_tracker import DeviceNodeResourceTracker
+            from unilabos.ros.nodes.resource_tracker import DeviceNodeResourceTracker
             resource_tracker = DeviceNodeResourceTracker()
         
         # 初始化基类

unilabos/device_comms/modbus_plc/client.py

@@ -4,8 +4,7 @@ import traceback
 from typing import Any, Union, List, Dict, Callable, Optional, Tuple
 from pydantic import BaseModel
 
-from pymodbus.client import ModbusSerialClient, ModbusTcpClient
-from pymodbus.framer import FramerType
+from pymodbus.client.sync import ModbusSerialClient, ModbusTcpClient
 from typing import TypedDict
 
 from unilabos.device_comms.modbus_plc.modbus import DeviceType, HoldRegister, Coil, InputRegister, DiscreteInputs, DataType, WorderOrder
@@ -403,7 +402,7 @@ class TCPClient(BaseClient):
 class RTUClient(BaseClient):
     def __init__(self, port: str, baudrate: int, timeout: int):
         super().__init__()
-        self._set_client(ModbusSerialClient(framer=FramerType.RTU, port=port, baudrate=baudrate, timeout=timeout))
+        self._set_client(ModbusSerialClient(method='rtu', port=port, baudrate=baudrate, timeout=timeout))
         self._connect()
 
 if __name__ == '__main__':

unilabos/device_comms/modbus_plc/modbus.py

@@ -1,12 +1,26 @@
 # coding=utf-8
 from enum import Enum
 from abc import ABC, abstractmethod
+from typing import Tuple, Union, Optional, TYPE_CHECKING
+from pymodbus.payload import BinaryPayloadDecoder, BinaryPayloadBuilder
+from pymodbus.constants import Endian
 
-from pymodbus.client import ModbusBaseSyncClient
-from pymodbus.client.mixin import ModbusClientMixin 
-from typing import Tuple, Union, Optional
+if TYPE_CHECKING:
+    from pymodbus.client.sync import ModbusSerialClient, ModbusTcpClient
+
+# Define DataType enum for pymodbus 2.5.3 compatibility
+class DataType(Enum):
+    INT16 = "int16"
+    UINT16 = "uint16"
+    INT32 = "int32"
+    UINT32 = "uint32"
+    INT64 = "int64"
+    UINT64 = "uint64"
+    FLOAT32 = "float32"
+    FLOAT64 = "float64"
+    STRING = "string"
+    BOOL = "bool"
 
-DataType = ModbusClientMixin.DATATYPE
 
 class WorderOrder(Enum):
     BIG = "big"
@@ -19,8 +33,96 @@ class DeviceType(Enum):
     INPUT_REGISTER = 'input_register'
 
 
+def _convert_from_registers(registers, data_type: DataType, word_order: str = 'big'):
+    """Convert registers to a value using BinaryPayloadDecoder.
+    
+    Args:
+        registers: List of register values
+        data_type: DataType enum specifying the target data type
+        word_order: 'big' or 'little' endian
+        
+    Returns:
+        Converted value
+    """
+    # Determine byte and word order based on word_order parameter
+    if word_order == 'little':
+        byte_order = Endian.Little
+        word_order_enum = Endian.Little
+    else:
+        byte_order = Endian.Big
+        word_order_enum = Endian.Big
+    
+    decoder = BinaryPayloadDecoder.fromRegisters(registers, byteorder=byte_order, wordorder=word_order_enum)
+    
+    if data_type == DataType.INT16:
+        return decoder.decode_16bit_int()
+    elif data_type == DataType.UINT16:
+        return decoder.decode_16bit_uint()
+    elif data_type == DataType.INT32:
+        return decoder.decode_32bit_int()
+    elif data_type == DataType.UINT32:
+        return decoder.decode_32bit_uint()
+    elif data_type == DataType.INT64:
+        return decoder.decode_64bit_int()
+    elif data_type == DataType.UINT64:
+        return decoder.decode_64bit_uint()
+    elif data_type == DataType.FLOAT32:
+        return decoder.decode_32bit_float()
+    elif data_type == DataType.FLOAT64:
+        return decoder.decode_64bit_float()
+    elif data_type == DataType.STRING:
+        return decoder.decode_string(len(registers) * 2)
+    else:
+        raise ValueError(f"Unsupported data type: {data_type}")
+
+
+def _convert_to_registers(value, data_type: DataType, word_order: str = 'little'):
+    """Convert a value to registers using BinaryPayloadBuilder.
+    
+    Args:
+        value: Value to convert
+        data_type: DataType enum specifying the source data type
+        word_order: 'big' or 'little' endian
+        
+    Returns:
+        List of register values
+    """
+    # Determine byte and word order based on word_order parameter
+    if word_order == 'little':
+        byte_order = Endian.Little
+        word_order_enum = Endian.Little
+    else:
+        byte_order = Endian.Big
+        word_order_enum = Endian.Big
+    
+    builder = BinaryPayloadBuilder(byteorder=byte_order, wordorder=word_order_enum)
+    
+    if data_type == DataType.INT16:
+        builder.add_16bit_int(value)
+    elif data_type == DataType.UINT16:
+        builder.add_16bit_uint(value)
+    elif data_type == DataType.INT32:
+        builder.add_32bit_int(value)
+    elif data_type == DataType.UINT32:
+        builder.add_32bit_uint(value)
+    elif data_type == DataType.INT64:
+        builder.add_64bit_int(value)
+    elif data_type == DataType.UINT64:
+        builder.add_64bit_uint(value)
+    elif data_type == DataType.FLOAT32:
+        builder.add_32bit_float(value)
+    elif data_type == DataType.FLOAT64:
+        builder.add_64bit_float(value)
+    elif data_type == DataType.STRING:
+        builder.add_string(value)
+    else:
+        raise ValueError(f"Unsupported data type: {data_type}")
+    
+    return builder.to_registers()
+
+
 class Base(ABC):
-    def __init__(self, client: ModbusBaseSyncClient, name: str, address: int, typ: DeviceType, data_type: DataType):
+    def __init__(self, client, name: str, address: int, typ: DeviceType, data_type):
         self._address: int = address
         self._client = client
         self._name = name
@@ -58,7 +160,11 @@ class Coil(Base):
                 count = value,
                 slave = slave)
 
-        return resp.bits, resp.isError()
+        # 检查是否读取出错
+        if resp.isError():
+            return [], True
+        
+        return resp.bits, False
 
     def write(self,value: Union[int, float, bool, str, list[bool], list[int], list[float]], data_type: Optional[DataType ]= None, word_order: WorderOrder = WorderOrder.LITTLE, slave = 1) -> bool:
         if isinstance(value, list):
@@ -91,8 +197,18 @@ class DiscreteInputs(Base):
                 count = value,
                 slave = slave)
 
+        # 检查是否读取出错
+        if resp.isError():
+            # 根据数据类型返回默认值
+            if data_type in [DataType.FLOAT32, DataType.FLOAT64]:
+                return 0.0, True
+            elif data_type == DataType.STRING:
+                return "", True
+            else:
+                return 0, True
+        
         # noinspection PyTypeChecker
-        return self._client.convert_from_registers(resp.registers, data_type, word_order=word_order.value), resp.isError()
+        return _convert_from_registers(resp.registers, data_type, word_order=word_order.value), False
 
     def write(self,value: Union[int, float, bool, str, list[bool], list[int], list[float]], data_type: Optional[DataType ]= None, word_order: WorderOrder = WorderOrder.LITTLE, slave = 1) -> bool:
         raise ValueError('discrete inputs only support read')
@@ -112,8 +228,19 @@ class HoldRegister(Base):
                 address = self.address,
                 count = value,
                 slave = slave)
+        
+        # 检查是否读取出错
+        if resp.isError():
+            # 根据数据类型返回默认值
+            if data_type in [DataType.FLOAT32, DataType.FLOAT64]:
+                return 0.0, True
+            elif data_type == DataType.STRING:
+                return "", True
+            else:
+                return 0, True
+        
         # noinspection PyTypeChecker
-        return self._client.convert_from_registers(resp.registers, data_type, word_order=word_order.value), resp.isError()
+        return _convert_from_registers(resp.registers, data_type, word_order=word_order.value), False
 
 
     def write(self,value: Union[int, float, bool, str, list[bool], list[int], list[float]], data_type: Optional[DataType ]= None, word_order: WorderOrder = WorderOrder.LITTLE, slave = 1) -> bool:
@@ -132,7 +259,7 @@ class HoldRegister(Base):
             return self._client.write_register(self.address, value, slave= slave).isError()
         else:
             # noinspection PyTypeChecker
-            encoder_resp = self._client.convert_to_registers(value, data_type=data_type, word_order=word_order.value)
+            encoder_resp = _convert_to_registers(value, data_type=data_type, word_order=word_order.value)
             return self._client.write_registers(self.address, encoder_resp, slave=slave).isError()
 
 
@@ -153,8 +280,19 @@ class InputRegister(Base):
                 address = self.address,
                 count = value,
                 slave = slave)
+        
+        # 检查是否读取出错
+        if resp.isError():
+            # 根据数据类型返回默认值
+            if data_type in [DataType.FLOAT32, DataType.FLOAT64]:
+                return 0.0, True
+            elif data_type == DataType.STRING:
+                return "", True
+            else:
+                return 0, True
+        
         # noinspection PyTypeChecker
-        return self._client.convert_from_registers(resp.registers, data_type, word_order=word_order.value), resp.isError()
+        return _convert_from_registers(resp.registers, data_type, word_order=word_order.value), False
 
     def write(self,value: Union[int, float, bool, str, list[bool], list[int], list[float]], data_type: Optional[DataType ]= None, word_order: WorderOrder = WorderOrder.LITTLE, slave = 1) -> bool:
         raise ValueError('input register only support read')

unilabos/device_comms/opcua_client/node/uniopcua.py

@@ -3,7 +3,7 @@ from enum import Enum
 from abc import ABC, abstractmethod
 from typing import Tuple, Union, Optional, Any, List
 
-from opcua import Client, Node, ua
+from opcua import Client, Node
 from opcua.ua import NodeId, NodeClass, VariantType
 
 
@@ -43,72 +43,27 @@ class Base(ABC):
         self._type = typ
         self._data_type = data_type
         self._node: Optional[Node] = None
-
+        
     def _get_node(self) -> Node:
         if self._node is None:
             try:
-                # 尝试多种 NodeId 字符串格式解析，兼容不同服务器/库的输出
-                # 可能的格式示例: 'ns=2;i=1234', 'ns=2;s=SomeString',
-                # 'StringNodeId(ns=4;s=OPC|变量名)', 'NumericNodeId(ns=2;i=1234)' 等
-                import re
-
-                nid = self._node_id
-                # 如果已经是 NodeId/Node 对象（库用户可能传入），直接使用
-                try:
-                    from opcua.ua import NodeId as UaNodeId
-                    if isinstance(nid, UaNodeId):
-                        self._node = self._client.get_node(nid)
-                        return self._node
-                except Exception:
-                    # 若导入或类型判断失败，则继续下一步
-                    pass
-
-                # 直接以字符串形式处理
-                if isinstance(nid, str):
-                    nid = nid.strip()
-
-                    # 处理包含类名的格式，如 'StringNodeId(ns=4;s=...)' 或 'NumericNodeId(ns=2;i=...)'
-                    # 提取括号内的内容
-                    match_wrapped = re.match(r'(String|Numeric|Byte|Guid|TwoByteNode|FourByteNode)NodeId\((.*)\)', nid)
-                    if match_wrapped:
-                        # 提取括号内的实际 node_id 字符串
-                        nid = match_wrapped.group(2).strip()
-
-                    # 常见短格式 'ns=2;i=1234' 或 'ns=2;s=SomeString'
-                    if re.match(r'^ns=\d+;[is]=', nid):
-                        self._node = self._client.get_node(nid)
+                # 检查是否是NumericNodeId(ns=X;i=Y)格式
+                if "NumericNodeId" in self._node_id:
+                    # 从字符串中提取命名空间和标识符
+                    import re
+                    match = re.search(r'ns=(\d+);i=(\d+)', self._node_id)
+                    if match:
+                        ns = int(match.group(1))
+                        identifier = int(match.group(2))
+                        node_id = NodeId(identifier, ns)
+                        self._node = self._client.get_node(node_id)
                     else:
-                        # 尝试提取 ns 和 i 或 s
-                        # 对于字符串标识符，可能包含特殊字符，使用非贪婪匹配
-                        m_num = re.search(r'ns=(\d+);i=(\d+)', nid)
-                        m_str = re.search(r'ns=(\d+);s=(.+?)(?:\)|$)', nid)
-                        if m_num:
-                            ns = int(m_num.group(1))
-                            identifier = int(m_num.group(2))
-                            node_id = NodeId(identifier, ns)
-                            self._node = self._client.get_node(node_id)
-                        elif m_str:
-                            ns = int(m_str.group(1))
-                            identifier = m_str.group(2).strip()
-                            # 对于字符串标识符，直接使用字符串格式
-                            node_id_str = f"ns={ns};s={identifier}"
-                            self._node = self._client.get_node(node_id_str)
-                        else:
-                            # 回退：尝试直接传入字符串（有些实现接受其它格式）
-                            try:
-                                self._node = self._client.get_node(self._node_id)
-                            except Exception as e:
-                                # 输出更详细的错误信息供调试
-                                print(f"获取节点失败(尝试直接字符串): {self._node_id}, 错误: {e}")
-                                raise
+                        raise ValueError(f"无法解析节点ID: {self._node_id}")
                 else:
-                    # 非字符串，尝试直接使用
+                    # 直接使用节点ID字符串
                     self._node = self._client.get_node(self._node_id)
             except Exception as e:
                 print(f"获取节点失败: {self._node_id}, 错误: {e}")
-                # 添加额外提示，帮助定位 BadNodeIdUnknown 问题
-                print("提示: 请确认该 node_id 是否来自当前连接的服务器地址空间，" \
-                      "以及 CSV/配置中名称与服务器 BrowseName 是否匹配。")
                 raise
         return self._node
 
@@ -116,16 +71,16 @@ class Base(ABC):
     def read(self) -> Tuple[Any, bool]:
         """读取节点值，返回(值, 是否出错)"""
         pass
-
+    
     @abstractmethod
     def write(self, value: Any) -> bool:
         """写入节点值，返回是否出错"""
         pass
-
+    
     @property
     def type(self) -> NodeType:
         return self._type
-
+    
     @property
     def node_id(self) -> str:
         return self._node_id
@@ -149,56 +104,7 @@ class Variable(Base):
 
     def write(self, value: Any) -> bool:
         try:
-            # 如果声明了数据类型，则尝试转换并使用对应的 Variant 写入
-            coerced = value
-            try:
-                if self._data_type is not None:
-                    # 基于声明的数据类型做简单类型转换
-                    dt = self._data_type
-                    if dt in (DataType.SBYTE, DataType.BYTE, DataType.INT16, DataType.UINT16,
-                              DataType.INT32, DataType.UINT32, DataType.INT64, DataType.UINT64):
-                        # 数值类型 -> int
-                        if isinstance(value, str):
-                            coerced = int(value)
-                        else:
-                            coerced = int(value)
-                    elif dt in (DataType.FLOAT, DataType.DOUBLE):
-                        if isinstance(value, str):
-                            coerced = float(value)
-                        else:
-                            coerced = float(value)
-                    elif dt == DataType.BOOLEAN:
-                        if isinstance(value, str):
-                            v = value.strip().lower()
-                            if v in ("true", "1", "yes", "on"):
-                                coerced = True
-                            elif v in ("false", "0", "no", "off"):
-                                coerced = False
-                            else:
-                                coerced = bool(value)
-                        else:
-                            coerced = bool(value)
-                    elif dt == DataType.STRING or dt == DataType.BYTESTRING or dt == DataType.DATETIME:
-                        coerced = str(value)
-
-                    # 使用 ua.Variant 明确指定 VariantType
-                    try:
-                        variant = ua.Variant(coerced, dt.value)
-                        self._get_node().set_value(variant)
-                    except Exception:
-                        # 回退：有些 set_value 实现接受 (value, variant_type)
-                        try:
-                            self._get_node().set_value(coerced, dt.value)
-                        except Exception:
-                            # 最后回退到直接写入（保持兼容性）
-                            self._get_node().set_value(coerced)
-                else:
-                    # 未声明数据类型，直接写入
-                    self._get_node().set_value(value)
-            except Exception:
-                # 若在转换或按数据类型写入失败，尝试直接写入原始值并让上层捕获错误
-                self._get_node().set_value(value)
-
+            self._get_node().set_value(value)
             return False
         except Exception as e:
             print(f"写入变量 {self._name} 失败: {e}")
@@ -210,54 +116,24 @@ class Method(Base):
         super().__init__(client, name, node_id, NodeType.METHOD, data_type)
         self._parent_node_id = parent_node_id
         self._parent_node = None
-
+        
     def _get_parent_node(self) -> Node:
         if self._parent_node is None:
             try:
-                # 处理父节点ID，使用与_get_node相同的解析逻辑
-                import re
-
-                nid = self._parent_node_id
-
-                # 如果已经是 NodeId 对象，直接使用
-                try:
-                    from opcua.ua import NodeId as UaNodeId
-                    if isinstance(nid, UaNodeId):
-                        self._parent_node = self._client.get_node(nid)
-                        return self._parent_node
-                except Exception:
-                    pass
-
-                # 字符串处理
-                if isinstance(nid, str):
-                    nid = nid.strip()
-
-                    # 处理包含类名的格式
-                    match_wrapped = re.match(r'(String|Numeric|Byte|Guid|TwoByteNode|FourByteNode)NodeId\((.*)\)', nid)
-                    if match_wrapped:
-                        nid = match_wrapped.group(2).strip()
-
-                    # 常见短格式
-                    if re.match(r'^ns=\d+;[is]=', nid):
-                        self._parent_node = self._client.get_node(nid)
+                # 检查是否是NumericNodeId(ns=X;i=Y)格式
+                if "NumericNodeId" in self._parent_node_id:
+                    # 从字符串中提取命名空间和标识符
+                    import re
+                    match = re.search(r'ns=(\d+);i=(\d+)', self._parent_node_id)
+                    if match:
+                        ns = int(match.group(1))
+                        identifier = int(match.group(2))
+                        node_id = NodeId(identifier, ns)
+                        self._parent_node = self._client.get_node(node_id)
                     else:
-                        # 提取 ns 和 i 或 s
-                        m_num = re.search(r'ns=(\d+);i=(\d+)', nid)
-                        m_str = re.search(r'ns=(\d+);s=(.+?)(?:\)|$)', nid)
-                        if m_num:
-                            ns = int(m_num.group(1))
-                            identifier = int(m_num.group(2))
-                            node_id = NodeId(identifier, ns)
-                            self._parent_node = self._client.get_node(node_id)
-                        elif m_str:
-                            ns = int(m_str.group(1))
-                            identifier = m_str.group(2).strip()
-                            node_id_str = f"ns={ns};s={identifier}"
-                            self._parent_node = self._client.get_node(node_id_str)
-                        else:
-                            # 回退
-                            self._parent_node = self._client.get_node(self._parent_node_id)
+                        raise ValueError(f"无法解析父节点ID: {self._parent_node_id}")
                 else:
+                    # 直接使用节点ID字符串
                     self._parent_node = self._client.get_node(self._parent_node_id)
             except Exception as e:
                 print(f"获取父节点失败: {self._parent_node_id}, 错误: {e}")
@@ -271,7 +147,7 @@ class Method(Base):
     def write(self, value: Any) -> bool:
         """方法节点不支持写入操作"""
         return True
-
+        
     def call(self, *args) -> Tuple[Any, bool]:
         """调用方法，返回(返回值, 是否出错)"""
         try:
@@ -285,7 +161,7 @@ class Method(Base):
 class Object(Base):
     def __init__(self, client: Client, name: str, node_id: str):
         super().__init__(client, name, node_id, NodeType.OBJECT, None)
-
+        
     def read(self) -> Tuple[Any, bool]:
         """对象节点不支持直接读取操作"""
         return None, True
@@ -293,7 +169,7 @@ class Object(Base):
     def write(self, value: Any) -> bool:
         """对象节点不支持直接写入操作"""
         return True
-
+    
     def get_children(self) -> Tuple[List[Node], bool]:
         """获取子节点列表，返回(子节点列表, 是否出错)"""
         try:
@@ -301,4 +177,4 @@ class Object(Base):
             return children, False
         except Exception as e:
             print(f"获取对象 {self._name} 的子节点失败: {e}")
-            return [], True
+            return [], True 

unilabos/device_mesh/resource_visalization.py

@@ -128,21 +128,14 @@ class ResourceVisualization:
                         new_dev.set("device_name", node["id"]+"_")
                         # if node["parent"] is not None:
                         #     new_dev.set("station_name", node["parent"]+'_')
-                        if "position" in node:
-                            new_dev.set("x",str(float(node["position"]["position"]["x"])/1000))
-                            new_dev.set("y",str(float(node["position"]["position"]["y"])/1000))
-                            new_dev.set("z",str(float(node["position"]["position"]["z"])/1000))
+
+                        new_dev.set("x",str(float(node["position"]["position"]["x"])/1000))
+                        new_dev.set("y",str(float(node["position"]["position"]["y"])/1000))
+                        new_dev.set("z",str(float(node["position"]["position"]["z"])/1000))
                         if "rotation" in node["config"]:
                             new_dev.set("rx",str(float(node["config"]["rotation"]["x"])))
                             new_dev.set("ry",str(float(node["config"]["rotation"]["y"])))
                             new_dev.set("r",str(float(node["config"]["rotation"]["z"])))
-                        if "pose" in node:
-                            new_dev.set("x",str(float(node["pose"]["position"]["x"])/1000))
-                            new_dev.set("y",str(float(node["pose"]["position"]["y"])/1000))
-                            new_dev.set("z",str(float(node["pose"]["position"]["z"])/1000))
-                            new_dev.set("rx",str(float(node["pose"]["rotation"]["x"])))
-                            new_dev.set("ry",str(float(node["pose"]["rotation"]["y"])))
-                            new_dev.set("r",str(float(node["pose"]["rotation"]["z"])))
                         if "device_config" in node["config"]:
                             for key, value in node["config"]["device_config"].items():
                                 new_dev.set(key, str(value))

unilabos/devices/LICENSE

@@ -1,73 +0,0 @@
-Uni-Lab-OS软件许可使用准则
-
-
-本软件使用准则（以下简称"本准则"）旨在规范用户在使用Uni-Lab-OS软件（以下简称"本软件"）过程中的行为和义务。在下载、安装、使用或以任何方式访问本软件之前，请务必仔细阅读并理解以下条款和条件。若您不同意本准则的全部或部分内容，请您立即停止使用本软件。一旦您开始访问、下载、安装、使用本软件，即表示您已阅读、理解并同意接受本准则的约束。
-
-1、使用许可
-1.1 本软件的所有权及版权归北京深势科技有限公司（以下简称"深势科技"）所有。在遵守本准则的前提下，深势科技特此授予学术用户（以下简称"您"）一个全球范围内的、非排他性的、免版权费用的使用许可，可为了满足学术目的而使用本软件。
-
-1.2 本准则下授予的许可仅适用于本软件的二进制代码版本。您不对本软件源代码拥有任何权利。
-
-2、使用限制
-2.1 本准则仅授予学术用户出于学术目的使用本软件，任何商业组织、商业机构或其他非学术用户不得使用本软件，如果违反本条款，深势科技将保留一切追诉的权利。
-2.2 您将本软件用于任何商业行为，应取得深势科技的商业许可。
-2.3 您不得将本软件或任何形式的衍生作品用于任何商业目的，也不得将其出售、出租、转让、分发或以其他方式提供给任何第三方。您必须确保本软件的使用仅限于您个人学术研究，禁止您为任何其他实体的利益使用本软件（无论是否收费）。
-2.4 您不得以任何方式修改、破解、反编译、反汇编、反向工程、隔离、分离或以其他方式从任何程序或文档中提取源代码或试图发现本软件的源代码。您不得以任何方式去除、修改或屏蔽本软件中的任何版权、商标或其他专有权利声明。您不得使用本软件进行任何非法活动，包括但不限于侵犯他人的知识产权、隐私权等。
-2.5 您同意将本软件仅用于合法的学术目的，且遵守您所在国家或地区的法律法规，您将承担因违反法律法规而产生的一切法律责任。
-
-3、软件所有权
-本软件在此仅作使用许可，并非出售。本软件及与软件有关的全部文档的所有权及其他所有权利（包括但不限于知识产权和商业秘密），始终是深势科技的专有财产，您不拥有任何权利，但本准则下被明确授予的有限的使用许可权利除外。
-
-4、衍生作品传播规范
-若您传播基于Uni-Lab-OS程序修改形成的作品，须同时满足以下全部条件：
-4.1 作品必须包含显著声明，明确标注修改内容及修改日期；
-4.2 作品必须声明本作品依据本许可协议发布；
-4.3 必须将整个作品（包括修改部分）作为整体授予获取副本者本许可协议的保障，且该许可将自动延伸适用于作品全组件（无论其以何种形式打包）；
-4.4 若衍生作品含交互式用户界面：每个界面均须显示合规法律声明，若原始Uni-Lab-OS程序的交互界面未展示法律声明，您的衍生作品可免除此义务。
-
-5、提出建议
-您可以对本软件提出建议，前提是：
-（i）您声明并保证，该建议未侵害任何第三方的任何知识产权；
-（ii）您承认，深势科技有权使用该建议，但无使用该建议的义务；
-（iii）您授予深势科技一项非独占的、不可撤销的、可分许可的、无版权费的、全球范围的著作权许可，以复制、分发、传播、公开展示、公开表演、修改、翻译、基于其制作衍生作品、生产、制作、推销、销售、提供销售和/或以其他方式整体或部分地使用该建议和基于其的衍生作品，包括但不限于，通过将该建议整体或部分地纳入深势科技的软件和/或其他软件，以及在现存的或将来任何时候存在的任何媒介中或通过该媒介体现，以及为从事上述活动而授予多个分许可；
-（iv）您特此授予深势科技一项永久的、全球范围的、非独占性的、免费的、免特许权使用费的、不可撤销的专利许可，许可其制造、委托制造、使用、要约销售、销售、进口及以其他方式转让该建议和基于其的衍生专利。上述专利许可的适用范围仅限于以下专利权利要求：您有权许可的、且仅因您的建议本身，或因您的建议与所提交的本软件结合而必然构成侵权的专利权利要求。若任何实体针对您或其他实体提起专利诉讼（包括诉讼中的交叉诉讼或反诉），主张该建议或您所贡献的软件构成直接或间接专利侵权，则依据本协议授予的、针对该建议或软件的任何专利许可，自该诉讼提起之日起终止。
-（v）您放弃对该建议的任何权利或主张，深势科技无需承担任何义务、版税或基于知识产权或其他方面的限制。
-
-6、引用要求
-如您使用本软件获得的成果发表在出版物上，您应在成果中承认对Uni-Lab-OS软件的使用并标注权利人名称。引用 Uni-Lab-OS时请使用以下内容：
-@article{gao2025unilabos,
-	title = {UniLabOS: An AI-Native Operating System for Autonomous Laboratories},
-	doi = {10.48550/arXiv.2512.21766},
-	publisher = {arXiv},
-	author = {Gao, Jing and Chang, Junhan and Que, Haohui and Xiong, Yanfei and Zhang, Shixiang and Qi, Xianwei and Liu, Zhen and Wang, Jun-Jie and Ding, Qianjun and Li, Xinyu and Pan, Ziwei and Xie, Qiming and Yan, Zhuang and Yan, Junchi and Zhang, Linfeng},
-	year = {2025}
-}
-
-7、保留权利
-您认可，所有未被明确授予您的本软件的权利，无论是当前或今后存在的，均由深势科技予以保留，任何未经深势科技明确授权而使用本软件的行为将被视为侵权，深势科技有权追究侵权者的一切法律责任。
-
-8、保密信息
-您同意将本软件代码及相关文档视为深势科技的机密信息，您不会向任何第三方提供相关代码，并将采取合理审慎的使用态度来防止本软件代码及相关文档被泄露。
-
-9、无保证
-该软件是"按原样"提供的，没有任何明示或暗示的保证，不包含任何代码或规范没有缺陷、适销性、适用于特定目的或不侵犯第三方权利的保证。您同意您自主承担使用本软件或与本准则有关的全部风险。
-
-10、免责条款 
-在任何情况下，无论基于侵权（包括过失）、合同或其他法律理论，除非适用法律强制规定（如故意或重大过失行为）或另有书面协议，深势科技不对被许可人因软件许可、使用或无法使用软件所致损害承担责任（包括任何性质的直接、间接、特殊、偶发或后果性损害，例如但不限于商誉损失、停工损失、计算机故障或失灵造成的损害，以及其他一切商业损害或损失），即使深势科技已被告知发生此类损害的可能性亦不例外。
-被许可人在再分发软件或其衍生作品时，仅能以自身名义独立承担责任进行操作，不得代表深势科技或其他被许可人。
-
-11、终止
-如果您以任何方式违反本准则或未能遵守本准则的任何重要条款或条件，则您被授予的所有权利将自动终止。
-
-12、举报
-如果您认为有人违反了本准则，请向深势科技进行举报，深势科技将对您的身份进行严格保密，举报邮箱changjh@dp.tech。
-
-13、法律管辖
-本准则中的任何内容均不得解释为通过暗示、禁止反悔或其他方式授予本准则中授予的许可或权利以外的任何许可或权利。如果本准则的任何条款被认定为不可执行，则仅在必要的范围内对该条款进行修改，使其可执行。本准则应受中华人民共和国法律管辖，不适用法律冲突条款及《联合国国际货物销售合同公约》，因本准则产生的一切争议由北京市海淀区人民法院管辖。
-
-14、未来版本
-深势科技保留不经事先通知随时变更或停止本软件或本准则的权利。
-
-15、语言优先
-本准则同时具有中文版本和英文版本，如果英文版本和中文版本有冲突，以中文版本为准。
-

unilabos/devices/LICENSE_eng

@@ -1,73 +0,0 @@
-Uni-Lab-OS License Agreement
-
-Preamble
-This License Agreement (the "Agreement") is instituted to govern user conduct and obligations in relation to the utilization of the Uni-Lab-OS (the "Software"). By accessing, downloading, installing, or utilizing the Software in any manner, you hereby acknowledge that you have meticulously reviewed, comprehended, and consented to be legally bound by the terms herein. If you dissent from any provision of this Agreement, you must forthwith cease all interaction with the Software.
-
-1. Grant of License
-1.1 The proprietary rights to the Software are exclusively retained by Beijing DP Technology Co., Ltd. ("DP Technology"). Subject to full compliance with this Agreement, DP Technology hereby grants academic users ("Licensee") a worldwide, non-exclusive, royalty-free license to untilise the Software solely for non-commercial academic pursuits.
-
-1.2 The foregoing license applies exclusively to the Software's executable binary code. No rights whatsoever are conferred to the Software's source code.
-
-2. Usage Restrictions
-2.1 This license is restricted to academic users engaging in scholastic activities. Commercial entities, institutions, or any non-academic parties are expressly prohibited from utilizing the Software. Violations of this clause shall entitle DP Technology to pursue all available legal remedies.
-2.2 The Licensee shall obtain a commercial license from DP Technology for any commercial use of the Software.
-2.3 The Licensee shall not utilise the Software or any derivative works for commercial purposes, nor distribute, sublicense, lease, transfer, or otherwise disseminate the Software to third parties. The Licensee is strictly prohibited from utilizing the Software for the benefit of any third-party entity, whether gratuitously or otherwise.
-2.4 Reverse engineering, decompilation, disassembly, code isolation, or any attempt to derive source code from the Software is strictly prohibited. The Licensee shall not alter, circumvent, or remove copyright notices, trademarks, or proprietary legends embedded in the Software. Use of the Software for unlawful activities—including but not limited to intellectual property infringement or privacy violations—is categorically barred.
-2.5 The Licensee warrants that the Software shall be utilised solely for lawful academic purposes in compliance with applicable jurisdictional statutes. All legal liabilities arising from noncompliance shall be borne exclusively by the Licensee.
-
-3. Proprietary Rights
-This Agreement confers a license to utilise the Software, not a transfer of ownership. All intellectual property rights—including copyrights, patents, trade secrets, and documentation—remain the exclusive dominion of DP Technology. The Licensee acquires no entitlements beyond the limited usage privileges expressly delineated herein.
-
-4. Derivative Work
-You may convey a work based on the Software, or the modifications to produce it from the Software, provided that you meet all of these conditions:
-4.1 The work must carry prominent notices stating that you modified it, and giving a relevant date.
-4.2 The work must carry prominent notices stating that it is released under this License.
-4.3 You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-4.4 If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Software has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-
-5. Feedback and Proposals
-Licensees may submit proposals, suggestions, or improvements pertaining to the Software ("Feedback") under the following conditions:
-(a) Licensee represents and warrants that such Feedback does not infringe upon any third-party intellectual property rights;
-(b) Licensee acknowledges that DP Technology reserves the right, but assumes no obligation, to utilize such Feedback;
-(c) Licensee irrevocably grants DP Technology a non-exclusive, royalty-free, perpetual, worldwide, sublicensable copyright license to reproduce, distribute, modify, publicly perform or display, translate, create derivative works of, commercialize, and otherwise exploit the Feedback in any medium or format, whether now known or hereafter devised, including the right to grant multiple tiers of sublicenses to enable such activities;
-(d) Licensee hereby grants DP Technology a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Feedback and such Derivative Works, where such license applies only to those patent claimss licensable by Licensee that are necessarily infringed by the Feedback(s) alone or by comibination of the Feedback(s) with the Software to which such Feedback(s) were submitted. If any entity institutes patent litigation against Licensee or any other entity (including a cross-claim orcounterclaim in a lawsuit) alleging that the Feedback, or the Software to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted under this Agreement for the Feedback or Software shall terminate as of the date such litigation is filed.
-(e) Licensee hereby waives all claims, proprietary rights, or restrictions related to DP Technology's use of such Feedback.
-
-6. Citation Requirement
-If academic or research output generated using the Software is published, Licensee must explicitly acknowledge the use of Uni-Lab-OS and attribute ownership to DP Technology. The following citation must be included:
-@article{gao2025unilabos,
-	title = {UniLabOS: An AI-Native Operating System for Autonomous Laboratories},
-	doi = {10.48550/arXiv.2512.21766},
-	publisher = {arXiv},
-	author = {Gao, Jing and Chang, Junhan and Que, Haohui and Xiong, Yanfei and Zhang, Shixiang and Qi, Xianwei and Liu, Zhen and Wang, Jun-Jie and Ding, Qianjun and Li, Xinyu and Pan, Ziwei and Xie, Qiming and Yan, Zhuang and Yan, Junchi and Zhang, Linfeng},
-	year = {2025}
-}
-
-7. Reservation of Rights
-All rights not expressly granted herein, whether existing now or arising in the future, are exclusively reserved by DP Technology. Any unauthorized use of the Software beyond the scope of this Agreement constitutes infringement, and DP Technology reserves all legal rights to pursue remedies against violators.
-
-8. Confidentiality
-Licensee agrees to treat the Software's code, documentation, and related materials as confidential information. Licensee shall not disclose such materials to third parties and shall employ reasonable safeguards to prevent unauthorized access, dissemination, or misuse.
-
-9. Disclaimer of Warranties
-The software is provided "as is," without warranties of any kind, express or implied, including but not limited to warranties of merchantability, fitness for a particular purpose, non-infringement, or error-free operation. Licensee accepts all risks associated with the use of the software.
-
-10. Limitation of Liability
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall DP Technology be liable to Licensee for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the software (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if DP Technology has been advised of the possibility of such damages.
-While redistributing the Software or Derivative Works thereof, Licensee may act only on Licensee's own behalf and on Licensee's sole responsibility, not on behalf of DP Technology or any other Licensee.
-
-11. Termination
-All rights granted herein shall terminate immediately and automatically if Licensee materially breaches any provision of this Agreement.
-
-12. Reporting Violations
-To report suspected violations of this Agreement, notify DP Technology via the designated email address: changjh@dp.tech. DP Technology shall maintain the confidentiality of the reporter's identity.
-
-13. Governing Law and Dispute Resolution
-This Agreement shall be governed by the laws of the People's Republic of China, excluding its conflict of laws principles and the United Nations Convention on Contracts for the International Sale of Goods. Any dispute arising from this Agreement shall be exclusively adjudicated by the Haidian District People's Court in Beijing.
-
-14. Amendments and Updates
-DP Technology reserves the right to modify, suspend, or terminate the Software or this Agreement at any time without prior notice.
-
-15. Language Priority
-This Agreement is provided in both Chinese and English. In the event of any discrepancy, the Chinese version shall prevail.
-

unilabos/devices/cameraSII/cameraDriver.py

@@ -1,712 +0,0 @@
-#!/usr/bin/env python3
-import asyncio
-import json
-import subprocess
-import sys
-import threading
-from typing import Optional, Dict, Any
-import logging
-
-import requests
-import websockets
-
-logging.getLogger("zeep").setLevel(logging.WARNING)
-logging.getLogger("zeep.xsd.schema").setLevel(logging.WARNING)
-logging.getLogger("zeep.xsd.schema.schema").setLevel(logging.WARNING)
-from onvif import ONVIFCamera  # 新增：ONVIF PTZ 控制
-
-
-# ======================= 独立的 PTZController =======================
-class PTZController:
-    def __init__(self, host: str, port: int, user: str, password: str):
-        """
-        :param host: 摄像机 IP 或域名（和 RTSP 的一样即可）
-        :param port: ONVIF 端口（多数为 80，看你的设备）
-        :param user: 摄像机用户名
-        :param password: 摄像机密码
-        """
-        self.host = host
-        self.port = port
-        self.user = user
-        self.password = password
-
-        self.cam: Optional[ONVIFCamera] = None
-        self.media_service = None
-        self.ptz_service = None
-        self.profile = None
-
-    def connect(self) -> bool:
-        """
-        建立 ONVIF 连接并初始化 PTZ 能力，失败返回 False（不抛异常）
-        Note: 首先 pip install onvif-zeep
-        """
-        try:
-            self.cam = ONVIFCamera(self.host, self.port, self.user, self.password)
-            self.media_service = self.cam.create_media_service()
-            self.ptz_service = self.cam.create_ptz_service()
-            profiles = self.media_service.GetProfiles()
-            if not profiles:
-                print("[PTZ] No media profiles found on camera.", file=sys.stderr)
-                return False
-            self.profile = profiles[0]
-            return True
-        except Exception as e:
-            print(f"[PTZ] Failed to init ONVIF PTZ: {e}", file=sys.stderr)
-            return False
-
-    def _continuous_move(self, pan: float, tilt: float, zoom: float, duration: float) -> bool:
-        """
-        连续移动一段时间（秒），之后自动停止。
-        此函数为阻塞模式：只有在 Stop 调用结束后，才返回 True/False。
-        """
-        if not self.ptz_service or not self.profile:
-            print("[PTZ] _continuous_move: ptz_service or profile not ready", file=sys.stderr)
-            return False
-
-        # 进入前先强行停一下，避免前一次残留动作
-        self._force_stop()
-
-        req = self.ptz_service.create_type("ContinuousMove")
-        req.ProfileToken = self.profile.token
-
-        req.Velocity = {
-            "PanTilt": {"x": pan, "y": tilt},
-            "Zoom": {"x": zoom},
-        }
-
-        try:
-            print(f"[PTZ] ContinuousMove start: pan={pan}, tilt={tilt}, zoom={zoom}, duration={duration}", file=sys.stderr)
-            self.ptz_service.ContinuousMove(req)
-        except Exception as e:
-            print(f"[PTZ] ContinuousMove failed: {e}", file=sys.stderr)
-            return False
-
-        # 阻塞等待：这里决定“运动时间”
-        import time
-        wait_seconds = max(2 * duration, 0.0)
-        time.sleep(wait_seconds)
-
-        # 运动完成后强制停止
-        return self._force_stop()
-
-    def stop(self) -> bool:
-        """
-        阻塞调用 Stop（带重试），成功 True，失败 False。
-        """
-        return self._force_stop()
-
-    # ------- 对外动作接口（给 CameraController 调用） -------
-    # 所有接口都为“阻塞模式”：只有在运动 + Stop 完成后才返回 True/False
-
-    def move_up(self, speed: float = 0.5, duration: float = 1.0) -> bool:
-        print(f"[PTZ] move_up called, speed={speed}, duration={duration}", file=sys.stderr)
-        return self._continuous_move(pan=0.0, tilt=+speed, zoom=0.0, duration=duration)
-
-    def move_down(self, speed: float = 0.5, duration: float = 1.0) -> bool:
-        print(f"[PTZ] move_down called, speed={speed}, duration={duration}", file=sys.stderr)
-        return self._continuous_move(pan=0.0, tilt=-speed, zoom=0.0, duration=duration)
-
-    def move_left(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        print(f"[PTZ] move_left called, speed={speed}, duration={duration}", file=sys.stderr)
-        return self._continuous_move(pan=-speed, tilt=0.0, zoom=0.0, duration=duration)
-
-    def move_right(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        print(f"[PTZ] move_right called, speed={speed}, duration={duration}", file=sys.stderr)
-        return self._continuous_move(pan=+speed, tilt=0.0, zoom=0.0, duration=duration)
-
-    # ------- 占位的变倍接口（当前设备不支持） -------
-    def zoom_in(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        """
-        当前设备不支持变倍；保留方法只是避免上层调用时报错。
-        """
-        print("[PTZ] zoom_in is disabled for this device.", file=sys.stderr)
-        return False
-
-    def zoom_out(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        """
-        当前设备不支持变倍；保留方法只是避免上层调用时报错。
-        """
-        print("[PTZ] zoom_out is disabled for this device.", file=sys.stderr)
-        return False
-
-    def _force_stop(self, retries: int = 3, delay: float = 0.1) -> bool:
-        """
-        尝试多次调用 Stop，作为“强制停止”手段。
-        :param retries: 重试次数
-        :param delay: 每次重试间隔（秒）
-        """
-        if not self.ptz_service or not self.profile:
-            print("[PTZ] _force_stop: ptz_service or profile not ready", file=sys.stderr)
-            return False
-
-        import time
-        last_error = None
-        for i in range(retries):
-            try:
-                print(f"[PTZ] _force_stop: calling Stop(), attempt={i+1}", file=sys.stderr)
-                self.ptz_service.Stop({"ProfileToken": self.profile.token})
-                print("[PTZ] _force_stop: Stop() returned OK", file=sys.stderr)
-                return True
-            except Exception as e:
-                last_error = e
-                print(f"[PTZ] _force_stop: Stop() failed at attempt {i+1}: {e}", file=sys.stderr)
-                time.sleep(delay)
-
-        print(f"[PTZ] _force_stop: all {retries} attempts failed, last error: {last_error}", file=sys.stderr)
-        return False
-
-# ======================= CameraController（加入 PTZ） =======================
-
-class CameraController:
-    """
-    Uni-Lab-OS 摄像头驱动（driver 形式）
-    启动 Uni-Lab-OS 后，立即开始推流
-
-    - WebSocket 信令：通过 signal_backend_url 连接到后端
-      例如: wss://sciol.ac.cn/api/realtime/signal/host/<host_id>
-    - 媒体服务器：通过 rtmp_url / webrtc_api / webrtc_stream_url
-      当前配置为 SRS，与独立 HostSimulator 独立运行脚本保持一致。
-    """
-
-    def __init__(
-        self,
-        host_id: str = "demo-host",
-
-        # （1）信令后端（WebSocket）
-        signal_backend_url: str = "wss://sciol.ac.cn/api/realtime/signal/host",
-
-        # （2）媒体后端（RTMP + WebRTC API）
-        rtmp_url: str = "rtmp://srs.sciol.ac.cn:4499/live/camera-01",
-        webrtc_api: str = "https://srs.sciol.ac.cn/rtc/v1/play/",
-        webrtc_stream_url: str = "webrtc://srs.sciol.ac.cn:4500/live/camera-01",
-        camera_rtsp_url: str = "",
-
-        # （3）PTZ 控制相关（ONVIF）
-        ptz_host: str = "",           # 一般就是摄像头 IP，比如 "192.168.31.164"
-        ptz_port: int = 80,           # ONVIF 端口，不一定是 80，按实际情况改
-        ptz_user: str = "",           # admin
-        ptz_password: str = "",       # admin123
-    ):
-        self.host_id = host_id
-        self.camera_rtsp_url = camera_rtsp_url
-
-        # 拼接最终的 WebSocket URL：.../host/<host_id>
-        signal_backend_url = signal_backend_url.rstrip("/")
-        if not signal_backend_url.endswith("/host"):
-            signal_backend_url = signal_backend_url + "/host"
-        self.signal_backend_url = f"{signal_backend_url}/{host_id}"
-
-        # 媒体服务器配置
-        self.rtmp_url = rtmp_url
-        self.webrtc_api = webrtc_api
-        self.webrtc_stream_url = webrtc_stream_url
-
-        # PTZ 控制
-        self.ptz_host = ptz_host
-        self.ptz_port = ptz_port
-        self.ptz_user = ptz_user
-        self.ptz_password = ptz_password
-        self._ptz: Optional[PTZController] = None
-        self._init_ptz_if_possible()
-
-        # 运行时状态
-        self._ws: Optional[object] = None
-        self._ffmpeg_process: Optional[subprocess.Popen] = None
-        self._running = False
-        self._loop_task: Optional[asyncio.Future] = None
-
-        # 事件循环 & 线程
-        self._loop: Optional[asyncio.AbstractEventLoop] = None
-        self._loop_thread: Optional[threading.Thread] = None
-
-        try:
-            self.start()
-        except Exception as e:
-            print(f"[CameraController] __init__ auto start failed: {e}", file=sys.stderr)
-
-    # ------------------------ PTZ 初始化 ------------------------
-
-    # ------------------------ PTZ 公开动作方法（一个动作一个函数） ------------------------
-
-    def ptz_move_up(self, speed: float = 0.5, duration: float = 1.0) -> bool:
-        print(f"[CameraController] ptz_move_up called, speed={speed}, duration={duration}")
-        return self._ptz.move_up(speed=speed, duration=duration)
-
-    def ptz_move_down(self, speed: float = 0.5, duration: float = 1.0) -> bool:
-        print(f"[CameraController] ptz_move_down called, speed={speed}, duration={duration}")
-        return self._ptz.move_down(speed=speed, duration=duration)
-
-    def ptz_move_left(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        print(f"[CameraController] ptz_move_left called, speed={speed}, duration={duration}")
-        return self._ptz.move_left(speed=speed, duration=duration)
-
-    def ptz_move_right(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        print(f"[CameraController] ptz_move_right called, speed={speed}, duration={duration}")
-        return self._ptz.move_right(speed=speed, duration=duration)
-
-    def zoom_in(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        """
-        当前设备不支持变倍；保留方法只是避免上层调用时报错。
-        """
-        print("[PTZ] zoom_in is disabled for this device.", file=sys.stderr)
-        return False
-
-    def zoom_out(self, speed: float = 0.2, duration: float = 1.0) -> bool:
-        """
-        当前设备不支持变倍；保留方法只是避免上层调用时报错。
-        """
-        print("[PTZ] zoom_out is disabled for this device.", file=sys.stderr)
-        return False
-
-    def ptz_stop(self):
-        if self._ptz is None:
-            print("[CameraController] PTZ not initialized.", file=sys.stderr)
-            return
-        self._ptz.stop()
-
-    def _init_ptz_if_possible(self):
-        """
-        根据 ptz_host / user / password 初始化 PTZ；
-        如果配置信息不全则不启用 PTZ（静默）。
-        """
-        if not (self.ptz_host and self.ptz_user and self.ptz_password):
-            return
-        ctrl = PTZController(
-            host=self.ptz_host,
-            port=self.ptz_port,
-            user=self.ptz_user,
-            password=self.ptz_password,
-        )
-        if ctrl.connect():
-            self._ptz = ctrl
-        else:
-            self._ptz = None
-
-    # ---------------------------------------------------------------------
-    # 对外暴露的方法：供 Uni-Lab-OS 调用
-    # ---------------------------------------------------------------------
-
-    def start(self, config: Optional[Dict[str, Any]] = None):
-        """
-        启动 Camera 连接 & 消息循环，并在启动时就开启 FFmpeg 推流，
-        """
-
-        if self._running:
-            return {"status": "already_running", "host_id": self.host_id}
-
-        # 应用 config 覆盖（如果有）
-        if config:
-            self.camera_rtsp_url = config.get("camera_rtsp_url", self.camera_rtsp_url)
-            cfg_host_id = config.get("host_id")
-            if cfg_host_id:
-                self.host_id = cfg_host_id
-
-            signal_backend_url = config.get("signal_backend_url")
-            if signal_backend_url:
-                signal_backend_url = signal_backend_url.rstrip("/")
-                if not signal_backend_url.endswith("/host"):
-                    signal_backend_url = signal_backend_url + "/host"
-                self.signal_backend_url = f"{signal_backend_url}/{self.host_id}"
-
-            self.rtmp_url = config.get("rtmp_url", self.rtmp_url)
-            self.webrtc_api = config.get("webrtc_api", self.webrtc_api)
-            self.webrtc_stream_url = config.get(
-                "webrtc_stream_url", self.webrtc_stream_url
-            )
-
-            # PTZ 相关配置也允许通过 config 注入
-            self.ptz_host = config.get("ptz_host", self.ptz_host)
-            self.ptz_port = int(config.get("ptz_port", self.ptz_port))
-            self.ptz_user = config.get("ptz_user", self.ptz_user)
-            self.ptz_password = config.get("ptz_password", self.ptz_password)
-            self._init_ptz_if_possible()
-
-        self._running = True
-
-        # === start 时启动 FFmpeg 推流 ===
-        self._start_ffmpeg()
-
-        # 创建新的事件循环和线程（用于 WebSocket 信令）
-        self._loop = asyncio.new_event_loop()
-
-        def loop_runner(loop: asyncio.AbstractEventLoop):
-            asyncio.set_event_loop(loop)
-            try:
-                loop.run_forever()
-            except Exception as e:
-                print(f"[CameraController] event loop error: {e}", file=sys.stderr)
-
-        self._loop_thread = threading.Thread(
-            target=loop_runner, args=(self._loop,), daemon=True
-        )
-        self._loop_thread.start()
-
-        self._loop_task = asyncio.run_coroutine_threadsafe(
-            self._run_main_loop(), self._loop
-        )
-
-        return {
-            "status": "started",
-            "host_id": self.host_id,
-            "signal_backend_url": self.signal_backend_url,
-            "rtmp_url": self.rtmp_url,
-            "webrtc_api": self.webrtc_api,
-            "webrtc_stream_url": self.webrtc_stream_url,
-        }
-
-    def stop(self) -> Dict[str, Any]:
-        """
-        停止推流 & 断开 WebSocket，并关闭事件循环线程。
-        """
-        self._running = False
-
-        self._stop_ffmpeg()
-
-        if self._ws and self._loop is not None:
-            async def close_ws():
-                try:
-                    await self._ws.close()
-                except Exception as e:
-                    print(
-                        f"[CameraController] error when closing WebSocket: {e}",
-                        file=sys.stderr,
-                    )
-
-            asyncio.run_coroutine_threadsafe(close_ws(), self._loop)
-
-        if self._loop_task is not None:
-            if not self._loop_task.done():
-                self._loop_task.cancel()
-            try:
-                self._loop_task.result()
-            except asyncio.CancelledError:
-                pass
-            except Exception as e:
-                print(
-                    f"[CameraController] main loop task error in stop(): {e}",
-                    file=sys.stderr,
-                )
-            finally:
-                self._loop_task = None
-
-        if self._loop is not None:
-            try:
-                self._loop.call_soon_threadsafe(self._loop.stop)
-            except Exception as e:
-                print(
-                    f"[CameraController] error when stopping event loop: {e}",
-                    file=sys.stderr,
-                )
-
-        if self._loop_thread is not None:
-            try:
-                self._loop_thread.join(timeout=5)
-            except Exception as e:
-                print(
-                    f"[CameraController] error when joining loop thread: {e}",
-                    file=sys.stderr,
-                )
-            finally:
-                self._loop_thread = None
-
-        self._ws = None
-        self._loop = None
-
-        return {"status": "stopped", "host_id": self.host_id}
-
-    def get_status(self) -> Dict[str, Any]:
-        """
-        查询当前状态，方便在 Uni-Lab-OS 中做监控。
-        """
-        ws_closed = None
-        if self._ws is not None:
-            ws_closed = getattr(self._ws, "closed", None)
-
-        if ws_closed is None:
-            websocket_connected = self._ws is not None
-        else:
-            websocket_connected = (self._ws is not None) and (not ws_closed)
-
-        return {
-            "host_id": self.host_id,
-            "running": self._running,
-            "websocket_connected": websocket_connected,
-            "ffmpeg_running": bool(
-                self._ffmpeg_process and self._ffmpeg_process.poll() is None
-            ),
-            "signal_backend_url": self.signal_backend_url,
-            "rtmp_url": self.rtmp_url,
-        }
-
-    # ---------------------------------------------------------------------
-    # 内部实现逻辑：WebSocket 循环 / FFmpeg / WebRTC Offer 处理
-    # ---------------------------------------------------------------------
-
-    async def _run_main_loop(self):
-        try:
-            while self._running:
-                try:
-                    async with websockets.connect(self.signal_backend_url) as ws:
-                        self._ws = ws
-                        await self._recv_loop()
-                except asyncio.CancelledError:
-                    raise
-                except Exception as e:
-                    if self._running:
-                        print(
-                            f"[CameraController] WebSocket connection error: {e}",
-                            file=sys.stderr,
-                        )
-                        await asyncio.sleep(3)
-        except asyncio.CancelledError:
-            pass
-
-    async def _recv_loop(self):
-        assert self._ws is not None
-        ws = self._ws
-
-        async for message in ws:
-            try:
-                data = json.loads(message)
-            except json.JSONDecodeError:
-                print(
-                    f"[CameraController] received non-JSON message: {message}",
-                    file=sys.stderr,
-                )
-                continue
-
-            try:
-                await self._handle_message(data)
-            except Exception as e:
-                print(
-                    f"[CameraController] error while handling message {data}: {e}",
-                    file=sys.stderr,
-                )
-
-    async def _handle_message(self, data: Dict[str, Any]):
-        """
-        处理来自信令后端的消息：
-        - command: start_stream / stop_stream / ptz_xxx
-        - type: offer (WebRTC)
-        """
-        cmd = data.get("command")
-
-        # ---------- 推流控制 ----------
-        if cmd == "start_stream":
-            try:
-                self._start_ffmpeg()
-            except Exception as e:
-                print(
-                    f"[CameraController] error when starting FFmpeg on start_stream: {e}",
-                    file=sys.stderr,
-                )
-            return
-
-        if cmd == "stop_stream":
-            try:
-                self._stop_ffmpeg()
-            except Exception as e:
-                print(
-                    f"[CameraController] error when stopping FFmpeg on stop_stream: {e}",
-                    file=sys.stderr,
-                )
-            return
-
-        # # ---------- PTZ 控制 ----------
-        # # 例如信令可以发：
-        # # {"command": "ptz_move", "direction": "down", "speed": 0.5, "duration": 0.5}
-        # if cmd == "ptz_move":
-        #     if self._ptz is None:
-        #         # 没有初始化 PTZ，静默忽略或打印一条
-        #         print("[CameraController] PTZ not initialized.", file=sys.stderr)
-        #         return
-
-        #     direction = data.get("direction", "")
-        #     speed = float(data.get("speed", 0.5))
-        #     duration = float(data.get("duration", 0.5))
-
-        #     try:
-        #         if direction == "up":
-        #             self._ptz.move_up(speed=speed, duration=duration)
-        #         elif direction == "down":
-        #             self._ptz.move_down(speed=speed, duration=duration)
-        #         elif direction == "left":
-        #             self._ptz.move_left(speed=speed, duration=duration)
-        #         elif direction == "right":
-        #             self._ptz.move_right(speed=speed, duration=duration)
-        #         elif direction == "zoom_in":
-        #             self._ptz.zoom_in(speed=speed, duration=duration)
-        #         elif direction == "zoom_out":
-        #             self._ptz.zoom_out(speed=speed, duration=duration)
-        #         elif direction == "stop":
-        #             self._ptz.stop()
-        #         else:
-        #             # 未知方向，忽略
-        #             pass
-        #     except Exception as e:
-        #         print(
-        #             f"[CameraController] error when handling PTZ move: {e}",
-        #             file=sys.stderr,
-        #         )
-        #     return
-
-        # ---------- WebRTC Offer ----------
-        if data.get("type") == "offer":
-            offer_sdp = data.get("sdp", "")
-            camera_id = data.get("cameraId", "camera-01")
-            try:
-                answer_sdp = await self._handle_webrtc_offer(offer_sdp)
-            except Exception as e:
-                print(
-                    f"[CameraController] error when handling WebRTC offer: {e}",
-                    file=sys.stderr,
-                )
-                return
-
-            if self._ws:
-                answer_payload = {
-                    "type": "answer",
-                    "sdp": answer_sdp,
-                    "cameraId": camera_id,
-                    "hostId": self.host_id,
-                }
-                try:
-                    await self._ws.send(json.dumps(answer_payload))
-                except Exception as e:
-                    print(
-                        f"[CameraController] error when sending WebRTC answer: {e}",
-                        file=sys.stderr,
-                    )
-
-    # ------------------------ FFmpeg 相关 ------------------------
-
-    def _start_ffmpeg(self):
-        if self._ffmpeg_process and self._ffmpeg_process.poll() is None:
-            return
-
-        cmd = [
-            "ffmpeg",
-            "-rtsp_transport", "tcp",
-            "-i", self.camera_rtsp_url,
-
-            "-c:v", "libx264",
-            "-preset", "ultrafast",
-            "-tune", "zerolatency",
-            "-profile:v", "baseline",
-            "-b:v", "1M",
-            "-maxrate", "1M",
-            "-bufsize", "2M",
-            "-g", "10",
-            "-keyint_min", "10",
-            "-sc_threshold", "0",
-            "-pix_fmt", "yuv420p",
-            "-x264-params", "bframes=0",
-
-            "-c:a", "aac",
-            "-ar", "44100",
-            "-ac", "1",
-            "-b:a", "64k",
-
-            "-f", "flv",
-            self.rtmp_url,
-        ]
-
-        try:
-            self._ffmpeg_process = subprocess.Popen(
-                cmd,
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.STDOUT,
-                shell=False,
-            )
-        except Exception as e:
-            print(f"[CameraController] failed to start FFmpeg: {e}", file=sys.stderr)
-            self._ffmpeg_process = None
-            raise
-
-    def _stop_ffmpeg(self):
-        proc = self._ffmpeg_process
-
-        if proc and proc.poll() is None:
-            try:
-                proc.terminate()
-                try:
-                    proc.wait(timeout=5)
-                except subprocess.TimeoutExpired:
-                    try:
-                        proc.kill()
-                        try:
-                            proc.wait(timeout=2)
-                        except subprocess.TimeoutExpired:
-                            print(
-                                f"[CameraController] FFmpeg process did not exit even after kill (pid={proc.pid})",
-                                file=sys.stderr,
-                            )
-                    except Exception as e:
-                        print(
-                            f"[CameraController] failed to kill FFmpeg process: {e}",
-                            file=sys.stderr,
-                        )
-            except Exception as e:
-                print(
-                    f"[CameraController] error when stopping FFmpeg: {e}",
-                    file=sys.stderr,
-                )
-
-        self._ffmpeg_process = None
-
-    # ------------------------ WebRTC Offer 相关 ------------------------
-
-    async def _handle_webrtc_offer(self, offer_sdp: str) -> str:
-        payload = {
-            "api": self.webrtc_api,
-            "streamurl": self.webrtc_stream_url,
-            "sdp": offer_sdp,
-        }
-
-        headers = {"Content-Type": "application/json"}
-
-        def _do_request():
-            return requests.post(
-                self.webrtc_api,
-                json=payload,
-                headers=headers,
-                timeout=10,
-            )
-
-        try:
-            loop = asyncio.get_running_loop()
-            resp = await loop.run_in_executor(None, _do_request)
-        except Exception as e:
-            print(
-                f"[CameraController] failed to send offer to media server: {e}",
-                file=sys.stderr,
-            )
-            raise
-
-        try:
-            resp.raise_for_status()
-        except Exception as e:
-            print(
-                f"[CameraController] media server HTTP error: {e}, "
-                f"status={resp.status_code}, body={resp.text[:200]}",
-                file=sys.stderr,
-            )
-            raise
-
-        try:
-            data = resp.json()
-        except Exception as e:
-            print(
-                f"[CameraController] failed to parse media server JSON: {e}, "
-                f"raw={resp.text[:200]}",
-                file=sys.stderr,
-            )
-            raise
-
-        answer_sdp = data.get("sdp", "")
-        if not answer_sdp:
-            msg = f"empty SDP from media server: {data}"
-            print(f"[CameraController] {msg}", file=sys.stderr)
-            raise RuntimeError(msg)
-
-        return answer_sdp

unilabos/devices/cameraSII/cameraUSB.py

@@ -1,401 +0,0 @@
-#!/usr/bin/env python3
-import asyncio
-import json
-import subprocess
-import sys
-import threading
-from typing import Optional, Dict, Any
-
-import requests
-import websockets
-
-
-class CameraController:
-    """
-    Uni-Lab-OS 摄像头驱动（Linux USB 摄像头版，无 PTZ）
-
-    - WebSocket 信令：signal_backend_url 连接到后端
-      例如: wss://sciol.ac.cn/api/realtime/signal/host/<host_id>
-    - 媒体服务器：RTMP 推流到 rtmp_url；WebRTC offer 转发到 SRS 的 webrtc_api
-    - 视频源：本地 USB 摄像头（V4L2，默认 /dev/video0）
-    """
-
-    def __init__(
-        self,
-        host_id: str = "demo-host",
-        signal_backend_url: str = "wss://sciol.ac.cn/api/realtime/signal/host",
-        rtmp_url: str = "rtmp://srs.sciol.ac.cn:4499/live/camera-01",
-        webrtc_api: str = "https://srs.sciol.ac.cn/rtc/v1/play/",
-        webrtc_stream_url: str = "webrtc://srs.sciol.ac.cn:4500/live/camera-01",
-        video_device: str = "/dev/video0",
-        width: int = 1280,
-        height: int = 720,
-        fps: int = 30,
-        video_bitrate: str = "1500k",
-        audio_device: Optional[str] = None,  # 比如 "hw:1,0"，没有音频就保持 None
-        audio_bitrate: str = "64k",
-    ):
-        self.host_id = host_id
-
-        # 拼接最终 WebSocket URL：.../host/<host_id>
-        signal_backend_url = signal_backend_url.rstrip("/")
-        if not signal_backend_url.endswith("/host"):
-            signal_backend_url = signal_backend_url + "/host"
-        self.signal_backend_url = f"{signal_backend_url}/{host_id}"
-
-        # 媒体服务器配置
-        self.rtmp_url = rtmp_url
-        self.webrtc_api = webrtc_api
-        self.webrtc_stream_url = webrtc_stream_url
-
-        # 本地采集配置
-        self.video_device = video_device
-        self.width = int(width)
-        self.height = int(height)
-        self.fps = int(fps)
-        self.video_bitrate = video_bitrate
-        self.audio_device = audio_device
-        self.audio_bitrate = audio_bitrate
-
-        # 运行时状态
-        self._ws: Optional[object] = None
-        self._ffmpeg_process: Optional[subprocess.Popen] = None
-        self._running = False
-        self._loop_task: Optional[asyncio.Future] = None
-
-        # 事件循环 & 线程
-        self._loop: Optional[asyncio.AbstractEventLoop] = None
-        self._loop_thread: Optional[threading.Thread] = None
-
-        try:
-            self.start()
-        except Exception as e:
-            print(f"[CameraController] __init__ auto start failed: {e}", file=sys.stderr)
-
-    # ---------------------------------------------------------------------
-    # 对外方法
-    # ---------------------------------------------------------------------
-
-    def start(self, config: Optional[Dict[str, Any]] = None):
-        if self._running:
-            return {"status": "already_running", "host_id": self.host_id}
-
-        # 应用 config 覆盖（如果有）
-        if config:
-            cfg_host_id = config.get("host_id")
-            if cfg_host_id:
-                self.host_id = cfg_host_id
-
-            signal_backend_url = config.get("signal_backend_url")
-            if signal_backend_url:
-                signal_backend_url = signal_backend_url.rstrip("/")
-                if not signal_backend_url.endswith("/host"):
-                    signal_backend_url = signal_backend_url + "/host"
-                self.signal_backend_url = f"{signal_backend_url}/{self.host_id}"
-
-            self.rtmp_url = config.get("rtmp_url", self.rtmp_url)
-            self.webrtc_api = config.get("webrtc_api", self.webrtc_api)
-            self.webrtc_stream_url = config.get("webrtc_stream_url", self.webrtc_stream_url)
-
-            self.video_device = config.get("video_device", self.video_device)
-            self.width = int(config.get("width", self.width))
-            self.height = int(config.get("height", self.height))
-            self.fps = int(config.get("fps", self.fps))
-            self.video_bitrate = config.get("video_bitrate", self.video_bitrate)
-            self.audio_device = config.get("audio_device", self.audio_device)
-            self.audio_bitrate = config.get("audio_bitrate", self.audio_bitrate)
-
-        self._running = True
-
-        print("[CameraController] start(): starting FFmpeg streaming...", file=sys.stderr)
-        self._start_ffmpeg()
-
-        self._loop = asyncio.new_event_loop()
-
-        def loop_runner(loop: asyncio.AbstractEventLoop):
-            asyncio.set_event_loop(loop)
-            try:
-                loop.run_forever()
-            except Exception as e:
-                print(f"[CameraController] event loop error: {e}", file=sys.stderr)
-
-        self._loop_thread = threading.Thread(target=loop_runner, args=(self._loop,), daemon=True)
-        self._loop_thread.start()
-
-        self._loop_task = asyncio.run_coroutine_threadsafe(self._run_main_loop(), self._loop)
-
-        return {
-            "status": "started",
-            "host_id": self.host_id,
-            "signal_backend_url": self.signal_backend_url,
-            "rtmp_url": self.rtmp_url,
-            "webrtc_api": self.webrtc_api,
-            "webrtc_stream_url": self.webrtc_stream_url,
-            "video_device": self.video_device,
-            "width": self.width,
-            "height": self.height,
-            "fps": self.fps,
-            "video_bitrate": self.video_bitrate,
-            "audio_device": self.audio_device,
-        }
-
-    def stop(self) -> Dict[str, Any]:
-        self._running = False
-
-        # 先取消主任务（让 ws connect/sleep 尽快退出）
-        if self._loop_task is not None and not self._loop_task.done():
-            self._loop_task.cancel()
-
-        # 停止推流
-        self._stop_ffmpeg()
-
-        # 关闭 WebSocket（在 loop 中执行）
-        if self._ws and self._loop is not None:
-
-            async def close_ws():
-                try:
-                    await self._ws.close()
-                except Exception as e:
-                    print(f"[CameraController] error closing WebSocket: {e}", file=sys.stderr)
-
-            try:
-                asyncio.run_coroutine_threadsafe(close_ws(), self._loop)
-            except Exception:
-                pass
-
-        # 停止事件循环
-        if self._loop is not None:
-            try:
-                self._loop.call_soon_threadsafe(self._loop.stop)
-            except Exception as e:
-                print(f"[CameraController] error stopping loop: {e}", file=sys.stderr)
-
-        # 等待线程退出
-        if self._loop_thread is not None:
-            try:
-                self._loop_thread.join(timeout=5)
-            except Exception as e:
-                print(f"[CameraController] error joining loop thread: {e}", file=sys.stderr)
-
-        self._ws = None
-        self._loop_task = None
-        self._loop = None
-        self._loop_thread = None
-
-        return {"status": "stopped", "host_id": self.host_id}
-
-    def get_status(self) -> Dict[str, Any]:
-        ws_closed = None
-        if self._ws is not None:
-            ws_closed = getattr(self._ws, "closed", None)
-
-        if ws_closed is None:
-            websocket_connected = self._ws is not None
-        else:
-            websocket_connected = (self._ws is not None) and (not ws_closed)
-
-        return {
-            "host_id": self.host_id,
-            "running": self._running,
-            "websocket_connected": websocket_connected,
-            "ffmpeg_running": bool(self._ffmpeg_process and self._ffmpeg_process.poll() is None),
-            "signal_backend_url": self.signal_backend_url,
-            "rtmp_url": self.rtmp_url,
-            "video_device": self.video_device,
-            "width": self.width,
-            "height": self.height,
-            "fps": self.fps,
-            "video_bitrate": self.video_bitrate,
-        }
-
-    # ---------------------------------------------------------------------
-    # WebSocket / 信令
-    # ---------------------------------------------------------------------
-
-    async def _run_main_loop(self):
-        print("[CameraController] main loop started", file=sys.stderr)
-        try:
-            while self._running:
-                try:
-                    async with websockets.connect(self.signal_backend_url) as ws:
-                        self._ws = ws
-                        print(f"[CameraController] WebSocket connected: {self.signal_backend_url}", file=sys.stderr)
-                        await self._recv_loop()
-                except asyncio.CancelledError:
-                    raise
-                except Exception as e:
-                    if self._running:
-                        print(f"[CameraController] WebSocket connection error: {e}", file=sys.stderr)
-                        await asyncio.sleep(3)
-        except asyncio.CancelledError:
-            pass
-        finally:
-            print("[CameraController] main loop exited", file=sys.stderr)
-
-    async def _recv_loop(self):
-        assert self._ws is not None
-        ws = self._ws
-
-        async for message in ws:
-            try:
-                data = json.loads(message)
-            except json.JSONDecodeError:
-                print(f"[CameraController] non-JSON message: {message}", file=sys.stderr)
-                continue
-
-            try:
-                await self._handle_message(data)
-            except Exception as e:
-                print(f"[CameraController] error handling message {data}: {e}", file=sys.stderr)
-
-    async def _handle_message(self, data: Dict[str, Any]):
-        cmd = data.get("command")
-
-        if cmd == "start_stream":
-            self._start_ffmpeg()
-            return
-
-        if cmd == "stop_stream":
-            self._stop_ffmpeg()
-            return
-
-        if data.get("type") == "offer":
-            offer_sdp = data.get("sdp", "")
-            camera_id = data.get("cameraId", "camera-01")
-
-            answer_sdp = await self._handle_webrtc_offer(offer_sdp)
-
-            if self._ws:
-                answer_payload = {
-                    "type": "answer",
-                    "sdp": answer_sdp,
-                    "cameraId": camera_id,
-                    "hostId": self.host_id,
-                }
-                await self._ws.send(json.dumps(answer_payload))
-
-    # ---------------------------------------------------------------------
-    # FFmpeg 推流（V4L2 USB 摄像头）
-    # ---------------------------------------------------------------------
-
-    def _start_ffmpeg(self):
-        if self._ffmpeg_process and self._ffmpeg_process.poll() is None:
-            return
-
-        # 兼容性优先：不强制输入像素格式；失败再通过外部调整 width/height/fps
-        video_size = f"{self.width}x{self.height}"
-
-        cmd = [
-            "ffmpeg",
-            "-hide_banner",
-            "-loglevel",
-            "warning",
-
-            # video input
-            "-f", "v4l2",
-            "-framerate", str(self.fps),
-            "-video_size", video_size,
-            "-i", self.video_device,
-        ]
-
-        # optional audio input
-        if self.audio_device:
-            cmd += [
-                "-f", "alsa",
-                "-i", self.audio_device,
-                "-c:a", "aac",
-                "-b:a", self.audio_bitrate,
-                "-ar", "44100",
-                "-ac", "1",
-            ]
-        else:
-            cmd += ["-an"]
-
-        # video encode + rtmp out
-        cmd += [
-            "-c:v", "libx264",
-            "-preset", "ultrafast",
-            "-tune", "zerolatency",
-            "-profile:v", "baseline",
-            "-pix_fmt", "yuv420p",
-            "-b:v", self.video_bitrate,
-            "-maxrate", self.video_bitrate,
-            "-bufsize", "2M",
-            "-g", str(max(self.fps, 10)),
-            "-keyint_min", str(max(self.fps, 10)),
-            "-sc_threshold", "0",
-            "-x264-params", "bframes=0",
-
-            "-f", "flv",
-            self.rtmp_url,
-        ]
-
-        print(f"[CameraController] starting FFmpeg: {' '.join(cmd)}", file=sys.stderr)
-
-        try:
-            # 不再丢弃日志，至少能看到 ffmpeg 报错（调试很关键）
-            self._ffmpeg_process = subprocess.Popen(
-                cmd,
-                stdout=subprocess.DEVNULL,
-                stderr=sys.stderr,
-                shell=False,
-            )
-        except Exception as e:
-            self._ffmpeg_process = None
-            print(f"[CameraController] failed to start FFmpeg: {e}", file=sys.stderr)
-
-    def _stop_ffmpeg(self):
-        proc = self._ffmpeg_process
-        if proc and proc.poll() is None:
-            try:
-                proc.terminate()
-                try:
-                    proc.wait(timeout=5)
-                except subprocess.TimeoutExpired:
-                    proc.kill()
-            except Exception as e:
-                print(f"[CameraController] error stopping FFmpeg: {e}", file=sys.stderr)
-        self._ffmpeg_process = None
-
-    # ---------------------------------------------------------------------
-    # WebRTC offer -> SRS
-    # ---------------------------------------------------------------------
-
-    async def _handle_webrtc_offer(self, offer_sdp: str) -> str:
-        payload = {
-            "api": self.webrtc_api,
-            "streamurl": self.webrtc_stream_url,
-            "sdp": offer_sdp,
-        }
-        headers = {"Content-Type": "application/json"}
-
-        def _do_post():
-            return requests.post(self.webrtc_api, json=payload, headers=headers, timeout=10)
-
-        loop = asyncio.get_running_loop()
-        resp = await loop.run_in_executor(None, _do_post)
-
-        resp.raise_for_status()
-        data = resp.json()
-        answer_sdp = data.get("sdp", "")
-        if not answer_sdp:
-            raise RuntimeError(f"empty SDP from media server: {data}")
-        return answer_sdp
-
-
-if __name__ == "__main__":
-    # 直接运行用于手动测试
-    c = CameraController(
-        host_id="demo-host",
-        video_device="/dev/video0",
-        width=1280,
-        height=720,
-        fps=30,
-        video_bitrate="1500k",
-        audio_device=None,
-    )
-    try:
-        while True:
-            asyncio.sleep(1)
-    except KeyboardInterrupt:
-        c.stop()

unilabos/devices/cameraSII/cameraUSB_test.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-import time
-import json
-
-from cameraUSB import CameraController
-
-
-def main():
-    # 按你的实际情况改
-    cfg = dict(
-        host_id="demo-host",
-        signal_backend_url="wss://sciol.ac.cn/api/realtime/signal/host",
-        rtmp_url="rtmp://srs.sciol.ac.cn:4499/live/camera-01",
-        webrtc_api="https://srs.sciol.ac.cn/rtc/v1/play/",
-        webrtc_stream_url="webrtc://srs.sciol.ac.cn:4500/live/camera-01",
-        video_device="/dev/video7",
-        width=1280,
-        height=720,
-        fps=30,
-        video_bitrate="1500k",
-        audio_device=None,
-    )
-
-    c = CameraController(**cfg)
-
-    # 可选：如果你不想依赖 __init__ 自动 start，可以这样显式调用：
-    # c = CameraController(host_id=cfg["host_id"])
-    # c.start(cfg)
-
-    run_seconds = 30  # 测试运行时长
-    t0 = time.time()
-
-    try:
-        while True:
-            st = c.get_status()
-            print(json.dumps(st, ensure_ascii=False, indent=2))
-
-            if time.time() - t0 >= run_seconds:
-                break
-
-            time.sleep(2)
-    except KeyboardInterrupt:
-        print("Interrupted, stopping...")
-    finally:
-        print("Stopping controller...")
-        c.stop()
-        print("Done.")
-
-
-if __name__ == "__main__":
-    main()

unilabos/devices/cameraSII/demo_camera_pic.py

@@ -1,36 +0,0 @@
-import cv2
-
-# 推荐把 @ 进行 URL 编码：@ -> %40
-RTSP_URL = "rtsp://admin:admin123@192.168.31.164:554/stream1"
-OUTPUT_IMAGE = "rtsp_test_frame.jpg"
-
-def main():
-    print(f"尝试连接 RTSP 流: {RTSP_URL}")
-    cap = cv2.VideoCapture(RTSP_URL)
-
-    if not cap.isOpened():
-        print("错误：无法打开 RTSP 流，请检查：")
-        print("  1. IP/端口是否正确")
-        print("  2. 账号密码（尤其是 @ 是否已转成 %40）是否正确")
-        print("  3. 摄像头是否允许当前主机访问（同一网段、防火墙等）")
-        return
-
-    print("连接成功，开始读取一帧...")
-    ret, frame = cap.read()
-
-    if not ret or frame is None:
-        print("错误：已连接但未能读取到帧数据（可能是码流未开启或网络抖动）")
-        cap.release()
-        return
-
-    # 保存当前帧
-    success = cv2.imwrite(OUTPUT_IMAGE, frame)
-    cap.release()
-
-    if success:
-        print(f"成功截取一帧并保存为: {OUTPUT_IMAGE}")
-    else:
-        print("错误：写入图片失败，请检查磁盘权限/路径")
-
-if __name__ == "__main__":
-    main()

unilabos/devices/cameraSII/demo_camera_push.py

@@ -1,21 +0,0 @@
-# run_camera_push.py
-import time
-from cameraDriver import CameraController  # 这里根据你的文件名调整
-
-if __name__ == "__main__":
-    controller = CameraController(
-        host_id="demo-host",
-        signal_backend_url="wss://sciol.ac.cn/api/realtime/signal/host",
-        rtmp_url="rtmp://srs.sciol.ac.cn:4499/live/camera-01",
-        webrtc_api="https://srs.sciol.ac.cn/rtc/v1/play/",
-        webrtc_stream_url="webrtc://srs.sciol.ac.cn:4500/live/camera-01",
-        camera_rtsp_url="rtsp://admin:admin123@192.168.31.164:554/stream1",
-    )
-
-    try:
-        while True:
-            status = controller.get_status()
-            print(status)
-            time.sleep(5)
-    except KeyboardInterrupt:
-        controller.stop()

unilabos/devices/cameraSII/ptz_cameracontroller_test.py

@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-使用 CameraController 来测试 PTZ：
-让摄像头按顺序向下、向上、向左、向右运动几次。
-"""
-
-import time
-import sys
-
-# 根据你的工程结构修改导入路径：
-# 假设 CameraController 定义在 cameraController.py 里
-from cameraDriver import CameraController
-
-
-def main():
-    # === 根据你的实际情况填 IP、端口、账号密码 ===
-    ptz_host = "192.168.31.164"
-    ptz_port = 2020          # 注意要和你单独测试 PTZController 时保持一致
-    ptz_user = "admin"
-    ptz_password = "admin123"
-
-    # 1. 创建 CameraController 实例
-    cam = CameraController(
-        # 其他摄像机相关参数按你类的 __init__ 来补充
-        ptz_host=ptz_host,
-        ptz_port=ptz_port,
-        ptz_user=ptz_user,
-        ptz_password=ptz_password,
-    )
-
-    # 2. 启动 / 初始化（如果你的 CameraController 有 start(config) 之类的接口）
-    #    这里给一个最小的 config，重点是 PTZ 相关字段
-    config = {
-        "ptz_host": ptz_host,
-        "ptz_port": ptz_port,
-        "ptz_user": ptz_user,
-        "ptz_password": ptz_password,
-    }
-
-    try:
-        cam.start(config)
-    except Exception as e:
-        print(f"[TEST] CameraController start() 失败: {e}", file=sys.stderr)
-        return
-
-    # 这里可以判断一下内部 _ptz 是否初始化成功（如果你对 CameraController 做了封装）
-    if getattr(cam, "_ptz", None) is None:
-        print("[TEST] CameraController 内部 PTZ 未初始化成功，请检查 ptz_host/port/user/password 配置。", file=sys.stderr)
-        return
-
-    # 3. 依次调用 CameraController 的 PTZ 方法
-    #    这里假设你在 CameraController 中提供了这几个对外方法：
-    #    ptz_move_down / ptz_move_up / ptz_move_left / ptz_move_right
-    #    如果你命名不一样，把下面调用名改成你的即可。
-
-    print("向下移动（通过 CameraController）...")
-    cam.ptz_move_down(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("向上移动（通过 CameraController）...")
-    cam.ptz_move_up(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("向左移动（通过 CameraController）...")
-    cam.ptz_move_left(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("向右移动（通过 CameraController）...")
-    cam.ptz_move_right(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("测试结束。")
-
-
-if __name__ == "__main__":
-    main()

unilabos/devices/cameraSII/ptz_test.py

@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-测试 cameraDriver.py中的 PTZController 类，让摄像头按顺序运动几次
-"""
-
-import time
-
-from cameraDriver import PTZController
-
-
-def main():
-    # 根据你的实际情况填 IP、端口、账号密码
-    host = "192.168.31.164"
-    port = 80
-    user = "admin"
-    password = "admin123"
-
-    ptz = PTZController(host=host, port=port, user=user, password=password)
-
-    # 1. 连接摄像头
-    if not ptz.connect():
-        print("连接 PTZ 失败，检查 IP/用户名/密码/端口。")
-        return
-
-    # 2. 依次测试几个动作
-    # 每个动作之间 sleep 一下方便观察
-
-    print("向下移动...")
-    ptz.move_down(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("向上移动...")
-    ptz.move_up(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("向左移动...")
-    ptz.move_left(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("向右移动...")
-    ptz.move_right(speed=0.5, duration=1.0)
-    time.sleep(1)
-
-    print("测试结束。")
-
-
-if __name__ == "__main__":
-    main()

unilabos/devices/electrolysis_water_platfrom/electrolysis_water_platfrom.py

@@ -0,0 +1,296 @@
+# -*- coding: utf-8 -*-
+import serial
+import time
+import csv
+import threading
+import os
+from collections import deque
+from typing import Dict, Any, Optional
+from pylabrobot.resources import Deck
+
+from unilabos.devices.workstation.workstation_base import WorkstationBase
+
+
+class ElectrolysisWaterPlatform(WorkstationBase):
+    """
+    电解水平台工作站
+    基于 WorkstationBase 的电解水实验平台，支持串口通信和数据采集
+    """
+    
+    def __init__(
+        self, 
+        deck: Deck,
+        port: str = "COM10",
+        baudrate: int = 115200,
+        csv_path: Optional[str] = None,
+        timeout: float = 0.2,
+        **kwargs
+    ):
+        super().__init__(deck, **kwargs)
+        
+        # ========== 配置 ==========
+        self.port = port
+        self.baudrate = baudrate
+        # 如果没有指定路径，默认保存在代码文件所在目录
+        if csv_path is None:
+            current_dir = os.path.dirname(os.path.abspath(__file__))
+            self.csv_path = os.path.join(current_dir, "stm32_data.csv")
+        else:
+            self.csv_path = csv_path
+        self.ser_timeout = timeout
+        self.chunk_read = 128
+        
+        # 串口对象
+        self.ser: Optional[serial.Serial] = None
+        self.stop_flag = False
+        
+        # 线程对象
+        self.rx_thread: Optional[threading.Thread] = None
+        self.tx_thread: Optional[threading.Thread] = None
+        
+        # ==== 接收（下位机->上位机）：固定 1+13+1 = 15 字节 ====
+        self.RX_HEAD = 0x3E
+        self.RX_TAIL = 0x3E
+        self.RX_FRAME_LEN = 1 + 13 + 1  # 15
+        
+        # ==== 发送（上位机->下位机）：固定 1+9+1 = 11 字节 ====
+        self.TX_HEAD = 0x3E
+        self.TX_TAIL = 0xE3  # 协议图中标注 E3 作为帧尾
+        self.TX_FRAME_LEN = 1 + 9 + 1  # 11
+    
+    def open_serial(self, port: Optional[str] = None, baudrate: Optional[int] = None, timeout: Optional[float] = None) -> Optional[serial.Serial]:
+        """打开串口"""
+        port = port or self.port
+        baudrate = baudrate or self.baudrate
+        timeout = timeout or self.ser_timeout
+        try:
+            ser = serial.Serial(port, baudrate, timeout=timeout)
+            print(f"[OK] 串口 {port} 已打开，波特率 {baudrate}")
+            ser.reset_input_buffer()
+            ser.reset_output_buffer()
+            self.ser = ser
+            return ser
+        except serial.SerialException as e:
+            print(f"[ERR] 无法打开串口 {port}: {e}")
+            return None
+
+    def close_serial(self):
+        """关闭串口"""
+        if self.ser and self.ser.is_open:
+            self.ser.close()
+            print("[INFO] 串口已关闭")
+
+    @staticmethod
+    def u16_be(h: int, l: int) -> int:
+        """将两个字节组合成16位无符号整数（大端序）"""
+        return ((h & 0xFF) << 8) | (l & 0xFF)
+
+    @staticmethod
+    def split_u16_be(val: int) -> tuple:
+        """返回 (高字节, 低字节)，输入会夹到 0..65535"""
+        v = int(max(0, min(65535, int(val))))
+        return (v >> 8) & 0xFF, v & 0xFF
+
+    # ================== 接收：固定15字节 ==================
+    def parse_rx_payload(self, dat13: bytes) -> Optional[Dict[str, Any]]:
+        """解析 13 字节数据区（下位机发送到上位机）"""
+        if len(dat13) != 13:
+            return None
+        current_mA      = self.u16_be(dat13[0], dat13[1])
+        voltage_mV      = self.u16_be(dat13[2], dat13[3])
+        temperature_raw = self.u16_be(dat13[4], dat13[5])
+        tds_ppm         = self.u16_be(dat13[6], dat13[7])
+        gas_sccm        = self.u16_be(dat13[8], dat13[9])
+        liquid_mL       = self.u16_be(dat13[10], dat13[11])
+        ph_raw          = dat13[12] & 0xFF
+
+        return {
+            "Current_mA": current_mA,
+            "Voltage_mV": voltage_mV,
+            "Temperature_C": round(temperature_raw / 100.0, 2),
+            "TDS_ppm": tds_ppm,
+            "GasFlow_sccm": gas_sccm,
+            "LiquidFlow_mL": liquid_mL,
+            "pH": round(ph_raw / 10.0, 2)
+        }
+
+    def try_parse_rx_frame(self, frame15: bytes) -> Optional[Dict[str, Any]]:
+        """尝试解析接收帧"""
+        if len(frame15) != self.RX_FRAME_LEN:
+            return None
+        if frame15[0] != self.RX_HEAD or frame15[-1] != self.RX_TAIL:
+            return None
+        return self.parse_rx_payload(frame15[1:-1])
+
+    def rx_thread_fn(self):
+        """接收线程函数"""
+        headers = ["Timestamp", "Current_mA", "Voltage_mV",
+                   "Temperature_C", "TDS_ppm", "GasFlow_sccm", "LiquidFlow_mL", "pH"]
+
+        new_file = not os.path.exists(self.csv_path)
+        f = open(self.csv_path, mode='a', newline='', encoding='utf-8')
+        writer = csv.writer(f)
+        if new_file:
+            writer.writerow(headers)
+            f.flush()
+
+        buf = deque(maxlen=8192)
+        print(f"[RX] 开始接收（帧长 {self.RX_FRAME_LEN} 字节）；写入：{self.csv_path}")
+
+        try:
+            while not self.stop_flag and self.ser and self.ser.is_open:
+                chunk = self.ser.read(self.chunk_read)
+                if chunk:
+                    buf.extend(chunk)
+                    while True:
+                        # 找帧头
+                        try:
+                            start = next(i for i, b in enumerate(buf) if b == self.RX_HEAD)
+                        except StopIteration:
+                            buf.clear()
+                            break
+                        if start > 0:
+                            for _ in range(start):
+                                buf.popleft()
+                        if len(buf) < self.RX_FRAME_LEN:
+                            break
+                        candidate = bytes([buf[i] for i in range(self.RX_FRAME_LEN)])
+                        if candidate[-1] == self.RX_TAIL:
+                            parsed = self.try_parse_rx_frame(candidate)
+                            for _ in range(self.RX_FRAME_LEN):
+                                buf.popleft()
+                            if parsed:
+                                ts = time.strftime("%Y-%m-%d %H:%M:%S")
+                                row = [ts,
+                                       parsed["Current_mA"], parsed["Voltage_mV"],
+                                       parsed["Temperature_C"], parsed["TDS_ppm"],
+                                       parsed["GasFlow_sccm"], parsed["LiquidFlow_mL"],
+                                       parsed["pH"]]
+                                writer.writerow(row)
+                                f.flush()
+                                # 若不想打印可注释下一行
+                                # print(f"[{ts}] I={parsed['Current_mA']} mA, V={parsed['Voltage_mV']} mV, "
+                                #       f"T={parsed['Temperature_C']} °C, TDS={parsed['TDS_ppm']}, "
+                                #       f"Gas={parsed['GasFlow_sccm']} sccm, Liq={parsed['LiquidFlow_mL']} mL, pH={parsed['pH']}")
+                        else:
+                            # 头不变，尾不对，丢1字节继续对齐
+                            buf.popleft()
+                else:
+                    time.sleep(0.01)
+        finally:
+            f.close()
+            print("[RX] 接收线程退出，CSV 已关闭")
+
+    # ================== 发送：固定11字节 ==================
+    def build_tx_frame(self, mode: int, current_ma: int, voltage_mv: int, temp_c: float, ki: float, pump_percent: float) -> bytes:
+        """
+        发送帧：HEAD + [mode, I_hi, I_lo, V_hi, V_lo, T_hi, T_lo, Ki_byte, Pump_byte] + TAIL
+        - mode: 0=恒压, 1=恒流
+        - current_ma: mA (0..65535)
+        - voltage_mv: mV (0..65535)
+        - temp_c: ℃，将 *100 后拆分为高/低字节
+        - ki: 0.0..20.0  -> byte = round(ki * 10) 夹到 0..200
+        - pump_percent: 0..100 -> byte = round(pump * 2) 夹到 0..200
+        """
+        mode_b = 1 if int(mode) == 1 else 0
+
+        i_hi, i_lo = self.split_u16_be(current_ma)
+        v_hi, v_lo = self.split_u16_be(voltage_mv)
+
+        t100 = int(round(float(temp_c) * 100.0))
+        t_hi, t_lo = self.split_u16_be(t100)
+
+        ki_b = int(max(0, min(200, round(float(ki) * 10))))
+        pump_b = int(max(0, min(200, round(float(pump_percent) * 2))))
+
+        return bytes((
+            self.TX_HEAD,
+            mode_b,
+            i_hi, i_lo,
+            v_hi, v_lo,
+            t_hi, t_lo,
+            ki_b,
+            pump_b,
+            self.TX_TAIL
+        ))
+
+    def tx_thread_fn(self):
+        """
+        发送线程函数
+        用户输入 6 个用逗号分隔的数值：
+        mode,current_mA,voltage_mV,set_temp_C,Ki,pump_percent
+        例如： 0,1000,500,0,0,50
+        """
+        print("\n输入 6 个值（用英文逗号分隔），顺序为：")
+        print("mode,current_mA,voltage_mV,set_temp_C,Ki,pump_percent")
+        print("示例恒压：0,500,1000,25,0,100   （stop 结束）\n")
+        print("示例恒流：1,1000,500,25,0,100   （stop 结束）\n")
+        print("示例恒流：1,2000,500,25,0,100   （stop 结束）\n")
+        # 1,2000,500,25,0,100
+
+        while not self.stop_flag and self.ser and self.ser.is_open:
+            try:
+                line = input(">>> ").strip()
+            except EOFError:
+                self.stop_flag = True
+                break
+
+            if not line:
+                continue
+            if line.lower() == "stop":
+                self.stop_flag = True
+                print("[SYS] 停止程序")
+                break
+
+            try:
+                parts = [p.strip() for p in line.split(",")]
+                if len(parts) != 6:
+                    raise ValueError("需要 6 个逗号分隔的数值")
+                mode = int(parts[0])
+                i_ma = int(float(parts[1]))
+                v_mv = int(float(parts[2]))
+                t_c  = float(parts[3])
+                ki   = float(parts[4])
+                pump = float(parts[5])
+
+                frame = self.build_tx_frame(mode, i_ma, v_mv, t_c, ki, pump)
+                self.ser.write(frame)
+                print("[TX]", " ".join(f"{b:02X}" for b in frame))
+            except Exception as e:
+                print("[TX] 输入/打包失败：", e)
+                print("格式：mode,current_mA,voltage_mV,set_temp_C,Ki,pump_percent")
+                continue
+    
+    def start(self):
+        """启动电解水平台"""
+        self.ser = self.open_serial()
+        if self.ser:
+            try:
+                self.rx_thread = threading.Thread(target=self.rx_thread_fn, daemon=True)
+                self.tx_thread = threading.Thread(target=self.tx_thread_fn, daemon=True)
+                self.rx_thread.start()
+                self.tx_thread.start()
+                print("[INFO] 电解水平台已启动")
+                self.tx_thread.join()  # 等待用户输入线程结束（输入 stop）
+            finally:
+                self.close_serial()
+    
+    def stop(self):
+        """停止电解水平台"""
+        self.stop_flag = True
+        if self.rx_thread and self.rx_thread.is_alive():
+            self.rx_thread.join(timeout=2.0)
+        if self.tx_thread and self.tx_thread.is_alive():
+            self.tx_thread.join(timeout=2.0)
+        self.close_serial()
+        print("[INFO] 电解水平台已停止")
+
+
+# ================== 主入口 ==================
+if __name__ == "__main__":
+    # 创建一个简单的 Deck 用于测试
+    from pylabrobot.resources import Deck
+    
+    deck = Deck()
+    platform = ElectrolysisWaterPlatform(deck)
+    platform.start()

unilabos/devices/laiyu_liquid/__init__.py

@@ -0,0 +1,307 @@
+"""
+LaiYu_Liquid 液体处理工作站集成模块
+
+该模块提供了 LaiYu_Liquid 工作站与 UniLabOS 的完整集成，包括：
+- 硬件后端和抽象接口
+- 资源定义和管理
+- 协议执行和液体传输
+- 工作台配置和布局
+
+主要组件：
+- LaiYuLiquidBackend: 硬件后端实现
+- LaiYuLiquid: 液体处理器抽象接口
+- 各种资源类：枪头架、板、容器等
+- 便捷创建函数和配置管理
+
+使用示例：
+    from unilabos.devices.laiyu_liquid import (
+        LaiYuLiquid, 
+        LaiYuLiquidBackend,
+        create_standard_deck,
+        create_tip_rack_1000ul
+    )
+    
+    # 创建后端和液体处理器
+    backend = LaiYuLiquidBackend()
+    lh = LaiYuLiquid(backend=backend)
+    
+    # 创建工作台
+    deck = create_standard_deck()
+    lh.deck = deck
+    
+    # 设置和运行
+    await lh.setup()
+"""
+
+# 版本信息
+__version__ = "1.0.0"
+__author__ = "LaiYu_Liquid Integration Team"
+__description__ = "LaiYu_Liquid 液体处理工作站 UniLabOS 集成模块"
+
+# 驱动程序导入
+from .drivers import (
+    XYZStepperController,
+    SOPAPipette,
+    MotorAxis,
+    MotorStatus,
+    SOPAConfig,
+    SOPAStatusCode,
+    StepperMotorDriver
+)
+
+# 控制器导入
+from .controllers import (
+    XYZController,
+    PipetteController,
+)
+
+# 后端导入
+from .backend.rviz_backend import (
+    LiquidHandlerRvizBackend,
+)
+
+# 资源类和创建函数导入
+from .core.laiyu_liquid_res import (
+    LaiYuLiquidDeck,
+    LaiYuLiquidContainer,
+    LaiYuLiquidTipRack
+)
+
+# 主设备类和配置
+from .core.laiyu_liquid_main import (
+    LaiYuLiquid,
+    LaiYuLiquidConfig,
+    LaiYuLiquidDeck,
+    LaiYuLiquidContainer,
+    LaiYuLiquidTipRack,
+    create_quick_setup
+)
+
+# 后端创建函数导入
+from .backend import (
+    LaiYuLiquidBackend,
+    create_laiyu_backend,
+)
+
+# 导出所有公共接口
+__all__ = [
+    # 版本信息
+    "__version__",
+    "__author__",
+    "__description__",
+    
+    # 驱动程序
+    "SOPAPipette",
+    "SOPAConfig", 
+    "StepperMotorDriver",
+    "XYZStepperController",
+    
+    # 控制器
+    "PipetteController",
+    "XYZController",
+    
+    # 后端
+    "LiquidHandlerRvizBackend",
+    
+    # 资源创建函数
+    "create_tip_rack_1000ul",
+    "create_tip_rack_200ul", 
+    "create_96_well_plate",
+    "create_deep_well_plate",
+    "create_8_tube_rack",
+    "create_standard_deck",
+    "create_waste_container",
+    "create_wash_container",
+    "create_reagent_container",
+    "load_deck_config",
+    
+    # 后端创建函数
+    "create_laiyu_backend",
+    
+    # 主要类
+    "LaiYuLiquid",
+    "LaiYuLiquidConfig", 
+    "LaiYuLiquidBackend",
+    "LaiYuLiquidDeck",
+    
+    # 工具函数
+    "get_version",
+    "get_supported_resources",
+    "create_quick_setup",
+    "validate_installation",
+    "print_module_info",
+    "setup_logging",
+]
+
+# 别名定义，为了向后兼容
+LaiYuLiquidDevice = LaiYuLiquid  # 主设备类别名
+LaiYuLiquidController = XYZController  # 控制器别名
+LaiYuLiquidDriver = XYZStepperController  # 驱动器别名
+
+# 模块级别的便捷函数
+
+def get_version() -> str:
+    """
+    获取模块版本
+    
+    Returns:
+        str: 版本号
+    """
+    return __version__
+
+
+def get_supported_resources() -> dict:
+    """
+    获取支持的资源类型
+    
+    Returns:
+        dict: 支持的资源类型字典
+    """
+    return {
+        "tip_racks": {
+            "LaiYuLiquidTipRack": LaiYuLiquidTipRack,
+        },
+        "containers": {
+            "LaiYuLiquidContainer": LaiYuLiquidContainer,
+        },
+        "decks": {
+            "LaiYuLiquidDeck": LaiYuLiquidDeck,
+        },
+        "devices": {
+            "LaiYuLiquid": LaiYuLiquid,
+        }
+    }
+
+
+def create_quick_setup() -> tuple:
+    """
+    快速创建基本设置
+    
+    Returns:
+        tuple: (backend, controllers, resources) 的元组
+    """
+    # 创建后端
+    backend = LiquidHandlerRvizBackend()
+    
+    # 创建控制器（使用默认端口进行演示）
+    pipette_controller = PipetteController(port="/dev/ttyUSB0", address=4)
+    xyz_controller = XYZController(port="/dev/ttyUSB1", auto_connect=False)
+    
+    # 创建测试资源
+    tip_rack_1000 = create_tip_rack_1000ul("tip_rack_1000")
+    tip_rack_200 = create_tip_rack_200ul("tip_rack_200")
+    well_plate = create_96_well_plate("96_well_plate")
+    
+    controllers = {
+        'pipette': pipette_controller,
+        'xyz': xyz_controller
+    }
+    
+    resources = {
+        'tip_rack_1000': tip_rack_1000,
+        'tip_rack_200': tip_rack_200,
+        'well_plate': well_plate
+    }
+    
+    return backend, controllers, resources
+
+
+def validate_installation() -> bool:
+    """
+    验证模块安装是否正确
+    
+    Returns:
+        bool: 安装是否正确
+    """
+    try:
+        # 检查核心类是否可以导入
+        from .core.laiyu_liquid_main import LaiYuLiquid, LaiYuLiquidConfig
+        from .backend import LaiYuLiquidBackend
+        from .controllers import XYZController, PipetteController
+        from .drivers import XYZStepperController, SOPAPipette
+        
+        # 尝试创建基本对象
+        config = LaiYuLiquidConfig()
+        backend = create_laiyu_backend("validation_test")
+        
+        print("模块安装验证成功")
+        return True
+        
+    except Exception as e:
+        print(f"模块安装验证失败: {e}")
+        return False
+
+
+def print_module_info():
+    """打印模块信息"""
+    print(f"LaiYu_Liquid 集成模块")
+    print(f"版本: {__version__}")
+    print(f"作者: {__author__}")
+    print(f"描述: {__description__}")
+    print(f"")
+    print(f"支持的资源类型:")
+    
+    resources = get_supported_resources()
+    for category, types in resources.items():
+        print(f"  {category}:")
+        for type_name, type_class in types.items():
+            print(f"    - {type_name}: {type_class.__name__}")
+    
+    print(f"")
+    print(f"主要功能:")
+    print(f"  - 硬件集成: LaiYuLiquidBackend")
+    print(f"  - 抽象接口: LaiYuLiquid")
+    print(f"  - 资源管理: 各种资源类和创建函数")
+    print(f"  - 协议执行: transfer_liquid 和相关函数")
+    print(f"  - 配置管理: deck.json 和加载函数")
+
+
+# 模块初始化时的检查
+def _check_dependencies():
+    """检查依赖项"""
+    try:
+        import pylabrobot
+        import asyncio
+        import json
+        import logging
+        return True
+    except ImportError as e:
+        import logging
+        logging.warning(f"缺少依赖项 {e}")
+        return False
+
+
+# 执行依赖检查
+_dependencies_ok = _check_dependencies()
+
+if not _dependencies_ok:
+    import logging
+    logging.warning("某些依赖项缺失，模块功能可能受限")
+
+
+# 模块级别的日志配置
+import logging
+
+def setup_logging(level: str = "INFO"):
+    """
+    设置模块日志
+    
+    Args:
+        level: 日志级别 (DEBUG, INFO, WARNING, ERROR)
+    """
+    logger = logging.getLogger("LaiYu_Liquid")
+    logger.setLevel(getattr(logging, level.upper()))
+    
+    if not logger.handlers:
+        handler = logging.StreamHandler()
+        formatter = logging.Formatter(
+            '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+        )
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+    
+    return logger
+
+
+# 默认日志设置
+_logger = setup_logging()

unilabos/devices/laiyu_liquid/backend/__init__.py

@@ -0,0 +1,9 @@
+"""
+LaiYu液体处理设备后端模块
+
+提供设备后端接口和实现
+"""
+
+from .laiyu_backend import LaiYuLiquidBackend, create_laiyu_backend
+
+__all__ = ['LaiYuLiquidBackend', 'create_laiyu_backend']

unilabos/devices/laiyu_liquid/backend/laiyu_backend.py

@@ -0,0 +1,334 @@
+"""
+LaiYu液体处理设备后端实现
+
+提供设备的后端接口和控制逻辑
+"""
+
+import logging
+from typing import Dict, Any, Optional, List
+from abc import ABC, abstractmethod
+
+# 尝试导入PyLabRobot后端
+try:
+    from pylabrobot.liquid_handling.backends import LiquidHandlerBackend
+    PYLABROBOT_AVAILABLE = True
+except ImportError:
+    PYLABROBOT_AVAILABLE = False
+    # 创建模拟后端基类
+    class LiquidHandlerBackend:
+        def __init__(self, name: str):
+            self.name = name
+            self.is_connected = False
+        
+        def connect(self):
+            """连接设备"""
+            pass
+        
+        def disconnect(self):
+            """断开连接"""
+            pass
+
+
+class LaiYuLiquidBackend(LiquidHandlerBackend):
+    """LaiYu液体处理设备后端"""
+    
+    def __init__(self, name: str = "LaiYu_Liquid_Backend"):
+        """
+        初始化LaiYu液体处理设备后端
+        
+        Args:
+            name: 后端名称
+        """
+        if PYLABROBOT_AVAILABLE:
+            # PyLabRobot 的 LiquidHandlerBackend 不接受参数
+            super().__init__()
+        else:
+            # 模拟版本接受 name 参数
+            super().__init__(name)
+        
+        self.name = name
+        self.logger = logging.getLogger(__name__)
+        self.is_connected = False
+        self.device_info = {
+            "name": "LaiYu液体处理设备",
+            "version": "1.0.0",
+            "manufacturer": "LaiYu",
+            "model": "LaiYu_Liquid_Handler"
+        }
+    
+    def connect(self) -> bool:
+        """
+        连接到LaiYu液体处理设备
+        
+        Returns:
+            bool: 连接是否成功
+        """
+        try:
+            self.logger.info("正在连接到LaiYu液体处理设备...")
+            # 这里应该实现实际的设备连接逻辑
+            # 目前返回模拟连接成功
+            self.is_connected = True
+            self.logger.info("成功连接到LaiYu液体处理设备")
+            return True
+        except Exception as e:
+            self.logger.error(f"连接LaiYu液体处理设备失败: {e}")
+            self.is_connected = False
+            return False
+    
+    def disconnect(self) -> bool:
+        """
+        断开与LaiYu液体处理设备的连接
+        
+        Returns:
+            bool: 断开连接是否成功
+        """
+        try:
+            self.logger.info("正在断开与LaiYu液体处理设备的连接...")
+            # 这里应该实现实际的设备断开连接逻辑
+            self.is_connected = False
+            self.logger.info("成功断开与LaiYu液体处理设备的连接")
+            return True
+        except Exception as e:
+            self.logger.error(f"断开LaiYu液体处理设备连接失败: {e}")
+            return False
+    
+    def is_device_connected(self) -> bool:
+        """
+        检查设备是否已连接
+        
+        Returns:
+            bool: 设备是否已连接
+        """
+        return self.is_connected
+    
+    def get_device_info(self) -> Dict[str, Any]:
+        """
+        获取设备信息
+        
+        Returns:
+            Dict[str, Any]: 设备信息字典
+        """
+        return self.device_info.copy()
+    
+    def home_device(self) -> bool:
+        """
+        设备归零操作
+        
+        Returns:
+            bool: 归零是否成功
+        """
+        if not self.is_connected:
+            self.logger.error("设备未连接，无法执行归零操作")
+            return False
+        
+        try:
+            self.logger.info("正在执行设备归零操作...")
+            # 这里应该实现实际的设备归零逻辑
+            self.logger.info("设备归零操作完成")
+            return True
+        except Exception as e:
+            self.logger.error(f"设备归零操作失败: {e}")
+            return False
+    
+    def aspirate(self, volume: float, location: Dict[str, Any]) -> bool:
+        """
+        吸液操作
+        
+        Args:
+            volume: 吸液体积 (微升)
+            location: 吸液位置信息
+            
+        Returns:
+            bool: 吸液是否成功
+        """
+        if not self.is_connected:
+            self.logger.error("设备未连接，无法执行吸液操作")
+            return False
+        
+        try:
+            self.logger.info(f"正在执行吸液操作: 体积={volume}μL, 位置={location}")
+            # 这里应该实现实际的吸液逻辑
+            self.logger.info("吸液操作完成")
+            return True
+        except Exception as e:
+            self.logger.error(f"吸液操作失败: {e}")
+            return False
+    
+    def dispense(self, volume: float, location: Dict[str, Any]) -> bool:
+        """
+        排液操作
+        
+        Args:
+            volume: 排液体积 (微升)
+            location: 排液位置信息
+            
+        Returns:
+            bool: 排液是否成功
+        """
+        if not self.is_connected:
+            self.logger.error("设备未连接，无法执行排液操作")
+            return False
+        
+        try:
+            self.logger.info(f"正在执行排液操作: 体积={volume}μL, 位置={location}")
+            # 这里应该实现实际的排液逻辑
+            self.logger.info("排液操作完成")
+            return True
+        except Exception as e:
+            self.logger.error(f"排液操作失败: {e}")
+            return False
+    
+    def pick_up_tip(self, location: Dict[str, Any]) -> bool:
+        """
+        取枪头操作
+        
+        Args:
+            location: 枪头位置信息
+            
+        Returns:
+            bool: 取枪头是否成功
+        """
+        if not self.is_connected:
+            self.logger.error("设备未连接，无法执行取枪头操作")
+            return False
+        
+        try:
+            self.logger.info(f"正在执行取枪头操作: 位置={location}")
+            # 这里应该实现实际的取枪头逻辑
+            self.logger.info("取枪头操作完成")
+            return True
+        except Exception as e:
+            self.logger.error(f"取枪头操作失败: {e}")
+            return False
+    
+    def drop_tip(self, location: Dict[str, Any]) -> bool:
+        """
+        丢弃枪头操作
+        
+        Args:
+            location: 丢弃位置信息
+            
+        Returns:
+            bool: 丢弃枪头是否成功
+        """
+        if not self.is_connected:
+            self.logger.error("设备未连接，无法执行丢弃枪头操作")
+            return False
+        
+        try:
+            self.logger.info(f"正在执行丢弃枪头操作: 位置={location}")
+            # 这里应该实现实际的丢弃枪头逻辑
+            self.logger.info("丢弃枪头操作完成")
+            return True
+        except Exception as e:
+            self.logger.error(f"丢弃枪头操作失败: {e}")
+            return False
+    
+    def move_to(self, location: Dict[str, Any]) -> bool:
+        """
+        移动到指定位置
+        
+        Args:
+            location: 目标位置信息
+            
+        Returns:
+            bool: 移动是否成功
+        """
+        if not self.is_connected:
+            self.logger.error("设备未连接，无法执行移动操作")
+            return False
+        
+        try:
+            self.logger.info(f"正在移动到位置: {location}")
+            # 这里应该实现实际的移动逻辑
+            self.logger.info("移动操作完成")
+            return True
+        except Exception as e:
+            self.logger.error(f"移动操作失败: {e}")
+            return False
+    
+    def get_status(self) -> Dict[str, Any]:
+        """
+        获取设备状态
+        
+        Returns:
+            Dict[str, Any]: 设备状态信息
+        """
+        return {
+            "connected": self.is_connected,
+            "device_info": self.device_info,
+            "status": "ready" if self.is_connected else "disconnected"
+        }
+    
+    # PyLabRobot 抽象方法实现
+    def stop(self):
+        """停止所有操作"""
+        self.logger.info("停止所有操作")
+        pass
+    
+    @property
+    def num_channels(self) -> int:
+        """返回通道数量"""
+        return 1  # 单通道移液器
+    
+    def can_pick_up_tip(self, tip_rack, tip_position) -> bool:
+        """检查是否可以拾取吸头"""
+        return True  # 简化实现，总是返回True
+    
+    def pick_up_tips(self, tip_rack, tip_positions):
+        """拾取多个吸头"""
+        self.logger.info(f"拾取吸头: {tip_positions}")
+        pass
+    
+    def drop_tips(self, tip_rack, tip_positions):
+        """丢弃多个吸头"""
+        self.logger.info(f"丢弃吸头: {tip_positions}")
+        pass
+    
+    def pick_up_tips96(self, tip_rack):
+        """拾取96个吸头"""
+        self.logger.info("拾取96个吸头")
+        pass
+    
+    def drop_tips96(self, tip_rack):
+        """丢弃96个吸头"""
+        self.logger.info("丢弃96个吸头")
+        pass
+    
+    def aspirate96(self, volume, plate, well_positions):
+        """96通道吸液"""
+        self.logger.info(f"96通道吸液: 体积={volume}")
+        pass
+    
+    def dispense96(self, volume, plate, well_positions):
+        """96通道排液"""
+        self.logger.info(f"96通道排液: 体积={volume}")
+        pass
+    
+    def pick_up_resource(self, resource, location):
+        """拾取资源"""
+        self.logger.info(f"拾取资源: {resource}")
+        pass
+    
+    def drop_resource(self, resource, location):
+        """放置资源"""
+        self.logger.info(f"放置资源: {resource}")
+        pass
+    
+    def move_picked_up_resource(self, resource, location):
+        """移动已拾取的资源"""
+        self.logger.info(f"移动资源: {resource} 到 {location}")
+        pass
+
+
+def create_laiyu_backend(name: str = "LaiYu_Liquid_Backend") -> LaiYuLiquidBackend:
+    """
+    创建LaiYu液体处理设备后端实例
+    
+    Args:
+        name: 后端名称
+        
+    Returns:
+        LaiYuLiquidBackend: 后端实例
+    """
+    return LaiYuLiquidBackend(name)

unilabos/devices/laiyu_liquid/backend/rviz_backend.py

@@ -0,0 +1,209 @@
+      
+import json
+from typing import List, Optional, Union
+
+from pylabrobot.liquid_handling.backends.backend import (
+  LiquidHandlerBackend,
+)
+from pylabrobot.liquid_handling.standard import (
+  Drop,
+  DropTipRack,
+  MultiHeadAspirationContainer,
+  MultiHeadAspirationPlate,
+  MultiHeadDispenseContainer,
+  MultiHeadDispensePlate,
+  Pickup,
+  PickupTipRack,
+  ResourceDrop,
+  ResourceMove,
+  ResourcePickup,
+  SingleChannelAspiration,
+  SingleChannelDispense,
+)
+from pylabrobot.resources import Resource, Tip
+
+import rclpy
+from rclpy.node import Node
+from sensor_msgs.msg import JointState
+import time
+from rclpy.action import ActionClient
+from unilabos_msgs.action import SendCmd
+import re
+
+from unilabos.devices.ros_dev.liquid_handler_joint_publisher import JointStatePublisher
+
+
+class LiquidHandlerRvizBackend(LiquidHandlerBackend):
+  """Chatter box backend for device-free testing. Prints out all operations."""
+
+  _pip_length = 5
+  _vol_length = 8
+  _resource_length = 20
+  _offset_length = 16
+  _flow_rate_length = 10
+  _blowout_length = 10
+  _lld_z_length = 10
+  _kwargs_length = 15
+  _tip_type_length = 12
+  _max_volume_length = 16
+  _fitting_depth_length = 20
+  _tip_length_length = 16
+  # _pickup_method_length = 20
+  _filter_length = 10
+
+  def __init__(self, num_channels: int = 8):
+    """Initialize a chatter box backend."""
+    super().__init__()
+    self._num_channels = num_channels
+# rclpy.init()
+    if not rclpy.ok():
+        rclpy.init()
+    self.joint_state_publisher = None
+
+  async def setup(self):
+    self.joint_state_publisher = JointStatePublisher()
+    await super().setup()
+  async def stop(self):
+    pass
+
+  def serialize(self) -> dict:
+    return {**super().serialize(), "num_channels": self.num_channels}
+
+  @property
+  def num_channels(self) -> int:
+    return self._num_channels
+
+  async def assigned_resource_callback(self, resource: Resource):
+    pass
+
+  async def unassigned_resource_callback(self, name: str):
+    pass
+
+  async def pick_up_tips(self, ops: List[Pickup], use_channels: List[int], **backend_kwargs):
+
+    for op, channel in zip(ops, use_channels):
+      offset = f"{round(op.offset.x, 1)},{round(op.offset.y, 1)},{round(op.offset.z, 1)}"
+      row = (
+        f"  p{channel}: "
+        f"{op.resource.name[-30:]:<{LiquidHandlerRvizBackend._resource_length}} "
+        f"{offset:<{LiquidHandlerRvizBackend._offset_length}} "
+        f"{op.tip.__class__.__name__:<{LiquidHandlerRvizBackend._tip_type_length}} "
+        f"{op.tip.maximal_volume:<{LiquidHandlerRvizBackend._max_volume_length}} "
+        f"{op.tip.fitting_depth:<{LiquidHandlerRvizBackend._fitting_depth_length}} "
+        f"{op.tip.total_tip_length:<{LiquidHandlerRvizBackend._tip_length_length}} "
+        # f"{str(op.tip.pickup_method)[-20:]:<{ChatterboxBackend._pickup_method_length}} "
+        f"{'Yes' if op.tip.has_filter else 'No':<{LiquidHandlerRvizBackend._filter_length}}"
+      )
+    coordinate = ops[0].resource.get_absolute_location(x="c",y="c")
+    x = coordinate.x
+    y = coordinate.y
+    z = coordinate.z + 70
+    self.joint_state_publisher.send_resource_action(ops[0].resource.name, x, y, z, "pick")
+    #   goback()
+
+
+
+
+  async def drop_tips(self, ops: List[Drop], use_channels: List[int], **backend_kwargs):
+
+    coordinate = ops[0].resource.get_absolute_location(x="c",y="c")
+    x = coordinate.x
+    y = coordinate.y
+    z = coordinate.z + 70
+    self.joint_state_publisher.send_resource_action(ops[0].resource.name, x, y, z, "drop_trash")
+    #   goback()
+
+  async def aspirate(
+    self,
+    ops: List[SingleChannelAspiration],
+    use_channels: List[int],
+    **backend_kwargs,
+  ):
+    # 执行吸液操作
+    pass
+
+    for o, p in zip(ops, use_channels):
+      offset = f"{round(o.offset.x, 1)},{round(o.offset.y, 1)},{round(o.offset.z, 1)}"
+      row = (
+        f"  p{p}: "
+        f"{o.volume:<{LiquidHandlerRvizBackend._vol_length}} "
+        f"{o.resource.name[-20:]:<{LiquidHandlerRvizBackend._resource_length}} "
+        f"{offset:<{LiquidHandlerRvizBackend._offset_length}} "
+        f"{str(o.flow_rate):<{LiquidHandlerRvizBackend._flow_rate_length}} "
+        f"{str(o.blow_out_air_volume):<{LiquidHandlerRvizBackend._blowout_length}} "
+        f"{str(o.liquid_height):<{LiquidHandlerRvizBackend._lld_z_length}} "
+        # f"{o.liquids if o.liquids is not None else 'none'}"
+      )
+      for key, value in backend_kwargs.items():
+        if isinstance(value, list) and all(isinstance(v, bool) for v in value):
+          value = "".join("T" if v else "F" for v in value)
+        if isinstance(value, list):
+          value = "".join(map(str, value))
+        row += f" {value:<15}"
+    coordinate = ops[0].resource.get_absolute_location(x="c",y="c")
+    x = coordinate.x
+    y = coordinate.y
+    z = coordinate.z + 70 
+    self.joint_state_publisher.send_resource_action(ops[0].resource.name, x, y, z, "")
+
+
+  async def dispense(
+    self,
+    ops: List[SingleChannelDispense],
+    use_channels: List[int],
+    **backend_kwargs,
+  ):
+
+    for o, p in zip(ops, use_channels):
+      offset = f"{round(o.offset.x, 1)},{round(o.offset.y, 1)},{round(o.offset.z, 1)}"
+      row = (
+        f"  p{p}: "
+        f"{o.volume:<{LiquidHandlerRvizBackend._vol_length}} "
+        f"{o.resource.name[-20:]:<{LiquidHandlerRvizBackend._resource_length}} "
+        f"{offset:<{LiquidHandlerRvizBackend._offset_length}} "
+        f"{str(o.flow_rate):<{LiquidHandlerRvizBackend._flow_rate_length}} "
+        f"{str(o.blow_out_air_volume):<{LiquidHandlerRvizBackend._blowout_length}} "
+        f"{str(o.liquid_height):<{LiquidHandlerRvizBackend._lld_z_length}} "
+        # f"{o.liquids if o.liquids is not None else 'none'}"
+      )
+      for key, value in backend_kwargs.items():
+        if isinstance(value, list) and all(isinstance(v, bool) for v in value):
+          value = "".join("T" if v else "F" for v in value)
+        if isinstance(value, list):
+          value = "".join(map(str, value))
+        row += f" {value:<{LiquidHandlerRvizBackend._kwargs_length}}"
+    coordinate = ops[0].resource.get_absolute_location(x="c",y="c")
+    x = coordinate.x
+    y = coordinate.y
+    z = coordinate.z + 70
+    self.joint_state_publisher.send_resource_action(ops[0].resource.name, x, y, z, "")
+
+  async def pick_up_tips96(self, pickup: PickupTipRack, **backend_kwargs):
+    pass
+
+  async def drop_tips96(self, drop: DropTipRack, **backend_kwargs):
+    pass
+
+  async def aspirate96(
+    self, aspiration: Union[MultiHeadAspirationPlate, MultiHeadAspirationContainer]
+  ):
+    pass
+
+  async def dispense96(self, dispense: Union[MultiHeadDispensePlate, MultiHeadDispenseContainer]):
+    pass
+
+  async def pick_up_resource(self, pickup: ResourcePickup):
+    # 执行资源拾取操作
+    pass
+
+  async def move_picked_up_resource(self, move: ResourceMove):
+    # 执行资源移动操作
+    pass
+
+  async def drop_resource(self, drop: ResourceDrop):
+    # 执行资源放置操作
+    pass
+
+  def can_pick_up_tip(self, channel_idx: int, tip: Tip) -> bool:
+    return True
+    

unilabos/devices/laiyu_liquid/config/deckconfig.md

@@ -0,0 +1,14 @@
+ goto 171 178 57  H1
+ goto 171 117 57  A1
+ goto 172 178 130
+ goto 173 179 133 
+  goto 173 180 133 
+goto 173 180 138
+goto 173 180 125 （+10mm，在空的上面边缘）
+goto 173 180 130 取不到
+goto 173 180 133 取不到
+goto 173 180 135
+goto 173 180 137 取到了！！！！
+goto 173 180 131 弹出枪头 H1
+
+goto 173 117 137 A1 （+10mm，可以取到新枪头了！！！！）

unilabos/devices/laiyu_liquid/controllers/__init__.py

@@ -0,0 +1,25 @@
+"""
+LaiYu_Liquid 控制器模块
+
+该模块包含了LaiYu_Liquid液体处理工作站的高级控制器：
+- 移液器控制器：提供液体处理的高级接口
+- XYZ运动控制器：提供三轴运动的高级接口
+"""
+
+# 移液器控制器导入
+from .pipette_controller import PipetteController
+
+# XYZ运动控制器导入
+from .xyz_controller import XYZController
+
+__all__ = [
+    # 移液器控制器
+    "PipetteController",
+    
+    # XYZ运动控制器
+    "XYZController",
+]
+
+__version__ = "1.0.0"
+__author__ = "LaiYu_Liquid Controller Team"
+__description__ = "LaiYu_Liquid 高级控制器集合"