plancraft 0.3.25__py3-none-any.whl → 0.3.27__py3-none-any.whl

plancraft/environment/actions.py

@@ -5,6 +5,14 @@ from typing import Optional
 from pydantic import BaseModel, field_validator, model_validator
 
 
+# [A1], [A2], [A3], [B1], [B2], [B3], [C1], [C2], [C3], [I1]-[I36]
+SLOT_REGEX_PATTERN = r"\[([ABC][0-9]|I[1-9]|I[12][0-9]|I3[0-6])\]"
+# [0], [A1], [A2], [A3], [B1], [B2], [B3], [C1], [C2], [C3], [I1]-[I36]
+SLOT_REGEX_PATTERN_WITH_CRAFTING_SLOT = r"\[(0|[ABC][0-9]|I[1-9]|I[12][0-9]|I3[0-6])\]"
+# 1-64
+QUANTITY_REGEX_PATTERN = r"([1-9]|[1-5][0-9]|6[0-4])"
+
+
 def convert_to_slot_index(slot: str) -> int:
     slot = slot.strip()
     grid_map = {
@@ -22,6 +30,10 @@ def convert_to_slot_index(slot: str) -> int:
     if slot in grid_map:
         return grid_map[slot]
     else:
+        # check if it is an inventory slot
+        if len(slot) < 4 or len(slot) > 5 or slot[1] != "I" or slot[2] == "0":
+            raise ValueError("Invalid slot index")
+        # convert I1 to 10, I2 to 11, I3 to 12, ..., I36 to 45
         return int(slot[2:-1]) + 9
 
 
@@ -40,8 +52,9 @@ def convert_from_slot_index(slot_index: int) -> str:
     }
     if slot_index < 10:
         return grid_map[slot_index]
-    else:
+    elif slot_index < 46:
         return f"[I{slot_index-9}]"
+    raise ValueError("Invalid slot index")
 
 
 class ActionHandlerBase(abc.ABC):
@@ -218,9 +231,7 @@ class MoveActionHandler(ActionHandlerBase):
 
     @property
     def regex_pattern(self) -> str:
-        return (
-            r"move: from \[(0|[ABCI][0-9])\] to \[(0|[ABCI][0-9])\] with quantity \d+"
-        )
+        return rf"move: from {SLOT_REGEX_PATTERN_WITH_CRAFTING_SLOT} to {SLOT_REGEX_PATTERN} with quantity {QUANTITY_REGEX_PATTERN}"
 
     @property
     def action_name(self) -> str:
@@ -258,9 +269,7 @@ class SmeltActionHandler(ActionHandlerBase):
 
     @property
     def regex_pattern(self) -> str:
-        return (
-            r"smelt: from \[(0|[ABCI][0-9])\] to \[(0|[ABCI][0-9])\] with quantity \d+"
-        )
+        return rf"smelt: from {SLOT_REGEX_PATTERN} to {SLOT_REGEX_PATTERN} with quantity {QUANTITY_REGEX_PATTERN}"
 
     @property
     def action_name(self) -> str:

{plancraft-0.3.25.dist-info → plancraft-0.3.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plancraft
-Version: 0.3.25
+Version: 0.3.27
 Summary: Plancraft: an evaluation dataset for planning with LLM agents
 License: MIT License
         

{plancraft-0.3.25.dist-info → plancraft-0.3.27.dist-info}/RECORD

@@ -11,7 +11,7 @@ plancraft/data/val.json,sha256=IToAiaqUNQi_xhX1bzmInuskLaT7C2ryQjP-CZkzL24,13044
 plancraft/data/val.small.easy.json,sha256=9zEmqepjXG2NIp88xnFqOCkwsUsku3HEwHoQGxgTr6U,190252
 plancraft/data/val.small.json,sha256=76E9EFaljDQyAokg97e-IblvcOe6KbrdKkXvRxhhkgo,237653
 plancraft/environment/__init__.py,sha256=XFsFny4lH195AwAmL-WeCaF9ZCMgc7IgXIwhQ8FTdgE,505
-plancraft/environment/actions.py,sha256=Y_uPg6xjMrtwvtADe7ziTFN9itw6IOOx3sJB5NQFNFE,10880
+plancraft/environment/actions.py,sha256=fL_kzVUyOiud_74ST2YWhEgNFhL7y_ydwDPDmY1CTtU,11551
 plancraft/environment/env.py,sha256=A4532st7JFBYBF_Nh0CEEi3ZTLJAeaB3t9PAIVSemj0,16390
 plancraft/environment/items.py,sha256=Z9rhSyVDEoHF1pxRvhyiT94tyQJaWHi3wUHVcamz82o,221
 plancraft/environment/planner.py,sha256=uIOJjIoyT_4pxeWeTKb8BkLJyKZG0-AMoEOkZs6Ua9A,19340
@@ -1920,7 +1920,7 @@ plancraft/models/generators.py,sha256=F76_iPiqxUjDIrQwF58tzM0bLM91OkZJ0sBqBuki5w
 plancraft/models/oracle.py,sha256=f-0KWlBuHy6wcxmDsxM3MQ_QwfBstzfbA26mlk1MgLA,1657
 plancraft/models/utils.py,sha256=E-sZohvolWgGbpHQKgAgkgIfUJoVnT5pMt6JP8xLHKg,4034
 plancraft/train/dataset.py,sha256=oFqEd4LG9oEQ-71teh0Wf7-jJbtybT2ZibfM2bBdBkM,5474
-plancraft-0.3.25.dist-info/METADATA,sha256=pSbT2EBhcwKnvRtOeq3lAPrpPrDgZ2DAsnosjLyQe78,11148
-plancraft-0.3.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plancraft-0.3.25.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
-plancraft-0.3.25.dist-info/RECORD,,
+plancraft-0.3.27.dist-info/METADATA,sha256=fii20vfc62_UjIquU8OXEWtxRXfaaaA2lRo7EbFaQok,11148
+plancraft-0.3.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plancraft-0.3.27.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
+plancraft-0.3.27.dist-info/RECORD,,