prompt-caller 0.1.1__py3-none-any.whl → 0.1.3__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
 
@@ -50,6 +51,14 @@ class PromptCaller:
 
         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()
@@ -119,7 +128,7 @@ class PromptCaller:
             output = configuration.get("output")
             configuration.pop("output")
 
-        chat = ChatOpenAI(**configuration)
+        chat = self._createChat(configuration)
 
         if output:
             dynamicModel = self.createPydanticModel(output)
@@ -129,14 +138,16 @@ class PromptCaller:
 
         return response
 
-    def agent(self, promptName, context=None, tools=None, allowed_steps=3):
+    def agent(
+        self, promptName, context=None, tools=None, output=None, allowed_steps=10
+    ):
 
         configuration, messages = self.loadPrompt(promptName, context)
 
-        output = None
+        dynamicOutput = None
 
-        if "output" in configuration:
-            output = configuration.get("output")
+        if output is None and "output" in configuration:
+            dynamicOutput = configuration.get("output")
             configuration.pop("output")
 
             for message in messages:
@@ -144,7 +155,7 @@ class PromptCaller:
                     message.content += "\nOnly use the tool DynamicModel when providing an output call."
                     break
 
-        chat = ChatOpenAI(**configuration)
+        chat = self._createChat(configuration)
 
         # Register the tools
         if tools is None:
@@ -156,10 +167,13 @@ class PromptCaller:
         tools_dict = {t.name.lower(): t for t in tools}
 
         if output:
-            dynamicModel = self.createPydanticModel(output)
+            tools.extend([output])
+            tools_dict[output.__name__.lower()] = output
+        elif dynamicOutput:
+            dynamicModel = self.createPydanticModel(dynamicOutput)
 
-        tools.extend([dynamicModel])
-        tools_dict["dynamicmodel"] = dynamicModel
+            tools.extend([dynamicModel])
+            tools_dict["dynamicmodel"] = dynamicModel
 
         chat = chat.bind_tools(tools)
 
@@ -174,9 +188,12 @@ class PromptCaller:
                     tool_name = tool_call["name"].lower()
 
                     # If it's the final formatting tool, validate and return
-                    if tool_name == "dynamicmodel":
+                    if dynamicOutput and tool_name == "dynamicmodel":
                         return dynamicModel.model_validate(tool_call["args"])
 
+                    if output and tool_name == output.__name__.lower():
+                        return output.model_validate(tool_call["args"])
+
                     selected_tool = tools_dict.get(tool_name)
                     if not selected_tool:
                         raise ValueError(f"Unknown tool: {tool_name}")
@@ -202,5 +219,6 @@ class PromptCaller:
             return response
 
         except Exception as e:
+            print(e)
             # Replace with appropriate logging in production
             raise RuntimeError("Error during agent process") from e

{prompt_caller-0.1.1.dist-info → prompt_caller-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompt_caller
-Version: 0.1.1
+Version: 0.1.3
 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

prompt_caller-0.1.3.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=XKmYQuU4XMFeeUEPjTEukpinAlapHOB_ZgWORVb9GnI,7489
+prompt_caller-0.1.3.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+prompt_caller-0.1.3.dist-info/METADATA,sha256=eOke1OseFZfeHAggOBrIDbXIRLTlkUrlPV1bn8t0WUY,4909
+prompt_caller-0.1.3.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+prompt_caller-0.1.3.dist-info/top_level.txt,sha256=iihiDRq-0VrKB8IKjxf7Lrtv-fLMq4tvgM4fH3x0I94,14
+prompt_caller-0.1.3.dist-info/RECORD,,

prompt_caller-0.1.1.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=fy-pLXmYD2j5fnAxgBvxCNBrkQvDPGX0nWyqnaWeqSo,6737
-prompt_caller-0.1.1.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-prompt_caller-0.1.1.dist-info/METADATA,sha256=j1xmg_Y_NAhh7CmlCgAcfSMuHChZ9C4DPcszLADg7dk,4909
-prompt_caller-0.1.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-prompt_caller-0.1.1.dist-info/top_level.txt,sha256=iihiDRq-0VrKB8IKjxf7Lrtv-fLMq4tvgM4fH3x0I94,14
-prompt_caller-0.1.1.dist-info/RECORD,,