device-protocol-sdk 1.2.3__tar.gz → 1.2.4__tar.gz

{device_protocol_sdk-1.2.3 → device_protocol_sdk-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: device_protocol_sdk
-Version: 1.2.3
+Version: 1.2.4
 Summary: 无人设备协议开发SDK
 Author: fuhl
 Requires-Python: >=3.8
@@ -10,7 +10,6 @@ Requires-Dist: grpcio-tools>=1.48.2
 Requires-Dist: paho-mqtt>=1.6.1
 Requires-Dist: pydantic>=1.9.0
 Requires-Dist: websockets>=10.0
-Requires-Dist: coord-convert>=0.2.1
 
 # Device Protocol SDK
 

{device_protocol_sdk-1.2.3 → device_protocol_sdk-1.2.4}/device_protocol_sdk/pusher.py

@@ -8,7 +8,6 @@ import paho.mqtt.client as mqtt
 from . import device_pb2
 from . import device_pb2_grpc
 from .model.device_key import DeviceKey
-from coord_convert import transform
 import math
 
 logger = logging.getLogger(__name__)
@@ -244,10 +243,17 @@ class DevicePusher:
                         # if not status:
                         #     logger.warning(f"设备 {deviceKey} 状态为空")
                             # break
+                        if status is None:
+                            logger.warning(f"设备 {deviceKey} 返回状态为 None")
+                            continue  # 跳过这个设备的处理
 
+                            # 添加对 status 是否为可迭代对象的检查
+                        if not isinstance(status, (list, tuple)):
+                            logger.warning(f"设备 {deviceKey} 状态格式错误: {type(status)}")
+                            continue
                         #将status中的gps坐标系转换 WGS84坐标转换为GCJ02坐标
                         for st in status:
-                            if 'lat' in st and 'lon' in st:
+                            if st and 'lat' in st and 'lon' in st:
                                 lat_wgs84 = st['lat']
                                 lon_wgs84 = st['lon']
                                 lon_gcj02, lat_gcj02 = self.wgs84_to_gcj02(lon_wgs84, lat_wgs84)
@@ -404,40 +410,45 @@ class DevicePusher:
                     mission_id = command_request.mission_id
                     selected_devices = json.loads(command_request.params)
                     result = ""
-
-                    for selected_device in selected_devices:
-                        # 解析参数
-                        device_id = selected_device['device_id']
-                        connection_str = selected_device['connection_str']
-                        deviceKey = DeviceKey(device_id=device_id, connection_str=connection_str)
-                        if mission_id == 'connect':
-                            # 获取或创建设备实例
-                            if deviceKey not in self.devices:
-                                logger.info(f"创建新设备实例: {deviceKey}")
-                                device = self.device_factory()
-                                self.devices[deviceKey] = device
-                                result = "创建连接成功"
-                                # 连接设备
-                                try:
-                                    device.connect(deviceKey)
-                                    if deviceKey not in self.status_tasks:
-                                        self.status_tasks[deviceKey] = asyncio.create_task(
-                                            self._report_status_continuously(self.protocol_name,device, deviceKey))
-                                        logger.info(f"为设备 {deviceKey} 启动状态上报任务")
-                                except Exception as e:
-                                    result = "创建连接失败"
-                                    raise ValueError(f"设备连接失败: {e}")
-                        else:
-                            actions = selected_device['actions']
-                            for action in actions:
-                                command_type = action['command_type']
-                                params = action['parameters']
+                    
+                    # 添加执行模式控制，可以根据需要配置
+                    execute_parallel = False  # 可以改为从配置或命令参数中获取
+                    
+                    if execute_parallel:
+                        #并行
+                        tasks = []
+                        for selected_device in selected_devices:
+                            task = self._process_single_device(selected_device, mission_id, command_request.command_id)
+                            tasks.append(task)
+                        
+                        # 等待所有设备处理完成
+                        results = await asyncio.gather(*tasks, return_exceptions=True)
+                        
+                        # 处理结果
+                        success_results = []
+                        for i, result in enumerate(results):
+                            if isinstance(result, Exception):
+                                logger.error(f"设备 {selected_devices[i]['device_id']} 处理失败: {result}")
+                                # 可以根据需要决定是否继续处理其他设备
+                            else:
+                                success_results.append(result)
+                        
+                        # 合并成功的结果
+                        result = success_results[0] if success_results else ""
+                    else:
+                        #串行
+                        for selected_device in selected_devices:
+                            # 解析参数
+                            device_id = selected_device['device_id']
+                            connection_str = selected_device['connection_str']
+                            deviceKey = DeviceKey(device_id=device_id, connection_str=connection_str)
+                            if mission_id == 'connect':
                                 # 获取或创建设备实例
                                 if deviceKey not in self.devices:
                                     logger.info(f"创建新设备实例: {deviceKey}")
                                     device = self.device_factory()
-                                    device.set_grpc_stub(self.grpc_stub)
                                     self.devices[deviceKey] = device
+                                    result = "创建连接成功"
                                     # 连接设备
                                     try:
                                         device.connect(deviceKey)
@@ -446,25 +457,46 @@ class DevicePusher:
                                                 self._report_status_continuously(self.protocol_name,device, deviceKey))
                                             logger.info(f"为设备 {deviceKey} 启动状态上报任务")
                                     except Exception as e:
+                                        result = "创建连接失败"
                                         raise ValueError(f"设备连接失败: {e}")
-
-                                device = self.devices[deviceKey]
-                                device.set_grpc_stub(self.grpc_stub)
-                                # 执行命令
-                                try:
-                                    result = device.excute_command(device_id, connection_str, command_type, params, mission_id)
-                                except Exception as e:
-                                    raise ValueError(f"命令执行失败: {e}")
-
-                    # 发送成功确认
-                    ack = device_pb2.CommandAck(
-                        command_id=command_request.command_id,
-                        mission_id=mission_id,
-                        success=True,
-                        data=json.dumps(result) if result else ""
-                    )
-                    await command_stream.write(ack)
-                    logger.info(f"命令执行成功: {command_request.command_id}")
+                            else:
+                                actions = selected_device['actions']
+                                for action in actions:
+                                    command_type = action['command_type']
+                                    params = action['parameters']
+                                    # 获取或创建设备实例
+                                    if deviceKey not in self.devices:
+                                        logger.info(f"创建新设备实例: {deviceKey}")
+                                        device = self.device_factory()
+                                        device.set_grpc_stub(self.grpc_stub)
+                                        self.devices[deviceKey] = device
+                                        # 连接设备
+                                        try:
+                                            device.connect(deviceKey)
+                                            if deviceKey not in self.status_tasks:
+                                                self.status_tasks[deviceKey] = asyncio.create_task(
+                                                    self._report_status_continuously(self.protocol_name,device, deviceKey))
+                                                logger.info(f"为设备 {deviceKey} 启动状态上报任务")
+                                        except Exception as e:
+                                            raise ValueError(f"设备连接失败: {e}")
+
+                                    device = self.devices[deviceKey]
+                                    device.set_grpc_stub(self.grpc_stub)
+                                    # 执行命令
+                                    try:
+                                        result = device.excute_command(device_id, connection_str, command_type, params, mission_id)
+                                    except Exception as e:
+                                        raise ValueError(f"命令执行失败: {e}")
+
+                        # 发送成功确认
+                        ack = device_pb2.CommandAck(
+                            command_id=command_request.command_id,
+                            mission_id=mission_id,
+                            success=True,
+                            data=json.dumps(result) if result else ""
+                        )
+                        await command_stream.write(ack)
+                        logger.info(f"命令执行成功: {command_request.command_id}")
 
                 except Exception as e:
                     logger.error(f"处理命令失败: {e}")
@@ -484,6 +516,63 @@ class DevicePusher:
             logger.error(f"命令流处理异常: {e}")
             raise
 
+    async def _process_single_device(self, selected_device, mission_id, command_id):
+        """处理单个设备的通用逻辑"""
+        # 解析参数
+        device_id = selected_device['device_id']
+        connection_str = selected_device['connection_str']
+        deviceKey = DeviceKey(device_id=device_id, connection_str=connection_str)
+        
+        if mission_id == 'connect':
+            # 获取或创建设备实例
+            if deviceKey not in self.devices:
+                logger.info(f"创建新设备实例: {deviceKey}")
+                device = self.device_factory()
+                self.devices[deviceKey] = device
+                result = "创建连接成功"
+                # 连接设备
+                try:
+                    device.connect(deviceKey)
+                    if deviceKey not in self.status_tasks:
+                        self.status_tasks[deviceKey] = asyncio.create_task(
+                            self._report_status_continuously(self.protocol_name, device, deviceKey))
+                        logger.info(f"为设备 {deviceKey} 启动状态上报任务")
+                except Exception as e:
+                    result = "创建连接失败"
+                    raise ValueError(f"设备连接失败: {e}")
+            return result
+        else:
+            actions = selected_device['actions']
+            final_result = ""
+            for action in actions:
+                command_type = action['command_type']
+                params = action['parameters']
+                # 获取或创建设备实例
+                if deviceKey not in self.devices:
+                    logger.info(f"创建新设备实例: {deviceKey}")
+                    device = self.device_factory()
+                    device.set_grpc_stub(self.grpc_stub)
+                    self.devices[deviceKey] = device
+                    # 连接设备
+                    try:
+                        device.connect(deviceKey)
+                        if deviceKey not in self.status_tasks:
+                            self.status_tasks[deviceKey] = asyncio.create_task(
+                                self._report_status_continuously(self.protocol_name, device, deviceKey))
+                            logger.info(f"为设备 {deviceKey} 启动状态上报任务")
+                    except Exception as e:
+                        raise ValueError(f"设备连接失败: {e}")
+
+                device = self.devices[deviceKey]
+                device.set_grpc_stub(self.grpc_stub)
+                # 执行命令
+                try:
+                    result = device.excute_command(device_id, connection_str, command_type, params, mission_id)
+                    final_result = result
+                except Exception as e:
+                    raise ValueError(f"命令执行失败: {e}")
+            return final_result
+    
     def _update_all_devices_grpc_stub(self):
         """更新所有设备实例的grpc_stub"""
         for device_key, device in self.devices.items():

{device_protocol_sdk-1.2.3 → device_protocol_sdk-1.2.4}/device_protocol_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: device_protocol_sdk
-Version: 1.2.3
+Version: 1.2.4
 Summary: 无人设备协议开发SDK
 Author: fuhl
 Requires-Python: >=3.8
@@ -10,7 +10,6 @@ Requires-Dist: grpcio-tools>=1.48.2
 Requires-Dist: paho-mqtt>=1.6.1
 Requires-Dist: pydantic>=1.9.0
 Requires-Dist: websockets>=10.0
-Requires-Dist: coord-convert>=0.2.1
 
 # Device Protocol SDK
 

{device_protocol_sdk-1.2.3 → device_protocol_sdk-1.2.4}/device_protocol_sdk.egg-info/requires.txt

@@ -3,4 +3,3 @@ grpcio-tools>=1.48.2
 paho-mqtt>=1.6.1
 pydantic>=1.9.0
 websockets>=10.0
-coord-convert>=0.2.1

{device_protocol_sdk-1.2.3 → device_protocol_sdk-1.2.4}/setup.py

@@ -7,7 +7,7 @@ long_description = readme_path.read_text(encoding="utf-8")
 
 setup(
     name="device_protocol_sdk",
-    version="1.2.3",
+    version="1.2.4",
     packages=find_packages(include=["sdk*", "device_protocol_sdk*"]),
     install_requires=[
         "grpcio>=1.48.2",  # gRPC 运行时依赖
@@ -15,7 +15,6 @@ setup(
         "paho-mqtt>=1.6.1",  # MQTT 客户端
         "pydantic>=1.9.0",  # 数据验证和设置管理
         "websockets>=10.0",  # Websocket 支持
-        "coord-convert>=0.2.1",
     ],
     python_requires=">=3.8",
     author="fuhl",