mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-14 13:14:39 +00:00
* Cleanup registry to be easy-understanding (#76) * delete deprecated mock devices * rename categories * combine chromatographic devices * rename rviz simulation nodes * organic virtual devices * parse vessel_id * run registry completion before merge --------- Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com> * fix: workstation handlers and vessel_id parsing * fix: working dir error when input config path feat: report publish topic when error * modify default discovery_interval to 15s * feat: add trace log level * feat: 添加ChinWe设备控制类,支持串口通信和电机控制功能 (#79) * fix: drop_tips not using auto resource select * fix: discard_tips error * fix: discard_tips * fix: prcxi_res * add: prcxi res fix: startup slow * feat: workstation example * fix pumps and liquid_handler handle * feat: 优化protocol node节点运行日志 * fix all protocol_compilers and remove deprecated devices * feat: 新增use_remote_resource参数 * fix and remove redundant info * bugfixes on organic protocols * fix filter protocol * fix protocol node * 临时兼容错误的driver写法 * fix: prcxi import error * use call_async in all service to avoid deadlock * fix: figure_resource * Update recipe.yaml * add workstation template and battery example * feat: add sk & ak * update workstation base * Create workstation_architecture.md * refactor: workstation_base 重构为仅含业务逻辑,通信和子设备管理交给 ProtocolNode * refactor: ProtocolNode→WorkstationNode * Add:msgs.action (#83) * update: Workstation dev 将版本号从 0.10.3 更新为 0.10.4 (#84) * Add:msgs.action * update: 将版本号从 0.10.3 更新为 0.10.4 * simplify resource system * uncompleted refactor * example for use WorkstationBase * feat: websocket * feat: websocket test * feat: workstation example * feat: action status * fix: station自己的方法注册错误 * fix: 还原protocol node处理方法 * fix: build * fix: missing job_id key * ws test version 1 * ws test version 2 * ws protocol * 增加物料关系上传日志 * 增加物料关系上传日志 * 修正物料关系上传 * 修复工站的tracker实例追踪失效问题 * 增加handle检测,增加material edge关系上传 * 修复event loop错误 * 修复edge上报错误 * 修复async错误 * 更新schema的title字段 * 主机节点信息等支持自动刷新 * 注册表编辑器 * 修复status密集发送时,消息出错 * 增加addr参数 * fix: addr param * fix: addr param * 取消labid 和 强制config输入 * Add action definitions for LiquidHandlerSetGroup and LiquidHandlerTransferGroup - Created LiquidHandlerSetGroup.action with fields for group name, wells, and volumes. - Created LiquidHandlerTransferGroup.action with fields for source and target group names and unit volume. - Both actions include response fields for return information and success status. * Add LiquidHandlerSetGroup and LiquidHandlerTransferGroup actions to CMakeLists * Add set_group and transfer_group methods to PRCXI9300Handler and update liquid_handler.yaml * result_info改为字典类型 * 新增uat的地址替换 * runze multiple pump support (cherry picked from commit49354fcf39) * remove runze multiple software obtainer (cherry picked from commit8bcc92a394) * support multiple backbone (cherry picked from commit4771ff2347) * Update runze pump format * Correct runze multiple backbone * Update runze_multiple_backbone * Correct runze pump multiple receive method. * Correct runze pump multiple receive method. * 对于PRCXI9320的transfer_group,一对多和多对多 * 移除MQTT,更新launch文档,提供注册表示例文件,更新到0.10.5 * fix import error * fix dupe upload registry * refactor ws client * add server timeout * Fix: run-column with correct vessel id (#86) * fix run_column * Update run_column_protocol.py (cherry picked from commite5aa4d940a) * resource_update use resource_add * 新增版位推荐功能 * 重新规定了版位推荐的入参 * update registry with nested obj * fix protocol node log_message, added create_resource return value * fix protocol node log_message, added create_resource return value * try fix add protocol * fix resource_add * 修复移液站错误的aspirate注册表 * Feature/xprbalance-zhida (#80) * feat(devices): add Zhida GC/MS pretreatment automation workstation * feat(devices): add mettler_toledo xpr balance * balance * 重新补全zhida注册表 * PRCXI9320 json * PRCXI9320 json * PRCXI9320 json * fix resource download * remove class for resource * bump version to 0.10.6 * 更新所有注册表 * 修复protocolnode的兼容性 * 修复protocolnode的兼容性 * Update install md * Add Defaultlayout * 更新物料接口 * fix dict to tree/nested-dict converter * coin_cell_station draft * refactor: rename "station_resource" to "deck" * add standardized BIOYOND resources: bottle_carrier, bottle * refactor and add BIOYOND resources tests * add BIOYOND deck assignment and pass all tests * fix: update resource with correct structure; remove deprecated liquid_handler set_group action * feat: 将新威电池测试系统驱动与配置文件并入 workstation_dev_YB2 (#92) * feat: 新威电池测试系统驱动与注册文件 * feat: bring neware driver & battery.json into workstation_dev_YB2 * add bioyond studio draft * bioyond station with communication init and resource sync * fix bioyond station and registry * fix: update resource with correct structure; remove deprecated liquid_handler set_group action * frontend_docs * create/update resources with POST/PUT for big amount/ small amount data * create/update resources with POST/PUT for big amount/ small amount data * refactor: add itemized_carrier instead of carrier consists of ResourceHolder * create warehouse by factory func * update bioyond launch json * add child_size for itemized_carrier * fix bioyond resource io * Workstation templates: Resources and its CRUD, and workstation tasks (#95) * coin_cell_station draft * refactor: rename "station_resource" to "deck" * add standardized BIOYOND resources: bottle_carrier, bottle * refactor and add BIOYOND resources tests * add BIOYOND deck assignment and pass all tests * fix: update resource with correct structure; remove deprecated liquid_handler set_group action * feat: 将新威电池测试系统驱动与配置文件并入 workstation_dev_YB2 (#92) * feat: 新威电池测试系统驱动与注册文件 * feat: bring neware driver & battery.json into workstation_dev_YB2 * add bioyond studio draft * bioyond station with communication init and resource sync * fix bioyond station and registry * create/update resources with POST/PUT for big amount/ small amount data * refactor: add itemized_carrier instead of carrier consists of ResourceHolder * create warehouse by factory func * update bioyond launch json * add child_size for itemized_carrier * fix bioyond resource io --------- Co-authored-by: h840473807 <47357934+h840473807@users.noreply.github.com> Co-authored-by: Xie Qiming <97236197+Andy6M@users.noreply.github.com> * 更新物料接口 * Workstation dev yb2 (#100) * Refactor and extend reaction station action messages * Refactor dispensing station tasks to enhance parameter clarity and add batch processing capabilities - Updated `create_90_10_vial_feeding_task` to include detailed parameters for 90%/10% vial feeding, improving clarity and usability. - Introduced `create_batch_90_10_vial_feeding_task` for batch processing of 90%/10% vial feeding tasks with JSON formatted input. - Added `create_batch_diamine_solution_task` for batch preparation of diamine solution, also utilizing JSON formatted input. - Refined `create_diamine_solution_task` to include additional parameters for better task configuration. - Enhanced schema descriptions and default values for improved user guidance. * 修复to_plr_resources * add update remove * 支持选择器注册表自动生成 支持转运物料 * 修复资源添加 * 修复transfer_resource_to_another生成 * 更新transfer_resource_to_another参数,支持spot入参 * 新增test_resource动作 * fix host_node error * fix host_node test_resource error * fix host_node test_resource error * 过滤本地动作 * 移动内部action以兼容host node * 修复同步任务报错不显示的bug * feat: 允许返回非本节点物料,后面可以通过decoration进行区分,就不进行warning了 * update todo * modify bioyond/plr converter, bioyond resource registry, and tests * pass the tests * update todo * add conda-pack-build.yml * add auto install script for conda-pack-build.yml (cherry picked from commit172599adcf) * update conda-pack-build.yml * update conda-pack-build.yml * update conda-pack-build.yml * update conda-pack-build.yml * update conda-pack-build.yml * Add version in __init__.py Update conda-pack-build.yml Add create_zip_archive.py * Update conda-pack-build.yml * Update conda-pack-build.yml (with mamba) * Update conda-pack-build.yml * Fix FileNotFoundError * Try fix 'charmap' codec can't encode characters in position 16-23: character maps to <undefined> * Fix unilabos msgs search error * Fix environment_check.py * Update recipe.yaml * Update registry. Update uuid loop figure method. Update install docs. * Fix nested conda pack * Fix one-key installation path error * Bump version to 0.10.7 * Workshop bj (#99) * Add LaiYu Liquid device integration and tests Introduce LaiYu Liquid device implementation, including backend, controllers, drivers, configuration, and resource files. Add hardware connection, tip pickup, and simplified test scripts, as well as experiment and registry configuration for LaiYu Liquid. Documentation and .gitignore for the device are also included. * feat(LaiYu_Liquid): 重构设备模块结构并添加硬件文档 refactor: 重新组织LaiYu_Liquid模块目录结构 docs: 添加SOPA移液器和步进电机控制指令文档 fix: 修正设备配置中的最大体积默认值 test: 新增工作台配置测试用例 chore: 删除过时的测试脚本和配置文件 * add * 重构: 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py 并更新所有导入引用 - 使用 git mv 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py - 更新所有相关文件中的导入引用 - 保持代码功能不变,仅改善命名一致性 - 测试确认所有导入正常工作 * 修复: 在 core/__init__.py 中添加 LaiYuLiquidBackend 导出 - 添加 LaiYuLiquidBackend 到导入列表 - 添加 LaiYuLiquidBackend 到 __all__ 导出列表 - 确保所有主要类都可以正确导入 * 修复大小写文件夹名字 * 电池装配工站二次开发教程(带目录)上传至dev (#94) * 电池装配工站二次开发教程 * Update intro.md * 物料教程 * 更新物料教程,json格式注释 * Update prcxi driver & fix transfer_liquid mix_times (#90) * Update prcxi driver & fix transfer_liquid mix_times * fix: correct mix_times type * Update liquid_handler registry * test: prcxi.py * Update registry from pr * fix ony-key script not exist * clean files --------- Co-authored-by: Junhan Chang <changjh@dp.tech> Co-authored-by: ZiWei <131428629+ZiWei09@users.noreply.github.com> Co-authored-by: Guangxin Zhang <guangxin.zhang.bio@gmail.com> Co-authored-by: Xie Qiming <97236197+Andy6M@users.noreply.github.com> Co-authored-by: h840473807 <47357934+h840473807@users.noreply.github.com> Co-authored-by: LccLink <1951855008@qq.com> Co-authored-by: lixinyu1011 <61094742+lixinyu1011@users.noreply.github.com> Co-authored-by: shiyubo0410 <shiyubo@dp.tech>
323 lines
11 KiB
Python
323 lines
11 KiB
Python
"""
|
||
HTTP客户端模块
|
||
|
||
提供与远程服务器通信的客户端功能,只有host需要用
|
||
"""
|
||
|
||
import json
|
||
import os
|
||
from typing import List, Dict, Any, Optional
|
||
|
||
import requests
|
||
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
|
||
|
||
|
||
class HTTPClient:
|
||
"""HTTP客户端,用于与远程服务器通信"""
|
||
|
||
def __init__(self, remote_addr: Optional[str] = None, auth: Optional[str] = None) -> None:
|
||
"""
|
||
初始化HTTP客户端
|
||
|
||
Args:
|
||
remote_addr: 远程服务器地址,如果不提供则从配置中获取
|
||
auth: 授权信息
|
||
"""
|
||
self.initialized = False
|
||
self.remote_addr = remote_addr or HTTPConfig.remote_addr
|
||
if auth is not None:
|
||
self.auth = auth
|
||
else:
|
||
auth_secret = BasicConfig.auth_secret()
|
||
self.auth = auth_secret
|
||
info(f"正在使用ak sk作为授权信息:[{auth_secret}]")
|
||
info(f"HTTPClient 初始化完成: remote_addr={self.remote_addr}")
|
||
|
||
def resource_edge_add(self, resources: List[Dict[str, Any]]) -> requests.Response:
|
||
"""
|
||
添加资源
|
||
|
||
Args:
|
||
resources: 要添加的资源列表
|
||
database_process_later: 后台处理资源
|
||
Returns:
|
||
Response: API响应对象
|
||
"""
|
||
response = requests.post(
|
||
f"{self.remote_addr}/edge/material/edge",
|
||
json={
|
||
"edges": resources,
|
||
},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
if response.status_code == 200:
|
||
res = response.json()
|
||
if "code" in res and res["code"] != 0:
|
||
logger.error(f"添加物料关系失败: {response.text}")
|
||
if response.status_code != 200 and response.status_code != 201:
|
||
logger.error(f"添加物料关系失败: {response.status_code}, {response.text}")
|
||
return response
|
||
|
||
def resource_tree_add(self, resources: ResourceTreeSet, mount_uuid: str, first_add: bool) -> Dict[str, str]:
|
||
"""
|
||
添加资源
|
||
|
||
Args:
|
||
resources: 要添加的资源树集合(ResourceTreeSet)
|
||
mount_uuid: 要挂载的资源的uuid
|
||
first_add: 是否为首次添加资源,可以是host也可以是slave来的
|
||
Returns:
|
||
Dict[str, str]: 旧UUID到新UUID的映射关系 {old_uuid: new_uuid}
|
||
"""
|
||
# 从序列化数据中提取所有节点的UUID(保存旧UUID)
|
||
old_uuids = {n.res_content.uuid: n for n in resources.all_nodes}
|
||
if not self.initialized or first_add:
|
||
self.initialized = True
|
||
info(f"首次添加资源,当前远程地址: {self.remote_addr}")
|
||
response = requests.post(
|
||
f"{self.remote_addr}/edge/material",
|
||
json={"nodes": [x for xs in resources.dump() for x in xs], "mount_uuid": mount_uuid},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
else:
|
||
response = requests.put(
|
||
f"{self.remote_addr}/edge/material",
|
||
json={"nodes": [x for xs in resources.dump() for x in xs], "mount_uuid": mount_uuid},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
|
||
# 处理响应,构建UUID映射
|
||
uuid_mapping = {}
|
||
if response.status_code == 200:
|
||
res = response.json()
|
||
if "code" in res and res["code"] != 0:
|
||
logger.error(f"添加物料失败: {response.text}")
|
||
else:
|
||
data = res["data"]
|
||
for i in data:
|
||
uuid_mapping[i["uuid"]] = i["cloud_uuid"]
|
||
else:
|
||
logger.error(f"添加物料失败: {response.text}")
|
||
for u, n in old_uuids.items():
|
||
if u in uuid_mapping:
|
||
n.res_content.uuid = uuid_mapping[u]
|
||
for c in n.children:
|
||
c.res_content.parent_uuid = n.res_content.uuid
|
||
else:
|
||
logger.warning(f"资源UUID未更新: {u}")
|
||
return uuid_mapping
|
||
|
||
def resource_tree_get(self, uuid_list: List[str], with_children: bool) -> List[Dict[str, Any]]:
|
||
"""
|
||
添加资源
|
||
|
||
Args:
|
||
uuid_list: List[str]
|
||
Returns:
|
||
Dict[str, str]: 旧UUID到新UUID的映射关系 {old_uuid: new_uuid}
|
||
"""
|
||
response = requests.post(
|
||
f"{self.remote_addr}/edge/material/query",
|
||
json={"uuids": uuid_list, "with_children": with_children},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
if response.status_code == 200:
|
||
res = response.json()
|
||
if "code" in res and res["code"] != 0:
|
||
logger.error(f"查询物料失败: {response.text}")
|
||
else:
|
||
data = res["data"]["nodes"]
|
||
return data
|
||
else:
|
||
logger.error(f"查询物料失败: {response.text}")
|
||
return []
|
||
|
||
def resource_add(self, resources: List[Dict[str, Any]]) -> requests.Response:
|
||
"""
|
||
添加资源
|
||
|
||
Args:
|
||
resources: 要添加的资源列表
|
||
Returns:
|
||
Response: API响应对象
|
||
"""
|
||
if not self.initialized:
|
||
self.initialized = True
|
||
info(f"首次添加资源,当前远程地址: {self.remote_addr}")
|
||
response = requests.post(
|
||
f"{self.remote_addr}/lab/material",
|
||
json={"nodes": resources},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
else:
|
||
response = requests.put(
|
||
f"{self.remote_addr}/lab/material",
|
||
json={"nodes": resources},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
if response.status_code == 200:
|
||
res = response.json()
|
||
if "code" in res and res["code"] != 0:
|
||
logger.error(f"添加物料失败: {response.text}")
|
||
if response.status_code != 200:
|
||
logger.error(f"添加物料失败: {response.text}")
|
||
return response
|
||
|
||
def resource_get(self, id: str, with_children: bool = False) -> Dict[str, Any]:
|
||
"""
|
||
获取资源
|
||
|
||
Args:
|
||
id: 资源ID
|
||
with_children: 是否包含子资源
|
||
|
||
Returns:
|
||
Dict: 返回的资源数据
|
||
"""
|
||
response = requests.get(
|
||
f"{self.remote_addr}/lab/material",
|
||
params={"id": id, "with_children": with_children},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=20,
|
||
)
|
||
return response.json()
|
||
|
||
def resource_del(self, id: str) -> requests.Response:
|
||
"""
|
||
删除资源
|
||
|
||
Args:
|
||
id: 要删除的资源ID
|
||
|
||
Returns:
|
||
Response: API响应对象
|
||
"""
|
||
response = requests.delete(
|
||
f"{self.remote_addr}/lab/resource/batch_delete/",
|
||
params={"id": id},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=20,
|
||
)
|
||
return response
|
||
|
||
def resource_update(self, resources: List[Dict[str, Any]]) -> requests.Response:
|
||
"""
|
||
更新资源
|
||
|
||
Args:
|
||
resources: 要更新的资源列表
|
||
|
||
Returns:
|
||
Response: API响应对象
|
||
"""
|
||
if not self.initialized:
|
||
self.initialized = True
|
||
info(f"首次添加资源,当前远程地址: {self.remote_addr}")
|
||
response = requests.post(
|
||
f"{self.remote_addr}/lab/material",
|
||
json={"nodes": resources},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
else:
|
||
response = requests.put(
|
||
f"{self.remote_addr}/lab/material",
|
||
json={"nodes": resources},
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=100,
|
||
)
|
||
if response.status_code == 200:
|
||
res = response.json()
|
||
if "code" in res and res["code"] != 0:
|
||
logger.error(f"添加物料失败: {response.text}")
|
||
if response.status_code != 200:
|
||
logger.error(f"添加物料失败: {response.text}")
|
||
return response.json()
|
||
|
||
def upload_file(self, file_path: str, scene: str = "models") -> requests.Response:
|
||
"""
|
||
上传文件到服务器
|
||
|
||
使用multipart/form-data格式上传文件,类似curl -F "files=@filepath"
|
||
|
||
Args:
|
||
file_path: 要上传的文件路径
|
||
scene: 上传场景,可选值为"user"或"models",默认为"models"
|
||
|
||
Returns:
|
||
Response: API响应对象
|
||
"""
|
||
with open(file_path, "rb") as file:
|
||
files = {"files": file}
|
||
logger.info(f"上传文件: {file_path} 到 {scene}")
|
||
response = requests.post(
|
||
f"{self.remote_addr}/api/account/file_upload/{scene}",
|
||
files=files,
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=30, # 上传文件可能需要更长的超时时间
|
||
)
|
||
return response
|
||
|
||
def resource_registry(self, registry_data: Dict[str, Any] | List[Dict[str, Any]]) -> requests.Response:
|
||
"""
|
||
注册资源到服务器
|
||
|
||
Args:
|
||
registry_data: 注册表数据,格式为 {resource_id: resource_info} / [{resource_info}]
|
||
|
||
Returns:
|
||
Response: API响应对象
|
||
"""
|
||
response = requests.post(
|
||
f"{self.remote_addr}/lab/resource",
|
||
json=registry_data,
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=30,
|
||
)
|
||
if response.status_code not in [200, 201]:
|
||
logger.error(f"注册资源失败: {response.status_code}, {response.text}")
|
||
return response
|
||
|
||
def request_startup_json(self) -> Optional[Dict[str, Any]]:
|
||
"""
|
||
请求启动配置
|
||
|
||
Args:
|
||
startup_json: 启动配置JSON数据
|
||
|
||
Returns:
|
||
Response: API响应对象
|
||
"""
|
||
response = requests.get(
|
||
f"{self.remote_addr}/edge/material/download",
|
||
headers={"Authorization": f"Lab {self.auth}"},
|
||
timeout=(3, 30),
|
||
)
|
||
if response.status_code != 200:
|
||
logger.error(f"请求启动配置失败: {response.status_code}, {response.text}")
|
||
else:
|
||
try:
|
||
with open(os.path.join(BasicConfig.working_dir, "startup_config.json"), "w", encoding="utf-8") as f:
|
||
f.write(response.text)
|
||
target_dict = json.loads(response.text)
|
||
if "data" in target_dict:
|
||
target_dict = target_dict["data"]
|
||
return target_dict
|
||
except json.JSONDecodeError as e:
|
||
logger.error(f"解析启动配置JSON失败: {str(e.args)}\n响应内容: {response.text}")
|
||
logger.error(f"响应内容: {response.text}")
|
||
return None
|
||
|
||
|
||
# 创建默认客户端实例
|
||
http_client = HTTPClient()
|