davidkhala.ai 0.2.0__tar.gz → 0.2.1__tar.gz

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: davidkhala.ai
-Version: 0.2.0
+Version: 0.2.1
 Summary: misc AI modules
 Requires-Python: >=3.12
 Provides-Extra: ali
@@ -28,12 +28,16 @@ Provides-Extra: langchain
 Requires-Dist: langchain; extra == 'langchain'
 Requires-Dist: langchain-openai; (python_version < '3.14') and extra == 'langchain'
 Requires-Dist: langgraph; extra == 'langchain'
+Provides-Extra: mistral
+Requires-Dist: mistralai; extra == 'mistral'
 Provides-Extra: openrouter
 Requires-Dist: openrouter; extra == 'openrouter'
 Provides-Extra: ragflow
 Requires-Dist: ragflow-sdk; extra == 'ragflow'
 Provides-Extra: telemetry
 Requires-Dist: opik; (python_version < '3.14') and extra == 'telemetry'
+Provides-Extra: you
+Requires-Dist: youdotcom; extra == 'you'
 Description-Content-Type: text/markdown
 
 # davidkhala.ai

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/agent/dify/ops/console/plugin.py

@@ -40,7 +40,7 @@ class ConsolePlugin(API):
         return _
 
     def get(self, *plugin_names: str) -> list[dict]:
-        "inspect installed plugins"
+        """inspect installed plugins"""
         url = f"{self.base_url}/list/installations/ids"
         r = self.request(url, method="POST", json={
             'plugin_ids': plugin_names,

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/agent/dify/plugins/popular.py

@@ -32,5 +32,8 @@ class Node:
         'junjiem/db_query',
         'junjiem/db_query_pre_auth',
     ]
-
+    web = [
+        'langgenius/searxng',
+        'langgenius/firecrawl'
+    ]
 

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/ali/dashscope.py

@@ -4,7 +4,7 @@ from http import HTTPStatus
 from dashscope.api_entities.dashscope_response import DashScopeAPIResponse
 
 from dashscope import Generation, TextEmbedding
-from davidkhala.ai.model import AbstractClient
+from davidkhala.ai.model import AbstractClient, MessageDict
 
 
 class ModelEnum(str, Enum):
@@ -21,11 +21,10 @@ class API(AbstractClient):
     Unsupported to use international base_url "https://dashscope-intl.aliyuncs.com"
     """
 
-    model: ModelEnum
-
     def __init__(self, api_key):
+        super().__init__()
         self.api_key = api_key
-
+        self.model: ModelEnum|None = None
     def as_embeddings(self, model=ModelEnum.EMBED):
         super().as_embeddings(model)
 
@@ -44,10 +43,7 @@ class API(AbstractClient):
         else:
             kwargs['messages'] = [
                 *self.messages,
-                {
-                    "role": "user",
-                    'content': user_prompt
-                }
+                MessageDict(role='user',content=user_prompt),
             ]
         # prompt 和 messages 是互斥的参数：如果你使用了 messages，就不要再传 prompt
         r = Generation.call(

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/api/__init__.py

@@ -8,7 +8,8 @@ from davidkhala.ai.model import AbstractClient
 
 class API(AbstractClient, Request):
     def __init__(self, api_key: str, base_url: str):
-        super().__init__({
+        AbstractClient.__init__(self)
+        Request.__init__(self,{
             "bearer": api_key
         })
         self.base_url = base_url + '/v1'

davidkhala_ai-0.2.1/davidkhala/ai/mistral/__init__.py

@@ -0,0 +1,33 @@
+# https://github.com/mistralai/client-python
+
+from davidkhala.ai.model import AbstractClient
+from mistralai import Mistral, ChatCompletionResponse, ResponseFormat
+from davidkhala.ai.model.chat import on_response
+
+class Client(AbstractClient):
+    n = 1
+
+    def __init__(self, api_key: str):
+        self.api_key = api_key
+        self.client = Mistral(api_key=api_key)
+        self.model = "mistral-large-latest"
+        self.messages = []
+
+    def __enter__(self):
+        self.client.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return self.client.__exit__(exc_type, exc_val, exc_tb)
+
+    def chat(self, *user_prompt, **kwargs):
+        response: ChatCompletionResponse = self.client.chat.complete(
+            model=self.model,
+            messages=[
+                *self.messages,
+                *[{"content": m, "role": "user"} for m in user_prompt]
+            ], stream=False, response_format=ResponseFormat(type='text'),
+            n=self.n,
+        )
+
+        return on_response(response, self.n)

davidkhala_ai-0.2.1/davidkhala/ai/model/__init__.py

@@ -0,0 +1,44 @@
+from abc import ABC
+from typing import Protocol, TypedDict
+
+
+class MessageDict(TypedDict):
+    content: str | list
+    role: str
+
+
+class ClientProtocol(Protocol):
+    api_key: str
+    base_url: str
+    model: str | None
+    messages: list[MessageDict] | None
+
+
+class AbstractClient(ABC, ClientProtocol):
+
+    def __init__(self):
+        self.model = None
+        self.messages = []
+
+    def as_chat(self, model: str, sys_prompt: str = None):
+        self.model = model
+        if sys_prompt is not None:
+            self.messages = [MessageDict(role='system', content=sys_prompt)]
+
+    def as_embeddings(self, model: str):
+        self.model = model
+
+    def chat(self, *user_prompt, **kwargs):
+        ...
+
+    def encode(self, *_input: str) -> list[list[float]]:
+        ...
+
+    def connect(self):
+        ...
+
+    def close(self):
+        ...
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()

davidkhala_ai-0.2.1/davidkhala/ai/model/chat.py

@@ -0,0 +1,19 @@
+from typing import Protocol, Any
+
+
+class MessageProtocol(Protocol):
+    content: str | Any
+
+
+class ChoiceProtocol(Protocol):
+    message: MessageProtocol
+
+
+class ChoicesAware(Protocol):
+    choices: list[ChoiceProtocol]
+
+
+def on_response(response: ChoicesAware, n: int):
+    contents = [choice.message.content for choice in response.choices]
+    assert len(contents) == n
+    return contents

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/openai/__init__.py

@@ -1,18 +1,30 @@
-import runpy
-from typing import Union, Literal
+from typing import Literal
 
-from openai import OpenAI, AsyncOpenAI
+from httpx import URL
+from openai import OpenAI
 
 from davidkhala.ai.model import AbstractClient
+from davidkhala.ai.model.chat import on_response
 
 
 class Client(AbstractClient):
-    client: OpenAI
-    encoding_format: Literal["float", "base64"] = "float"
-    n = 1
-
+    def __init__(self, client: OpenAI):
+        super().__init__()
+        self.client:OpenAI = client
+        self.base_url:URL = client.base_url
+        self.api_key = client.api_key
+        self.encoding_format:Literal["float", "base64"] = "float"
+        self.n:int = 1
     def connect(self):
-        self.client.models.list()
+        try:
+            type(self).models.fget(self)
+            return True
+        except:  # TODO make specific
+            return False
+
+    @property
+    def models(self):
+        return self.client.models.list()
 
     def encode(self, *_input: str) -> list[list[float]]:
         response = self.client.embeddings.create(
@@ -50,15 +62,11 @@ class Client(AbstractClient):
             n=self.n,
             **kwargs
         )
-        contents = [choice.message.content for choice in response.choices]
-        assert len(contents) == self.n
-        return contents
 
-    def disconnect(self):
+        return on_response(response, self.n)
+
+    def close(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.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/openai/azure.py

@@ -10,23 +10,24 @@ class AzureHosted(Client):
             raise ValueError('Web search options not supported in any models of Azure AI Foundry')
         return super().chat(*user_prompt, **kwargs)
 
+
 class ModelDeploymentClient(AzureHosted):
     def __init__(self, key, deployment):
-        self.client = AzureOpenAI(
+        super().__init__(AzureOpenAI(
             api_version="2024-12-01-preview",  # mandatory
             azure_endpoint=f"https://{deployment}.cognitiveservices.azure.com/",
             api_key=key,
-        )
+        ))
 
 
 @deprecated("Azure Open AI is deprecated. Please migrate to Microsoft Foundry")
 class OpenAIClient(AzureHosted):
 
     def __init__(self, api_key, project):
-        self.client = OpenAI(
+        super().__init__(OpenAI(
             base_url=f"https://{project}.openai.azure.com/openai/v1/",
             api_key=api_key,
-        )
+        ))
 
     def as_chat(self, model="gpt-oss-120b", sys_prompt: str = None):
         super().as_chat(model, sys_prompt)

davidkhala_ai-0.2.1/davidkhala/ai/openai/databricks.py

@@ -0,0 +1,23 @@
+from openai import OpenAI
+from davidkhala.ai.openai import Client as BaseClient
+
+
+class Client(BaseClient):
+    def __init__(self, host: str, token: str):
+        super().__init__(OpenAI(
+            base_url=f"https://{host}/serving-endpoints",
+            api_key=token
+        ))
+
+    def chat(self, *user_prompt, **kwargs):
+        """Databricks always reasoning"""
+        rs = super().chat(*user_prompt, **kwargs)
+        for r in rs:
+            assert len(r) == 2
+            assert r[0]['type'] == 'reasoning'
+            for s in r[0]['summary']:
+                assert s['type'] =='summary_text'
+                yield s['text']
+            assert r[1]['type'] == 'text'
+            yield r[1]['text']
+

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/openai/native.py

@@ -7,10 +7,11 @@ from davidkhala.ai.openai import Client
 
 class NativeClient(Client):
     def __init__(self, api_key, base_url=None):
-        self.client = OpenAI(
+        super().__init__(OpenAI(
             api_key=api_key,
             base_url=base_url
-        )
+        ))
+
 
     def chat(self, *user_prompt, web_search:Optional[Literal["low", "medium", "high"]]=None, **kwargs):
         opts = {

davidkhala_ai-0.2.1/davidkhala/ai/openai/opik.py

@@ -0,0 +1,10 @@
+import runpy
+
+from openai import OpenAI, AsyncOpenAI
+from typing import Union
+
+
+def bind(instance: Union[OpenAI, AsyncOpenAI]):
+    from opik.integrations.openai import track_openai
+    runpy.run_path('../opik.py')
+    return track_openai(instance)

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/davidkhala/ai/openrouter/__init__.py

@@ -6,6 +6,7 @@ from openrouter import OpenRouter
 
 class Client(AbstractClient):
     def __init__(self, api_key: str):
+        super().__init__()
         self.api_key = api_key
         self.client = OpenRouter(api_key)
 

davidkhala_ai-0.2.1/davidkhala/ai/you.py

@@ -0,0 +1,55 @@
+from typing import AsyncIterator
+
+from youdotcom import You, models
+from youdotcom.models import Web
+from youdotcom.types.typesafe_models import AgentType, get_text_tokens, Format
+from youdotcom.utils import eventstreaming
+
+
+class Client:
+    def __init__(self, api_key: str):
+        self.client = You(api_key_auth=api_key)
+
+    def chat(self, user_prompt: str, *, tools: list[models.Tool] = None) -> str:
+        res = self.client.agents.runs.create(
+            agent=AgentType.ADVANCED if tools else AgentType.EXPRESS,
+            input=user_prompt,
+            stream=False,
+            tools=tools,
+        )
+
+        return "".join(get_text_tokens(res))
+
+    def scrape(self, *urls: str) -> list[str]:
+        """
+        :return the content of the web pages as Markdown format (incl. metadata)
+        """
+        res = self.client.contents.generate(
+            urls=list(urls),
+            format_=Format.MARKDOWN,
+        )
+        return [_.markdown for _ in res]
+
+    def search(self, query: str) -> list[Web]:
+        res = self.client.search.unified(
+            query=query
+        )
+        return res.results.web
+
+    async def async_chat(self, user_prompt: str) -> AsyncIterator[str]:
+        res: eventstreaming.EventStreamAsync[models.Data] = await self.client.agents.runs.create_async(
+            agent=AgentType.EXPRESS,
+            input=user_prompt,
+            stream=True,
+        )
+
+        async for event in res:
+            if event.type == 'response.output_text.delta':
+                yield event.response.delta
+
+    def __enter__(self):
+        self.client.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.client.close()

{davidkhala_ai-0.2.0 → davidkhala_ai-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "davidkhala.ai"
-version = "0.2.0"
+version = "0.2.1"
 description = "misc AI modules"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -17,6 +17,8 @@ hf = [
     "huggingface_hub", 'hf_xet',
     'onnxruntime', 'onnx' # for test only
 ]
+mistral = ["mistralai"]
+you = ['youdotcom']
 openrouter = ["openrouter"]
 ali = ["dashscope", "wuying-agentbay-sdk", "davidkhala.utils"]
 azure = ["openai", "davidkhala.utils"]

davidkhala_ai-0.2.0/davidkhala/ai/model.py

@@ -1,28 +0,0 @@
-from abc import ABC
-from typing import Optional
-
-
-class AbstractClient(ABC):
-    api_key: str
-    base_url: str
-    model: Optional[str]
-    messages = []
-
-    def as_chat(self, model: str, sys_prompt: str = None):
-        self.model = model
-        if sys_prompt is not None:
-            self.messages = [{"role": "system", "content": sys_prompt}]
-
-    def as_embeddings(self, model: str):
-        self.model = model
-
-    def chat(self, *user_prompt, **kwargs):
-        ...
-
-    def encode(self, *_input: str) -> list[list[float]]:
-        ...
-    def connect(self):
-        ...
-
-    def disconnect(self):
-        ...