plancraft 0.4.6__py3-none-any.whl → 0.4.8__py3-none-any.whl

plancraft/environment/actions.py

@@ -216,6 +216,16 @@ class StopAction(BaseModel):
         return f"impossible: {self.reason}"
 
 
+class ClearAction(BaseModel):
+    """
+    Fake action that represents clearing the crafting grid by moving all items to inventory slots
+    Used for a more semantically aware planner step
+    """
+
+    def __str__(self):
+        return "clearing crafting grid"
+
+
 # when symbolic action is true, can either move objects around or smelt
 SymbolicAction = MoveAction | SmeltAction
 

plancraft/environment/planner.py

@@ -5,6 +5,7 @@ from collections import Counter
 import networkx as nx
 
 from plancraft.environment.actions import (
+    ClearAction,
     MoveAction,
     SmeltAction,
     StopAction,
@@ -392,7 +393,8 @@ def decompose_subgoal(
 
                     # if item is already in the correct position, skip
                     if (
-                        inventory_position in current_inventory
+                        items_to_use_counter[item] > 0
+                        and inventory_position in current_inventory
                         and current_inventory[inventory_position]["type"] == item
                     ) and current_inventory[inventory_position]["quantity"] > 0:
                         min_quantity_needed.add(inventory_position)
@@ -441,6 +443,8 @@ def decompose_subgoal(
                         )
                         action_items_used.append(current_inventory[from_slot]["type"])
                         items_to_use_counter[item] -= 1
+                        if items_to_use_counter[item] == 0:
+                            del items_to_use_counter[item]
                         added_item = True
                         # update state of inventory
                         current_inventory = update_inventory(
@@ -497,7 +501,9 @@ def decompose_subgoal(
 
 
 def get_subplans(
-    observation: dict, return_items=False
+    observation: dict,
+    return_items=False,
+    clear_first=False,
 ) -> tuple[list[list[str]], list, list[str]] | tuple[list[list[str]], list]:
     current_inventory = copy.deepcopy(observation["inventory"])
     plan = get_plan(observation)
@@ -510,6 +516,29 @@ def get_subplans(
     subplans = []
     action_items_used = []
 
+    if clear_first:
+        # move all the current stuff in the crafting grid to free inventory slots
+        # While this makes a worse planner, this makes a clearer distinction between crafting steps
+        subplan = []
+        for slot in range(1, 10):  # crafting grid slots 1-9
+            if slot in current_inventory and current_inventory[slot]["quantity"] > 0:
+                free_slot = find_free_inventory_slot(current_inventory, from_slot=slot)
+                action = MoveAction(
+                    slot_from=slot,
+                    slot_to=free_slot,
+                    quantity=current_inventory[slot]["quantity"],
+                )
+                subplan.append(str(action))
+                current_inventory = update_inventory(
+                    current_inventory,
+                    slot,
+                    free_slot,
+                    current_inventory[slot]["quantity"],
+                )
+        if subplan:  # only add clear subplan if there were items to clear
+            subplans.append(subplan)
+            action_items_used.append([])
+
     # Calculate the subplans for each step in the plan
     for plan_recipe, new_inventory in plan:
         subplan, current_inventory, action_items = decompose_subgoal(
@@ -517,6 +546,14 @@ def get_subplans(
         )
         subplans.append(subplan)
         action_items_used.append(action_items)
+
+    # If we added a clear action, we need to modify the plan to include it
+    if clear_first and len(subplans) > len(plan):
+        # Insert a fake clear action at the beginning of the plan
+        clear_action = ClearAction()
+        plan_inventory_counter = copy.deepcopy(plan[0][1])
+        plan = [(clear_action, plan_inventory_counter)] + plan
+
     if return_items:
         return subplans, plan, action_items_used
     return subplans, plan

{plancraft-0.4.6.dist-info → plancraft-0.4.8.dist-info}/METADATA

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

{plancraft-0.4.6.dist-info → plancraft-0.4.8.dist-info}/RECORD

@@ -11,13 +11,14 @@ plancraft/data/test.small.easy.json,sha256=5NZEJ2PqIgmHQecJOIVQyM1D6GFKyJq7GVmgR
 plancraft/data/test.small.json,sha256=eULAG1rdolRMXPrecV-7YoDIheKGyIT5MVpWdISV0wg,270089
 plancraft/data/train.json,sha256=asZIFnkBdgupPKRXacM4J0Ngt21B2BrMT6oPgFA96HI,2697710
 plancraft/data/val.json,sha256=IToAiaqUNQi_xhX1bzmInuskLaT7C2ryQjP-CZkzL24,1304403
+plancraft/data/val.repeated.json,sha256=gLeCg94oB0B_e8QyH8-FBygcJctGA4bkXYldoOHtSfQ,1726468
 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=Pub21caxM5iZ9IaX-ny1-xxr_peJIwwV_QAx3BVSry0,11551
+plancraft/environment/actions.py,sha256=bMHR8bmgE_DD10K4Bii_QRgTs-GPkcgw9NKwHDoDmyQ,11813
 plancraft/environment/env.py,sha256=B7VpIMcQKITyDmkHgBoR4KbmxmM1b4A6Y-1_b90EMXo,16428
 plancraft/environment/items.py,sha256=Z9rhSyVDEoHF1pxRvhyiT94tyQJaWHi3wUHVcamz82o,221
-plancraft/environment/planner.py,sha256=ZrCFQKyW5eqN07f5v4XUhnUxwK85gluWc5u7pEHMhiI,20517
+plancraft/environment/planner.py,sha256=Mw-fEfJPxqAf4mJedH4-6K4qng5xmTzSzzAGmhHf16U,22169
 plancraft/environment/prompts.py,sha256=NU9YHAz3id-IgaukQvEi5uLlpEstpE5_Hccvvq1At2Y,6950
 plancraft/environment/recipes.py,sha256=0vwzOU86eZmGN2EpZVSIvzxpx0AOBWNPxTtAOFBN2A0,19570
 plancraft/environment/sampler.py,sha256=BworSMWQ-TLbV9068tkNOdo4ZLP-UDox6Laeb4Weu9k,7723
@@ -1923,7 +1924,7 @@ plancraft/models/generators.py,sha256=7COMLjjx_HbTWJqINNLqqExQv7gLikfLTViacAdSt5
 plancraft/models/oracle.py,sha256=f-0KWlBuHy6wcxmDsxM3MQ_QwfBstzfbA26mlk1MgLA,1657
 plancraft/models/utils.py,sha256=xgkP5jqCeFfkKe3Xd4ZYfTqiEJ-dA-qgFAC-J35ub3E,4029
 plancraft/train/dataset.py,sha256=oFqEd4LG9oEQ-71teh0Wf7-jJbtybT2ZibfM2bBdBkM,5474
-plancraft-0.4.6.dist-info/METADATA,sha256=GYJLfVMx2iKQeXNhHUbhZsNTDND2ZNZCR6s1jDl0gv4,12391
-plancraft-0.4.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plancraft-0.4.6.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
-plancraft-0.4.6.dist-info/RECORD,,
+plancraft-0.4.8.dist-info/METADATA,sha256=obqlXXK80FBjyK3x1a6_MEvipOeepxFpngP6j7Odf_s,12391
+plancraft-0.4.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plancraft-0.4.8.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
+plancraft-0.4.8.dist-info/RECORD,,