davidkhala.ai 0.0.7__py3-none-any.whl → 0.0.8__py3-none-any.whl

davidkhala/ai/ali/dashscope.py

@@ -1,10 +1,9 @@
 from enum import Enum
 from http import HTTPStatus
-from typing import List
 
-from dashscope import Generation, TextEmbedding
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 
+from dashscope import Generation, TextEmbedding
 from davidkhala.ai.model import AbstractClient
 
 
@@ -58,7 +57,7 @@ class API(AbstractClient):
         )
         return API._on_response(r)
 
-    def encode(self, *_input: str)-> List[List[float]]:
+    def encode(self, *_input: str)-> list[list[float]]:
         r= TextEmbedding.call(
             self.model,list(_input),
             api_key= self.api_key,

davidkhala/ai/api/__init__.py

@@ -6,11 +6,12 @@ from davidkhala.utils.http_request import Request
 from davidkhala.ai.model import AbstractClient
 
 
-class API(AbstractClient):
+class API(AbstractClient, Request):
     def __init__(self, api_key: str, base_url: str):
-        self.api_key = api_key
+        super().__init__({
+            "bearer": api_key
+        })
         self.base_url = base_url + '/v1'
-        self._ = Request({"bearer": api_key})
 
     @property
     @abstractmethod
@@ -31,7 +32,7 @@ class API(AbstractClient):
             **kwargs,
         }
 
-        response = self._.request(f"{self.base_url}/chat/completions", "POST", json=json)
+        response = self.request(f"{self.base_url}/chat/completions", "POST", json=json)
 
         return {
             "data": list(map(lambda x: x['message']['content'], response['choices'])),
@@ -43,5 +44,5 @@ class API(AbstractClient):
         }
 
     def list_models(self):
-        response = self._.request(f"{self.base_url}/models", "GET")
+        response = self.request(f"{self.base_url}/models", "GET")
         return response['data']

davidkhala/ai/api/openrouter.py

@@ -35,13 +35,24 @@ class OpenRouter(API):
         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'][
+            self.options["headers"]["HTTP-Referer"] = kwargs['leaderboard'][
                 'url']  # Site URL for rankings on openrouter.ai.
-            self._.options["headers"]["X-Title"] = kwargs['leaderboard'][
+            self.options["headers"]["X-Title"] = kwargs['leaderboard'][
                 'name']  # Site title for rankings on openrouter.ai.
         self.models = models
 
-        self._.on_response = OpenRouter.on_response
+        self.on_response = OpenRouter.on_response
+        self.retry = True
+
+    def request(self, url, method: str, params=None, data=None, json=None) -> dict:
+        try:
+            return super().request(url, method, params, data, json)
+        except requests.HTTPError as e:
+            if e.response.status_code == 429 and self.retry:  # 429: You are being rate limited
+                time.sleep(1)
+                return self.request(url, method, params, data, json)
+            else:
+                raise
 
     def chat(self, *user_prompt: str, **kwargs):
         if self.models:
@@ -49,13 +60,8 @@ class OpenRouter(API):
         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)
-            else: raise
+        r = super().chat(*user_prompt, **kwargs)
+
         if self.models:
             assert r['model'] in self.models
         return r

davidkhala/ai/api/siliconflow.py

@@ -34,7 +34,16 @@ class SiliconFlow(API):
 
     def __init__(self, api_key: str):
         super().__init__(api_key, 'https://api.siliconflow.cn')
-        self._.options['timeout'] = 50
+        self.options['timeout'] = 50
+
     def chat(self, *user_prompt: str, **kwargs):
         kwargs['model'] = self.model
-        return super().chat(*user_prompt, **kwargs)
+        return super().chat(*user_prompt, **kwargs)
+
+    def encode(self, *_input: str) -> list[list[float]]:
+        json = {
+            'input': _input,
+            'model': self.model
+        }
+        response = self.request(f"{self.base_url}/embeddings", "POST", json=json)
+        return [_['embedding'] for _ in response['data']]

davidkhala/ai/huggingface/BAAI.py

@@ -0,0 +1,10 @@
+import os
+
+from davidkhala.ai.huggingface import clone
+from pathlib import Path
+
+def bge_m3_path(git_dir: os.PathLike):
+    model_dir = clone(git_dir, repo_id="BAAI/bge-m3",allow_patterns=["onnx/*"])
+    onnx_path = Path(model_dir) / "onnx" / "model.onnx"
+    assert onnx_path.is_file() and onnx_path.exists()
+    return onnx_path

davidkhala/ai/huggingface/__init__.py

@@ -0,0 +1,21 @@
+import os
+from typing import Optional
+
+from huggingface_hub import snapshot_download
+
+
+def clone(git_dir: os.PathLike,
+          *,
+          owner: Optional[str] = None,
+          repository: Optional[str] = None,
+          repo_id: Optional[str] = None,
+          **kwargs
+          ) -> str:
+    if not repo_id:
+        repo_id = f"{owner}/{repository}"
+    return snapshot_download(
+        repo_id=repo_id,
+        local_dir=git_dir,
+        local_dir_use_symlinks=False,
+        **kwargs
+    )

davidkhala/ai/model.py

@@ -1,5 +1,5 @@
 from abc import ABC
-from typing import Optional, List
+from typing import Optional
 
 
 class AbstractClient(ABC):
@@ -19,7 +19,7 @@ class AbstractClient(ABC):
     def chat(self, *user_prompt, **kwargs):
         ...
 
-    def encode(self, *_input: str) -> List[List[float]]:
+    def encode(self, *_input: str) -> list[list[float]]:
         ...
     def connect(self):
         ...

davidkhala/ai/openai/__init__.py

@@ -1,5 +1,5 @@
 import runpy
-from typing import Union, Literal, List
+from typing import Union, Literal
 
 from openai import OpenAI, AsyncOpenAI
 
@@ -14,7 +14,7 @@ class Client(AbstractClient):
     def connect(self):
         self.client.models.list()
 
-    def encode(self, *_input: str) -> List[List[float]]:
+    def encode(self, *_input: str) -> list[list[float]]:
         response = self.client.embeddings.create(
             model=self.model,
             input=list(_input),

{davidkhala_ai-0.0.7.dist-info → davidkhala_ai-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: davidkhala.ai
-Version: 0.0.7
+Version: 0.0.8
 Summary: misc AI modules
 Requires-Python: >=3.13
 Provides-Extra: ali
@@ -12,6 +12,11 @@ Requires-Dist: openai; extra == 'azure'
 Provides-Extra: google
 Requires-Dist: google-adk; extra == 'google'
 Requires-Dist: google-genai; extra == 'google'
+Provides-Extra: hf
+Requires-Dist: hf-xet; extra == 'hf'
+Requires-Dist: huggingface-hub; extra == 'hf'
+Requires-Dist: onnx; extra == 'hf'
+Requires-Dist: onnxruntime; extra == 'hf'
 Provides-Extra: langchain
 Requires-Dist: langchain; extra == 'langchain'
 Requires-Dist: langchain-openai; extra == 'langchain'

davidkhala_ai-0.0.8.dist-info/RECORD

@@ -0,0 +1,21 @@
+davidkhala/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+davidkhala/ai/model.py,sha256=1wcXC8X8oqerMatlcPbZmuxZ-nJWdJKmaDSDgiGlUGw,647
+davidkhala/ai/opik.py,sha256=YU1XuweMUAzUkhpjxhltt-SBBDBkR3z-PCNo0DqzBRs,39
+davidkhala/ai/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+davidkhala/ai/agent/langgraph.py,sha256=jrc_Yvgo7eJjd3y5UJn0t1FzpnObDGYscwgsuVl2O_I,1052
+davidkhala/ai/ali/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+davidkhala/ai/ali/dashscope.py,sha256=SZIzRhVHlLx3s5I2RNUh2-u8OoSdrbvoN5e1k8Mh8N0,1943
+davidkhala/ai/api/__init__.py,sha256=q2Ro5nhW5kJx2CYR1MRVamjTT5tTexPZwhrS2hwAvFM,1319
+davidkhala/ai/api/openrouter.py,sha256=khccJr5cBnudFy6Jc2O3A1TNCuHH_5W6Q2tXrkwlUYE,2308
+davidkhala/ai/api/siliconflow.py,sha256=LWRZ-or6zgdDSCRfPcOT8nJRqcAO3vQAmvS-3Xeo6IU,1652
+davidkhala/ai/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+davidkhala/ai/google/adk.py,sha256=QwxYoOzT2Hol03V4NM0PF_HAzUGb4fB18VUAYacYbAY,657
+davidkhala/ai/google/gemini.py,sha256=Xf4HDOOcK4-jEBERzuLnQNFsU61P2fFx4K0z-ijvNHE,214
+davidkhala/ai/huggingface/BAAI.py,sha256=LZ9kp5Gfql4UzuTn4osyekI6VV1H3RIfED2IolXFj5c,341
+davidkhala/ai/huggingface/__init__.py,sha256=FJyU8eOfWQWKAvkIa5qwubF9ghsSQ8C0e6p6DKyomgs,521
+davidkhala/ai/openai/__init__.py,sha256=UalrIvniAFSbCAQeCrDgBVEWCFTCPxFnoOAGVnVWkkI,1864
+davidkhala/ai/openai/azure.py,sha256=jAtZNW1d8ub3odhB_f1MXxM7MImg64MXDnqLm1-Idkk,828
+davidkhala/ai/openai/native.py,sha256=-XuHn0KSQnuFdJ4jTwZla1ts5iOW2L2Hosfo8o8iip8,257
+davidkhala_ai-0.0.8.dist-info/METADATA,sha256=0FhXLSp1itgKjftPfCFL3FO8i-snghKJR5R4jqIjU_Y,877
+davidkhala_ai-0.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+davidkhala_ai-0.0.8.dist-info/RECORD,,

davidkhala_ai-0.0.7.dist-info/RECORD

@@ -1,19 +0,0 @@
-davidkhala/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-davidkhala/ai/model.py,sha256=5rqnbb9sGJ9xDY31bRWx6O1d7nDqQjsYCeSDCm1Bv4A,653
-davidkhala/ai/opik.py,sha256=YU1XuweMUAzUkhpjxhltt-SBBDBkR3z-PCNo0DqzBRs,39
-davidkhala/ai/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-davidkhala/ai/agent/langgraph.py,sha256=jrc_Yvgo7eJjd3y5UJn0t1FzpnObDGYscwgsuVl2O_I,1052
-davidkhala/ai/ali/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-davidkhala/ai/ali/dashscope.py,sha256=b49unSTVXhjHCA0F1Qt6_-Zs7zjSgEetIcVK5E2nDMQ,1968
-davidkhala/ai/api/__init__.py,sha256=XR0QpCzILpYTuFBw_S9doxMu9JNrZCa8Zi4ojbbqENA,1322
-davidkhala/ai/api/openrouter.py,sha256=FiThnZpS9teZRRix7C9nw5NiOkTQ5qiZfeGLJqciUIQ,2078
-davidkhala/ai/api/siliconflow.py,sha256=B5Zccpq1peNY5mQJS7duBEonj-aeQVxvmU7F7AVIN_s,1356
-davidkhala/ai/google/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-davidkhala/ai/google/adk.py,sha256=QwxYoOzT2Hol03V4NM0PF_HAzUGb4fB18VUAYacYbAY,657
-davidkhala/ai/google/gemini.py,sha256=Xf4HDOOcK4-jEBERzuLnQNFsU61P2fFx4K0z-ijvNHE,214
-davidkhala/ai/openai/__init__.py,sha256=B0LG4h4cquK2sS4DqBywV-Kf6pwOVp8hU5H8hUp-pXA,1870
-davidkhala/ai/openai/azure.py,sha256=jAtZNW1d8ub3odhB_f1MXxM7MImg64MXDnqLm1-Idkk,828
-davidkhala/ai/openai/native.py,sha256=-XuHn0KSQnuFdJ4jTwZla1ts5iOW2L2Hosfo8o8iip8,257
-davidkhala_ai-0.0.7.dist-info/METADATA,sha256=RFYRmpi6zwy71-kX3kF_2OtpSUqYAkFbsyDDfbLuH54,698
-davidkhala_ai-0.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-davidkhala_ai-0.0.7.dist-info/RECORD,,