openrouter-provider 0.0.3__py3-none-any.whl → 0.0.5__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/OpenRouterProvider.py

@@ -1,3 +1,4 @@
+import logging
 from .Chat_message import *
 from .Tool import tool_model
 from .LLMs import *
@@ -9,6 +10,10 @@ from dataclasses import dataclass, field, asdict
 from typing import List, Optional, Literal
 import json
 
+# エラーのみ表示、詳細なトレースバック付き
+logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(levelname)s - %(message)s")
+logger = logging.getLogger(__name__)
+
 
 @dataclass
 class ProviderConfig:
@@ -21,7 +26,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 +34,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 +55,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 +69,44 @@ 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],
-            extra_body={
-                "provider": provider.to_dict() if provider else None
-            }
-        )
-        reply = Chat_message(text=response.choices[0].message.content, role=Role.ai)
-        
-        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
+            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)

{openrouter_provider-0.0.3.dist-info → openrouter_provider-0.0.5.dist-info}/METADATA

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

openrouter_provider-0.0.5.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=EpLWhxx7xnRa-q7xqP2Ur9dmYb9Mzv_UF6BChwpcbYk,4357
+OpenRouterProvider/LLMs.py,sha256=-0ELd6fqmdDvsdaPIElRsluiK85-Y6USwvQb2b4M8TA,2607
+OpenRouterProvider/OpenRouterProvider.py,sha256=4k87D5kKNPgRJ-7qMv9oPWY7P2psrNaNOALmyPMuNsw,4397
+OpenRouterProvider/Tool.py,sha256=QeeWOD2oaYjB9tjF-Jvcjd_G_qSUIuKwFgyh20Ne06I,2010
+openrouter_provider-0.0.5.dist-info/METADATA,sha256=_H9lXm0ohRX57GdvJMJNIyn6pyWblQQTDHOWv7EM6GE,5995
+openrouter_provider-0.0.5.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+openrouter_provider-0.0.5.dist-info/top_level.txt,sha256=I5BMEzkQFEnEYTqOY1Ktmnp7r1rrZQyeWdclKyyyHKs,28
+openrouter_provider-0.0.5.dist-info/RECORD,,

openrouter_provider-0.0.3.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=BE7O2b1iW_g8xp7tFjwgGzd6T3G96EVI4Pz69ovw4RU,3929
-OpenRouterProvider/Tool.py,sha256=QeeWOD2oaYjB9tjF-Jvcjd_G_qSUIuKwFgyh20Ne06I,2010
-openrouter_provider-0.0.3.dist-info/METADATA,sha256=iWSY6mLLjCPaWUEyt_ATUKsdKONSGp7JHjkQeJbI2UQ,5995
-openrouter_provider-0.0.3.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-openrouter_provider-0.0.3.dist-info/top_level.txt,sha256=I5BMEzkQFEnEYTqOY1Ktmnp7r1rrZQyeWdclKyyyHKs,28
-openrouter_provider-0.0.3.dist-info/RECORD,,