openrouter-provider 0.0.4__tar.gz → 0.0.6__tar.gz

{openrouter_provider-0.0.4 → openrouter_provider-0.0.6}/PKG-INFO

@@ -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.4 → openrouter_provider-0.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openrouter-provider"
-version = "0.0.4"
+version = "0.0.6"
 description = "This is an unofficial wrapper of OpenRouter."
 readme = "README.md"
 requires-python = ">=3.7"

{openrouter_provider-0.0.4 → openrouter_provider-0.0.6}/src/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)

{openrouter_provider-0.0.4 → openrouter_provider-0.0.6}/src/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))
+        
+        

openrouter_provider-0.0.6/src/OpenRouterProvider/OpenRouterProvider.py

@@ -0,0 +1,141 @@
+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, time
+from dataclasses import dataclass, field, asdict
+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
+class ProviderConfig:
+    order: Optional[List[str]] = None
+    allow_fallbacks: bool = None
+    require_parameters: bool = None
+    data_collection: Literal["allow", "deny"] = None
+    only: Optional[List[str]] = None
+    ignore: Optional[List[str]] = None
+    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}
+
+
+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=api_key,
+        )
+
+    def make_prompt(self, system_prompt: Chat_message,
+                    querys: list[Chat_message]) -> list[dict]:
+        messages = [{"role": "system", "content": system_prompt.text}]
+
+        for query in querys:
+            if query.role == Role.user:
+                if query.images is None:
+                    messages.append({"role": "user", "content": query.text})
+                else:
+                    content = [{"type": "text", "text": query.text}]
+                    for img in query.images[:50]:
+                        content.append(
+                            {"type": "image_url",
+                             "image_url": {"url": f"data:image/jpeg;base64,{img}"}})
+                    messages.append({"role": "user", "content": content})
+
+            elif query.role == Role.ai or query.role == Role.tool:
+                assistant_msg = {"role": "assistant"}
+                assistant_msg["content"] = query.text or None
+
+                if query.tool_calls:
+                    assistant_msg["tool_calls"] = [
+                        {
+                            "id": str(t.id),
+                            "type": "function",
+                            "function": {
+                                "name": t.name,
+                                "arguments": t.arguments
+                            }
+                        }
+                        for t in query.tool_calls
+                    ]
+                messages.append(assistant_msg)
+
+            for t in query.tool_calls:
+                messages.append({
+                    "role": "tool",
+                    "tool_call_id": str(t.id),
+                    "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)
+
+            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')
+        
+        # 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 → openrouter_provider-0.0.6}/src/openrouter_provider.egg-info/PKG-INFO

@@ -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.4/src/OpenRouterProvider/OpenRouterProvider.py

@@ -1,101 +0,0 @@
-from .Chat_message import *
-from .Tool import tool_model
-from .LLMs import *
-
-from openai import OpenAI
-from dotenv import load_dotenv
-import os
-from dataclasses import dataclass, field, asdict
-from typing import List, Optional, Literal
-import json
-
-
-@dataclass
-class ProviderConfig:
-    order: Optional[List[str]] = None
-    allow_fallbacks: bool = None
-    require_parameters: bool = None
-    data_collection: Literal["allow", "deny"] = None
-    only: Optional[List[str]] = None
-    ignore: Optional[List[str]] = None
-    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}
-
-
-class OpenRouterProvider:
-    def __init__(self) -> None:
-        load_dotenv()
-        self.client = OpenAI(
-            base_url="https://openrouter.ai/api/v1",
-            api_key=os.getenv("OPENROUTER_API_KEY"),
-        )
-
-    def make_prompt(self, system_prompt: Chat_message,
-                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})
-                else:
-                    content = [{"type": "text", "text": query.text}]
-                    for img in query.images[:50]:
-                        content.append(
-                            {"type": "image_url",
-                            "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 は明示必須
-
-                # ① tool_calls を付与（あれば）
-                if query.tool_calls:
-                    assistant_msg["tool_calls"] = [
-                        {
-                            "id": str(t.id),
-                            "type": "function",
-                            "function": {
-                                "name": t.name,
-                                "arguments": t.arguments          # JSON 文字列
-                            }
-                        }
-                        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)                  # 実行結果（文字列）
-                })
-        return messages
-
-
-    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)
-        
-        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
-