prompt-caller 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

prompt_caller/prompt_caller.py

@@ -8,6 +8,7 @@ from jinja2 import Template
 from langchain_core.tools import tool
 from langchain_core.messages import HumanMessage, SystemMessage, ToolMessage
 from langchain_openai import ChatOpenAI
+from langchain_google_genai import ChatGoogleGenerativeAI
 from PIL import Image
 from pydantic import BaseModel, Field, create_model
 
@@ -18,7 +19,6 @@ load_dotenv()
 
 
 class PromptCaller:
-
     def __init__(self, promptPath="prompts"):
         self.promptPath = promptPath
 
@@ -39,17 +39,44 @@ class PromptCaller:
         template = Template(body)
         return template.render(context)
 
+    import re
+
     def _parseJSXBody(self, body):
         elements = []
-        tag_pattern = r"<(system|user|assistant|image)>(.*?)</\1>"
+        # 1. Regex to find tags, attributes string, and content
+        tag_pattern = r"<(system|user|assistant|image)([^>]*)>(.*?)</\1>"
+
+        # 2. Regex to find key="value" pairs within the attributes string
+        attr_pattern = r'(\w+)\s*=\s*"(.*?)"'
 
         matches = re.findall(tag_pattern, body, re.DOTALL)
 
-        for tag, content in matches:
-            elements.append({"role": tag, "content": content.strip()})
+        for tag, attrs_string, content in matches:
+            # 3. Parse the attributes string (e.g., ' tag="image 1"') into a dict
+            attributes = {}
+            if attrs_string:
+                attr_matches = re.findall(attr_pattern, attrs_string)
+                for key, value in attr_matches:
+                    attributes[key] = value
+
+            element = {"role": tag, "content": content.strip()}
+
+            # 4. Add the attributes to our element dict if they exist
+            if attributes:
+                element["attributes"] = attributes
+
+            elements.append(element)
 
         return elements
 
+    def _createChat(self, configuration):
+        if configuration.get("model") is not None and configuration.get(
+            "model"
+        ).startswith("gemini"):
+            return ChatGoogleGenerativeAI(**configuration)
+        else:
+            return ChatOpenAI(**configuration)
+
     def getImageBase64(self, url: str) -> str:
         response = requests.get(url)
         response.raise_for_status()
@@ -87,16 +114,18 @@ class PromptCaller:
                 if base64_image.startswith("http"):
                     base64_image = self.getImageBase64(base64_image)
 
-                messages.append(
-                    HumanMessage(
-                        content=[
-                            {
-                                "type": "image_url",
-                                "image_url": {"url": base64_image},
-                            }
-                        ]
-                    )
-                )
+                content = [
+                    {
+                        "type": "image_url",
+                        "image_url": {"url": base64_image},
+                    }
+                ]
+
+                tag = message.get("attributes", {}).get("tag")
+                if tag:
+                    content.append({"type": "text", "text": f"({tag})"})
+
+                messages.append(HumanMessage(content=content))
 
         return configuration, messages
 
@@ -110,7 +139,6 @@ class PromptCaller:
         return create_model("DynamicModel", **fields)
 
     def call(self, promptName, context=None):
-
         configuration, messages = self.loadPrompt(promptName, context)
 
         output = None
@@ -119,7 +147,7 @@ class PromptCaller:
             output = configuration.get("output")
             configuration.pop("output")
 
-        chat = ChatOpenAI(**configuration)
+        chat = self._createChat(configuration)
 
         if output:
             dynamicModel = self.createPydanticModel(output)
@@ -132,7 +160,6 @@ class PromptCaller:
     def agent(
         self, promptName, context=None, tools=None, output=None, allowed_steps=10
     ):
-
         configuration, messages = self.loadPrompt(promptName, context)
 
         dynamicOutput = None
@@ -143,10 +170,10 @@ class PromptCaller:
 
             for message in messages:
                 if isinstance(message, SystemMessage):
-                    message.content += "\nOnly use the tool DynamicModel when providing an output call."
+                    message.content += "\n\nYou have to use the tool `dynamicmodel` when providing your final answer. If you don't, you have failed the task."
                     break
 
-        chat = ChatOpenAI(**configuration)
+        chat = self._createChat(configuration)
 
         # Register the tools
         if tools is None:
@@ -161,7 +188,7 @@ class PromptCaller:
             tools.extend([output])
             tools_dict[output.__name__.lower()] = output
         elif dynamicOutput:
-            dynamicModel = self.createPydanticModel(output)
+            dynamicModel = self.createPydanticModel(dynamicOutput)
 
             tools.extend([dynamicModel])
             tools_dict["dynamicmodel"] = dynamicModel

{prompt_caller-0.1.2.dist-info → prompt_caller-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompt_caller
-Version: 0.1.2
+Version: 0.1.4
 Summary: This package is responsible for calling prompts in a specific format. It uses LangChain and OpenAI API
 Home-page: https://github.com/ThiNepo/prompt-caller
 Author: Thiago Nepomuceno
@@ -14,6 +14,7 @@ Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: Jinja2>=3.1.4
 Requires-Dist: langchain-openai>=0.3.5
+Requires-Dist: langchain-google-genai==2.1.5
 Requires-Dist: openai>=1.63.0
 Requires-Dist: pillow>=11.0.0
 

prompt_caller-0.1.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+prompt_caller/__init__.py,sha256=4EGdeAJ_Ig7A-b-e17-nYbiXjckT7uL3to5lchMsoW4,41
+prompt_caller/__main__.py,sha256=dJ0dYtVmnhZuoV79R6YiAIta1ZkUKb-TEX4VEuYbgk0,139
+prompt_caller/prompt_caller.py,sha256=0Rqfzp7hUgPH10auxEwJMoaASOSZNlTyDvS8Hd6X0Yk,8333
+prompt_caller-0.1.4.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+prompt_caller-0.1.4.dist-info/METADATA,sha256=0x0EKp50KvL-dYuc9n8TEvouL53jD_V1fMw2bSKGPEY,4955
+prompt_caller-0.1.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+prompt_caller-0.1.4.dist-info/top_level.txt,sha256=iihiDRq-0VrKB8IKjxf7Lrtv-fLMq4tvgM4fH3x0I94,14
+prompt_caller-0.1.4.dist-info/RECORD,,

prompt_caller-0.1.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-prompt_caller/__init__.py,sha256=4EGdeAJ_Ig7A-b-e17-nYbiXjckT7uL3to5lchMsoW4,41
-prompt_caller/__main__.py,sha256=dJ0dYtVmnhZuoV79R6YiAIta1ZkUKb-TEX4VEuYbgk0,139
-prompt_caller/prompt_caller.py,sha256=zAJq_5v-ku_O9ACAw7C7JU1RmVwlIvunbd-31B0XX6E,7119
-prompt_caller-0.1.2.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-prompt_caller-0.1.2.dist-info/METADATA,sha256=IjSAGTvmJbi7X6_5f3OxvH6QA7l9H6Opx4d9wtGGRak,4909
-prompt_caller-0.1.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-prompt_caller-0.1.2.dist-info/top_level.txt,sha256=iihiDRq-0VrKB8IKjxf7Lrtv-fLMq4tvgM4fH3x0I94,14
-prompt_caller-0.1.2.dist-info/RECORD,,