banks 2.1.1__tar.gz → 2.1.2__tar.gz

{banks-2.1.1 → banks-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: banks
-Version: 2.1.1
+Version: 2.1.2
 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 → banks-2.1.2}/README.md

@@ -92,8 +92,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 → banks-2.1.2}/src/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.2"

{banks-2.1.1 → banks-2.1.2}/src/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-2.1.1 → banks-2.1.2}/src/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 → banks-2.1.2}/tests/conftest.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import pytest
 import redis
 
@@ -19,3 +21,9 @@ def skip_by_redis(request):
     if request.node.get_closest_marker("redis"):
         if not is_redis_available():
             pytest.skip("Redis is not available")
+
+
+@pytest.fixture
+def data_path() -> Path:
+    here = Path(__file__).parent
+    return here / "data"

banks-2.1.2/tests/test_chat.py

@@ -0,0 +1,82 @@
+from typing import cast
+
+import pytest
+from jinja2 import TemplateSyntaxError
+
+from banks import Prompt
+from banks.types import ContentBlock
+
+
+def test_wrong_tag():
+    with pytest.raises(TemplateSyntaxError):
+        Prompt("{% chat %}{% endchat %}")
+
+
+def test_wrong_tag_params():
+    with pytest.raises(TemplateSyntaxError):
+        Prompt('{% chat foo="bar" %}{% endchat %}')
+
+
+def test_wrong_role_type():
+    with pytest.raises(TemplateSyntaxError):
+        Prompt('{% chat role="does not exist" %}{% endchat %}')
+
+
+def test_blocks():
+    p = Prompt('{% chat role="user" %}Tell me what you see: {{ picture | image }}{% endchat %}')
+    messages = p.chat_messages({"picture": "http://foo.bar"})
+    assert len(messages) == 1
+    content = messages[0].content
+    assert len(content) == 2
+    assert content[0].type == "text"  # type: ignore
+    assert content[1].type == "image_url"  # type: ignore
+
+
+def test_blocks_newlines():
+    p = Prompt("""{% chat role="system" %}
+Some instructions:
+
+1. Do this.
+2. Then this.
+3. Finally, that.
+{% endchat %}""")
+    messages = p.chat_messages()
+    assert len(messages) == 1
+    assert len(messages[0].content) == 1
+
+
+def test_blocks_complex(data_path):
+    p = Prompt("""
+{% chat role="system" %}
+Given a list of images and text from each image, please answer the question to the best of your ability.
+{% endchat %}
+
+{% chat role="user" %}
+{% for image_path, text in images_and_texts %}
+Here is some text: {{ text }}
+And here is an image:
+{{ image_path | image }}
+{% endfor %}
+{% endchat %}
+    """)
+
+    messages = p.chat_messages(
+        {
+            "images_and_texts": [
+                (str(data_path / "1x1.png"), "This is the first page of the document"),
+                (str(data_path / "1x1.png"), "This is the second page of the document"),
+            ]
+        }
+    )
+    assert len(messages) == 2
+
+    blocks = cast(list[ContentBlock], messages[0].content)
+    assert len(blocks) == 1
+    assert blocks[0].type == "text"
+
+    blocks = cast(list[ContentBlock], messages[1].content)
+    assert len(blocks) == 4
+    assert blocks[0].type == "text"
+    assert blocks[1].type == "image_url"
+    assert blocks[2].type == "text"
+    assert blocks[3].type == "image_url"

banks-2.1.1/tests/test_chat.py

@@ -1,29 +0,0 @@
-import pytest
-from jinja2 import TemplateSyntaxError
-
-from banks import Prompt
-
-
-def test_wrong_tag():
-    with pytest.raises(TemplateSyntaxError):
-        Prompt("{% chat %}{% endchat %}")
-
-
-def test_wrong_tag_params():
-    with pytest.raises(TemplateSyntaxError):
-        Prompt('{% chat foo="bar" %}{% endchat %}')
-
-
-def test_wrong_role_type():
-    with pytest.raises(TemplateSyntaxError):
-        Prompt('{% chat role="does not exist" %}{% endchat %}')
-
-
-def test_blocks():
-    p = Prompt('{% chat role="user" %}Tell me what you see: {{ picture | image }}{% endchat %}')
-    messages = p.chat_messages({"picture": "http://foo.bar"})
-    assert len(messages) == 1
-    content = messages[0].content
-    assert len(content) == 2
-    assert content[0].type == "text"  # type: ignore
-    assert content[1].type == "image_url"  # type: ignore