davidkhala.ai 0.0.3__tar.gz → 0.0.5__tar.gz

{davidkhala_ai-0.0.3 → davidkhala_ai-0.0.5}/PKG-INFO

@@ -1,12 +1,14 @@
 Metadata-Version: 2.4
 Name: davidkhala.ai
-Version: 0.0.3
+Version: 0.0.5
 Summary: misc AI modules
 Requires-Python: >=3.13
 Provides-Extra: ali
 Requires-Dist: dashscope; extra == 'ali'
 Provides-Extra: api
-Requires-Dist: requests; extra == 'api'
+Requires-Dist: davidkhala-utils[http-request]; extra == 'api'
+Provides-Extra: azure
+Requires-Dist: openai; extra == 'azure'
 Provides-Extra: google
 Requires-Dist: google-adk; extra == 'google'
 Requires-Dist: google-genai; extra == 'google'
@@ -14,7 +16,5 @@ Provides-Extra: langchain
 Requires-Dist: langchain; extra == 'langchain'
 Requires-Dist: langchain-openai; extra == 'langchain'
 Requires-Dist: langgraph; extra == 'langchain'
-Provides-Extra: openai
-Requires-Dist: openai; extra == 'openai'
 Provides-Extra: telemetry
 Requires-Dist: opik; (python_version < '3.14') and extra == 'telemetry'

{davidkhala_ai-0.0.3 → davidkhala_ai-0.0.5}/davidkhala/ai/agent/langgraph.py

@@ -1,8 +1,6 @@
 from langchain_openai import ChatOpenAI
 from langgraph.prebuilt import create_react_agent
 
-from davidkhala.ai.api.open import Leaderboard
-
 
 class Agent:
 
@@ -18,10 +16,10 @@ class Agent:
 
 
 class OpenRouterModel:
-    def __init__(self, api_key, leaderboard: Leaderboard = None):
+    def __init__(self, api_key, leaderboard: dict = None):
         self.api_key = api_key
 
-        if leaderboard is not None:
+        if leaderboard:
             self.headers = {
                 "HTTP-Referer": leaderboard['url'],
                 "X-Title": leaderboard['name'],

davidkhala_ai-0.0.5/davidkhala/ai/api/__init__.py

@@ -0,0 +1,47 @@
+import datetime
+from abc import abstractmethod
+
+from davidkhala.http_request import Request
+
+from davidkhala.ai.model import AbstractClient
+
+
+class API(AbstractClient):
+    def __init__(self, api_key: str, base_url: str):
+        self.api_key = api_key
+        self.base_url = base_url + '/v1'
+        self._ = Request({"bearer": api_key})
+
+    @property
+    @abstractmethod
+    def free_models(self) -> list[str]:
+        ...
+
+    def chat(self, *user_prompt: str, **kwargs):
+        messages = [
+            *self.messages,
+            *[{
+                "role": "user",
+                "content": _
+            } for _ in user_prompt],
+        ]
+
+        json = {
+            "messages": messages,
+            **kwargs,
+        }
+
+        response = self._.request(f"{self.base_url}/chat/completions", "POST", json=json)
+
+        return {
+            "data": list(map(lambda x: x['message']['content'], response['choices'])),
+            "meta": {
+                "usage": response['usage'],
+                "created": datetime.datetime.fromtimestamp(response['created'])
+            },
+            'model': response['model'],
+        }
+
+    def list_models(self):
+        response = self._.request(f"{self.base_url}/models", "GET")
+        return response['data']

davidkhala_ai-0.0.5/davidkhala/ai/api/openrouter.py

@@ -0,0 +1,60 @@
+import time
+
+import requests
+from davidkhala.http_request import default_on_response
+from requests import Response
+
+from davidkhala.ai.api import API
+
+
+class OpenRouter(API):
+    @property
+    def free_models(self) -> list[str]:
+        return list(
+            map(lambda model: model['id'],
+                filter(lambda model: model['id'].endswith(':free'), self.list_models())
+                )
+        )
+
+    @staticmethod
+    def on_response(response: requests.Response):
+        r = default_on_response(response)
+        # openrouter special error on response.ok
+        err = r.get('error')
+        if err:
+            derived_response = Response()
+            derived_response.status_code = err['code']
+            derived_response.reason = err['message']
+            derived_response.metadata = err.get("metadata")
+
+            derived_response.raise_for_status()
+        return r
+
+    def __init__(self, api_key: str, *models: str, **kwargs):
+
+        super().__init__(api_key, 'https://openrouter.ai/api')
+
+        if 'leaderboard' in kwargs and type(kwargs['leaderboard']) is dict:
+            self._.options["headers"]["HTTP-Referer"] = kwargs['leaderboard'][
+                'url']  # Site URL for rankings on openrouter.ai.
+            self._.options["headers"]["X-Title"] = kwargs['leaderboard'][
+                'name']  # Site title for rankings on openrouter.ai.
+        self.models = models
+
+        self._.on_response = OpenRouter.on_response
+
+    def chat(self, *user_prompt: str, **kwargs):
+        if self.models:
+            kwargs["models"] = self.models
+        else:
+            kwargs["model"] = self.model
+
+        try:
+            r = super().chat(*user_prompt, **kwargs)
+        except requests.HTTPError as e:
+            if e.response.status_code == 429 and kwargs.get('retry'):
+                time.sleep(1)
+                return self.chat(*user_prompt, **kwargs)
+        if self.models:
+            assert r['model'] in self.models
+        return r

{davidkhala_ai-0.0.3 → davidkhala_ai-0.0.5}/davidkhala/ai/api/siliconflow.py

@@ -32,6 +32,9 @@ class SiliconFlow(API):
             'Kwai-Kolors/Kolors'
         ]
 
-    def __init__(self, api_key: str, model: str):
+    def __init__(self, api_key: str):
         super().__init__(api_key, 'https://api.siliconflow.cn')
-        self.model = model
+        self._.options['timeout'] = 50
+    def chat(self, *user_prompt: str, **kwargs):
+        kwargs['model'] = self.model
+        return super().chat(*user_prompt, **kwargs)

{davidkhala_ai-0.0.3 → davidkhala_ai-0.0.5}/davidkhala/ai/model.py

@@ -16,7 +16,7 @@ class AbstractClient(ABC):
     def as_embeddings(self, model: str):
         self.model = model
 
-    def chat(self, user_prompt: str, **kwargs):
+    def chat(self, *user_prompt, **kwargs):
         ...
 
     def encode(self, *_input: str) -> List[List[float]]:

davidkhala_ai-0.0.5/davidkhala/ai/openai/__init__.py

@@ -0,0 +1,63 @@
+import runpy
+from typing import Union, Literal, List
+
+from openai import OpenAI, AsyncOpenAI
+
+from davidkhala.ai.model import AbstractClient
+
+
+class Client(AbstractClient):
+    client: OpenAI
+    encoding_format: Literal["float", "base64"] = "float"
+    n = 1
+
+    def connect(self):
+        self.client.models.list()
+
+    def encode(self, *_input: str) -> List[List[float]]:
+        response = self.client.embeddings.create(
+            model=self.model,
+            input=list(_input),
+            encoding_format=self.encoding_format
+        )
+        return [item.embedding for item in response.data]
+
+    def chat(self, *user_prompt):
+
+        messages = [
+            *self.messages,
+        ]
+        for prompt in user_prompt:
+            message = {
+                "role": "user"
+            }
+            if type(prompt) == str:
+                message['content'] = prompt
+            elif type(prompt) == dict:
+                message['content'] = [
+                    {"type": "text", "text": prompt['text']},
+                    {
+                        "type": "image_url",
+                        "image_url": {
+                            "url": prompt['image_url'],
+                        }
+                    },
+                ]
+            messages.append(message)
+        response = self.client.chat.completions.create(
+            model=self.model,
+            messages=messages,
+            n=self.n
+        )
+        contents = [choice.message.content for choice in response.choices]
+        assert len(contents) == self.n
+        return contents
+
+    def disconnect(self):
+        self.client.close()
+
+
+def with_opik(instance: Union[OpenAI, AsyncOpenAI]):
+    from opik.integrations.openai import track_openai
+    runpy.run_path('../opik.py')
+    return track_openai(instance)

{davidkhala_ai-0.0.3 → davidkhala_ai-0.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "davidkhala.ai"
-version = "0.0.3"
+version = "0.0.5"
 description = "misc AI modules"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -14,12 +14,12 @@ google = [
     "google-genai", "google-adk"
 ]
 api = [
-    "requests",
+    "davidkhala.utils[http_request]",
 ]
 ali = [
     "dashscope"
 ]
-openai = [
+azure = [
     "openai"
 ]
 telemetry =[

davidkhala_ai-0.0.3/davidkhala/ai/api/__init__.py

@@ -1,65 +0,0 @@
-import datetime
-from abc import abstractmethod, ABC
-
-import requests
-
-# TODO Think openrouter as exceptional case
-class API(ABC):
-    def __init__(self, api_key: str, base_url: str):
-        self.base_url = base_url+'/v1'
-        self.model = None
-        self.headers = {
-            "Authorization": f"Bearer {api_key}",
-        }
-    @property
-    @abstractmethod
-    def free_models(self)->list[str]:
-        ...
-
-    def pre_request(self, headers: dict, data: dict):
-        data["model"] = self.model
-    def chat(self, prompt, system_prompt: str = None):
-
-
-        messages = [
-            {
-                "role": "user",
-                "content": prompt
-            }
-        ]
-        if system_prompt is not None:
-            messages.append({
-                "role": "system",
-                "content": system_prompt
-            })
-        json = {
-            "messages": messages
-        }
-        self.pre_request(self.headers, json)
-        # timeout=50 to cater siliconflow
-        response = requests.post(f"{self.base_url}/chat/completions", headers=self.headers, json=json, timeout=50)
-        parsed_response = API.parse(response)
-
-
-        return {
-            "data": list(map(lambda x: x['message']['content'], parsed_response['choices'])),
-            "meta": {
-                "usage": parsed_response['usage'],
-                "created": datetime.datetime.fromtimestamp(parsed_response['created'])
-            }
-        }
-    @staticmethod
-    def parse(response):
-        parsed_response = response.json()
-
-        match parsed_response:
-            case dict():
-                err = parsed_response.get('error')
-                if err is not None:
-                    raise Exception(err)
-            case str():
-                raise Exception(parsed_response)
-        return parsed_response
-    def list_models(self):
-        response = requests.get(f"{self.base_url}/models", headers=self.headers)
-        return API.parse(response)['data']

davidkhala_ai-0.0.3/davidkhala/ai/api/open.py

@@ -1,35 +0,0 @@
-from typing import TypedDict, Optional
-
-from davidkhala.ai.api import API
-
-
-class Leaderboard(TypedDict):
-    url:Optional[str]
-    name:Optional[str]
-
-class OpenRouter(API):
-    @property
-    def free_models(self) -> list[str]:
-        return list(
-            map(lambda model: model['id'],
-                filter(lambda model: model['id'].endswith(':free'), self.list_models())
-                )
-        )
-
-    def __init__(self, api_key: str, models: list[str] = None, *,
-                 leaderboard: Leaderboard = None):
-
-        super().__init__(api_key, 'https://openrouter.ai/api')
-        self.leaderboard = leaderboard
-        if models is None:
-            models = [self.free_models[0]]
-        self.models = models
-    # TODO Hard to multi-model supports here
-    def pre_request(self, headers: dict, data: dict):
-        if self.leaderboard is not None:
-            headers["HTTP-Referer"] = self.leaderboard['url'],  # Optional. Site URL for rankings on openrouter.ai.
-            headers["X-Title"] = self.leaderboard['name'],  # Optional. Site title for rankings on openrouter.ai.
-        if len(self.models) > 1:
-            data["models"] = self.models
-        else:
-            data["model"] = self.models[0]

davidkhala_ai-0.0.3/davidkhala/ai/openai/__init__.py

@@ -1,57 +0,0 @@
-import runpy
-from typing import Union, Literal, List
-
-from openai import OpenAI, AsyncOpenAI
-
-from davidkhala.ai.model import AbstractClient
-
-
-class Client(AbstractClient):
-    client: OpenAI
-    encoding_format: Literal["float", "base64"] = "float"
-
-    def connect(self):
-        self.client.models.list()
-
-    def encode(self, *_input: str) -> List[List[float]]:
-        response = self.client.embeddings.create(
-            model=self.model,
-            input=list(_input),
-            encoding_format=self.encoding_format
-        )
-        return [item.embedding for item in response.data]
-
-    def chat(self, user_prompt, image: str = None):
-
-        message = {
-            "role": "user"
-        }
-        if image is None:
-            message['content'] = user_prompt
-        else:
-            message['content'] = [
-                {"type": "text", "text": user_prompt},
-                {
-                    "type": "image_url",
-                    "image_url": {
-                        "url": image,
-                    }
-                },
-            ]
-        response = self.client.chat.completions.create(
-            model=self.model,
-            messages=[
-                *self.messages,
-                message
-            ],
-        )
-        return response.choices[0].message.content
-
-    def disconnect(self):
-        self.client.close()
-
-
-def with_opik(instance: Union[OpenAI, AsyncOpenAI]):
-    from opik.integrations.openai import track_openai
-    runpy.run_path('../opik.py')
-    return track_openai(instance)