davidkhala.ai 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

davidkhala/ai/agent/dify/api/__init__.py

@@ -0,0 +1,27 @@
+from typing import Iterable, Callable, Any, Optional
+
+from davidkhala.utils.http_request import Request
+
+
+class API(Request):
+    def __init__(self, api_key: str, base_url="https://api.dify.ai/v1"):
+        super().__init__({'bearer': api_key})
+        self.base_url = base_url
+        self.api_key = api_key
+
+
+class Iterator(Iterable):
+    def __iter__(self):
+        return self
+
+    def __init__(self, get_fn: Callable[[int, int], Any], r: Optional[dict]):
+        self.response = r
+        self.fn = get_fn
+
+    def __next__(self):
+        if self.response and not self.response['has_more']:
+            raise StopIteration
+        page = 1 if not self.response else self.response['page'] + 1
+        limit = None if not self.response else self.response['limit']
+        self.response = self.fn(page, limit)
+        return self.response['data']

davidkhala/ai/agent/dify/api/app.py

@@ -0,0 +1,38 @@
+import json
+
+import requests
+
+from davidkhala.ai.agent.dify.api import API
+
+
+class Feedbacks(API):
+    def paginate_feedbacks(self, page=1, size=20):
+        """
+        when 'rating'='like', content=None
+        when 'rating'='dislike', content can be filled by end user
+        NOTE: for security reason, api cannot access conversation context associated with the feedback. End user should copy the conversation to comment by themselves.
+        """
+        response = requests.get(f"{self.base_url}/app/feedbacks", params={"page": page, "limit": size}, **self.options)
+        if not response.ok:
+            response.raise_for_status()
+        else:
+            return json.loads(response.text)
+
+    def list_feedbacks(self):
+        # TODO https://github.com/langgenius/dify/issues/28067
+        return self.paginate_feedbacks()['data']
+
+class Conversation(API):
+    """
+    Note: The Service API does not share conversations created by the WebApp. Conversations created through the API are isolated from those created in the WebApp interface.
+    It means you cannot get user conversation content from API, API call has only access to conversation created by API
+    """
+    def __init__(self, api_key: str, user: str):
+        super().__init__(api_key) # base_url need to be configured afterward if not default
+        self.user = user  # user_id, from_end_user_id
+
+    def paginate_messages(self, conversation_id):
+        return self.request(f"{self.base_url}/messages", "GET", params={
+            'conversation_id': conversation_id,
+            'user': self.user,
+        })

davidkhala/ai/agent/dify/{knowledge.py → api/knowledge.py}

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import os
 from pathlib import Path
-from typing import Iterable, TypedDict, Callable, Any, Optional
+from typing import Iterable, TypedDict, Optional
 from urllib.parse import urlparse
 
 import requests
 
-from davidkhala.ai.agent.dify.base import API
+from davidkhala.ai.agent.dify.api import API, Iterator
 
 
 class DatasetDict(TypedDict):
@@ -37,23 +37,6 @@ class DatasetDict(TypedDict):
     external_knowledge_info: dict
 
 
-class Iterator(Iterable):
-    def __iter__(self):
-        return self
-
-    def __init__(self, get_fn: Callable[[int, int], Any], r: Optional[dict]):
-        self.response = r
-        self.fn = get_fn
-
-    def __next__(self):
-        if self.response and not self.response['has_more']:
-            raise StopIteration
-        page = 1 if not self.response else self.response['page'] + 1
-        limit = None if not self.response else self.response['limit']
-        self.response = self.fn(page, limit)
-        return self.response['data']
-
-
 class DocumentDict(TypedDict):
     id: str
     position: int
@@ -178,12 +161,14 @@ class ChunkDict(TypedDict):
 class Document(API):
     def __init__(self, d: Dataset.Instance, document_id: str):
         super().__init__(d.api_key, f"{d.base_url}/documents/{document_id}")
+
+    def exist(self):
         try:
             self.get()
-            self.exist = True
+            return True
         except requests.exceptions.HTTPError as e:
             if e.response.status_code == 404:
-                self.exist = False
+                return False
             else:
                 raise e
 
@@ -200,3 +185,7 @@ class Document(API):
         for chunk_batch in Iterator(self.paginate_chunks, None):
             for chunk in chunk_batch:
                 yield chunk
+
+    def delete(self):
+        if self.exist():
+            self.request(self.base_url, "DELETE")

davidkhala/ai/agent/dify/ops/__init__.py

@@ -0,0 +1 @@
+

davidkhala/ai/agent/dify/ops/db/__init__.py

@@ -0,0 +1,40 @@
+from typing import Any, Optional
+
+from davidkhala.data.base.pg import Postgres
+from sqlalchemy import desc
+from sqlalchemy.orm import Session
+
+from davidkhala.ai.agent.dify.ops.db.orm import AppModelConfig
+
+
+class DB(Postgres):
+
+    def __init__(self, connection_string: str):
+        super().__init__(connection_string)
+        self.connect()
+
+    def get_dict(self, sql): return self.query(sql).mappings().all()
+
+    @property
+    def accounts(self): return self.get_dict("select name, email from accounts where status = 'active'")
+
+    @property
+    def apps(self): return self.get_dict("select id, name, mode from apps where status = 'normal'")
+
+    def app_config(self, app_id) -> AppModelConfig | None:
+        with Session(self.client) as session:
+            return (
+                session.query(AppModelConfig)
+                .filter(AppModelConfig.app_id == app_id)
+                .order_by(desc(AppModelConfig.created_at))
+                .first()
+            )
+
+    def update_app_config(self, record: AppModelConfig, refresh:bool=False) -> AppModelConfig | None:
+        with Session(self.client) as session:
+            session.add(record)
+            session.commit()
+            if refresh:
+                session.refresh(record)  # 刷新对象，确保拿到数据库生成的字段（如 id）
+                return record
+            return None

davidkhala/ai/agent/dify/ops/db/orm.py

@@ -0,0 +1,50 @@
+from sqlalchemy import (
+    Column, String, Text, JSON, TIMESTAMP,
+    func
+)
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.orm import declarative_base
+
+Base = declarative_base()
+
+class AppModelConfig(Base):
+    __tablename__ = "app_model_configs"
+    __table_args__ = {"schema": "public"}
+
+    id = Column(UUID(as_uuid=True), primary_key=True, server_default=func.uuid_generate_v4())
+    app_id = Column(UUID(as_uuid=True), nullable=False)
+
+    provider = Column(String(255))
+    model_id = Column(String(255))
+    configs = Column(JSON)
+
+    created_at = Column(TIMESTAMP, nullable=False, server_default=func.current_timestamp())
+    updated_at = Column(TIMESTAMP, nullable=False, server_default=func.current_timestamp())
+
+    opening_statement = Column(Text)
+    suggested_questions = Column(Text)
+    suggested_questions_after_answer = Column(Text)
+    more_like_this = Column(Text)
+    model = Column(Text)
+    user_input_form = Column(Text)
+    pre_prompt = Column(Text)
+    agent_mode = Column(Text)
+    speech_to_text = Column(Text)
+    sensitive_word_avoidance = Column(Text)
+    retriever_resource = Column(Text)
+
+    dataset_query_variable = Column(String(255))
+    prompt_type = Column(String(255), nullable=False, server_default="simple")
+
+    chat_prompt_config = Column(Text)
+    completion_prompt_config = Column(Text)
+    dataset_configs = Column(Text)
+    external_data_tools = Column(Text)
+    file_upload = Column(Text)
+    text_to_speech = Column(Text)
+
+    created_by = Column(UUID(as_uuid=True))
+    updated_by = Column(UUID(as_uuid=True))
+
+    def __repr__(self):
+        return f"<AppModelConfig(id={self.id}, app_id={self.app_id}, provider={self.provider}, model_id={self.model_id})>"

davidkhala/ai/agent/dify/plugin.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+
+class JsonEntry(BaseModel):
+    data: list
+
+class Output(BaseModel):
+    """Class for result of a Dify node"""
+    text: str
+    files: list
+    json: list[JsonEntry]

davidkhala/ai/openrouter/__init__.py

@@ -0,0 +1,27 @@
+from openrouter.errors import UnauthorizedResponseError
+
+from davidkhala.ai.model import AbstractClient
+from openrouter import OpenRouter
+
+
+class Client(AbstractClient):
+    def __init__(self, api_key: str):
+        self.api_key = api_key
+        self.client = OpenRouter(api_key=api_key)
+
+    def chat(self, *user_prompt, **kwargs):
+        r = self.client.chat.send(
+            model=self.model,
+            messages=[
+                *self.messages,
+                *[{'role': 'user', 'content': _} for _ in user_prompt]
+            ]
+        )
+        return [_.message.content for _ in r.choices]
+    def connect(self):
+        try:
+            self.client.api_keys.list()
+            return True
+        except UnauthorizedResponseError:
+            return False
+

{davidkhala_ai-0.1.4.dist-info → davidkhala_ai-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: davidkhala.ai
-Version: 0.1.4
+Version: 0.1.6
 Summary: misc AI modules
 Requires-Python: >=3.13
 Provides-Extra: ali
@@ -9,6 +9,10 @@ Provides-Extra: api
 Requires-Dist: davidkhala-utils[http-request]; extra == 'api'
 Provides-Extra: azure
 Requires-Dist: openai; extra == 'azure'
+Provides-Extra: dify
+Requires-Dist: davidkhala-databases[pg]; extra == 'dify'
+Requires-Dist: davidkhala-utils[http-request]; extra == 'dify'
+Requires-Dist: dify-plugin; extra == 'dify'
 Provides-Extra: google
 Requires-Dist: google-adk; extra == 'google'
 Requires-Dist: google-genai; extra == 'google'
@@ -21,6 +25,9 @@ Provides-Extra: langchain
 Requires-Dist: langchain; extra == 'langchain'
 Requires-Dist: langchain-openai; extra == 'langchain'
 Requires-Dist: langgraph; extra == 'langchain'
+Provides-Extra: openrouter
+Requires-Dist: davidkhala-utils[http-request]; extra == 'openrouter'
+Requires-Dist: openrouter; extra == 'openrouter'
 Provides-Extra: ragflow
 Requires-Dist: ragflow-sdk; extra == 'ragflow'
 Provides-Extra: telemetry
@@ -29,4 +36,5 @@ Description-Content-Type: text/markdown
 
 # davidkhala.ai
 
-For usage of `azure.ai.agents`, goto https://github.com/davidkhala/azure-utils/tree/main/py 
+- For usage of `azure.ai.agents`, goto https://github.com/davidkhala/azure-utils/tree/main/py
+- [openrouter python sdk](https://openrouter.ai/docs/sdks/python) 

{davidkhala_ai-0.1.4.dist-info → davidkhala_ai-0.1.6.dist-info}/RECORD

@@ -6,8 +6,13 @@ davidkhala/ai/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 davidkhala/ai/agent/langgraph.py,sha256=jrc_Yvgo7eJjd3y5UJn0t1FzpnObDGYscwgsuVl2O_I,1052
 davidkhala/ai/agent/ragflow.py,sha256=UaK31us6V0NhAPCthGo07rQsm72vlR-McmihC_NDe1g,273
 davidkhala/ai/agent/dify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-davidkhala/ai/agent/dify/base.py,sha256=V4BIhG9oTg9ayPZnYVxxA1Yobl2C4ukSWEOu2U_l0Tw,259
-davidkhala/ai/agent/dify/knowledge.py,sha256=GFRKbudSoTR6BX7FiMg6a0uTepkm1X1N7kwqowDyRg4,6214
+davidkhala/ai/agent/dify/plugin.py,sha256=wrX47gev8GBbWkF1g7h_9bx4UpgdC3OhhjRRAXw60zs,209
+davidkhala/ai/agent/dify/api/__init__.py,sha256=9-8OesuXF_wPmPrh_gEZpEZP51dcZxb0i6ixOBYKcwQ,876
+davidkhala/ai/agent/dify/api/app.py,sha256=CJT6fdUfLyuQkvtrFEbtfEcKWIBzhcQDYV4J3nKx-DQ,1624
+davidkhala/ai/agent/dify/api/knowledge.py,sha256=cQPTS2S8DRfUKSECrLqFLC-PtObpYTGv2rHEvhkXW-k,5765
+davidkhala/ai/agent/dify/ops/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+davidkhala/ai/agent/dify/ops/db/__init__.py,sha256=OXEUHs7unxRfw8ozwK_lUhV-SaOgCuEYM27q71F1nXU,1412
+davidkhala/ai/agent/dify/ops/db/orm.py,sha256=NrmVn7oDcWiWw7mCzyJ_QPTTju8ayX3Ar21JICREGpg,1780
 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
@@ -22,6 +27,7 @@ davidkhala/ai/huggingface/inference.py,sha256=bYN0PtLF2CaIHzdTP4LaTALJhcawvuLnLR
 davidkhala/ai/openai/__init__.py,sha256=GXzWaw2ER3YFGHG6TPD9SmAHV6Tpsnqxj6tXlaWsrko,1897
 davidkhala/ai/openai/azure.py,sha256=QR1uZj8qAyhpCjo3Ks5zNV8GfOp3-enyZs6fBvV-MkA,1110
 davidkhala/ai/openai/native.py,sha256=MB0nDnzCOj_M42RMhdK3HTMVnxGnwpLT2GeLwSrepwI,704
-davidkhala_ai-0.1.4.dist-info/METADATA,sha256=RvHa05xsA2__WejkH8lp5vYqPThvI2Ymj1iqk_5KK4M,1098
-davidkhala_ai-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-davidkhala_ai-0.1.4.dist-info/RECORD,,
+davidkhala/ai/openrouter/__init__.py,sha256=5vciqhkPwQqBcHEwbuTeuwQgESqb6jsnQmb__EC4nWE,798
+davidkhala_ai-0.1.6.dist-info/METADATA,sha256=bgODlj3_Ma0zhfSwxO-6So3k9L7tonkyQkpTz6sa0CU,1497
+davidkhala_ai-0.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+davidkhala_ai-0.1.6.dist-info/RECORD,,

davidkhala/ai/agent/dify/base.py

@@ -1,7 +0,0 @@
-from davidkhala.utils.http_request import Request
-
-class API(Request):
-    def __init__(self, api_key: str, base_url="https://api.dify.ai/v1"):
-        super().__init__({'bearer': api_key})
-        self.base_url = base_url
-        self.api_key = api_key