plancraft 0.3.16__py3-none-any.whl → 0.3.17__py3-none-any.whl

plancraft/environment/actions.py

@@ -208,10 +208,10 @@ class MoveActionHandler(ActionHandlerBase):
         """
         Parse the raw model response to a MoveAction
         """
-        action_match = re.search(f"({self.action_name}):", generated_text)
-        if not action_match:
-            return
         try:
+            action_match = re.search(f"({self.action_name}):", generated_text)
+            if not action_match:
+                return
             slot_from = re.search(r" from (\[[ABCI]?\d+\])", generated_text).group(1)
             slot_to = re.search(r" to (\[[ABCI]?\d+\])", generated_text).group(1)
             quantity = re.search(r"with quantity (\d+)", generated_text).group(1)
@@ -221,8 +221,10 @@ class MoveActionHandler(ActionHandlerBase):
                 quantity=quantity,
             )
             return action
-        except AttributeError as e:
-            return f"Format Error: {e}"
+        except AttributeError:
+            return (
+                f"Format Error. Action be in the format: {self.prompt_format_example}"
+            )
 
 
 class SmeltActionHandler(ActionHandlerBase):
@@ -242,10 +244,11 @@ class SmeltActionHandler(ActionHandlerBase):
         """
         Parse the raw model response to a SmeltAction
         """
-        action_match = re.search(f"({self.action_name}):", generated_text)
-        if not action_match:
-            return
+
         try:
+            action_match = re.search(f"({self.action_name}):", generated_text)
+            if not action_match:
+                return
             slot_from = re.search(r" from (\[[ABCI]?\d+\])", generated_text).group(1)
             slot_to = re.search(r" to (\[[ABCI]?\d+\])", generated_text).group(1)
             quantity = re.search(r"with quantity (\d+)", generated_text).group(1)
@@ -255,8 +258,10 @@ class SmeltActionHandler(ActionHandlerBase):
                 quantity=quantity,
             )
             return action
-        except AttributeError as e:
-            return f"Format Error: {e}"
+        except AttributeError:
+            return (
+                f"Format Error. Action be in the format: {self.prompt_format_example}"
+            )
 
 
 class ImpossibleActionHandler(ActionHandlerBase):
@@ -276,11 +281,16 @@ class ImpossibleActionHandler(ActionHandlerBase):
         """
         Parse the raw model response to a StopAction
         """
-        action_match = re.search(f"({self.action_name}):", generated_text)
-        if not action_match:
-            return
-        reason = re.search(r"impossible: (.*)", generated_text).group(1)
-        return StopAction(reason=reason)
+        try:
+            action_match = re.search(f"({self.action_name}):", generated_text)
+            if not action_match:
+                return
+            reason = re.search(r"impossible: (.*)", generated_text).group(1)
+            return StopAction(reason=reason)
+        except AttributeError:
+            return (
+                f"Format Error. Action be in the format: {self.prompt_format_example}"
+            )
 
 
 class ThinkActionHandler(ActionHandlerBase):
@@ -300,7 +310,12 @@ class ThinkActionHandler(ActionHandlerBase):
         """
         Parse the raw model response to a ThinkAction
         """
-        action_match = re.search(f"({self.action_name}):", generated_text)
-        if not action_match:
-            return
-        return "Ok"
+        try:
+            action_match = re.search(f"({self.action_name}):", generated_text)
+            if not action_match:
+                return
+            return "Ok"
+        except AttributeError:
+            return (
+                f"Format Error. Action be in the format: {self.prompt_format_example}"
+            )

plancraft/environment/search.py

@@ -46,8 +46,14 @@ class GoldSearchActionHandler(ActionHandlerBase):
         """
         Parse the raw model response to a SearchAction
         """
-        action_match = re.search(f"({self.action_name}):", generated_text)
-        if not action_match:
-            return
-        search_target = re.search(r"search: (\w+)", generated_text).group(1)
-        return gold_search_recipe(search_target)
+        try:
+            action_match = re.search(f"({self.action_name}):", generated_text)
+            if not action_match:
+                return
+
+            search_target = re.search(r"search: *(\w+)", generated_text).group(1)
+            return gold_search_recipe(search_target)
+        except AttributeError:
+            return (
+                f"Format Error. Action be in the format: {self.prompt_format_example}"
+            )

{plancraft-0.3.16.dist-info → plancraft-0.3.17.dist-info}/METADATA

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

{plancraft-0.3.16.dist-info → plancraft-0.3.17.dist-info}/RECORD

@@ -11,14 +11,14 @@ 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=AQxFaK4YW53mPwhuPhHrDF9wENSVjPHSWk0v77I1thw,9460
+plancraft/environment/actions.py,sha256=VhPSRr0b1ySxb106TcBFdb3MdycxWwQGzqDnWQagm-8,10007
 plancraft/environment/env.py,sha256=A4532st7JFBYBF_Nh0CEEi3ZTLJAeaB3t9PAIVSemj0,16390
 plancraft/environment/items.py,sha256=Z9rhSyVDEoHF1pxRvhyiT94tyQJaWHi3wUHVcamz82o,221
 plancraft/environment/planner.py,sha256=uIOJjIoyT_4pxeWeTKb8BkLJyKZG0-AMoEOkZs6Ua9A,19340
 plancraft/environment/prompts.py,sha256=8QXclX0ygpL02uZichE1AVkbdn_0HGteD5bzo0FZGOU,6947
 plancraft/environment/recipes.py,sha256=0vwzOU86eZmGN2EpZVSIvzxpx0AOBWNPxTtAOFBN2A0,19570
 plancraft/environment/sampler.py,sha256=79hLpTU0ajvMPoBsvSe8tE88x31c8Vlczb3tJZJcau0,7441
-plancraft/environment/search.py,sha256=Dmdvj04kMvPlwvoWSc2261LTXV8RbMpS4FODV1YoZKs,1847
+plancraft/environment/search.py,sha256=kk6t-MkpFGTL7I38GQ6H21BjW9qJLSNGMbJqvZhr1LE,2035
 plancraft/environment/assets/constants.json,sha256=kyOIOh82CTTMMGEIS60k5k6M-6fkEmYDoGAnvi3Zx5k,1379016
 plancraft/environment/assets/minecraft_font.ttf,sha256=AzoK9cgggXwjFPHtIO7uz-YaDrminl3nvB-VsaTvTAk,60992
 plancraft/environment/assets/table.png,sha256=IKIViZKAPyR4FWnS0JP9AZ19vIEO3qoS5-YRGAO1ow8,5430
@@ -1920,7 +1920,7 @@ plancraft/models/generators.py,sha256=F76_iPiqxUjDIrQwF58tzM0bLM91OkZJ0sBqBuki5w
 plancraft/models/oracle.py,sha256=tMp9mTwD70T3qohj-LZhJFjHYWyiVHDh8gu27asVimI,1342
 plancraft/models/utils.py,sha256=E-sZohvolWgGbpHQKgAgkgIfUJoVnT5pMt6JP8xLHKg,4034
 plancraft/train/dataset.py,sha256=oFqEd4LG9oEQ-71teh0Wf7-jJbtybT2ZibfM2bBdBkM,5474
-plancraft-0.3.16.dist-info/METADATA,sha256=FIfCMBzCVuDWFCf5cPPKXLdm1EHbgKRpQ2eT5khTMN0,11148
-plancraft-0.3.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plancraft-0.3.16.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
-plancraft-0.3.16.dist-info/RECORD,,
+plancraft-0.3.17.dist-info/METADATA,sha256=DhUcHfnj_fMJTnHQVQVl50RpM3mwPCdFHOFNQtCo39c,11148
+plancraft-0.3.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plancraft-0.3.17.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
+plancraft-0.3.17.dist-info/RECORD,,