create warehouse by factory func

unilabos/resources/bioyond/decks.py

@@ -1,12 +1,21 @@
-from pylabrobot.resources import Deck, Coordinate
+from pylabrobot.resources import Deck, Coordinate, Rotation
 
 from unilabos.resources.bioyond.warehouses import bioyond_warehouse_1x4x4, bioyond_warehouse_1x4x2, bioyond_warehouse_liquid_and_lid_handling
 
 
 class BIOYOND_PolymerReactionStation_Deck(Deck):
-    def __init__(self, name: str = "PolymerReactionStation_Deck") -> None:
+    def __init__(
+        self, 
+        name: str = "PolymerReactionStation_Deck",
+        size_x: float = 2700.0,
+        size_y: float = 1080.0,
+        size_z: float = 1500.0,
+        category: str = "deck",
+        setup: bool = False
+    ) -> None:
         super().__init__(name=name, size_x=2700.0, size_y=1080.0, size_z=1500.0)
-        self.setup()
+        if setup:
+            self.setup()
 
     def setup(self) -> None:
         # 添加仓库
@@ -20,7 +29,7 @@ class BIOYOND_PolymerReactionStation_Deck(Deck):
             "堆栈2": Coordinate(2550.0, 650.0, 0.0),
             "站内试剂存放堆栈": Coordinate(800.0, 475.0, 0.0),
         }
-        self.warehouses["站内试剂存放堆栈"].rotation = 90.0
+        self.warehouses["站内试剂存放堆栈"].rotation = Rotation(z=90)
 
         for warehouse_name, warehouse in self.warehouses.items():
             self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name])

unilabos/resources/bioyond/warehouses.py

@@ -1,9 +1,9 @@
-from unilabos.resources.warehouse import WareHouse
+from unilabos.resources.warehouse import WareHouse, warehouse_factory
 
 
 def bioyond_warehouse_1x4x4(name: str) -> WareHouse:
     """创建BioYond 4x1x4仓库"""
-    return WareHouse(
+    return warehouse_factory(
         name=name,
         num_items_x=1,
         num_items_y=4,
@@ -20,7 +20,7 @@ def bioyond_warehouse_1x4x4(name: str) -> WareHouse:
 
 def bioyond_warehouse_1x4x2(name: str) -> WareHouse:
     """创建BioYond 4x1x2仓库"""
-    return WareHouse(
+    return warehouse_factory(
         name=name,
         num_items_x=1,
         num_items_y=4,
@@ -38,7 +38,7 @@ def bioyond_warehouse_1x4x2(name: str) -> WareHouse:
 
 def bioyond_warehouse_liquid_and_lid_handling(name: str) -> WareHouse:
     """创建BioYond开关盖加液模块台面"""
-    return WareHouse(
+    return warehouse_factory(
         name=name,
         num_items_x=2,
         num_items_y=5,

unilabos/resources/itemized_carrier.py

@@ -71,6 +71,9 @@ class ItemizedCarrier(ResourcePLR):
     size_x: float,
     size_y: float,
     size_z: float,
+    num_items_x: int = 0,
+    num_items_y: int = 0,
+    num_items_z: int = 0,
     sites: Optional[Dict[Union[int, str], Optional[ResourcePLR]]] = None,
     category: Optional[str] = "carrier",
     model: Optional[str] = None,
@@ -83,18 +86,27 @@ class ItemizedCarrier(ResourcePLR):
       category=category,
       model=model,
     )
-    sites = sites or {}
-    self.sites: List[Optional[ResourcePLR]] = list(sites.values())
-    self._ordering = sites
-    self.num_items = len(self.sites)
-    self.child_locations: Dict[str, Coordinate] = {}
-    for spot, resource in sites.items():
-      if resource is not None and getattr(resource, "location", None) is None:
-        raise ValueError(f"resource {resource} has no location")
-      if resource is not None:
-        self.child_locations[spot] = resource.location
-      else:
-        self.child_locations[spot] = Coordinate.zero()
+    self.num_items = len(sites)
+    self.num_items_x, self.num_items_y, self.num_items_z = num_items_x, num_items_y, num_items_z
+    if isinstance(sites, dict):
+      sites = sites or {}
+      self.sites: List[Optional[ResourcePLR]] = list(sites.values())
+      self._ordering = sites
+      self.child_locations: Dict[str, Coordinate] = {}
+      for spot, resource in sites.items():
+        if resource is not None and getattr(resource, "location", None) is None:
+          raise ValueError(f"resource {resource} has no location")
+        if resource is not None:
+          self.child_locations[spot] = resource.location
+        else:
+          self.child_locations[spot] = Coordinate.zero()
+    elif isinstance(sites, list):
+      # deserialize时走这里；还需要根据 self.sites 索引children
+      self.child_locations = {site["label"]: Coordinate(**site["position"]) for site in sites}
+      self.sites = [site["occupied_by"] for site in sites]
+      self._ordering = {site["label"]: site["position"] for site in sites}
+    else:
+      print("sites:", sites)
 
   @property
   def capacity(self):
@@ -112,7 +124,20 @@ class ItemizedCarrier(ResourcePLR):
     reassign: bool = True,
     spot: Optional[int] = None,
   ):
-    idx = spot if spot is not None else len(self.sites)
+    idx = spot
+    # 如果只给 location，根据坐标和 deserialize 后的 self.sites（持有names）来寻找 resource 该摆放的位置
+    if spot is not None:
+      idx = spot
+    else:
+      for i, site in enumerate(self.sites):
+        site_location = list(self.child_locations.values())[i]
+        if type(site) == str and site == resource.name:
+          idx = i
+          break
+        if site_location == location:
+          idx = i
+          break
+        
     if not reassign and self.sites[idx] is not None:
       raise ValueError(f"a site with index {idx} already exists")
     super().assign_child_resource(resource, location=location, reassign=reassign)
@@ -288,9 +313,15 @@ class ItemizedCarrier(ResourcePLR):
   def serialize(self):
     return {
       **super().serialize(),
-      "slots": [{
+      "num_items_x": self.num_items_x,
+      "num_items_y": self.num_items_y,
+      "num_items_z": self.num_items_z,
+      "sites": [{
         "label": str(identifier),
         "visible": True if self[identifier] is not None else False,
+        "occupied_by": self[identifier].name 
+                        if isinstance(self[identifier], ResourcePLR) and not isinstance(self[identifier], ResourceHolder) else 
+                        self[identifier] if isinstance(self[identifier], str) else None,
         "position": {"x": location.x, "y": location.y, "z": location.z},
         "size": {"width": self._size_x, "height": self._size_y, "depth": self._size_z},
         "content_type": ["bottle", "container", "tube", "bottle_carrier", "tip_rack"]

unilabos/resources/warehouse.py

@@ -1,63 +1,88 @@
-from typing import Optional, List
+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
+from unilabos.resources.itemized_carrier import ItemizedCarrier, ResourcePLR
+
+
+def warehouse_factory(
+    name: str,
+    num_items_x: int = 4,
+    num_items_y: int = 1,
+    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,
+):
+    # 创建16个板架位 (4层 x 4位置)
+    locations = []
+    for layer in range(num_items_z):  # 4层
+        for row in range(num_items_y):  # 4行
+            for col in range(num_items_x):  # 1列 (每层4x1=4个位置)
+                # 计算位置
+                x = dx + col * item_dx
+                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,
+    )
+    
+    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,
+        # ordered_items=ordered_items,
+        # ordering=ordering,
+        sites=sites,
+        category=category,
+        model=model,
+    )
 
 
 class WareHouse(ItemizedCarrier):
-    """4x4x1堆栈载体类 - 可容纳16个板位的载体（4层x4行x1列）"""
-
+    """堆栈载体类 - 可容纳16个板位的载体（4层x4行x1列）"""
     def __init__(
         self,
         name: str,
-        num_items_x: int = 4,
-        num_items_y: int = 1,
-        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,
+        size_x: float,
+        size_y: float,
+        size_z: float,
+        num_items_x: int,
+        num_items_y: int,
+        num_items_z: int,
+        sites: Optional[Dict[Union[int, str], Optional[ResourcePLR]]] = None,
         category: str = "warehouse",
         model: Optional[str] = None,
     ):
-        self.num_items_x = num_items_x
-        self.num_items_y = num_items_y
-        self.num_items_z = num_items_z
-        # 创建16个板架位 (4层 x 4位置)
-        locations = []
-
-        for layer in range(num_items_z):  # 4层
-            for row in range(num_items_y):  # 4行
-                for col in range(num_items_x):  # 1列 (每层4x1=4个位置)
-                    # 计算位置
-                    x = dx + col * item_dx
-                    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,
-        )
 
         super().__init__(
             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,
+            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,
             sites=sites,
             category=category,
             model=model,