更新构建

.conda/recipe.yaml

@@ -1,13 +1,12 @@
 package:
   name: unilabos
-  version: 0.10.1
+  version: 0.10.2
 
 source:
   path: ../unilabos
   target_directory: unilabos
 
 build:
-  noarch: python
   script:
   - set PIP_NO_INDEX=
   - if: win
@@ -33,8 +32,10 @@ requirements:
   - conda-forge::python ==3.11.11
   - compilers
   - cmake
-  - make
   - ninja
+  - if: unix
+    then:
+    - make
   - sphinx
   - sphinx_rtd_theme
   - numpy

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

@@ -8,6 +8,10 @@ on:
     branches: [main, dev]
   workflow_dispatch:
     inputs:
+      platforms:
+        description: '选择构建平台 (逗号分隔): linux-64, osx-64, osx-arm64, win-64'
+        required: false
+        default: 'linux-64'
       upload_to_anaconda:
         description: '是否上传到Anaconda.org'
         required: false
@@ -16,7 +20,20 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: linux-64
+          - os: macos-13 # Intel
+            platform: osx-64
+          - os: macos-latest # ARM64
+            platform: osx-arm64
+          - os: windows-latest
+            platform: win-64
+
+    runs-on: ${{ matrix.os }}
 
     defaults:
       run:
@@ -27,7 +44,21 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Check if platform should be built
+        id: should_build
+        run: |
+          if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then
+            echo "should_build=true" >> $GITHUB_OUTPUT
+          elif [[ -z "${{ github.event.inputs.platforms }}" ]]; then
+            echo "should_build=true" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event.inputs.platforms }}" == *"${{ matrix.platform }}"* ]]; then
+            echo "should_build=true" >> $GITHUB_OUTPUT
+          else
+            echo "should_build=false" >> $GITHUB_OUTPUT
+          fi
+
       - name: Setup Miniconda
+        if: steps.should_build.outputs.should_build == 'true'
         uses: conda-incubator/setup-miniconda@v3
         with:
           miniconda-version: 'latest'
@@ -39,38 +70,47 @@ jobs:
           show-channel-urls: true
 
       - name: Install rattler-build and anaconda-client
+        if: steps.should_build.outputs.should_build == 'true'
         run: |
           conda install -c conda-forge rattler-build anaconda-client
 
       - name: Show environment info
+        if: steps.should_build.outputs.should_build == 'true'
         run: |
           conda info
           conda list | grep -E "(rattler-build|anaconda-client)"
+          echo "Platform: ${{ matrix.platform }}"
+          echo "OS: ${{ matrix.os }}"
           echo "Building UniLabOS package"
 
       - name: Build conda package
+        if: steps.should_build.outputs.should_build == 'true'
         run: |
           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'
         run: |
           echo "Built packages in output directory:"
           find ./output -name "*.conda" | head -10
+          ls -la ./output/${{ matrix.platform }}/ || echo "${{ matrix.platform }} directory not found"
           ls -la ./output/noarch/ || echo "noarch directory not found"
           echo "Output directory structure:"
           find ./output -type f -name "*.conda"
 
       - name: Prepare artifacts for upload
+        if: steps.should_build.outputs.should_build == 'true'
         run: |
           mkdir -p conda-packages-temp
           find ./output -name "*.conda" -exec cp {} conda-packages-temp/ \;
           echo "Copied files to temp directory:"
           ls -la conda-packages-temp/
 
       - name: Upload conda package artifacts
+        if: steps.should_build.outputs.should_build == 'true'
         uses: actions/upload-artifact@v4
         with:
-          name: conda-package-unilabos
+          name: conda-package-unilabos-${{ matrix.platform }}
           path: conda-packages-temp
           if-no-files-found: warn
           retention-days: 30

recipes/msgs/recipe.yaml

@@ -1,6 +1,6 @@
 package:
   name: ros-humble-unilabos-msgs
-  version: 0.10.1
+  version: 0.10.2
 source:
   path: ../../unilabos_msgs
   target_directory: src

recipes/unilabos/recipe.yaml

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

setup.py

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

unilabos/app/main.py

@@ -43,10 +43,11 @@ def convert_argv_dashes_to_underscores(args: argparse.ArgumentParser):
     for i, arg in enumerate(sys.argv):
         for option_string in option_strings:
             if arg.startswith(option_string):
-                new_arg = arg[:2] + arg[2:len(option_string)].replace("-", "_") + arg[len(option_string):]
+                new_arg = arg[:2] + arg[2 : len(option_string)].replace("-", "_") + arg[len(option_string) :]
                 sys.argv[i] = new_arg
                 break
 
+
 def parse_args():
     """解析命令行参数"""
     parser = argparse.ArgumentParser(description="Start Uni-Lab Edge server.")
@@ -128,6 +129,11 @@ def parse_args():
         default="",
         help="实验室唯一ID，也可通过环境变量 UNILABOS_MQCONFIG_LABID 设置或传入--config设置",
     )
+    parser.add_argument(
+        "--skip_env_check",
+        action="store_true",
+        help="跳过启动时的环境依赖检查",
+    )
     return parser
 
 
@@ -138,6 +144,17 @@ def main():
     convert_argv_dashes_to_underscores(args)
     args_dict = vars(args.parse_args())
 
+    # 环境检查 - 检查并自动安装必需的包 (可选)
+    if not args_dict.get("skip_env_check", False):
+        from unilabos.utils.environment_check import check_environment
+
+        print_status("正在进行环境依赖检查...", "info")
+        if not check_environment(auto_install=True):
+            print_status("环境检查失败，程序退出", "error")
+            os._exit(1)
+    else:
+        print_status("跳过环境依赖检查", "warning")
+
     # 加载配置文件，优先加载config，然后从env读取
     config_path = args_dict.get("config")
     if os.getcwd().endswith("unilabos_data"):
@@ -151,17 +168,22 @@ def main():
             if not os.path.exists(config_path):
                 print_status(
                     f"当前工作目录 {working_dir} 未找到local_config.py，请通过 --config 传入 local_config.py 文件路径",
-                    "error")
+                    "error",
+                )
                 os._exit(1)
     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 config_path and (not os.path.exists(working_dir) or not os.path.exists(os.path.join(working_dir, "local_config.py"))):
+    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")
         print_status(f"您是否为第一次使用？并将当前路径 {working_dir} 作为工作目录？ (Y/n)", "info")
         if input() != "n":
             os.makedirs(working_dir, exist_ok=True)
             config_path = os.path.join(working_dir, "local_config.py")
-            shutil.copy(os.path.join(os.path.dirname(os.path.dirname(__file__)), "config", "example_config.py"), config_path)
+            shutil.copy(
+                os.path.join(os.path.dirname(os.path.dirname(__file__)), "config", "example_config.py"), config_path
+            )
             print_status(f"已创建 local_config.py 路径： {config_path}", "info")
             print_status(f"请在文件夹中配置lab_id，放入下载的CA.crt、lab.crt、lab.key重新启动本程序", "info")
             os._exit(1)

unilabos/utils/__init__.py

@@ -1,7 +1,8 @@
 from unilabos.utils.log import logger
+from unilabos.utils.environment_check import check_environment, EnvironmentChecker
 
 # 确保日志配置在导入utils包时自动应用
 # 这样任何导入utils包或其子模块的代码都会自动配置好日志
 
-# 导出logger，使其可以通过from unilabos.utils import logger直接导入
-__all__ = ['logger']
+# 导出logger和环境检查工具，使其可以直接导入
+__all__ = ["logger", "check_environment", "EnvironmentChecker"]