plancraft 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

plancraft/environment/planner.py

@@ -234,11 +234,13 @@ def get_plan(observation: dict):
 
 def decompose_subgoal(
     current_inventory: dict, plan_recipe, new_inventory: dict[str, int]
-) -> list[str]:
+) -> tuple[list[str], dict[str, int], list[str]]:
     """
     For a given plan_recipe and inventory, output the list of action to craft recipe
     """
     subplan = []
+    # track the item type used in each action's from_slot
+    action_items_used = []
     new_inventory_counter = Counter(new_inventory)
     current_inventory_counter = get_inventory_counter(current_inventory)
     items_to_use_counter = current_inventory_counter - new_inventory_counter
@@ -264,6 +266,7 @@ def decompose_subgoal(
             action = SmeltAction(
                 slot_from=from_slot, slot_to=free_slot, quantity=quantity
             )
+            action_items_used.append(current_inventory[from_slot]["type"])
             subplan.append(str(action))
 
             # update inventory to decrement quantity of item in from_slot and increment quantity of item in free_slot
@@ -280,7 +283,7 @@ def decompose_subgoal(
             if current_inventory[from_slot]["quantity"] <= 0:
                 del current_inventory[from_slot]
 
-            return subplan, current_inventory
+            return subplan, current_inventory, action_items_used
 
     elif isinstance(plan_recipe, ShapelessRecipe):
         crafting_slot = 1
@@ -314,6 +317,7 @@ def decompose_subgoal(
                         slot_to=free_slot,
                         quantity=current_inventory[crafting_slot]["quantity"],
                     )
+                    action_items_used.append(current_inventory[crafting_slot]["type"])
                     subplan.append(str(action))
                     current_inventory = update_inventory(
                         current_inventory,
@@ -331,6 +335,7 @@ def decompose_subgoal(
                 action = MoveAction(
                     slot_from=from_slot, slot_to=crafting_slot, quantity=1
                 )
+                action_items_used.append(current_inventory[from_slot]["type"])
                 subplan.append(str(action))
                 current_inventory = update_inventory(
                     current_inventory, from_slot, crafting_slot, 1
@@ -366,6 +371,9 @@ def decompose_subgoal(
                         slot_to=free_slot,
                         quantity=current_inventory[inventory_position]["quantity"],
                     )
+                    action_items_used.append(
+                        current_inventory[inventory_position]["type"]
+                    )
                     current_inventory = update_inventory(
                         current_inventory,
                         inventory_position,
@@ -411,6 +419,9 @@ def decompose_subgoal(
                                     "quantity"
                                 ],
                             )
+                            action_items_used.append(
+                                current_inventory[inventory_position]["type"]
+                            )
                             current_inventory = update_inventory(
                                 current_inventory,
                                 inventory_position,
@@ -428,6 +439,7 @@ def decompose_subgoal(
                             slot_to=inventory_position,
                             quantity=1,
                         )
+                        action_items_used.append(current_inventory[from_slot]["type"])
                         items_to_use_counter[item] -= 1
                         added_item = True
                         # update state of inventory
@@ -446,6 +458,7 @@ def decompose_subgoal(
                     slot_to=free_slot,
                     quantity=current_inventory[slot]["quantity"],
                 )
+                action_items_used.append(current_inventory[slot]["type"])
                 current_inventory = update_inventory(
                     current_inventory,
                     slot,
@@ -469,6 +482,7 @@ def decompose_subgoal(
             )
         )
     )
+    action_items_used.append(current_inventory[0]["type"])
     current_inventory = update_inventory(
         current_inventory, 0, free_slot, plan_recipe.result.count
     )
@@ -479,10 +493,10 @@ def decompose_subgoal(
             if current_inventory[i]["quantity"] <= 0:
                 del current_inventory[i]
 
-    return subplan, current_inventory
+    return subplan, current_inventory, action_items_used
 
 
-def get_subplans(observation: dict) -> tuple[list[list[str]], list]:
+def get_subplans(observation: dict, return_items=False) -> tuple[list[list[str]], list]:
     current_inventory = copy.deepcopy(observation["inventory"])
     plan = get_plan(observation)
     # get action
@@ -490,10 +504,15 @@ def get_subplans(observation: dict) -> tuple[list[list[str]], list]:
         return [[str(StopAction())]], []
     # plan_recipe, new_inventory = plan[0]
     subplans = []
+    action_items_used = []
+
     # Calculate the subplans for each step in the plan
     for plan_recipe, new_inventory in plan:
-        subplan, current_inventory = decompose_subgoal(
+        subplan, current_inventory, action_items = decompose_subgoal(
             current_inventory, plan_recipe, new_inventory
         )
         subplans.append(subplan)
+        action_items_used.append(action_items)
+    if return_items:
+        return subplans, plan, action_items_used
     return subplans, plan

{plancraft-0.4.3.dist-info → plancraft-0.4.5.dist-info}/METADATA

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

{plancraft-0.4.3.dist-info → plancraft-0.4.5.dist-info}/RECORD

@@ -17,7 +17,7 @@ plancraft/environment/__init__.py,sha256=XFsFny4lH195AwAmL-WeCaF9ZCMgc7IgXIwhQ8F
 plancraft/environment/actions.py,sha256=Pub21caxM5iZ9IaX-ny1-xxr_peJIwwV_QAx3BVSry0,11551
 plancraft/environment/env.py,sha256=B7VpIMcQKITyDmkHgBoR4KbmxmM1b4A6Y-1_b90EMXo,16428
 plancraft/environment/items.py,sha256=Z9rhSyVDEoHF1pxRvhyiT94tyQJaWHi3wUHVcamz82o,221
-plancraft/environment/planner.py,sha256=uIOJjIoyT_4pxeWeTKb8BkLJyKZG0-AMoEOkZs6Ua9A,19340
+plancraft/environment/planner.py,sha256=-ZN6MSQxMTNfexa6ixzzFKK-qBSB4jbxOJLtknnHju8,20437
 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 +1923,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.3.dist-info/METADATA,sha256=wyA9iis_caO9cCKd5h5guPpuhRXi0pTkmR0dBXsbaHc,12391
-plancraft-0.4.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plancraft-0.4.3.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
-plancraft-0.4.3.dist-info/RECORD,,
+plancraft-0.4.5.dist-info/METADATA,sha256=60Kf6bWIVm32lmbZdgsYr1qcg8_KoycH-TxL5fw0Wg8,12391
+plancraft-0.4.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plancraft-0.4.5.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
+plancraft-0.4.5.dist-info/RECORD,,