openrouter-provider 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

OpenRouterProvider/Chat_message.py

@@ -6,6 +6,8 @@ import base64
 from io import BytesIO
 from dataclasses import dataclass
 
+from openai.types.chat import ChatCompletion
+
 
 class Role(Enum):
     system = "system"
@@ -24,15 +26,21 @@ class ToolCall:
 
 
 class Chat_message:
-    def __init__(self, text: str, images: list[Image.Image]=None, role: Role=Role.user, answerdBy: LLMModel=None, token :int=0, cost: float=0) -> None:
+    def __init__(self, 
+                 text: str, 
+                 images: list[Image.Image]=None, 
+                 role: Role=Role.user, 
+                 answerdBy: LLMModel=None, 
+                 raw_response: ChatCompletion=None
+                ) -> None:
         self.role = role
         self.text = text
         self.images = self._process_image(images=images)
-        self.token = token
-        self.cost = cost
         self.answeredBy: LLMModel = answerdBy
         
         self.tool_calls: list[ToolCall] = []
+        self.raw_resoonse: ChatCompletion = raw_response
+
 
     def __str__(self) -> str:
         # ANSI color codes for blue, green, and reset (to default)

OpenRouterProvider/Chatbot_manager.py

@@ -5,6 +5,8 @@ from .LLMs import LLMModel
 from dotenv import load_dotenv
 import time
 import json
+from typing import Iterator
+
 
 _base_system_prompt = """
 It's [TIME] today.
@@ -120,4 +122,23 @@ class Chatbot_manager:
             self._memory.append(reply)
 
         return reply
-    
+    
+    def invoke_stream(self, model: LLMModel, query: Chat_message, tools: list[tool_model]=[], provider:ProviderConfig=None) -> Iterator[str]:
+        self._memory.append(query)
+        client = OpenRouterProvider()
+        generator = client.invoke_stream(
+            model=model,
+            system_prompt=self._system_prompt,
+            querys=self._memory,
+            tools=self.tools + tools,
+            provider=provider
+        )
+        
+        text = ""
+        for token in generator:
+            text += token.choices[0].delta.content
+            yield token.choices[0].delta.content
+
+        self._memory.append(Chat_message(text=text, role=Role.ai, answerdBy=LLMModel))
+        
+        

OpenRouterProvider/OpenRouterProvider.py

@@ -1,13 +1,19 @@
+import logging
 from .Chat_message import *
 from .Tool import tool_model
 from .LLMs import *
 
 from openai import OpenAI
+from openai.types.chat import ChatCompletionChunk
 from dotenv import load_dotenv
-import os
+import os, time
 from dataclasses import dataclass, field, asdict
-from typing import List, Optional, Literal
-import json
+from typing import List, Optional, Literal, Iterator
+from pprint import pprint
+
+# エラーのみ表示、詳細なトレースバック付き
+logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(levelname)s - %(message)s")
+logger = logging.getLogger(__name__)
 
 
 @dataclass
@@ -21,7 +27,7 @@ class ProviderConfig:
     quantizations: Optional[List[str]] = None
     sort: Optional[Literal["price", "throughput"]] = None
     max_price: Optional[dict] = None
-    
+
     def to_dict(self) -> dict:
         return {k: v for k, v in asdict(self).items() if v is not None}
 
@@ -29,17 +35,19 @@ class ProviderConfig:
 class OpenRouterProvider:
     def __init__(self) -> None:
         load_dotenv()
+        api_key = os.getenv("OPENROUTER_API_KEY")
+        if not api_key:
+            logger.error("OPENROUTER_API_KEY is not set in environment variables.")
         self.client = OpenAI(
             base_url="https://openrouter.ai/api/v1",
-            api_key=os.getenv("OPENROUTER_API_KEY"),
+            api_key=api_key,
         )
 
     def make_prompt(self, system_prompt: Chat_message,
-                querys: list[Chat_message]) -> list[dict]:
+                    querys: list[Chat_message]) -> list[dict]:
         messages = [{"role": "system", "content": system_prompt.text}]
 
         for query in querys:
-            # ----- USER -----
             if query.role == Role.user:
                 if query.images is None:
                     messages.append({"role": "user", "content": query.text})
@@ -48,15 +56,13 @@ class OpenRouterProvider:
                     for img in query.images[:50]:
                         content.append(
                             {"type": "image_url",
-                            "image_url": {"url": f"data:image/jpeg;base64,{img}"}})
+                             "image_url": {"url": f"data:image/jpeg;base64,{img}"}})
                     messages.append({"role": "user", "content": content})
 
-            # ----- ASSISTANT -----
             elif query.role == Role.ai or query.role == Role.tool:
                 assistant_msg = {"role": "assistant"}
-                assistant_msg["content"] = query.text or None      # ← content は明示必須
+                assistant_msg["content"] = query.text or None
 
-                # ① tool_calls を付与（あれば）
                 if query.tool_calls:
                     assistant_msg["tool_calls"] = [
                         {
@@ -64,38 +70,72 @@ class OpenRouterProvider:
                             "type": "function",
                             "function": {
                                 "name": t.name,
-                                "arguments": t.arguments          # JSON 文字列
+                                "arguments": t.arguments
                             }
                         }
                         for t in query.tool_calls
                     ]
                 messages.append(assistant_msg)
 
-            # ② tool メッセージを assistant の直後に並べる
             for t in query.tool_calls:
                 messages.append({
                     "role": "tool",
                     "tool_call_id": str(t.id),
-                    "content": str(t.result)                  # 実行結果（文字列）
+                    "content": str(t.result)
                 })
+
         return messages
 
+    def invoke(self, model: LLMModel, system_prompt: Chat_message, querys: list[Chat_message], tools: list[tool_model] = [], provider: ProviderConfig = None) -> Chat_message:
+        try:
+            messages = self.make_prompt(system_prompt, querys)
 
-    def invoke(self, model: LLMModel, system_prompt: Chat_message, querys: list[Chat_message], tools:list[tool_model]=[], provider:ProviderConfig=None) -> Chat_message:
-        response = self.client.chat.completions.create(
-            model=model.name,
-            messages=self.make_prompt(system_prompt, querys),
-            tools=[tool.tool_definition for tool in tools] if tools else None,
-            extra_body={
-                "provider": provider.to_dict() if provider else None
-            }
-        )
-        reply = Chat_message(text=response.choices[0].message.content, role=Role.ai)
+            tool_defs = [tool.tool_definition for tool in tools] if tools else None
+            provider_dict = provider.to_dict() if provider else None
+
+            response = self.client.chat.completions.create(
+                model=model.name,
+                messages=messages,
+                tools=tool_defs,
+                extra_body={"provider": provider_dict}
+            )
+
+            reply = Chat_message(text=response.choices[0].message.content, role=Role.ai, raw_response=response)
+
+            if response.choices[0].message.tool_calls:
+                reply.role = Role.tool
+                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
+
+        except Exception as e:
+            logger.exception(f"An error occurred while invoking the model: {e.__class__.__name__}: {str(e)}")
+            return Chat_message(text="Fail to get response. Please see the error message.", role=Role.ai, raw_response=None)
+        
+    def invoke_stream(self, model: LLMModel, system_prompt: Chat_message, querys: list[Chat_message], tools: list[tool_model] = [], provider: ProviderConfig = None) -> Iterator[ChatCompletionChunk]:
+        # chunk example
+        # ChatCompletionChunk(id='gen-1746748260-mdKZLTs9QY7MmUxWKb8V', choices=[Choice(delta=ChoiceDelta(content='!', function_call=None, refusal=None, role='assistant', tool_calls=None), finish_reason=None, index=0, logprobs=None, native_finish_reason=None)], created=1746748260, model='openai/gpt-4o-mini', object='chat.completion.chunk', service_tier=None, system_fingerprint='fp_e2f22fdd96', usage=None, provider='OpenAI')
+        
+        # ChatCompletionChunk(id='gen-1746748260-mdKZLTs9QY7MmUxWKb8V', choices=[Choice(delta=ChoiceDelta(content='', function_call=None, refusal=None, role='assistant', tool_calls=None), finish_reason='stop', index=0, logprobs=None, native_finish_reason='stop')], created=1746748260, model='openai/gpt-4o-mini', object='chat.completion.chunk', service_tier=None, system_fingerprint='fp_e2f22fdd96', usage=None, provider='OpenAI')
         
-        if response.choices[0].message.tool_calls:
-            reply.role = Role.tool
-            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
+        # ChatCompletionChunk(id='gen-1746748260-mdKZLTs9QY7MmUxWKb8V', choices=[Choice(delta=ChoiceDelta(content='', function_call=None, refusal=None, role='assistant', tool_calls=None), finish_reason=None, index=0, logprobs=None, native_finish_reason=None)], created=1746748260, model='openai/gpt-4o-mini', object='chat.completion.chunk', service_tier=None, system_fingerprint=None, usage=CompletionUsage(completion_tokens=54, prompt_tokens=61, total_tokens=115, completion_tokens_details=CompletionTokensDetails(reasoning_tokens=0), prompt_tokens_details={'cached_tokens': 0}), provider='OpenAI')
+        
+        try:
+            messages = self.make_prompt(system_prompt, querys)
+
+            tool_defs = [tool.tool_definition for tool in tools] if tools else None
+            provider_dict = provider.to_dict() if provider else None
+
+            response = self.client.chat.completions.create(
+                model=model.name,
+                messages=messages,
+                tools=tool_defs,
+                extra_body={"provider": provider_dict},
+                stream=True
+            )
+            
+            return response
 
+        except Exception as e:
+            logger.exception(f"An error occurred while invoking the model: {e.__class__.__name__}: {str(e)}")
+            return Chat_message(text="Fail to get response. Please see the error message.", role=Role.ai, raw_response=None)

{openrouter_provider-0.0.4.dist-info → openrouter_provider-0.0.6.dist-info}/METADATA

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

openrouter_provider-0.0.6.dist-info/RECORD

@@ -0,0 +1,10 @@
+__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+OpenRouterProvider/Chat_message.py,sha256=lQd8bFp7OHOgeOrcpcVZMdkV2Mb4reUsv5Ixo6WecYY,4424
+OpenRouterProvider/Chatbot_manager.py,sha256=RzRIrCwCV0PqvjvGZQFB6xJlWOZEgsyZdLAgsH01meg,5091
+OpenRouterProvider/LLMs.py,sha256=-0ELd6fqmdDvsdaPIElRsluiK85-Y6USwvQb2b4M8TA,2607
+OpenRouterProvider/OpenRouterProvider.py,sha256=B8ni2KdbVXZVwMhaetZnl6aA25J3s6oMoAPpuuenx1U,6994
+OpenRouterProvider/Tool.py,sha256=QeeWOD2oaYjB9tjF-Jvcjd_G_qSUIuKwFgyh20Ne06I,2010
+openrouter_provider-0.0.6.dist-info/METADATA,sha256=5CKWKftpXU_T-Y78MP98yVmTBhr9cTWeEYBQYXhRhqg,5995
+openrouter_provider-0.0.6.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+openrouter_provider-0.0.6.dist-info/top_level.txt,sha256=I5BMEzkQFEnEYTqOY1Ktmnp7r1rrZQyeWdclKyyyHKs,28
+openrouter_provider-0.0.6.dist-info/RECORD,,

{openrouter_provider-0.0.4.dist-info → openrouter_provider-0.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

openrouter_provider-0.0.4.dist-info/RECORD

@@ -1,10 +0,0 @@
-__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-OpenRouterProvider/Chat_message.py,sha256=EG6CGfe3qLdczehA6wkX9FWTEFdKteAKWprQ5VSRbbU,4259
-OpenRouterProvider/Chatbot_manager.py,sha256=EpLWhxx7xnRa-q7xqP2Ur9dmYb9Mzv_UF6BChwpcbYk,4357
-OpenRouterProvider/LLMs.py,sha256=-0ELd6fqmdDvsdaPIElRsluiK85-Y6USwvQb2b4M8TA,2607
-OpenRouterProvider/OpenRouterProvider.py,sha256=XbS6-mhv7tzNgfzQrNeZRNDtpFC4DevhfCde4UxPw_o,3948
-OpenRouterProvider/Tool.py,sha256=QeeWOD2oaYjB9tjF-Jvcjd_G_qSUIuKwFgyh20Ne06I,2010
-openrouter_provider-0.0.4.dist-info/METADATA,sha256=nO3cxDrVZdqQIiKX18o0mIqTWWp2kQuVWENt3bt9JWg,5995
-openrouter_provider-0.0.4.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-openrouter_provider-0.0.4.dist-info/top_level.txt,sha256=I5BMEzkQFEnEYTqOY1Ktmnp7r1rrZQyeWdclKyyyHKs,28
-openrouter_provider-0.0.4.dist-info/RECORD,,