dijkstra402
9f8b5eaf71
Merge dev branch: Add battery resources, bioyond_cell device registry, and fix file path resolution
2025-12-18 11:11:59 +08:00
ZiWei
c68d5246d0
feat(bioyond): 添加测量小瓶仓库和更新仓库工厂函数参数
2025-11-19 11:28:35 +08:00
ZiWei
f81d20bb1d
fix(warehouse): 修正BioYond 4x4x1仓库的物品尺寸参数
2025-11-16 15:47:10 +08:00
ZiWei
850eeae55a
HR物料同步，前端展示位置修复 ( #135 )
...
* 更新Bioyond工作站配置，添加新的物料类型映射和载架定义，优化物料查询逻辑
* 添加Bioyond实验配置文件，定义物料类型映射和设备配置
* 更新bioyond_warehouse_reagent_stack方法，修正试剂堆栈尺寸和布局描述
* 更新Bioyond实验配置，修正物料类型映射，优化设备配置
* 更新Bioyond资源同步逻辑，优化物料入库流程，增强错误处理和日志记录
* 更新Bioyond资源，添加配液站和反应站专用载架，优化仓库工厂函数的排序方式
* 更新Bioyond资源，添加配液站和反应站相关载架，优化试剂瓶和样品瓶配置
* 更新Bioyond实验配置，修正试剂瓶载架ID，确保与设备匹配
* 更新Bioyond资源，移除反应站单烧杯载架，添加反应站单烧瓶载架分类
* Refactor Bioyond resource synchronization and update bottle carrier definitions
- Removed traceback printing in error handling for Bioyond synchronization.
- Enhanced logging for existing Bioyond material ID usage during synchronization.
- Added new bottle carrier definitions for single flask and updated existing ones.
- Refactored dispensing station and reaction station bottle definitions for clarity and consistency.
- Improved resource mapping and error handling in graphio for Bioyond resource conversion.
- Introduced layout parameter in warehouse factory for better warehouse configuration.
* 更新Bioyond仓库工厂，添加排序方式支持，优化坐标计算逻辑
* 更新Bioyond载架和甲板配置，调整样品板尺寸和仓库坐标
* 更新Bioyond资源同步，增强占用位置日志信息，修正坐标转换逻辑
* 更新Bioyond反应站和分配站配置，调整材料类型映射和ID，移除不必要的项
* support name change during materials change
* fix json dumps
* correct tip
* 优化调度器API路径，更新相关方法描述
* 更新 BIOYOND 载架相关文档，调整 API 以支持自带试剂瓶的载架类型，修复资源获取时的子物料处理逻辑
* 实现资源删除时的同步处理，优化出库操作逻辑
* 修复 ItemizedCarrier 中的可见性逻辑
* 保存 Bioyond 原始信息到 unilabos_extra，以便出库时查询
* 根据 resource.capacity 判断是试剂瓶（载架）还是多瓶载架，走不同的奔曜转换
* Fix bioyond bottle_carriers ordering
* 优化 Bioyond 物料同步逻辑，增强坐标解析和位置更新处理
* disable slave connect websocket
* correct remove_resource stats
* change uuid logger to trace level
* enable slave mode
* refactor(bioyond): 统一资源命名并优化物料同步逻辑
- 将DispensingStation和ReactionStation资源统一为PolymerStation命名
- 优化物料同步逻辑，支持耗材类型(typeMode=0)的查询
- 添加物料默认参数配置功能
- 调整仓库坐标布局
- 清理废弃资源定义
* feat(warehouses): 为仓库函数添加col_offset和layout参数
* refactor: 更新实验配置中的物料类型映射命名
将DispensingStation和ReactionStation的物料类型映射统一更名为PolymerStation，保持命名一致性
* fix: 更新实验配置中的载体名称从6VialCarrier到6StockCarrier
* feat(bioyond): 实现物料创建与入库分离逻辑
将物料同步流程拆分为两个独立阶段：transfer阶段只创建物料，add阶段执行入库
简化状态检查接口，仅返回连接状态
* fix(reaction_station): 修正液体进料烧杯体积单位并增强返回结果
将液体进料烧杯的体积单位从μL改为g以匹配实际使用场景
在返回结果中添加merged_workflow和order_params字段，提供更完整的工作流信息
* feat(dispensing_station): 在任务创建返回结果中添加order_params信息
在create_order方法返回结果中增加order_params字段，以便调用方获取完整的任务参数
* fix(dispensing_station): 修改90%物料分配逻辑从分成3份改为直接使用
原逻辑将主称固体平均分成3份作为90%物料，现改为直接使用main_portion
* feat(bioyond): 添加任务编码和任务ID的输出，支持批量任务创建后的状态监控
* refactor(registry): 简化设备配置中的任务结果处理逻辑
将多个单独的任务编码和ID字段合并为统一的return_info字段
更新相关描述以反映新的数据结构
* feat(工作站): 添加HTTP报送服务和任务完成状态跟踪
- 在graphio.py中添加API必需字段
- 实现工作站HTTP服务启动和停止逻辑
- 添加任务完成状态跟踪字典和等待方法
- 重写任务完成报送处理方法记录状态
- 支持批量任务完成等待和报告获取
* refactor(dispensing_station): 移除wait_for_order_completion_and_get_report功能
该功能已被wait_for_multiple_orders_and_get_reports替代，简化代码结构
* fix: 更新任务报告API错误
* fix(workstation_http_service): 修复状态查询中device_id获取逻辑
处理状态查询时安全获取device_id，避免因属性不存在导致的异常
* fix(bioyond_studio): 改进物料入库失败时的错误处理和日志记录
在物料入库API调用失败时，添加更详细的错误信息打印
同时修正station.py中对空响应和失败情况的判断逻辑
* refactor(bioyond): 优化瓶架载体的分配逻辑和注释说明
重构瓶架载体的分配逻辑，使用嵌套循环替代硬编码索引分配
添加更详细的坐标映射说明，明确PLR与Bioyond坐标的对应关系
* fix(bioyond_rpc): 修复物料入库成功时无data字段返回空的问题
当API返回成功但无data字段时，返回包含success标识的字典而非空字典
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
Co-authored-by: Junhan Chang <changjh@dp.tech >
2025-11-15 02:57:48 +08:00
lixinyu1011
0bf6994f95
1114物料手册定义教程byxinyu ( #165 )
...
* 宜宾奔耀工站deck前端by_Xinyu
* 构建物料教程byxinyu
* 1114物料手册定义教程
2025-11-15 02:49:17 +08:00
dijkstra402
04b578a68b
更新YB_Deck堆栈坐标位置，根据图片像素坐标映射到实际尺寸
2025-11-10 18:57:20 +08:00
dijkstra402
538891fcbe
Update YB resources: add YB_ prefix to models and update deck configurations
2025-11-09 17:04:52 +08:00
dijkstra402
be429147c0
Fix infinite recursion in YB_jia_yang_tou_da by renaming carrier function to YB_jia_yang_tou_da_Carrier
2025-11-08 15:42:18 +08:00
dijkstra402
7af32b379b
Add YB_ prefix to bottle carrier model names
2025-11-08 14:53:25 +08:00
dijkstra402
200105f647
Add debug prints to create_orders and add resource_tree_transfer method
2025-11-08 13:35:47 +08:00
Calvin Cao
0238a92e75
Merge pull request #144 from sun7151887/fix/yb3-material-names-and-model
...
更新YB工站deck坐标配置
2025-11-03 23:51:10 +08:00
dijkstra402
8009956326
更新YB工站deck坐标配置
...
- 根据实际布局图更新各堆栈的坐标位置
- 将粉末加样头堆栈拆分为左右两部分(10x1x1 -> 2个5x1x1)
- 将试剂替换仓库拆分为左右两部分(10x1x1 -> 2个5x1x1)
- 更新配液站内试剂仓库的坐标
- 所有坐标基于像素位置精确计算(deck原点: 206,446)
2025-11-03 23:49:02 +08:00
lixinyu1011
cd12932788
1103byxinyu
2025-11-03 22:53:37 +08:00
lixinyu1011
a2d6012080
Merge branch 'workstation_dev_YB3' of https://github.com/lixinyu1011/Uni-Lab-OS into workstation_dev_YB3
2025-11-03 19:50:04 +08:00
lixinyu1011
10adc853a5
1103-2byxinyu
2025-11-03 19:50:01 +08:00
Calvin Cao
62d08aa954
Merge branch 'workstation_dev_YB3' into workstation_dev_YB3
2025-11-03 19:46:52 +08:00
lixinyu1011
4485907df8
1103byxinyu
2025-11-03 18:46:50 +08:00
dijkstra402
727d2c2595
fix: 修正YB warehouse排列方式和物料类型映射
...
- 修改warehouse_factory为YB_warehouse_factory
- 调整warehouse排列方式：左上角为A01，竖着排ABCD，横着排01、02、03
- 修正config.py中的物料名称拼写错误(YB_fen_ye_20ml_Bottle, YB_pei_ye_xiao_Bottle)
- 添加缺失的warehouse函数(bioyond_warehouse_2x2x1, bioyond_warehouse_3x5x1, bioyond_warehouse_20x1x1)
- 更新decks.py中的warehouse位置映射
- 删除废弃的bottles.py和warehouses.py文件
2025-11-01 10:42:31 +08:00
ZiWei
d0884cdbd8
bioyond_HR ( #133 )
...
* feat: Enhance Bioyond synchronization and resource management
- Implemented synchronization for all material types (consumables, samples, reagents) from Bioyond, logging detailed information for each type.
- Improved error handling and logging during synchronization processes.
- Added functionality to save Bioyond material IDs in UniLab resources for future updates.
- Enhanced the `sync_to_external` method to handle material movements correctly, including querying and creating materials in Bioyond.
- Updated warehouse configurations to support new storage types and improved layout for better resource management.
- Introduced new resource types such as reactors and tip boxes, with detailed specifications.
- Modified warehouse factory to support column offsets for naming conventions (e.g., A05-D08).
- Improved resource tracking by merging extra attributes instead of overwriting them.
- Added a new method for updating resources in Bioyond, ensuring better synchronization of resource changes.
* feat: 添加TipBox和Reactor的配置到bottles.yaml
* fix: 修复液体投料方法中的volume参数处理逻辑
2025-10-29 12:10:05 +08:00
calvincao
a97781c4eb
Merge remote-tracking branch 'origin/dev' into workstation_dev_YB3
2025-10-28 11:47:07 +08:00
dijkstra402
2d58576937
feat: 添加YB瓶子和载架配置
...
- 在YB_bottles.py中添加8种瓶子类型（100ml液体、高粘液、5ml分液瓶、20ml分液瓶、配液瓶小、配液瓶大、枪头等）
- 在YB_bottle_carriers.py中添加12个载架函数（包括新增的高粘液载架和100ml液体载架）
- 更新config.py的MATERIAL_TYPE_MAPPINGS配置，添加16种物料类型映射
- 创建YB_bottle_carriers.yaml注册文件，包含所有载架和瓶子函数
- 创建YB_bottle.yaml注册文件，包含独立的瓶子函数配置
- 移除不存在的瓶子函数引用（YB_Solid_Vial等4个函数）
2025-10-27 22:23:09 +08:00
lixinyu1011
3231d60646
1027by_Xinyu
2025-10-27 20:08:19 +08:00
lixinyu1011
d0279f63f0
Merge remote-tracking branch 'upstream/workstation_dev_YB3' into workstation_dev_YB3
2025-10-27 19:33:45 +08:00
lixinyu1011
ceef342860
1027byxinyu
2025-10-27 18:16:26 +08:00
Calvin Cao
667138baac
Merge branch 'workstation_dev_YB3' into workstation_dev_YB3
2025-10-24 13:56:00 +08:00
dijkstra402
01adf7ca92
refactor: 将 BIOYOND_PolymerStation_ 前缀统一改为 YB_
...
- 重命名 bottles.py 中所有工厂函数：BIOYOND_PolymerStation_* -> YB_*
- 重命名 bottle_carriers.py 中所有载具工厂函数和导入
- 更新 registry YAML 文件中的 module 引用
- 更新 MATERIAL_TYPE_MAPPINGS 配置中的类型字符串
- 更新测试文件和样例 JSON 中的类型引用
- 添加 YB_* 别名条目到 registry 以支持双键访问
2025-10-24 13:49:48 +08:00
lixinyu1011
7206e42bf1
xinyu1024修改
2025-10-24 11:37:36 +08:00
dijkstra402
9e850d8a81
更新载架网格布局：5ml/20ml/配液瓶(小)板改为4x2，加样头(大)板改为1x1
2025-10-23 17:42:10 +08:00
dijkstra402
d3d8ba6500
fix(yb3): 物料名称与模型对齐；YAML 去掉 BIOYOND_PolymerStation_ 前缀；修复 6StockCarrier model
2025-10-23 15:32:36 +08:00
calvincao
5a7845d8ca
更新配置文件中的 report_ip 默认值，优化 bioyond_cell_workstation.py 中的订单状态处理逻辑，新增多个瓶子和载架类型的定义，调整仓库结构以支持更灵活的物料管理。
2025-10-23 08:34:33 +08:00
ZiWei
fa5896ffdb
fix(warehouses): 修正bioyond_warehouse_1x4x4仓库的尺寸参数
...
调整仓库的num_items_x和num_items_z值以匹配实际布局，并更新物品尺寸参数
2025-10-21 17:15:51 +08:00
lixinyu1011
8b0c845661
More decks&plates support for bioyond ( #115 )
2025-10-21 16:25:54 +08:00
lixinyu1011
d2352cc514
1020_YB奔耀仿真机同步对齐dev_unilab可控
...
待修改unilab的http服务
2025-10-20 12:48:19 +08:00
ZiWei
9f7c3f02f9
fix(bioyond/warehouses): 修正仓库尺寸和物品排列参数
...
调整仓库的x轴和z轴物品数量以及物品尺寸参数，使其符合4x1x4的规格要求
2025-10-19 08:36:40 +08:00
Junhan Chang
88c4d1a9d1
modify bioyond/plr converter, bioyond resource registry, and tests
2025-10-11 04:59:59 +08:00
Junhan Chang
cfc1ee6e79
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 >
2025-09-30 17:23:13 +08:00
