plancraft 0.3.20__py3-none-any.whl → 0.3.22__py3-none-any.whl

plancraft/environment/actions.py

@@ -61,6 +61,14 @@ class ActionHandlerBase(abc.ABC):
         """
         raise NotImplementedError()
 
+    @property
+    @abc.abstractmethod
+    def regex_pattern(self) -> str:
+        """
+        Return the regex pattern for the model
+        """
+        raise NotImplementedError()
+
     @property
     @abc.abstractmethod
     def action_name(self) -> str:
@@ -97,7 +105,7 @@ class MoveAction(BaseModel):
                 return convert_to_slot_index(value)
             except ValueError:
                 raise AttributeError(
-                    "slot_from and slot_to must be [0] or [A1] to [C3] or [I1] to [I36]"
+                    "[Source] and [Target] must be [0] or [A1] to [C3] or [I1] to [I36]"
                 )
         return value
 
@@ -113,11 +121,11 @@ class MoveAction(BaseModel):
     @model_validator(mode="after")
     def validate(self):
         if self.slot_from == self.slot_to:
-            raise AttributeError("slot_from and slot_to must be different")
+            raise AttributeError("[Source] and [Target] must be different")
         if self.slot_from < 0 or self.slot_from > 45:
-            raise AttributeError("slot_from must be between 0 and 45")
+            raise AttributeError("[Source] must be between 0 and 45")
         if self.slot_to < 1 or self.slot_to > 45:
-            raise AttributeError("slot_to must be between 1 and 45")
+            raise AttributeError("[Target] must be between 1 and 45")
         if self.quantity < 1 or self.quantity > 64:
             raise AttributeError("quantity must be between 1 and 64")
         return self
@@ -146,7 +154,7 @@ class SmeltAction(BaseModel):
                 return convert_to_slot_index(value)
             except ValueError:
                 raise AttributeError(
-                    "slot_from and slot_to must be [0] or [A1] to [C3] or [I1] to [I36]"
+                    "[Source] and [Target] must be [0] or [A1] to [C3] or [I1] to [I36]"
                 )
         return value
 
@@ -162,11 +170,11 @@ class SmeltAction(BaseModel):
     @model_validator(mode="after")
     def validate(self):
         if self.slot_from == self.slot_to:
-            raise AttributeError("slot_from and slot_to must be different")
+            raise AttributeError("[Source] and [Target] must be different")
         if self.slot_from < 0 or self.slot_from > 45:
-            raise AttributeError("slot_from must be between 0 and 45")
+            raise AttributeError("[Source] must be between 0 and 45")
         if self.slot_to < 1 or self.slot_to > 45:
-            raise AttributeError("slot_to must be between 1 and 45")
+            raise AttributeError("[Target] must be between 1 and 45")
         if self.quantity < 1 or self.quantity > 64:
             raise AttributeError("quantity must be between 1 and 64")
         return self
@@ -200,6 +208,12 @@ class MoveActionHandler(ActionHandlerBase):
     def prompt_format_example(self) -> str:
         return "`move: from [Source] to [Target] with quantity N`"
 
+    @property
+    def regex_pattern(self) -> str:
+        return (
+            r"move: from \[(0|[ABCI][0-9])\] to \[(0|[ABCI][0-9])\] with quantity \d+"
+        )
+
     @property
     def action_name(self) -> str:
         return "move"
@@ -221,10 +235,8 @@ class MoveActionHandler(ActionHandlerBase):
                 quantity=quantity,
             )
             return action
-        except AttributeError:
-            return (
-                f"Format Error. Action be in the format: {self.prompt_format_example}"
-            )
+        except AttributeError as e:
+            return f"Format Error: {e}. Correct format: {self.prompt_format_example}"
 
 
 class SmeltActionHandler(ActionHandlerBase):
@@ -236,6 +248,12 @@ class SmeltActionHandler(ActionHandlerBase):
     def prompt_format_example(self) -> str:
         return "`smelt: from [Source] to [Target] with quantity N`"
 
+    @property
+    def regex_pattern(self) -> str:
+        return (
+            r"smelt: from \[(0|[ABCI][0-9])\] to \[(0|[ABCI][0-9])\] with quantity \d+"
+        )
+
     @property
     def action_name(self) -> str:
         return "smelt"
@@ -258,10 +276,8 @@ class SmeltActionHandler(ActionHandlerBase):
                 quantity=quantity,
             )
             return action
-        except AttributeError:
-            return (
-                f"Format Error. Action be in the format: {self.prompt_format_example}"
-            )
+        except AttributeError as e:
+            return f"Format Error: {e}. Correct format: {self.prompt_format_example}"
 
 
 class ImpossibleActionHandler(ActionHandlerBase):
@@ -273,6 +289,10 @@ class ImpossibleActionHandler(ActionHandlerBase):
     def prompt_format_example(self) -> str:
         return "`impossible: <reason>`"
 
+    @property
+    def regex_pattern(self) -> str:
+        return r"impossible: .+"
+
     @property
     def action_name(self) -> str:
         return "impossible"
@@ -287,10 +307,8 @@ class ImpossibleActionHandler(ActionHandlerBase):
                 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}"
-            )
+        except AttributeError as e:
+            return f"Format Error: {e}. Correct format: {self.prompt_format_example}"
 
 
 class ThinkActionHandler(ActionHandlerBase):
@@ -302,6 +320,10 @@ class ThinkActionHandler(ActionHandlerBase):
     def prompt_format_example(self) -> str:
         return "`think: <thought message>`"
 
+    @property
+    def regex_pattern(self) -> str:
+        return r"think: .+"
+
     @property
     def action_name(self) -> str:
         return "think"
@@ -315,7 +337,5 @@ class ThinkActionHandler(ActionHandlerBase):
             if not action_match:
                 return
             return "Ok"
-        except AttributeError:
-            return (
-                f"Format Error. Action be in the format: {self.prompt_format_example}"
-            )
+        except AttributeError as e:
+            return f"Format Error: {e}. Correct format: {self.prompt_format_example}"

plancraft/environment/search.py

@@ -38,6 +38,10 @@ class GoldSearchActionHandler(ActionHandlerBase):
     def prompt_format_example(self) -> str:
         return "`search: <recipe name>`"
 
+    @property
+    def regex_pattern(self) -> str:
+        return r"search: \w+"
+
     @property
     def action_name(self) -> str:
         return "search"
@@ -53,7 +57,5 @@ class GoldSearchActionHandler(ActionHandlerBase):
 
             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}"
-            )
+        except AttributeError as e:
+            return f"Format Error: {e}. Correct format: {self.prompt_format_example}"

{plancraft-0.3.20.dist-info → plancraft-0.3.22.dist-info}/METADATA

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

{plancraft-0.3.20.dist-info → plancraft-0.3.22.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=VhPSRr0b1ySxb106TcBFdb3MdycxWwQGzqDnWQagm-8,10007
+plancraft/environment/actions.py,sha256=Ve3SHwg0o2NcMBVM8O-IRjsvcdO2dH8kqvweWm6euo8,10559
 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=kk6t-MkpFGTL7I38GQ6H21BjW9qJLSNGMbJqvZhr1LE,2035
+plancraft/environment/search.py,sha256=z31eEwQBY7WJaYVBEEwulFS8P3h1Nwo1Th9BaCTxk5M,2085
 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=f-0KWlBuHy6wcxmDsxM3MQ_QwfBstzfbA26mlk1MgLA,1657
 plancraft/models/utils.py,sha256=E-sZohvolWgGbpHQKgAgkgIfUJoVnT5pMt6JP8xLHKg,4034
 plancraft/train/dataset.py,sha256=oFqEd4LG9oEQ-71teh0Wf7-jJbtybT2ZibfM2bBdBkM,5474
-plancraft-0.3.20.dist-info/METADATA,sha256=7Gs3Txfw2YCBVDAstW7K69fho4vktcYp6sw6g2nQOYE,11148
-plancraft-0.3.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plancraft-0.3.20.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
-plancraft-0.3.20.dist-info/RECORD,,
+plancraft-0.3.22.dist-info/METADATA,sha256=jTX0TZZxJRldUDDFuJ6AhuN1Bf5Jc2DuDooPVwCBkAQ,11148
+plancraft-0.3.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plancraft-0.3.22.dist-info/licenses/LICENSE,sha256=YGR8ehDB4t-T-lOQKMfKNR-2zsOU7E3E5NA8t25HKE0,1070
+plancraft-0.3.22.dist-info/RECORD,,