create warehouse by factory func

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,