mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-17 21:11:12 +00:00
* 更新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>
145 lines
5.2 KiB
Python
145 lines
5.2 KiB
Python
from typing import Dict, Optional, List, Union
|
||
from pylabrobot.resources import Coordinate
|
||
from pylabrobot.resources.carrier import ResourceHolder, create_homogeneous_resources
|
||
|
||
from unilabos.resources.itemized_carrier import ItemizedCarrier, ResourcePLR
|
||
|
||
|
||
LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||
|
||
|
||
def warehouse_factory(
|
||
name: str,
|
||
num_items_x: int = 1,
|
||
num_items_y: int = 4,
|
||
num_items_z: int = 4,
|
||
dx: float = 137.0,
|
||
dy: float = 96.0,
|
||
dz: float = 120.0,
|
||
item_dx: float = 10.0,
|
||
item_dy: float = 10.0,
|
||
item_dz: float = 10.0,
|
||
removed_positions: Optional[List[int]] = None,
|
||
empty: bool = False,
|
||
category: str = "warehouse",
|
||
model: Optional[str] = None,
|
||
col_offset: int = 0, # 列起始偏移量,用于生成A05-D08等命名
|
||
layout: str = "col-major", # 新增:排序方式,"col-major"=列优先,"row-major"=行优先
|
||
):
|
||
# 创建位置坐标
|
||
locations = []
|
||
|
||
for layer in range(num_items_z): # 层
|
||
for row in range(num_items_y): # 行
|
||
for col in range(num_items_x): # 列
|
||
# 计算位置
|
||
x = dx + col * item_dx
|
||
|
||
# 根据 layout 决定 y 坐标计算
|
||
if layout == "row-major":
|
||
# 行优先:row=0(A行) 应该显示在上方,需要较小的 y 值
|
||
y = dy + row * item_dy
|
||
else:
|
||
# 列优先:保持原逻辑(row=0 对应较大的 y)
|
||
y = dy + (num_items_y - row - 1) * item_dy
|
||
|
||
z = dz + (num_items_z - layer - 1) * item_dz
|
||
locations.append(Coordinate(x, y, z))
|
||
if removed_positions:
|
||
locations = [loc for i, loc in enumerate(locations) if i not in removed_positions]
|
||
_sites = create_homogeneous_resources(
|
||
klass=ResourceHolder,
|
||
locations=locations,
|
||
resource_size_x=127.0,
|
||
resource_size_y=86.0,
|
||
name_prefix=name,
|
||
)
|
||
len_x, len_y = (num_items_x, num_items_y) if num_items_z == 1 else (num_items_y, num_items_z) if num_items_x == 1 else (num_items_x, num_items_z)
|
||
|
||
# 根据 layout 参数生成不同的排序方式
|
||
# 注意:物理位置的 y 坐标是倒序的 (row=0 时 y 最大,对应前端显示的顶部)
|
||
if layout == "row-major":
|
||
# 行优先顺序: A01,A02,A03,A04, B01,B02,B03,B04
|
||
# locations[0] 对应 row=0, y最大(前端顶部)→ 应该是 A01
|
||
keys = [f"{LETTERS[j]}{i + 1 + col_offset:02d}" for j in range(len_y) for i in range(len_x)]
|
||
else:
|
||
# 列优先顺序: A01,B01,C01,D01, A02,B02,C02,D02
|
||
keys = [f"{LETTERS[j]}{i + 1 + col_offset:02d}" for i in range(len_x) for j in range(len_y)]
|
||
|
||
sites = {i: site for i, site in zip(keys, _sites.values())}
|
||
|
||
return WareHouse(
|
||
name=name,
|
||
size_x=dx + item_dx * num_items_x,
|
||
size_y=dy + item_dy * num_items_y,
|
||
size_z=dz + item_dz * num_items_z,
|
||
num_items_x = num_items_x,
|
||
num_items_y = num_items_y,
|
||
num_items_z = num_items_z,
|
||
ordering_layout=layout, # 传递排序方式到 ordering_layout
|
||
# ordered_items=ordered_items,
|
||
# ordering=ordering,
|
||
sites=sites,
|
||
category=category,
|
||
model=model,
|
||
)
|
||
|
||
|
||
class WareHouse(ItemizedCarrier):
|
||
"""堆栈载体类 - 可容纳16个板位的载体(4层x4行x1列)"""
|
||
def __init__(
|
||
self,
|
||
name: str,
|
||
size_x: float,
|
||
size_y: float,
|
||
size_z: float,
|
||
num_items_x: int,
|
||
num_items_y: int,
|
||
num_items_z: int,
|
||
layout: str = "x-y",
|
||
sites: Optional[Dict[Union[int, str], Optional[ResourcePLR]]] = None,
|
||
category: str = "warehouse",
|
||
model: Optional[str] = None,
|
||
ordering_layout: str = "col-major",
|
||
**kwargs
|
||
):
|
||
super().__init__(
|
||
name=name,
|
||
size_x=size_x,
|
||
size_y=size_y,
|
||
size_z=size_z,
|
||
# ordered_items=ordered_items,
|
||
# ordering=ordering,
|
||
num_items_x=num_items_x,
|
||
num_items_y=num_items_y,
|
||
num_items_z=num_items_z,
|
||
layout=layout,
|
||
sites=sites,
|
||
category=category,
|
||
model=model,
|
||
)
|
||
|
||
# 保存排序方式,供graphio.py的坐标映射使用
|
||
# 使用独立属性避免与父类的layout冲突
|
||
self.ordering_layout = ordering_layout
|
||
|
||
def serialize(self) -> dict:
|
||
"""序列化时保存 ordering_layout 属性"""
|
||
data = super().serialize()
|
||
data['ordering_layout'] = self.ordering_layout
|
||
return data
|
||
|
||
def get_site_by_layer_position(self, row: int, col: int, layer: int) -> ResourceHolder:
|
||
if not (0 <= layer < 4 and 0 <= row < 4 and 0 <= col < 1):
|
||
raise ValueError("无效的位置: layer={}, row={}, col={}".format(layer, row, col))
|
||
|
||
site_index = layer * 4 + row * 1 + col
|
||
return self.sites[site_index]
|
||
|
||
def add_rack_to_position(self, row: int, col: int, layer: int, rack) -> None:
|
||
site = self.get_site_by_layer_position(row, col, layer)
|
||
site.assign_child_resource(rack)
|
||
|
||
def get_rack_at_position(self, row: int, col: int, layer: int):
|
||
site = self.get_site_by_layer_position(row, col, layer)
|
||
return site.resource |