agentic-kit-common 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

agentic_kit_common/llm/__init__.py

@@ -0,0 +1,2 @@
+from .openai import create_openai_llm
+from .utils import combine_simple_context

agentic_kit_common/llm/openai.py

@@ -0,0 +1,33 @@
+import os
+
+from dotenv import load_dotenv
+from langchain_openai import ChatOpenAI
+
+load_dotenv()
+
+
+model_name = os.getenv("MODEL_NAME", None)
+openai_api_base = os.getenv("OPENAI_API_BASE", None)
+openai_api_key = os.getenv("OPENAI_API_KEY", 'API_KEY')
+temperature = float(os.getenv("TEMPERATURE", 0.2))
+
+
+def create_openai_llm(**kwargs):
+    _model_name = kwargs.pop('model_name', model_name)
+    _openai_api_base = kwargs.pop('openai_api_base', openai_api_base)
+    _openai_api_key = kwargs.pop('openai_api_key', openai_api_key)
+    if not _openai_api_key:
+        _openai_api_key = 'API_KEY'
+    _temperature = kwargs.pop('temperature', temperature)
+
+    assert model_name is not None
+    assert openai_api_base is not None
+
+    llm = ChatOpenAI(
+        model_name=_model_name,
+        openai_api_base=_openai_api_base,
+        openai_api_key=_openai_api_key,
+        temperature=_temperature,
+        **kwargs
+    )
+    return llm

agentic_kit_common/llm/utils.py

@@ -0,0 +1,61 @@
+import json
+import re
+from typing import Any, Dict, List, Union
+
+from langchain_core.messages import BaseMessage, SystemMessage, HumanMessage
+
+
+def combine_simple_context(system: str, user: str = None):
+    context: List[Union[BaseMessage, dict[str, Any]]] = [SystemMessage(content=system)]
+    if user:
+        context.append(HumanMessage(content=system))
+    return context
+
+
+def fix_json_response(text: str) -> Union[Dict, List, str, int, float, bool, None]:
+    """
+    去掉大模型返回的 ```json / ``` 等 markdown 标记，并安全反序列化 JSON。
+    若解析失败，返回原字符串。
+
+    参数
+    ----
+    text : str
+        原始响应，可能包含 ```json ... ``` 或其他变体。
+
+    返回
+    ----
+    Python 对象（dict / list / str / int / float / bool / None）
+        解析失败时返回输入字符串本身。
+    """
+    if not isinstance(text, str):
+        return text
+
+    # 1. 去掉 ```json 或 ``` 包裹（支持开头、结尾、单行、多行）
+    cleaned = re.sub(r'^\s*```(?:json|JSON)?\s*\n?', '', text)
+    cleaned = re.sub(r'\n?\s*```\s*$', '', cleaned)
+
+    # 2. 去掉首尾空白
+    cleaned = cleaned.strip()
+
+    # 3. 尝试 JSON 反序列化
+    try:
+        json.loads(cleaned)
+        return cleaned
+    except json.JSONDecodeError:
+        # 4. 兜底：返回原字符串
+        return text
+
+
+# ----------------- 使用示例 -----------------
+if __name__ == "__main__":
+    demo_list = [
+        '```json\n{"a": 1, "b": "hello"}\n```',
+        "```JSON{'key': 'value'}```",
+        "```\n[1, 2, 3]```",
+        "plain text",
+        {"already_dict": 1},
+    ]
+    for d in demo_list:
+        print("原始:", repr(d))
+        print("修复:", repr(fix_json_response(d)))
+        print("-" * 30)

agentic_kit_common/orm/multi_session.py

@@ -64,9 +64,11 @@ class DatabaseEngineManager:
     def add_engine(self, engine_info: DatabaseEngineModel) -> bool:
         """添加数据库引擎"""
         with self._lock:
+            resource_uid =  engine_info.resource_uid
             engine_name = engine_info.engine_name
             database_uri = engine_info.database_uri
             database_name = engine_info.database_name
+            database_desc = engine_info.database_desc
             config = engine_info.config.model_dump().copy()
 
             if engine_name in self._engines:
@@ -91,8 +93,10 @@ class DatabaseEngineManager:
                 self._engines[engine_name] = engine
                 self._sessions[engine_name] = session_factory
                 self._engine_configs[engine_name] = {
+                    "resource_uid": resource_uid,
                     "database_uri": database_uri,
                     "database_name": database_name,
+                    "database_desc": database_desc,
                     "config": config or self._default_config.copy()
                 }
 

agentic_kit_common/orm/schema.py

@@ -13,7 +13,9 @@ _DEFAULT_CONFIG = DatabaseEngineConfigModel()
 
 
 class DatabaseEngineModel(BaseModel):
+    resource_uid: str = Field("", description="数据库唯一ID")
     engine_name: str = Field(..., description="数据库引擎名字")
     database_uri: str = Field(..., description="数据库uir地址")
     database_name: str = Field(..., description="数据库名称")
+    database_desc: str = Field("", description="数据库描述信息")
     config: DatabaseEngineConfigModel = Field(_DEFAULT_CONFIG, description="配置信息")

{agentic_kit_common-0.0.11.dist-info → agentic_kit_common-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-kit-common
-Version: 0.0.11
+Version: 0.0.13
 Summary: Common utilities and tools for agentic kit ecosystem
 Home-page: 
 Author: manson
@@ -24,6 +24,7 @@ Requires-Dist: langchain_core
 Requires-Dist: langgraph
 Requires-Dist: langchain_community
 Requires-Dist: langchain_experimental
+Requires-Dist: langchain-openai
 Requires-Dist: mysql-connector-python
 Requires-Dist: sqlalchemy
 Requires-Dist: sqlglot

{agentic_kit_common-0.0.11.dist-info → agentic_kit_common-0.0.13.dist-info}/RECORD

@@ -1,4 +1,7 @@
 agentic_kit_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentic_kit_common/llm/__init__.py,sha256=VwtIj4DFfKOcVH0QPLQPV4dTBSVnbQYPnj7xmOTLhO4,80
+agentic_kit_common/llm/openai.py,sha256=-GdfYpbCzioUT8kjGKSxIB_JUAN-cpiqQssgmzM3HDs,934
+agentic_kit_common/llm/utils.py,sha256=OD98I-L3xLqbilxiQvM4TI60DKEkhyS-_wuWE4q5sxw,1775
 agentic_kit_common/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentic_kit_common/log/logger.py,sha256=EH8pOW6KVpb-c4RdK2sohpHgfs3_hBcaAletRs1O23k,391
 agentic_kit_common/minio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,8 +10,8 @@ agentic_kit_common/orm/__init__.py,sha256=wqY81g3P7FftFvLK5SaxFJzNNxrQwtmcb4RCXO
 agentic_kit_common/orm/base.py,sha256=QIura_i2nIY2XeA3-KkO2loLNbEAoJK2qx0hu_8nhYU,2277
 agentic_kit_common/orm/execution.py,sha256=beyRJqVGY5nOqMDpvLcfwimUzP6eSz8ayNHLwh1hGOo,2858
 agentic_kit_common/orm/manager.py,sha256=lWgFk5fUu_9m6yN_fskWHSYGaW30ty--KZKj8AuvIh0,4852
-agentic_kit_common/orm/multi_session.py,sha256=CAEnOLl0I-r77JAknKQ2sERF40OkHD7BOrYVYoHuQV4,8814
-agentic_kit_common/orm/schema.py,sha256=ukdVP71NE_JO5_HOe_FApJjBAKUsDluoElVn5vNSGJQ,1023
+agentic_kit_common/orm/multi_session.py,sha256=xESwEeQw1UdR-5jqywbmI_Z0jxUn_l-cMyagnm7fc3c,9023
+agentic_kit_common/orm/schema.py,sha256=RfVoJ7RD9ZckogLfLWh9P9x3JkZRURnsIw50scBp75Y,1162
 agentic_kit_common/orm/session.py,sha256=LX4ZUKJNXdcQ0KqRt5L0pJX-QG-tDyKXEDijcPUkGD0,2716
 agentic_kit_common/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentic_kit_common/vector/embedding/__init__.py,sha256=mp--cfCDzTn5hNxzcIAU4m0g4F0d0rrZErFVWsGDvx4,40
@@ -28,7 +31,7 @@ test/test_embedding.py,sha256=xcfHDHGL2_tpXp_VaLnNDAWvKdkc1K1BjiYoV5WxtFY,900
 test/test_minio.py,sha256=TOkX8A2pPkjrwAIH88xBZmFpDc1ZgTk1QS6mtubOZ-Y,2308
 test/test_orm.py,sha256=8fGCU7BWaD5sDbg0fgYN0Saf_hi7t-q8svHCHLQDceo,1620
 test/test_vector.py,sha256=Z3Bwvrw0XGBWXHYXk9pkF1cjnUZSZk0gmLsgQIIaZuY,1717
-agentic_kit_common-0.0.11.dist-info/METADATA,sha256=i2EbkVNKrTVCcfwE9ky0Sfr64Lg8A97GsPOQzDCgKwM,7520
-agentic_kit_common-0.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agentic_kit_common-0.0.11.dist-info/top_level.txt,sha256=nEKDlp84vqKSVWssGcxyuIsTqWLhMo45xqMs2GK4Dgg,24
-agentic_kit_common-0.0.11.dist-info/RECORD,,
+agentic_kit_common-0.0.13.dist-info/METADATA,sha256=0byZM7sFLmky9UOjde8zWBNVyTEZxm7VEPCKxqwHHqw,7552
+agentic_kit_common-0.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agentic_kit_common-0.0.13.dist-info/top_level.txt,sha256=nEKDlp84vqKSVWssGcxyuIsTqWLhMo45xqMs2GK4Dgg,24
+agentic_kit_common-0.0.13.dist-info/RECORD,,