openrouter-provider 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

openrouter/message.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from enum import Enum
 from io import BytesIO
 import base64
+import uuid
 from typing import Optional, Any
 
 from PIL import Image
@@ -34,8 +35,10 @@ class Message:
         images: Optional[list[Image.Image]] = None,
         role: Role = Role.user,
         answered_by: Optional[LLMModel] = None,
-        raw_response: Optional[ChatCompletion] = None
+        raw_response: Optional[ChatCompletion] = None,
+        id: Optional[str] = None
     ) -> None:
+        self.id = id if id is not None else str(uuid.uuid4())
         self.role = role
         self.text = text
         self.images = self._process_image(images)

openrouter/openrouter.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 import json
 import time
+from copy import deepcopy
 from typing import Iterator, AsyncIterator
 
 from dotenv import load_dotenv
@@ -35,9 +36,57 @@ class OpenRouterClient:
         system_prompt = _base_system_prompt
         system_prompt = system_prompt.replace("[TIME]", f"{month}/{day}/{year}")
         system_prompt = system_prompt.replace("[SYSTEM_INSTRUCTION]", prompt)
-        
+
         self._system_prompt = Message(text=system_prompt, role=Role.system)
-        
+
+    def _execute_tools(self, reply: Message, tools: list[tool_model]) -> Message:
+        if not reply.tool_calls:
+            return reply
+
+        reply_copy = deepcopy(reply)
+
+        for requested_tool in reply_copy.tool_calls:
+            args = requested_tool.arguments
+            if isinstance(args, str):
+                args = json.loads(args)
+
+            for tool in tools:
+                if tool.name == requested_tool.name:
+                    result = tool(**args)
+                    requested_tool.result = result
+                    break
+
+        return reply_copy
+
+    def execute_tool(self, reply: Message, tool_index: int, tools: List[tool_model] = []) -> Message:
+        if not reply.tool_calls:
+            return reply
+
+        if tool_index < 0 or tool_index >= len(reply.tool_calls):
+            raise IndexError(f"Tool index {tool_index} is out of range. Available tools: {len(reply.tool_calls)}")
+
+        requested_tool = reply.tool_calls[tool_index]
+
+        args = requested_tool.arguments
+        if isinstance(args, str):
+            args = json.loads(args)
+
+        all_tools = self.tools + tools
+        for tool in all_tools:
+            if tool.name == requested_tool.name:
+                result = tool(**args)
+                requested_tool.result = result
+                break
+        else:
+            raise ValueError(f"Tool '{requested_tool.name}' not found in registered tools")
+
+        for i, msg in enumerate(self._memory):
+            if msg.id == reply.id:
+                self._memory[i] = reply
+                break
+
+        return reply
+
     def clear_memory(self) -> None:
         self._memory = []
         
@@ -80,15 +129,17 @@ class OpenRouterClient:
     def invoke(
         self,
         model: LLMModel,
-        query: Message,
+        query: Message = None,
         tools: list[tool_model] = None,
         provider: ProviderConfig = None,
-        temperature: float = 0.3
+        temperature: float = 0.3,
+        auto_tool_exec: bool = True
     ) -> Message:
         tools = tools or []
-        self._memory.append(query)
+        if query is not None:
+            self._memory.append(query)
         client = OpenRouterProvider()
-        
+
         reply = client.invoke(
             model=model,
             temperature=temperature,
@@ -100,20 +151,19 @@ class OpenRouterClient:
         reply.answered_by = model
         self._memory.append(reply)
 
-        # Execute tools
-        if reply.tool_calls:
-            for requested_tool in reply.tool_calls:
-                args = requested_tool.arguments
-                if isinstance(args, str):
-                    args = json.loads(args)
-
-                for tool in (self.tools + tools):
-                    if tool.name == requested_tool.name:
-                        result = tool(**args)
-                        requested_tool.result = result
-                        break
-                else:
-                    return reply
+        if auto_tool_exec and reply.tool_calls:
+            reply = self._execute_tools(reply, self.tools + tools)
+            self._memory[-1] = reply
+
+            reply = client.invoke(
+                model=model,
+                temperature=temperature,
+                system_prompt=self._system_prompt,
+                querys=self._memory,
+                provider=provider
+            )
+            reply.answered_by = model
+            self._memory.append(reply)
 
         return reply
     
@@ -147,13 +197,15 @@ class OpenRouterClient:
     async def async_invoke(
         self,
         model: LLMModel,
-        query: Message,
+        query: Message = None,
         tools: list[tool_model] = None,
         provider: ProviderConfig = None,
-        temperature: float = 0.3
+        temperature: float = 0.3,
+        auto_tool_exec: bool = True
     ) -> Message:
         tools = tools or []
-        self._memory.append(query)
+        if query is not None:
+            self._memory.append(query)
         client = OpenRouterProvider()
         reply = await client.async_invoke(
             model=model,
@@ -166,19 +218,8 @@ class OpenRouterClient:
         reply.answered_by = model
         self._memory.append(reply)
 
-        if reply.tool_calls:
-            for requested_tool in reply.tool_calls:
-                args = requested_tool.arguments
-                if isinstance(args, str):
-                    args = json.loads(args)
-
-                for tool in (self.tools + tools):
-                    if tool.name == requested_tool.name:
-                        result = tool(**args)
-                        requested_tool.result = result
-                        break
-                else:
-                    return reply
+        if auto_tool_exec and reply.tool_calls:
+            reply = self._execute_tools(reply, self.tools + tools)
 
             reply = await client.async_invoke(
                 model=model,
@@ -243,3 +284,4 @@ class OpenRouterClient:
         self._memory.append(Message(text=reply.model_dump_json(), role=Role.ai, answered_by=model))
         
         return reply
+

openrouter/openrouter_provider.py

@@ -122,6 +122,8 @@ class OpenRouterProvider:
             for tool in response.choices[0].message.tool_calls:
                 reply.tool_calls.append(ToolCall(id=tool.id, name=tool.function.name, arguments=tool.function.arguments))
         return reply
+    
+    
         
     def invoke_stream(
         self,

{openrouter_provider-1.0.7.dist-info → openrouter_provider-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrouter-provider
-Version: 1.0.7
+Version: 1.0.9
 Summary: This is an unofficial wrapper of OpenRouter.
 Author-email: Keisuke Miyamto <aichiboyhighschool@gmail.com>
 Requires-Python: >=3.7

openrouter_provider-1.0.9.dist-info/RECORD

@@ -0,0 +1,10 @@
+openrouter/__init__.py,sha256=xuIzdm8-l3Tmc-zrNIXTicv05c9HCMxTS9xynKpWK-Q,123
+openrouter/llms.py,sha256=zmujFW5BmQA0Fm6z8skuO3ipLpaUMy1VBZxYkPE9OcM,3391
+openrouter/message.py,sha256=ESI4YT6x0TuPZ0AY29ZPlBCv72KrQad1-IeNmrfGD0w,2978
+openrouter/openrouter.py,sha256=T1n3Mi26StAMzJ5yNNY5ww6fympiHBfp5M4pzYPmaV8,8993
+openrouter/openrouter_provider.py,sha256=_Rt85X5pJ1IGbJeITfnzEG0QSp0qTo_PrDWIqtbd0xg,8577
+openrouter/tool.py,sha256=tUUNLosz1XhzPIwY1zHXWNM3ePs7hcVD1a_W5hWTCWk,1975
+openrouter_provider-1.0.9.dist-info/METADATA,sha256=4HR6qiN7tDmtfGczhobO0oZsFtrYbyNS8pZ9rryZmT8,11503
+openrouter_provider-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+openrouter_provider-1.0.9.dist-info/top_level.txt,sha256=0jnlCcRirGeYZLm5ZbWQRUonIp4tTPl_9mq-ds_1SEo,11
+openrouter_provider-1.0.9.dist-info/RECORD,,

openrouter_provider-1.0.7.dist-info/RECORD

@@ -1,10 +0,0 @@
-openrouter/__init__.py,sha256=xuIzdm8-l3Tmc-zrNIXTicv05c9HCMxTS9xynKpWK-Q,123
-openrouter/llms.py,sha256=zmujFW5BmQA0Fm6z8skuO3ipLpaUMy1VBZxYkPE9OcM,3391
-openrouter/message.py,sha256=0q0OYdTl3f1TOx79TJRwPYyFuTxoYI9tSCpQN-N8G-A,2870
-openrouter/openrouter.py,sha256=jywShAm6oALzaNxrw5K6Jd7XizDpyEhVc_pJnJ0KIjI,7695
-openrouter/openrouter_provider.py,sha256=w6isS1VX7iMf71zwQ5tMv7v5X0yeMbLF6vqimOrB724,8567
-openrouter/tool.py,sha256=tUUNLosz1XhzPIwY1zHXWNM3ePs7hcVD1a_W5hWTCWk,1975
-openrouter_provider-1.0.7.dist-info/METADATA,sha256=rwtcuUZFVUe7unjlVEfjIKZ4Mk1weMyT3GJiLATGg9w,11503
-openrouter_provider-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-openrouter_provider-1.0.7.dist-info/top_level.txt,sha256=0jnlCcRirGeYZLm5ZbWQRUonIp4tTPl_9mq-ds_1SEo,11
-openrouter_provider-1.0.7.dist-info/RECORD,,