banks 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

banks/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present Massimiliano Pippi <mpippi@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "2.1.1"
+__version__ = "2.1.3"

banks/extensions/chat.py

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: 2023-present Massimiliano Pippi <mpippi@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-import re
 
 from jinja2 import TemplateSyntaxError, nodes
 from jinja2.ext import Extension
@@ -9,7 +8,6 @@ from jinja2.ext import Extension
 from banks.types import chat_message_from_text
 
 SUPPORTED_TYPES = ("system", "user", "assistant")
-CONTENT_BLOCK_REGEX = re.compile(r"<content_block>((?s:.)*)<\/content_block>")
 
 
 class ChatExtension(Extension):
@@ -52,8 +50,8 @@ class ChatExtension(Extension):
             raise TemplateSyntaxError(error_msg, lineno)
 
         if attr_value.value not in SUPPORTED_TYPES:
-            types = ",".join(SUPPORTED_TYPES)
-            msg = f"Unknown role type '{attr_value}', use one of ({types})"
+            types = ", ".join(SUPPORTED_TYPES)
+            msg = f"Unknown role type '{attr_value.value}', use one of ({types})"
             raise TemplateSyntaxError(msg, lineno)
 
         # Pass the role name to the CallBlock node

banks/registries/directory.py

@@ -27,7 +27,7 @@ DEFAULT_INDEX_NAME = "index.json"
 class PromptFile(PromptModel):
     """Model representing a prompt file stored on disk."""
 
-    path: Path = Field(exclude=True)
+    path: Path | None = Field(default=None, exclude=True)
 
     @classmethod
     def from_prompt_path(cls: type[Self], prompt: Prompt, path: Path) -> Self:
@@ -101,7 +101,7 @@ class DirectoryPromptRegistry:
         """
         version = version or DEFAULT_VERSION
         for pf in self._index.files:
-            if pf.name == name and pf.version == version and pf.path.exists():
+            if pf.name == name and pf.version == version and pf.path and pf.path.exists():
                 return Prompt(**pf.model_dump())
         raise PromptNotFoundError
 
@@ -135,6 +135,10 @@ class DirectoryPromptRegistry:
     def _load(self):
         """Load the prompt index from disk."""
         self._index = PromptFileIndex.model_validate_json(self._index_path.read_text())
+        # Reconstruct the file paths since they're excluded from serialization
+        for pf in self._index.files:
+            if pf.path is None:
+                pf.path = self._path / f"{pf.name}.{pf.version}.jinja"
 
     def _save(self):
         """Save the prompt index to disk."""

banks/types.py

@@ -16,7 +16,7 @@ from typing_extensions import Self
 from .utils import parse_params_from_docstring, python_type_to_jsonschema
 
 # pylint: disable=invalid-name
-CONTENT_BLOCK_REGEX = re.compile(r"(<content_block>\{.*?\}<\/content_block>)|([^<](?:(?!<content_block>).)*)")
+CONTENT_BLOCK_REGEX = re.compile(r"(<content_block>\{.*?\}<\/content_block>)|([^<](?:(?!<content_block>)[\s\S])*)")
 
 
 class ContentBlockType(str, Enum):

{banks-2.1.1.dist-info → banks-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: banks
-Version: 2.1.1
+Version: 2.1.3
 Summary: A prompt programming language
 Project-URL: Documentation, https://github.com/masci/banks#readme
 Project-URL: Issues, https://github.com/masci/banks/issues
@@ -123,8 +123,14 @@ print(p.chat_messages({"persona": "helpful assistant"}))
 
 # Output:
 # [
-#   ChatMessage(role='system', content='You are a helpful assistant.\n'),
-#   ChatMessage(role='user', content='Hello, how are you?\n')
+#   ChatMessage(role='system', content=[
+#      ContentBlock(type=<ContentBlockType.text: 'text'>, cache_control=None, text='You are a helpful assistant.', 
+#                  image_url=None, input_audio=None)
+#   ], tool_call_id=None, name=None), 
+#   ChatMessage(role='user', content=[
+#      ContentBlock(type=<ContentBlockType.text: 'text'>, cache_control=None, text='Hello, how are you?', 
+#                  image_url=None, input_audio=None)
+#   ], tool_call_id=None, name=None)
 # ]
 ```
 

{banks-2.1.1.dist-info → banks-2.1.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
-banks/__about__.py,sha256=S57kL24mDlNkjLlC1XN2yFEPPClI55FfNyJjlqC8_Fw,132
+banks/__about__.py,sha256=GetPXxJYXnTH5Y2Q50FaMRs7TJ2tkq34MorPa-qCNpc,132
 banks/__init__.py,sha256=4IBopxXstFZliCvSjOuTurSQb32Vy26EXOPhmNZ4Hus,334
 banks/cache.py,sha256=uUGAu82-mfrscc2q24x19ZMZBkoQzf3hh7_V300J-Ik,1069
 banks/config.py,sha256=c6B1cXUZ-NN0XmJvfezXeHPXHP7knk8TfbmcZL7gCzk,1082
 banks/env.py,sha256=PBSz-iH_E3_KYofAfsQZLrYMZXVLNJLxgSFD7GB1Xd0,1233
 banks/errors.py,sha256=I5cgsa7wtolRVKBSq_aH5xs27yVcErBlMyUswCnM-es,580
 banks/prompt.py,sha256=RhPq3wpE-AiCfCftZpPFj2HXGdazwYD502Pr1e-j7FY,8162
-banks/types.py,sha256=R53mLqmTm9HoDJDfRP4mjfpORthkKJbn-6kxudsi_bw,5515
+banks/types.py,sha256=03x7E7FPVfuN39xY--c0fKumnyVUVzNrq9pgG5R-pAU,5520
 banks/utils.py,sha256=ZetGG3qhXMYOitDZQCWbE33wHEqR0ih2ZEg_dIW8OeI,1827
 banks/extensions/__init__.py,sha256=Lx4UrOzywYQY7a8qvIqvc3ql54nwK0lNP7x3jYdbREY,110
-banks/extensions/chat.py,sha256=3eGsvtBxcaXwjCNiaKVgVc7HN8p1p9CIAGgqlt9F_-U,2560
+banks/extensions/chat.py,sha256=VV6UV1wQZcJ0KbIFHSFmDeptWtww4o2IXF5pXB6TpTM,2478
 banks/extensions/completion.py,sha256=kF55PiNxjqpslUTAd46H4jOy0eFiLLm5hEcwxS4_oxs,7356
 banks/extensions/docs.py,sha256=vWOZvu2JoS4LwUG-BR3jPqThirYvu3Fdba331UxooYM,1098
 banks/filters/__init__.py,sha256=LV4mtTYkmLPo0OST8PMhJJmyC8azZJgU-ZKtpAVU1_0,325
@@ -18,10 +18,10 @@ banks/filters/image.py,sha256=cxp_Tlqy-DQ1y3I6IyO6TwM7KkdP8aL_xEKcSqeWX1w,1140
 banks/filters/lemmatize.py,sha256=Yvp8M4HCx6C0nrcu3UEMtjJUwsyVYI6GQDYOG4S6EEw,887
 banks/filters/tool.py,sha256=i8ukSDYw54ksShVJ2abfRQAiKzKrqUtmgBB1H04cig0,475
 banks/registries/__init__.py,sha256=iRK-8420cKBckOTd5KcIFQyV66EsF0Mc7UHCkzf8qZU,255
-banks/registries/directory.py,sha256=WXVL8gIrH2OqDYcC89TuTW-iXSwT9WqJq_OWe_kYC2Q,5803
+banks/registries/directory.py,sha256=gRFO7fl9yXHt2NJ1pDA2wPSQtlORhSw1GKWxSTyFzE8,6055
 banks/registries/file.py,sha256=8ayvFrcM8Tk0DWgGXmKD2DRBfGXr5CmgtdQaQ5cXhow,4054
 banks/registries/redis.py,sha256=eBL92URJa-NegOxRLS4b2xrDRDxz6iiaz_7Ddi32Rtc,2756
-banks-2.1.1.dist-info/METADATA,sha256=cMavPBlQKZ02YwJ77whxc8UvBw0u7pDSP723SkF1y30,11749
-banks-2.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-banks-2.1.1.dist-info/licenses/LICENSE.txt,sha256=NZJne_JTwMFwq_g-kq-sm4PuaeVOgu1l3NUGOgBHX-g,1102
-banks-2.1.1.dist-info/RECORD,,
+banks-2.1.3.dist-info/METADATA,sha256=TL6VlzchrWjdEduPj_aHzVKJts7peXbug1CUaogpPbo,12098
+banks-2.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+banks-2.1.3.dist-info/licenses/LICENSE.txt,sha256=NZJne_JTwMFwq_g-kq-sm4PuaeVOgu1l3NUGOgBHX-g,1102
+banks-2.1.3.dist-info/RECORD,,