agentic-kit-common 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

agentic_kit_common/log/logger.py

@@ -0,0 +1,16 @@
+import logging
+
+
+def setup_logger(tag, level):
+    logger = logging.getLogger(tag)
+    logger.setLevel(level)
+
+    if not logger.handlers:
+        handler = logging.StreamHandler()
+        formatter = logging.Formatter(
+            '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+        )
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+
+    return logger

agentic_kit_common/orm/execution.py

@@ -1,53 +1,90 @@
-from typing import List, Union
+from typing import List, Union, Optional, Set
 
-import sqlparse
+import sqlglot
 from sqlalchemy import text
 from sqlalchemy.orm import Session
+from sqlglot import expressions
 
 
-def is_readonly_sql(sql: str) -> bool:
+def get_operation_type(statement) -> str:
+    """获取SQL操作类型"""
+    return type(statement).__name__.upper()
+
+
+def get_sql_operation_info(sql: str) -> Optional[dict]:
     """
-    只允许：
-      SELECT / WITH / VALUES / EXPLAIN / DESCRIBE / SHOW
-    拒绝：
-      INSERT/UPDATE/DELETE/CREATE/ALTER/DROP/TRUNCATE/LOAD/REPLACE/LOCK/UNLOCK/GRANT/REVOKE/EXECUTE/CALL
+    获取SQL操作信息（用于调试和日志记录）
+
+    Returns:
+        dict: 包含操作类型、涉及表等信息
     """
-    sql_clean = sqlparse.format(sql.strip(), strip_comments=True)
-    tokens = [t.normalized for t in sqlparse.parse(sql_clean)[0].flatten()
-              if t.ttype in (sqlparse.tokens.Keyword, sqlparse.tokens.DML, sqlparse.tokens.DDL)]
+    try:
+        statement = sqlglot.parse_one(sql, read="mysql")
+        operation_type = get_operation_type(statement)
+
+        tables = []
+        for table in statement.find_all(expressions.Table):
+            table_name = table.name
+            if table_name.startswith('`') and table_name.endswith('`'):
+                table_name = table_name[1:-1]
+            tables.append(table_name)
+
+        return {
+            'operation': operation_type,
+            'tables': tables,
+            'has_wildcard': bool(statement.find(expressions.Star)) if isinstance(statement, expressions.Select) else False
+        }
+    except Exception as e:
+        print(f"获取SQL操作信息失败: {e}")
+        return None
+
+
+def is_readonly_expression(node: expressions.Expression, allowed_operations: Optional[Set[str]] = None, enable_wildcard_check: bool = True):
+    """递归检查表达式树中是否出现写操作节点"""
+    # 写操作黑名单节点类型
+    write_types = {
+        expressions.Insert,
+        expressions.Update,
+        expressions.Delete,
+        expressions.Create,
+        expressions.Alter,
+        expressions.Drop,
+        expressions.Replace,
+        expressions.Merge
+    }
+    for descendant in node.walk():
+        if type(descendant) in write_types:
+            return False, type(descendant)
+
+    if allowed_operations:
+        op_type = get_operation_type(node)
+        # 检查操作类型
+        if op_type not in allowed_operations:
+            return False, op_type
+
+    if enable_wildcard_check and isinstance(node, expressions.Select) and node.find(expressions.Star):
+        return False, expressions.Star
 
-    forbidden = {"INSERT", "UPDATE", "DELETE", "CREATE", "ALTER", "DROP", "TRUNCATE",
-                 "LOAD", "REPLACE", "LOCK", "UNLOCK", "GRANT", "REVOKE", "EXEC", "CALL"}
-    allowed_root = {"SELECT", "WITH", "EXPLAIN", "DESCRIBE", "SHOW", "VALUES"}
+    return True, None
 
-    root = tokens[0].upper() if tokens else ""
-    if root not in allowed_root:
-        return False
-    if any(k in forbidden for k in tokens):
-        return False
-    return True
 
+def session_sql_execute(db_session: Session, sql_text: Union[str, List], format_result: bool = True):
+    def __do_execute(_sql: str):
+        _result = db_session.execute(text(f"{sql_text}"))
+        if format_result:
+            columns = list(_result.keys())
+            rows = [dict(zip(columns, r)) for r in _result.fetchall()]
+            return rows
+        else:
+            return _result
 
-def session_sql_execute(db_session: Session, sql_text: Union[str, List], query_only: bool = True):
     if isinstance(sql_text, str):
-        # 处理单条SQL语句
-        if query_only:
-            if not is_readonly_sql(sql_text):
-                return []
-        result = db_session.execute(text(f"{sql_text}"))
-        columns = list(result.keys())
-        rows = [dict(zip(columns, r)) for r in result.fetchall()]
-        return rows
+        return __do_execute(sql_text)
     elif isinstance(sql_text, list):
         results = []
         for sub_sql_text in sql_text:
-            if query_only:
-                if not is_readonly_sql(sub_sql_text):
-                    continue
-            result = db_session.execute(text(f"{sub_sql_text}"))
-            columns = list(result.keys())
-            rows = [dict(zip(columns, r)) for r in result.fetchall()]
-            results.append(rows)
+            result = __do_execute(sub_sql_text)
+            results.append(result)
             return results
     else:
         return []

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.10.dist-info → agentic_kit_common-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-kit-common
-Version: 0.0.10
+Version: 0.0.12
 Summary: Common utilities and tools for agentic kit ecosystem
 Home-page: 
 Author: manson
@@ -26,6 +26,7 @@ Requires-Dist: langchain_community
 Requires-Dist: langchain_experimental
 Requires-Dist: mysql-connector-python
 Requires-Dist: sqlalchemy
+Requires-Dist: sqlglot
 Requires-Dist: pymilvus
 Requires-Dist: xinference_client
 Dynamic: author

{agentic_kit_common-0.0.10.dist-info → agentic_kit_common-0.0.12.dist-info}/RECORD

@@ -1,12 +1,14 @@
 agentic_kit_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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
 agentic_kit_common/minio/minio_manager.py,sha256=PzoUWn0YqXTHx1UClbkwLkIUmv5O4aSDc7eVf08qOzs,21494
 agentic_kit_common/orm/__init__.py,sha256=wqY81g3P7FftFvLK5SaxFJzNNxrQwtmcb4RCXOSAZa8,71
 agentic_kit_common/orm/base.py,sha256=QIura_i2nIY2XeA3-KkO2loLNbEAoJK2qx0hu_8nhYU,2277
-agentic_kit_common/orm/execution.py,sha256=sCEcInFGFZ9ZiIs0eHKbQPtN4Z02v7vGdFMyVEWygcU,1951
+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
@@ -26,7 +28,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.10.dist-info/METADATA,sha256=KIp7HPRyzygUBrXu8H9B4xu8NOFiD6_B5PTaYVN20Fc,7497
-agentic_kit_common-0.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agentic_kit_common-0.0.10.dist-info/top_level.txt,sha256=nEKDlp84vqKSVWssGcxyuIsTqWLhMo45xqMs2GK4Dgg,24
-agentic_kit_common-0.0.10.dist-info/RECORD,,
+agentic_kit_common-0.0.12.dist-info/METADATA,sha256=1HdcutDJ_PjZvfGs6cQx_SRxmHKGgY7u2y-0-y1KmLs,7520
+agentic_kit_common-0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agentic_kit_common-0.0.12.dist-info/top_level.txt,sha256=nEKDlp84vqKSVWssGcxyuIsTqWLhMo45xqMs2GK4Dgg,24
+agentic_kit_common-0.0.12.dist-info/RECORD,,