agentic-kit-common 0.0.1__tar.gz → 0.0.2__tar.gz

{agentic_kit_common-0.0.1 → agentic_kit_common-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-kit-common
-Version: 0.0.1
+Version: 0.0.2
 Summary: Common utilities and tools for agentic kit ecosystem, including MinIO manager and other shared components
 Home-page: 
 Author: manson
@@ -14,7 +14,7 @@ Classifier: Topic :: System :: Distributed Computing
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: minio
 Requires-Dist: urllib3
@@ -24,6 +24,8 @@ Requires-Dist: langchain_core
 Requires-Dist: langgraph
 Requires-Dist: langchain_community
 Requires-Dist: langchain_experimental
+Requires-Dist: mysql-connector-python
+Requires-Dist: sqlalchemy
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

agentic_kit_common-0.0.2/agentic_kit_common/orm/__init__.py

@@ -0,0 +1,2 @@
+from .base import Model
+from .session import get_db_session, keepalive

agentic_kit_common-0.0.2/agentic_kit_common/orm/base.py

@@ -0,0 +1,81 @@
+from sqlalchemy.orm import declarative_base
+
+from .session import get_db_session
+
+
+class CRUDMixin(object):
+    """Mixin that adds convenience methods for CRUD (create, read, update, delete) operations."""
+
+    @classmethod
+    def create(cls, commit=True, db=None, **kwargs):
+        """Create a new record and save it the database."""
+
+        def __create(_instance):
+            if commit:
+                db.add(_instance)
+                db.commit()
+                return _instance
+            else:
+                db.add(_instance)
+                db.flush()
+                return _instance
+
+        instance = cls(**kwargs)
+        if db:
+            return __create(_instance=instance)
+        else:
+            with get_db_session() as db:
+                return __create(_instance=instance)
+
+    def update(self, commit=True, db=None, **kwargs):
+        """Update specific fields of a record."""
+        for attr, value in kwargs.items():
+            setattr(self, attr, value)
+
+        def _update(_obj, _db):
+            if _db:
+                _db.add(_obj)
+                if commit:
+                    _db.commit()
+                else:
+                    _db.flush()
+                return self
+            else:
+                with get_db_session() as _db:
+                    _db.add(_obj)
+                    if commit:
+                        _db.commit()
+                    else:
+                        _db.flush()
+                    return _obj
+
+        return _update(self, _db=db)
+
+    def delete(self, commit=True, db=None):
+        """Remove the record from the database."""
+        if db:
+            db.delete(self)
+            return commit and db.commit()
+        else:
+            with get_db_session() as db:
+                db.delete(self)
+                return commit and db.commit()
+
+    def soft_delete(self, commit=True, db=None):
+        """Remove the record from the database."""
+        return self.update(commit=commit, db=db, **{
+            'active': False
+        })
+
+
+Base = declarative_base()
+
+
+class Model(CRUDMixin, Base):
+    """Base model class that includes CRUD convenience methods."""
+
+    __abstract__ = True
+
+    def __init__(self, **kwargs):
+        for k, v in kwargs.items():
+            setattr(self, k, v)

agentic_kit_common-0.0.2/agentic_kit_common/orm/manager.py

@@ -0,0 +1,145 @@
+import time
+from abc import abstractmethod
+from sqlalchemy import asc, desc
+
+from .session import get_db_session
+
+
+class BaseOrmManager(object):
+    """Model orm manager"""
+
+    _model_cls = None
+
+    @classmethod
+    def get_by_id(cls, obj_id, close_session_after_curd=False):
+        with get_db_session() as db:
+            query = db.query(cls._model_cls) \
+                .filter(cls._model_cls.id == obj_id) \
+                .filter(cls._model_cls.active == True)
+
+            if hasattr(cls._model_cls, 'active'):
+                query = query.filter(cls._model_cls.active == 1)
+
+            _obj = query.first()
+
+            if close_session_after_curd:
+                db.close()
+
+            return _obj or None
+
+    @classmethod
+    def get_object_or_none(cls, close_session_after_curd=False, **lookup):
+        """Get object using lookup parameters, i.e pk=1"""
+        if lookup:
+            with get_db_session() as db:
+                res = db.query(cls._model_cls).filter_by(**lookup).first()
+
+                if close_session_after_curd:
+                    db.close()
+
+                return res
+
+    @classmethod
+    def get_objects_all(cls, close_session_after_curd=False, **lookup):
+        if lookup:
+            with get_db_session() as db:
+                res = db.query(cls._model_cls).filter_by(**lookup).all()
+
+                if close_session_after_curd:
+                    db.close()
+
+                return res
+
+    @classmethod
+    def get_list(cls, paginate=False, close_session_after_curd=False, **kwargs):
+        with get_db_session() as db:
+            query = db.query(cls._model_cls)
+            # """分页查询示例"""
+            # # 填充具体查询条件
+            for column, value in kwargs.items():
+                if not hasattr(cls._model_cls, column):
+                    continue
+                # 根据值类型，来组装查询条件
+                if isinstance(value, tuple):
+                    # 范围查询
+                    query = query.filter(getattr(cls._model_cls, column).between(*value))
+                elif isinstance(value, list):
+                    # in查询
+                    query = query.filter(getattr(cls._model_cls, column).in_(value))
+                elif isinstance(value, str) and value.find("%") != -1:
+                    # 模糊查询
+                    query = query.filter(getattr(cls._model_cls, column).like(value))
+                else:
+                    # 等值查询
+                    query = query.filter(getattr(cls._model_cls, column) == value)
+
+            if kwargs.get('active', None) is None and hasattr(cls._model_cls, 'active'):
+                query = query.filter(cls._model_cls.active == 1)
+
+            if paginate:
+                # 总数
+                total = query.count()
+
+                # 计算分页offset
+                page = kwargs.get('page', 1)
+                per_page = kwargs.get('per_page', 20)
+                offset = (page - 1) * per_page
+
+                # 排序
+                if hasattr(cls._model_cls, 'sort'):
+                    query = query.order_by(asc(cls._model_cls.sort))
+                query = query.order_by(desc(cls._model_cls.id)).offset(offset).limit(per_page)
+
+                # 查询记录
+                result = query.all()
+                pagination = {
+                    'total': total,
+                    'page': page,
+                    'per_page': per_page,
+                    'items': result
+                }
+                res = pagination
+                # return pagination
+            else:
+                res = query.all()
+                # return res
+
+            if close_session_after_curd:
+                db.close()
+
+            return res
+
+    @classmethod
+    def create_obj(cls, commit=False, **kwargs):
+        now = int(time.time())
+        obj = cls._model_cls.create(commit=commit, created_at=now, updated_at=now, active=True, **kwargs)
+        return obj
+
+    @classmethod
+    def update_obj(cls, obj, commit=False, **kwargs):
+        """更新obj信息"""
+        obj.update(commit=commit, updated_at=int(time.time()), **kwargs)
+        return obj
+
+    @classmethod
+    def soft_delete_obj(cls, obj):
+        """软删除obj信息"""
+        cls.update_obj(obj, **{
+            'active': False
+        })
+        return obj
+
+    @classmethod
+    def delete_obj(cls, obj, commit=False):
+        """删除obj信息"""
+        obj.delete(commit=commit)
+        return obj
+
+    @classmethod
+    @abstractmethod
+    def render(cls, obj):
+        raise NotImplemented()
+
+    @classmethod
+    def render_simple(cls, obj):
+        cls.render(obj)

agentic_kit_common-0.0.2/agentic_kit_common/orm/session.py

@@ -0,0 +1,67 @@
+import asyncio
+from contextlib import contextmanager
+
+from sqlalchemy import create_engine, text
+from sqlalchemy.exc import OperationalError
+from sqlalchemy.orm import sessionmaker, scoped_session
+
+
+sqlalchemy_database_uri = os.getenv("SQLALCHEMY_DATABASE_URI", "sqlite:///fallback.db")
+sqlalchemy_database_name = os.getenv("SQLALCHEMY_DATABASE_NAME", "default")
+sqlalchemy_echo = os.getenv("SQLALCHEMY_ECHO", False)
+sqlalchemy_pool_size = os.getenv("SQLALCHEMY_POOL_SIZE", 10)
+sqlalchemy_max_overflow = os.getenv("SQLALCHEMY_MAX_OVERFLOW", 5)
+sqlalchemy_pool_pre_ping = os.getenv("SQLALCHEMY_POOL_PRE_PING", True)
+sqlalchemy_pool_recycle = os.getenv("SQLALCHEMY_POOL_RECYCLE", 1800)
+
+
+# 创建引擎
+engine = create_engine(
+    url=f'{sqlalchemy_database_uri}/{sqlalchemy_database_name}',
+    echo=sqlalchemy_echo,  # 是否打印SQL
+    pool_size=sqlalchemy_pool_size,  # 连接池的大小，指定同时在连接池中保持的数据库连接数，默认:5
+    max_overflow=sqlalchemy_max_overflow,  # 超出连接池大小的连接数，超过这个数量的连接将被丢弃,默认: 5
+    pool_pre_ping=sqlalchemy_pool_pre_ping,
+    pool_recycle=sqlalchemy_pool_recycle,
+    # connect_args={ "use_unicode": True}  
+)
+# print("Database engine created")
+# print(f"DATABASE_URL: {settings.sqlalchemy_database_uri}")
+# 封装获取会话
+_Session = scoped_session(sessionmaker(bind=engine, expire_on_commit=False, autocommit=False, autoflush=False))
+
+
+# 实例化SessionLocal类
+@contextmanager
+def get_db_session(auto_commit_by_exit=False, auto_close=False):
+    """使用上下文管理资源关闭"""
+    _session = _Session()
+    try:
+        yield _session
+        # 退出时，是否自动提交
+        if auto_commit_by_exit:
+            _session.commit()
+    except OperationalError as e:
+        # 捕获连接超时异常并重新初始化会话
+        _session.close()
+        _session = _Session()
+        yield _session
+        if auto_commit_by_exit:
+            _session.commit()
+    except Exception as e:
+        _session.rollback()
+        raise e
+    finally:
+        if auto_close:
+            _session.close()
+
+async def keepalive():
+    while True:
+        try:
+            with get_db_session() as session:
+                session.execute(text("SELECT 1"))
+                session.commit()
+        except Exception as e:
+            print(f"Keepalive failed: {e}")
+            keepalive()
+        await asyncio.sleep(300)  # 每5分钟执行一次

agentic_kit_common-0.0.2/agentic_kit_common/web/http/response.py

@@ -0,0 +1,46 @@
+from fastapi.responses import JSONResponse
+from pydantic import BaseModel, Field
+from typing import Any, Optional, Union
+
+
+class ResponseCode:
+    SUCCESS = 0
+    ERROR = -1
+
+
+class ResponseMessage:
+    SUCCESS = 'success'
+    ERROR = 'error'
+
+
+def default_data():
+    return ''
+
+
+class BaseResponse(BaseModel):
+    code: int = Field(0, description='API status code')
+    message: str = Field('success', description='API status message')
+    data: Optional[Union[Any, None]] = Field(default_factory=default_data, description='API data')
+
+    class Config:
+        json_schema_extra = {
+            'example': {
+                'code': ResponseCode.SUCCESS,
+                'message': ResponseMessage.SUCCESS,
+                'data': None
+            }
+        }
+
+    @classmethod
+    def success(cls, data: Optional[Any] = '', message: str = ResponseMessage.SUCCESS, code=ResponseCode.SUCCESS):
+        return BaseResponse(code=code, message=message, data=data)
+
+    @classmethod
+    def error(cls, data: Optional[Any] = '', message: str = ResponseMessage.ERROR, code=ResponseCode.ERROR):
+        return BaseResponse(code=code, message=message, data=data)
+
+    @classmethod
+    def json_resp(cls, data=None, status_code: int = 200):
+        if data is None:
+            data = {}
+        return JSONResponse(status_code=status_code, content=data)

{agentic_kit_common-0.0.1 → agentic_kit_common-0.0.2}/agentic_kit_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-kit-common
-Version: 0.0.1
+Version: 0.0.2
 Summary: Common utilities and tools for agentic kit ecosystem, including MinIO manager and other shared components
 Home-page: 
 Author: manson
@@ -14,7 +14,7 @@ Classifier: Topic :: System :: Distributed Computing
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: minio
 Requires-Dist: urllib3
@@ -24,6 +24,8 @@ Requires-Dist: langchain_core
 Requires-Dist: langgraph
 Requires-Dist: langchain_community
 Requires-Dist: langchain_experimental
+Requires-Dist: mysql-connector-python
+Requires-Dist: sqlalchemy
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

agentic_kit_common-0.0.2/agentic_kit_common.egg-info/SOURCES.txt

@@ -0,0 +1,20 @@
+README.md
+setup.py
+agentic_kit_common/__init__.py
+agentic_kit_common.egg-info/PKG-INFO
+agentic_kit_common.egg-info/SOURCES.txt
+agentic_kit_common.egg-info/dependency_links.txt
+agentic_kit_common.egg-info/requires.txt
+agentic_kit_common.egg-info/top_level.txt
+agentic_kit_common/minio/__init__.py
+agentic_kit_common/minio/minio_manager.py
+agentic_kit_common/orm/__init__.py
+agentic_kit_common/orm/base.py
+agentic_kit_common/orm/manager.py
+agentic_kit_common/orm/session.py
+agentic_kit_common/web/__init__.py
+agentic_kit_common/web/http/__init__.py
+agentic_kit_common/web/http/response.py
+test/__init__.py
+test/config.py
+test/test_minio.py

{agentic_kit_common-0.0.1 → agentic_kit_common-0.0.2}/agentic_kit_common.egg-info/requires.txt

@@ -6,3 +6,5 @@ langchain_core
 langgraph
 langchain_community
 langchain_experimental
+mysql-connector-python
+sqlalchemy

{agentic_kit_common-0.0.1 → agentic_kit_common-0.0.2}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='agentic-kit-common',
-    version="0.0.1",
+    version="0.0.2",
     author="manson",
     author_email="manson.li3307@gmail.com",
     description='Common utilities and tools for agentic kit ecosystem, including MinIO manager and other shared components',
@@ -22,7 +22,7 @@ setup(
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent'
     ],
-    python_requires='>=3.10',
+    python_requires='>=3.12',
     install_requires=[
         # MinIO dependencies
         "minio",
@@ -37,6 +37,10 @@ setup(
         "langgraph",
         "langchain_community",
         "langchain_experimental",
+
+        # sqlalchemy
+        "mysql-connector-python",
+        "sqlalchemy",
     ],
     keywords=['AI', 'LLM', 'Agent', 'MinIO', 'Storage', 'Common', 'Utilities'],
     include_package_data=True,

{agentic_kit_common-0.0.1 → agentic_kit_common-0.0.2}/test/test_minio.py

@@ -1,13 +1,13 @@
+import sys
 import unittest
 from datetime import timedelta
 from pathlib import Path
-import sys
 
 project_root = Path(__file__).parent.parent
 sys.path.insert(0, str(project_root))
 
-from agentic_kit_common.Minio_db.minio_manager import MinioManager
-from agentic_kit_common.Minio_db.config import load_config
+from agentic_kit_common.minio.minio_manager import MinioManager
+from .config import load_config
 
 
 class MyTestCase(unittest.TestCase):

agentic_kit_common-0.0.1/agentic_kit_common.egg-info/SOURCES.txt

@@ -1,13 +0,0 @@
-README.md
-setup.py
-agentic_kit_common/__init__.py
-agentic_kit_common.egg-info/PKG-INFO
-agentic_kit_common.egg-info/SOURCES.txt
-agentic_kit_common.egg-info/dependency_links.txt
-agentic_kit_common.egg-info/requires.txt
-agentic_kit_common.egg-info/top_level.txt
-agentic_kit_common/Minio_db/__init__.py
-agentic_kit_common/Minio_db/config.py
-agentic_kit_common/Minio_db/minio_manager.py
-test/__init__.py
-test/test_minio.py