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

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

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

{openrouter_provider-0.0.6 → openrouter_provider-0.0.8}/pyproject.toml

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

{openrouter_provider-0.0.6 → openrouter_provider-0.0.8}/src/OpenRouterProvider/Chatbot_manager.py

@@ -5,7 +5,8 @@ from .LLMs import LLMModel
 from dotenv import load_dotenv
 import time
 import json
-from typing import Iterator
+from typing import Iterator, AsyncIterator
+from pydantic import BaseModel
 
 
 _base_system_prompt = """
@@ -90,7 +91,7 @@ class Chatbot_manager:
             system_prompt=self._system_prompt,
             querys=self._memory,
             tools=self.tools + tools,
-            provider=provider
+            provider=provider,
         )
         reply.answeredBy = model
         self._memory.append(reply)
@@ -141,4 +142,74 @@ class Chatbot_manager:
 
         self._memory.append(Chat_message(text=text, role=Role.ai, answerdBy=LLMModel))
         
-        
+    async def async_invoke(self, model: LLMModel, query: Chat_message, tools: list[tool_model] = [], provider: ProviderConfig = None) -> Chat_message:
+        self._memory.append(query)
+        client = OpenRouterProvider()
+        reply = await client.async_invoke(
+            model=model,
+            system_prompt=self._system_prompt,
+            querys=self._memory,
+            tools=self.tools + tools,
+            provider=provider
+        )
+        reply.answeredBy = 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:
+                    print("Tool Not found", requested_tool.name)
+                    return reply
+
+            reply = await client.async_invoke(
+                model=model,
+                system_prompt=self._system_prompt,
+                querys=self._memory,
+                tools=self.tools + tools,
+                provider=provider
+            )
+            reply.answeredBy = model
+            self._memory.append(reply)
+
+        return reply
+
+    async def async_invoke_stream(self, model: LLMModel, query: Chat_message, tools: list[tool_model] = [], provider: ProviderConfig = None) -> AsyncIterator[str]:
+        self._memory.append(query)
+        client = OpenRouterProvider()
+
+        stream = client.async_invoke_stream(
+            model=model,
+            system_prompt=self._system_prompt,
+            querys=self._memory,
+            tools=self.tools + tools,
+            provider=provider
+        )
+
+        text = ""
+        async for chunk in stream:
+            delta = chunk.choices[0].delta.content or ""
+            text += delta
+            yield delta
+
+        self._memory.append(Chat_message(text=text, role=Role.ai, answerdBy=model))
+        
+    def structured_output(self, model: LLMModel, query: Chat_message, provider:ProviderConfig=None, json_schema: BaseModel=None) -> BaseModel:
+        self._memory.append(query)
+        client = OpenRouterProvider()
+        reply = client.structured_output(
+            model=model,
+            system_prompt=self._system_prompt,
+            querys=self._memory,
+            provider=provider,
+            json_schema=json_schema
+        )
+        return reply

{openrouter_provider-0.0.6 → openrouter_provider-0.0.8}/src/OpenRouterProvider/OpenRouterProvider.py

@@ -1,15 +1,21 @@
+
+# structured output
+# https://note.com/brave_quince241/n/n60a5759c8f05
+
 import logging
 from .Chat_message import *
 from .Tool import tool_model
 from .LLMs import *
 
-from openai import OpenAI
+from openai import OpenAI, AsyncOpenAI
 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 typing import List, Optional, Literal, Iterator, AsyncIterator
 from pprint import pprint
+from pydantic import BaseModel
+
 
 # エラーのみ表示、詳細なトレースバック付き
 logging.basicConfig(level=logging.ERROR, format="%(asctime)s - %(levelname)s - %(message)s")
@@ -42,6 +48,10 @@ class OpenRouterProvider:
             base_url="https://openrouter.ai/api/v1",
             api_key=api_key,
         )
+        self.async_client = AsyncOpenAI(
+            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]:
@@ -83,7 +93,7 @@ class OpenRouterProvider:
                     "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:
@@ -92,12 +102,12 @@ class OpenRouterProvider:
 
             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}
+                extra_body={"provider": provider_dict},
             )
 
             reply = Chat_message(text=response.choices[0].message.content, role=Role.ai, raw_response=response)
@@ -139,3 +149,77 @@ class OpenRouterProvider:
         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)
+
+    async def async_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 = await self.async_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 asynchronously 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)
+        
+    async def async_invoke_stream(
+        self,
+        model: LLMModel,
+        system_prompt: Chat_message,
+        querys: list[Chat_message],
+        tools: list[tool_model] = [],
+        provider: ProviderConfig = None
+    ) -> AsyncIterator[ChatCompletionChunk]:
+        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 = await self.async_client.chat.completions.create(
+                model=model.name,
+                messages=messages,
+                tools=tool_defs,
+                extra_body={"provider": provider_dict},
+                stream=True
+            )
+
+            async for chunk in response:
+                yield chunk
+
+        except Exception as e:
+            logger.exception(f"An error occurred while asynchronously streaming the model: {e.__class__.__name__}: {str(e)}")
+            return
+        
+    def structured_output(self, model: LLMModel, system_prompt: Chat_message, querys: list[Chat_message], provider: ProviderConfig = None, json_schema: BaseModel = None) -> BaseModel:
+        try:
+            messages = self.make_prompt(system_prompt, querys)
+            provider_dict = provider.to_dict() if provider else None
+            
+            response = self.client.chat.completions.create(
+                model=model.name,
+                messages=messages,
+                response_format={"type": "json_schema", "json_schema": {"name": json_schema.__name__, "schema": json_schema.model_json_schema()}},
+                extra_body={"provider": provider_dict},
+            )
+
+            return json_schema.model_validate_json(response.choices[0].message.content)
+
+        except Exception as e:
+            logger.exception(f"An error occurred while invoking structured output: {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.6 → openrouter_provider-0.0.8}/src/openrouter_provider.egg-info/PKG-INFO

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