openrouter-provider 1.0.1__py3-none-any.whl → 1.0.10__py3-none-any.whl

openrouter/__init__.py

@@ -0,0 +1,5 @@
+from .llms import *
+from .message import *
+from .openrouter import *
+from .openrouter_provider import *
+from .tool import *

llms.py → openrouter/llms.py

@@ -34,9 +34,8 @@ claude_4_1_opus = LLMModel(name='anthropic/claude-opus-4.1', input_cost=15, outp
 # Google
 gemini_2_0_flash = LLMModel(name='google/gemini-2.0-flash-001', input_cost=0.1, output_cost=0.4)
 gemini_2_5_flash_lite = LLMModel(name='google/gemini-2.5-flash-lite', input_cost=0.1, output_cost=0.4)
-gemini_2_5_flash = LLMModel(name='google/gemini-2.5-flash-preview', input_cost=0.15, output_cost=0.60)
-gemini_2_5_flash_thinking = LLMModel(name='google/gemini-2.5-flash-preview:thinking', input_cost=0.15, output_cost=3.5)
-gemini_2_5_pro = LLMModel(name='google/gemini-2.5-pro-preview-03-25', input_cost=1.25, output_cost=10)
+gemini_2_5_flash = LLMModel(name='google/gemini-2.5-flash', input_cost=0.3, output_cost=2.5)
+gemini_2_5_pro = LLMModel(name='google/gemini-2.5-pro', input_cost=1.25, output_cost=10)
 
 # Deepseek
 deepseek_v3_free = LLMModel(name='deepseek/deepseek-chat-v3-0324:free', input_cost=0, output_cost=0)

message.py → openrouter/message.py

@@ -3,12 +3,13 @@ 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
 from openai.types.chat import ChatCompletion
 
-from .llms import LLMModel
+from openrouter.llms import LLMModel
 
 
 class Role(Enum):
@@ -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.py → openrouter/openrouter.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 import json
 import time
+from copy import deepcopy
 from typing import Iterator, AsyncIterator
 
 from dotenv import load_dotenv
 from pydantic import BaseModel
 
-from .llms import *
-from .message import *
-from .openrouter_provider import *
-from .tool import *
+from openrouter.llms import *
+from openrouter.message import *
+from openrouter.openrouter_provider import *
+from openrouter.tool import *
 
 
 _base_system_prompt = """
@@ -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,14 +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,
@@ -99,28 +151,17 @@ 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)
+            self._memory[-1] = reply
+
             reply = client.invoke(
                 model=model,
+                temperature=temperature,
                 system_prompt=self._system_prompt,
                 querys=self._memory,
-                tools=self.tools + tools,
                 provider=provider
             )
-            
             reply.answered_by = model
             self._memory.append(reply)
 
@@ -156,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,
@@ -175,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,
@@ -248,4 +280,8 @@ class OpenRouterClient:
             provider=provider,
             json_schema=json_schema
         )
+        
+        self._memory.append(Message(text=reply.model_dump_json(), role=Role.ai, answered_by=model))
+        
         return reply
+

openrouter_provider.py → openrouter/openrouter_provider.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+import json
 import os
 from dataclasses import dataclass, asdict
 from typing import List, Optional, Literal, Iterator, AsyncIterator
@@ -6,11 +7,11 @@ from typing import List, Optional, Literal, Iterator, AsyncIterator
 from dotenv import load_dotenv
 from openai import OpenAI, AsyncOpenAI
 from openai.types.chat import ChatCompletionChunk
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
 
-from .message import Message, Role, ToolCall
-from .tool import tool_model
-from .llms import LLMModel
+from openrouter.message import Message, Role, ToolCall
+from openrouter.tool import tool_model
+from openrouter.llms import LLMModel
 
 
 
@@ -122,7 +123,7 @@ 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,
         model: LLMModel,
@@ -219,14 +220,60 @@ class OpenRouterProvider:
         messages = self.make_prompt(system_prompt, querys)
         provider_dict = provider.to_dict() if provider else None
         
+        schema = json_schema.model_json_schema()
+        
+        def add_additional_properties_false(obj):
+            if isinstance(obj, dict):
+                if "properties" in obj:
+                    obj["additionalProperties"] = False
+                for value in obj.values():
+                    add_additional_properties_false(value)
+            elif isinstance(obj, list):
+                for item in obj:
+                    add_additional_properties_false(item)
+        
+        def ensure_required_properties(obj):
+            if isinstance(obj, dict):
+                properties = obj.get("properties")
+                if isinstance(properties, dict):
+                    keys = list(properties.keys())
+                    existing_required = obj.get("required")
+                    if isinstance(existing_required, list):
+                        required_set = set(existing_required)
+                    else:
+                        required_set = set()
+                    required_set.update(keys)
+                    obj["required"] = list(required_set)
+                for value in obj.values():
+                    ensure_required_properties(value)
+            elif isinstance(obj, list):
+                for item in obj:
+                    ensure_required_properties(item)
+
+        add_additional_properties_false(schema)
+        ensure_required_properties(schema)
+        
         response = self.client.chat.completions.create(
             model=model.name,
             temperature=temperature,
             messages=messages,
-            response_format={"type": "json_schema", "json_schema": {"name": json_schema.__name__, "schema": json_schema.model_json_schema()}},
+            response_format={"type": "json_schema", "json_schema": {"name": json_schema.__name__, "schema": schema}},
             extra_body={"provider": provider_dict},
         )
 
-        return json_schema.model_validate_json(response.choices[0].message.content)
-        
-    
+        content = response.choices[0].message.content
+
+        try:
+            return json_schema.model_validate_json(content)
+        except ValidationError:
+            formatted_content = content
+            try:
+                parsed = json.loads(content)
+                formatted_content = json.dumps(parsed, indent=2, ensure_ascii=False)
+            except json.JSONDecodeError:
+                pass
+            print("structured_output validation failed, response content:")
+            print(formatted_content)
+            raise
+
+    

{openrouter_provider-1.0.1.dist-info → openrouter_provider-1.0.10.dist-info}/METADATA

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

openrouter_provider-1.0.10.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=NHKZjpTTBKWTYcH67XTXh8vTotV-zsuuQl2xzAjXq24,9898
+openrouter/tool.py,sha256=tUUNLosz1XhzPIwY1zHXWNM3ePs7hcVD1a_W5hWTCWk,1975
+openrouter_provider-1.0.10.dist-info/METADATA,sha256=NFw7weaQNpo-sEJbxrsC_DqrkJsLSJ7_bk4APhRecVY,11504
+openrouter_provider-1.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+openrouter_provider-1.0.10.dist-info/top_level.txt,sha256=0jnlCcRirGeYZLm5ZbWQRUonIp4tTPl_9mq-ds_1SEo,11
+openrouter_provider-1.0.10.dist-info/RECORD,,

openrouter_provider-1.0.10.dist-info/top_level.txt

@@ -0,0 +1 @@
+openrouter

openrouter_provider-1.0.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-llms.py,sha256=IjG3WgmPDbNR8zvAOYDsZvSZNmDjYfPS4IpdtlI4OI8,3535
-message.py,sha256=xTPzrgiVd651EeccUoxh5h1Xo4Xhu1VpAnb6NB-p9YY,2860
-openrouter.py,sha256=zXa6huZ4QIzJpbk9GeX4fEKJsyYwZN09ZlmbkAef5ik,7857
-openrouter_provider.py,sha256=dJe_kPENFfhzC9J7q4XyglpXYq-1KPFIwsgyIdHeml8,8021
-tool.py,sha256=tUUNLosz1XhzPIwY1zHXWNM3ePs7hcVD1a_W5hWTCWk,1975
-openrouter_provider-1.0.1.dist-info/METADATA,sha256=g4NGzvYX4bY8VU3c9gEAT8XWcfT0itTTY-HiOQVb3o4,11503
-openrouter_provider-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-openrouter_provider-1.0.1.dist-info/top_level.txt,sha256=P1gRRxgxRCkgKpO2Eru8nR9svmkGy1YlKSVavfrNIFs,58
-openrouter_provider-1.0.1.dist-info/RECORD,,

openrouter_provider-1.0.1.dist-info/top_level.txt

@@ -1,6 +0,0 @@
-__init__
-llms
-message
-openrouter
-openrouter_provider
-tool