v0.10.3

.conda/recipe.yaml

@@ -1,26 +1,30 @@
 package:
   name: unilabos
-  version: 0.10.2
+  version: 0.10.3
 
 source:
   path: ../unilabos
   target_directory: unilabos
 
 build:
+  python:
+    entry_points:
+     - unilab = unilabos.app.main:main
+     - unilab-register = unilabos.app.register: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%
-    - python -m pip install %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
+    - $PYTHON -m pip install $SRC_DIR
 
 
 requirements:

recipes/msgs/bld_ament_cmake.bat

@@ -1,6 +1,7 @@
-::Generated by vinca http://github.com/RoboStack/vinca.
+:: Generated by vinca http://github.com/RoboStack/vinca.
 :: DO NOT EDIT!
-setlocal EnableDelayedExpansion
+@echo off
+setlocal enabledelayedexpansion
 
 set "PYTHONPATH=%LIBRARY_PREFIX%\lib\site-packages;%SP_DIR%"
 
@@ -16,10 +17,11 @@ pushd build
 
 :: try to fix long paths issues by using default generator
 set "CMAKE_GENERATOR=Visual Studio %VS_MAJOR% %VS_YEAR%"
-set "SP_DIR_FORWARDSLASHES=%SP_DIR:\=/%"
 
 set PYTHON="%PREFIX%\python.exe"
-set PYTHON=%PYTHON:\=\\%
+set PYTHON=%PYTHON:\=/%
+set SP_DIR="..\Lib\site-packages"
+set SP_DIR=%SP_DIR:\=/%
 
 cmake ^
     -G "%CMAKE_GENERATOR%" ^
@@ -33,12 +35,10 @@ cmake ^
     -DBUILD_SHARED_LIBS=ON ^
     -DBUILD_TESTING=OFF ^
     -DCMAKE_OBJECT_PATH_MAX=255 ^
-    -DPYTHON_INSTALL_DIR=%SP_DIR_FORWARDSLASHES% ^
+    -DPYTHON_INSTALL_DIR=%SP_DIR% ^
     --compile-no-warning-as-error ^
     %SRC_DIR%\src
-
 if errorlevel 1 exit 1
 
-cmake --build . --config Release --target install
-
-if errorlevel 1 exit 1
+cmake --build . --config Release --target install -j8
+if errorlevel 1 exit 1

recipes/msgs/build_ament_cmake.sh

@@ -56,7 +56,6 @@ cmake \
     -DPYTHON_EXECUTABLE=$PYTHON_EXECUTABLE \
     -DPython_EXECUTABLE=$PYTHON_EXECUTABLE \
     -DPython3_EXECUTABLE=$PYTHON_EXECUTABLE \
-    -DPython3_FIND_STRATEGY=LOCATION \
     -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG_EXECUTABLE \
     -DPYTHON_INSTALL_DIR=$FIXED_SP_DIR \
     -DSETUPTOOLS_DEB_LAYOUT=OFF \
@@ -68,4 +67,4 @@ cmake \
     --compile-no-warning-as-error \
     $SRC_DIR/src
 
-cmake --build . --config Release --target install
+cmake --build . --config Release --target install -j8

recipes/msgs/recipe.yaml

@@ -1,6 +1,6 @@
 package:
   name: ros-humble-unilabos-msgs
-  version: 0.10.2
+  version: 0.10.3
 source:
   path: ../../unilabos_msgs
   target_directory: src
@@ -23,14 +23,14 @@ about:
 
 requirements:
   build:
+  - ${{ compiler('cxx') }}
+  - ${{ compiler('c') }}
+  - python ==3.11.11
+  - numpy
   - if: build_platform != target_platform
     then:
     - pkg-config
-    - python ==3.11.11
     - cross-python_${{ target_platform }}
-    - numpy
-  - ${{ compiler('cxx') }}
-  - ${{ compiler('c') }}
   - if: linux and x86_64
     then:
     - sysroot_linux-64 ==2.17

recipes/unilabos/recipe.yaml

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

setup.py

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

unilabos/app/register.py

@@ -18,6 +18,11 @@ def register_devices_and_resources(mqtt_client, lab_registry):
         mqtt_client.publish_registry(device_info["id"], device_info, False)
         logger.debug(f"[UniLab Register] 注册设备: {device_info['id']}")
 
+    # # 注册资源信息
+    # for resource_info in lab_registry.obtain_registry_resource_info():
+    #     mqtt_client.publish_registry(resource_info["id"], resource_info, False)
+    #     logger.debug(f"[UniLab Register] 注册资源: {resource_info['id']}")
+
     # 注册资源信息 - 使用HTTP方式
     from unilabos.app.web.client import http_client
 

unilabos_msgs/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>unilabos_msgs</name>
-  <version>0.10.2</version>
+  <version>0.10.3</version>
   <description>ROS2 Messages package for unilabos devices</description>
   <maintainer email="changjh@pku.edu.cn">Junhan Chang</maintainer>
   <license>MIT</license>