davidkhala.ai 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

davidkhala/ai/ali/dashscope.py

@@ -0,0 +1,68 @@
+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 davidkhala.ai.model import AbstractClient
+
+
+class ModelEnum(str, Enum):
+    BAILIAN = Generation.Models.bailian_v1
+    DOLLY = Generation.Models.dolly_12b_v2
+    TURBO = Generation.Models.qwen_turbo
+    PLUS = Generation.Models.qwen_plus
+    MAX = Generation.Models.qwen_max
+    EMBED = TextEmbedding.Models.text_embedding_v4
+
+
+class API(AbstractClient):
+    """
+    Unsupported to use international base_url "https://dashscope-intl.aliyuncs.com"
+    """
+
+    model: ModelEnum
+
+    def __init__(self, api_key):
+        self.api_key = api_key
+
+    def as_embeddings(self, model=ModelEnum.EMBED):
+        super().as_embeddings(model)
+
+    @staticmethod
+    def _on_response(response:DashScopeAPIResponse):
+        if response.status_code == HTTPStatus.OK:
+            return response.output
+        else:
+            raise Exception(response)
+
+
+    def chat(self, user_prompt: str, **kwargs):
+
+        if not self.messages:
+            kwargs['prompt'] = user_prompt
+        else:
+            kwargs['messages'] = [
+                *self.messages,
+                {
+                    "role": "user",
+                    'content': user_prompt
+                }
+            ]
+        # prompt 和 messages 是互斥的参数：如果你使用了 messages，就不要再传 prompt
+        r = Generation.call(
+            self.model,
+            api_key=self.api_key,
+            **kwargs
+        )
+        return API._on_response(r)
+
+    def encode(self, *_input: str)-> List[List[float]]:
+        r= TextEmbedding.call(
+            self.model,list(_input),
+            api_key= self.api_key,
+        )
+        r = API._on_response(r)
+
+        return [item['embedding'] for item in r['embeddings']]

davidkhala/ai/model.py

@@ -0,0 +1,28 @@
+from abc import ABC
+from typing import Optional, List
+
+
+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: str, **kwargs):
+        ...
+
+    def encode(self, *_input: str) -> List[List[float]]:
+        ...
+    def connect(self):
+        ...
+
+    def disconnect(self):
+        ...

davidkhala/ai/openai/__init__.py

@@ -1,35 +1,25 @@
 import runpy
-from abc import ABC
-from typing import Union, Optional, Literal, List
+from typing import Union, Literal, List
 
 from openai import OpenAI, AsyncOpenAI
 
+from davidkhala.ai.model import AbstractClient
 
-class Client(ABC):
-    api_key: str
-    base_url: str
-    model: Optional[str]
-    messages = []
-    client: OpenAI
-
-    def as_chat(self, model, 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, encoding_format: str = "float"):
-        self.model = model
+class Client(AbstractClient):
+    client: OpenAI
+    encoding_format: Literal["float", "base64"] = "float"
 
     def connect(self):
         self.client.models.list()
 
-    def encode(self, _input: str, _format: Literal["float", "base64"] = "float")-> List[float]:
+    def encode(self, *_input: str) -> List[List[float]]:
         response = self.client.embeddings.create(
             model=self.model,
-            input=_input,
-            encoding_format=_format
+            input=list(_input),
+            encoding_format=self.encoding_format
         )
-        return response.data[0].embedding
+        return [item.embedding for item in response.data]
 
     def chat(self, user_prompt, image: str = None):
 

{davidkhala_ai-0.0.1.dist-info → davidkhala_ai-0.0.2.dist-info}/METADATA

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: davidkhala.ai
-Version: 0.0.1
+Version: 0.0.2
 Summary: misc AI modules
-Requires-Python: >=3.13
+Requires-Python: ==3.13.*
 Requires-Dist: opik
+Provides-Extra: ali
+Requires-Dist: dashscope; extra == 'ali'
 Provides-Extra: api
 Requires-Dist: requests; extra == 'api'
 Provides-Extra: google

{davidkhala_ai-0.0.1.dist-info → davidkhala_ai-0.0.2.dist-info}/RECORD

@@ -1,16 +1,20 @@
 davidkhala/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+davidkhala/ai/model.py,sha256=ujc88wQUP7SAyg9K8SQ45AuFOPFGtwAUyL05jYlUEBQ,657
 davidkhala/ai/opik.py,sha256=YU1XuweMUAzUkhpjxhltt-SBBDBkR3z-PCNo0DqzBRs,39
 davidkhala/ai/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+davidkhala/ai/agent/dify.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 davidkhala/ai/agent/langgraph.py,sha256=VEA2NQov_-KffTjgzO7nOIHiI4U9Y6enLTe3MQqKihc,1121
+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=IKT7TmMUrfk6bllpsXdBd-w13lHgWADU5Qk5ln01DLY,2018
 davidkhala/ai/api/open.py,sha256=_63n7Trrvj5pK-ZCud3HIJ-cpZWDAPpCQUjXGusFdU0,1221
 davidkhala/ai/api/siliconflow.py,sha256=uts5K1TpBOg8Eo6UZkNJWktQPoolfmn2sID01wiac6s,1314
 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=GrgaO2NEoJKEWMc20yBbTx_-YikA0zRjJbtn0_j9RJs,1887
+davidkhala/ai/openai/__init__.py,sha256=SvQvUgVgw5vRQtF4S3WUYqg1DOzGSQ7BtHvTSEwkmpY,1597
 davidkhala/ai/openai/azure.py,sha256=jAtZNW1d8ub3odhB_f1MXxM7MImg64MXDnqLm1-Idkk,828
 davidkhala/ai/openai/native.py,sha256=-XuHn0KSQnuFdJ4jTwZla1ts5iOW2L2Hosfo8o8iip8,257
-davidkhala_ai-0.0.1.dist-info/METADATA,sha256=-0mMOhqWaLneA3egQyWwWCkLgTevJTv6qjG-DY3nK-E,539
-davidkhala_ai-0.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-davidkhala_ai-0.0.1.dist-info/RECORD,,
+davidkhala_ai-0.0.2.dist-info/METADATA,sha256=rR3VkQp9l3KG5QVtiLIYZHHWVvwH4eoYBIdaa4p3wlQ,602
+davidkhala_ai-0.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+davidkhala_ai-0.0.2.dist-info/RECORD,,