codosdk 1.0.9__tar.gz → 1.0.11__tar.gz

codosdk-1.0.11/PKG-INFO

@@ -0,0 +1,98 @@
+Metadata-Version: 2.2
+Name: codosdk
+Version: 1.0.11
+Summary: CODO项目的Python SDK
+Home-page: https://github.com/ss1917/codo_sdk/
+Author: shenshuo
+Author-email: 191715030@qq.com
+License: GPLv3
+Keywords: ops,codo,devops
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console :: Curses
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=2.7, >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: fire==0.5.0
+Requires-Dist: shortuuid==1.0.11
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: sqlalchemy==1.3.23
+Requires-Dist: pika==1.3.1
+Requires-Dist: PyJWT==2.0.1
+Requires-Dist: requests==2.28.2
+Requires-Dist: redis==4.5.1
+Requires-Dist: tornado>=6.0
+Requires-Dist: loguru>=0.6.0
+Requires-Dist: cryptography==42.0.4
+Requires-Dist: ldap3==2.9
+Requires-Dist: pydantic>=1.10.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+## 安装
+
+### python3安装
+
+[python链接](https://www.python.org/)
+
+##### python3.9以上
+
+##### SDK 安装
+
+```bash
+$ pip3 install -U git+https://github.com/ss1917/ops_sdk.git
+```
+
+## 结构
+
+```shell
+.
+├── README.md    项目readme
+└── opssdk
+    ├── logs     日志模块
+    ├── install  安装模块
+    ├── get_info 配置获取
+    └── operate  运维操作
+        ├── check           系统参数检查和获取
+        ├── mysql           mysql 操作
+        ├── mail            发送邮件
+        └── centralization  集中化管理工具 salt
+    └── websdk2      web开发使用
+    ├── application.py          tornado application
+    ├── base_handler.py         tornado  基类
+    ├── cache.py                处理redis缓存
+    ├── configs.py              配置文件管理
+    ├── consts.py               常量
+    ├── db_context.py           MySQL 处理类
+    ├── error.py                异常
+    ├── fetch_coroutine.py      
+    ├── __init__.py
+    ├── jwt_token.py            jwt
+    ├── mqhelper.py             MQ 处理类
+    ├── program.py
+    ├── salt_api.py             salt 处理类 可以移到工具类
+    ├── sms.py                  发送短信     可以移到工具类
+    ├── tools.py                工具类
+    └── web_logs.py             日志处理
+```
+
+## License
+
+Everything is [GPL v3.0](https://www.gnu.org/licenses/gpl-3.0.html).

codosdk-1.0.11/codosdk.egg-info/PKG-INFO

@@ -0,0 +1,98 @@
+Metadata-Version: 2.2
+Name: codosdk
+Version: 1.0.11
+Summary: CODO项目的Python SDK
+Home-page: https://github.com/ss1917/codo_sdk/
+Author: shenshuo
+Author-email: 191715030@qq.com
+License: GPLv3
+Keywords: ops,codo,devops
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console :: Curses
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=2.7, >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: fire==0.5.0
+Requires-Dist: shortuuid==1.0.11
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: sqlalchemy==1.3.23
+Requires-Dist: pika==1.3.1
+Requires-Dist: PyJWT==2.0.1
+Requires-Dist: requests==2.28.2
+Requires-Dist: redis==4.5.1
+Requires-Dist: tornado>=6.0
+Requires-Dist: loguru>=0.6.0
+Requires-Dist: cryptography==42.0.4
+Requires-Dist: ldap3==2.9
+Requires-Dist: pydantic>=1.10.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+## 安装
+
+### python3安装
+
+[python链接](https://www.python.org/)
+
+##### python3.9以上
+
+##### SDK 安装
+
+```bash
+$ pip3 install -U git+https://github.com/ss1917/ops_sdk.git
+```
+
+## 结构
+
+```shell
+.
+├── README.md    项目readme
+└── opssdk
+    ├── logs     日志模块
+    ├── install  安装模块
+    ├── get_info 配置获取
+    └── operate  运维操作
+        ├── check           系统参数检查和获取
+        ├── mysql           mysql 操作
+        ├── mail            发送邮件
+        └── centralization  集中化管理工具 salt
+    └── websdk2      web开发使用
+    ├── application.py          tornado application
+    ├── base_handler.py         tornado  基类
+    ├── cache.py                处理redis缓存
+    ├── configs.py              配置文件管理
+    ├── consts.py               常量
+    ├── db_context.py           MySQL 处理类
+    ├── error.py                异常
+    ├── fetch_coroutine.py      
+    ├── __init__.py
+    ├── jwt_token.py            jwt
+    ├── mqhelper.py             MQ 处理类
+    ├── program.py
+    ├── salt_api.py             salt 处理类 可以移到工具类
+    ├── sms.py                  发送短信     可以移到工具类
+    ├── tools.py                工具类
+    └── web_logs.py             日志处理
+```
+
+## License
+
+Everything is [GPL v3.0](https://www.gnu.org/licenses/gpl-3.0.html).

{codosdk-1.0.9 → codosdk-1.0.11}/codosdk.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ websdk2/client.py
 websdk2/cloud_utils.py
 websdk2/configs.py
 websdk2/consts.py
+websdk2/crud_utils.py
 websdk2/db_context.py
 websdk2/error.py
 websdk2/fetch_coroutine.py

{codosdk-1.0.9 → codosdk-1.0.11}/setup.py

@@ -7,9 +7,9 @@ desc   : CODO SDK
 """
 
 import sys
-from distutils.core import setup
+from setuptools import setup, find_packages
 
-VERSION = '1.0.9'
+VERSION = '1.0.11'
 
 if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
     print('This program requires at least Python 2.7 or 3.6 to run.')
@@ -34,14 +34,16 @@ setup(
     name='codosdk',
     version=VERSION,
     description="CODO项目的Python SDK",
-    packages=['opssdk', 'opssdk.utils', 'websdk2', 'websdk2.apis', 'websdk2.cloud', 'websdk2.utils'],
+    # packages=['opssdk', 'opssdk.utils', 'websdk2', 'websdk2.apis', 'websdk2.cloud', 'websdk2.utils'],
+    packages=find_packages(),
     url='https://github.com/ss1917/codo_sdk/',
     license='GPLv3',
-    keywords="ops,opencodo,devops",
+    keywords="ops, codo, devops",
     install_requires=get_install_requires(),
     author='shenshuo',
     author_email='191715030@qq.com',
-    long_description='SDK of the operation and maintenance script logs operate',
+    long_description=open('README.md').read(),  # 自动读取README文件
+    long_description_content_type='text/markdown',  # 确保Markdown格式
     include_package_data=True,
     data_files=get_data_files(),
     classifiers=[
@@ -55,5 +57,6 @@ setup(
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.9'
     ],
-    platforms='any'
+    platforms='any',
+    python_requires='>=2.7, >=3.6',  # 精确控制支持的Python版本
 )

codosdk-1.0.11/websdk2/crud_utils.py

@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+# -*-coding:utf-8-*-
+"""
+Author : shenshuo
+Date   : 2025年02月08日
+Desc   : 存储类
+"""
+
+import logging
+from sqlalchemy import true
+from sqlalchemy.exc import IntegrityError
+from .db_context import DBContextV2 as DBContext
+from .utils.pydantic_utils import sqlalchemy_to_pydantic, ValidationError, PydanticDelList
+from .sqlalchemy_pagination import paginate
+
+
+class ModelCRUDView:
+    def __init__(self, model, **kwargs):
+        self.model = model
+        self.pydantic_model_base = sqlalchemy_to_pydantic(model)
+        self.pydantic_model = sqlalchemy_to_pydantic(model, exclude=['id'])
+
+    def prepare(self):
+        pass
+
+    @staticmethod
+    def del_data(data) -> dict:
+        for key in ['_index', '_rowKey', 'update_time']:
+            data.pop(key, None)
+        return data
+
+    def handle_get(self, data: dict) -> dict:
+        self.prepare()
+        data_id = data.get('id')
+        if not data_id:
+            return dict(code=1, msg="缺少必要的 'id' 参数", data=None)
+
+        try:
+            with DBContext('r') as session:
+                _info = session.query(self.model).filter(self.model.id == data_id).first()
+                if not _info:
+                    return dict(code=1, msg='数据未找到', data=None)
+                return dict(code=0, msg='获取成功', data={
+                    data: _info.to_dict()
+                })
+        except Exception as e:
+            logging.error(f"Database query failed: {e}")
+            return dict(code=2, msg='查询失败', data=None)
+
+    def handle_list(self, params: dict, get_by_val_func=None) -> dict:
+        self.prepare()
+
+        value = params.get('searchValue', params.get('searchVal'))
+        filter_map = params.pop('filter_map', {})
+        params.setdefault('page_size', 300)  # 统一处理默认值
+
+        # 如果未提供过滤函数，使用默认函数
+        if get_by_val_func is None:
+            def default_get_by_val(value: str):
+                """默认返回不过滤"""
+                return true()
+
+            get_by_val_func = default_get_by_val
+
+        if not callable(get_by_val_func):
+            raise ValueError("The `get_by_val_func` parameter must be a callable function.")
+
+        try:
+            # 调用 get_by_val_func 生成过滤条件
+            filter_condition = get_by_val_func(value)
+            if not isinstance(filter_condition, (bool, type(true()))):
+                raise ValueError("The `get_by_val_func` must return a SQLAlchemy filter condition or a boolean.")
+
+        except Exception as e:
+            raise ValueError(f"Error while executing `get_by_val_func`: {e}")
+
+        with DBContext('r') as session:
+            query = session.query(self.model).filter(filter_condition).filter_by(**filter_map)
+            page = paginate(query, **params)
+
+        return dict(
+            code=0,
+            msg='获取成功',
+            data={
+                'items': page.items,
+                'current_page': page.page,  # 当前页
+                'total_pages': page.pages,  # 总页数
+                'count': page.total  # 总数
+            }
+        )
+
+    def handle_add(self, data: dict) -> dict:
+        self.prepare()
+        data = self.del_data(data)
+        try:
+            self.pydantic_model(**data)
+        except ValidationError as e:
+            return dict(code=-1, msg=str(e))
+
+        try:
+            with DBContext('w', None, True) as db:
+                db.add(self.model(**data))
+        except IntegrityError as e:
+            return dict(code=-2, msg='不要重复添加')
+
+        except Exception as e:
+            return dict(code=-3, msg=f'{e}')
+
+        return dict(code=0, msg="创建成功")
+
+    def handle_update(self, data: dict) -> dict:
+        self.prepare()
+        data = self.del_data(data)
+        try:
+            valid_data = self.pydantic_model_base(**data)
+        except ValidationError as e:
+            return dict(code=-1, msg=str(e))
+
+        try:
+            with DBContext('w', None, True) as db:
+                db.query(self.model).filter(self.model.id == valid_data.id).update(data)
+
+        except IntegrityError as e:
+            return dict(code=-2, msg=f'修改失败，已存在')
+
+        except Exception as err:
+            return dict(code=-3, msg=f'修改失败, {err}')
+
+        return dict(code=0, msg="修改成功")
+
+    def handle_update_no_validation(self, data: dict) -> dict:
+        """不进行校验的更新方法"""
+        self.prepare()
+        data_id = data.get('id')
+        with DBContext('w', None, True) as db:
+            db.query(self.model).filter(self.model.id == data_id).update(data)
+        return dict(code=0, msg='更新成功')
+
+    def handle_delete(self, data: dict) -> dict:
+        self.prepare()
+        try:
+            valid_data = PydanticDelList(**data)
+        except ValidationError as e:
+            return dict(code=-1, msg=str(e))
+
+        with DBContext('w', None, True) as session:
+            session.query(self.model).filter(self.model.id.in_(valid_data.id_list)).delete(synchronize_session=False)
+        return dict(code=0, msg=f"删除成功")

{codosdk-1.0.9 → codosdk-1.0.11}/websdk2/model_utils.py

@@ -2,7 +2,7 @@
 # -*-coding:utf-8-*-
 """
 Author : shenshuo
-Date   : 2019年12月11日
+Date   : 2025年02月08日
 Desc   : models类
 """
 

{codosdk-1.0.9 → codosdk-1.0.11}/websdk2/tools.py

@@ -14,6 +14,7 @@ import subprocess
 from concurrent.futures import ThreadPoolExecutor
 from .consts import const
 
+
 def singleton(class_):
     instances = {}
 

{codosdk-1.0.9 → codosdk-1.0.11}/websdk2/utils/pydantic_utils.py

@@ -5,7 +5,7 @@ Version : 0.0.8
 Contact : 191715030@qq.com
 Author  : shenshuo
 Date    : 2021/1/26 20:28
-Desc    :  https://github.com/tiangolo/pydantic-sqlalchemy
+Desc    : https://github.com/tiangolo/pydantic-sqlalchemy
 """
 
 ####

codosdk-1.0.9/PKG-INFO

@@ -1,45 +0,0 @@
-Metadata-Version: 2.2
-Name: codosdk
-Version: 1.0.9
-Summary: CODO项目的Python SDK
-Home-page: https://github.com/ss1917/codo_sdk/
-Author: shenshuo
-Author-email: 191715030@qq.com
-License: GPLv3
-Keywords: ops,opencodo,devops
-Platform: any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console :: Curses
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.9
-License-File: LICENSE
-Requires-Dist: fire==0.5.0
-Requires-Dist: shortuuid==1.0.11
-Requires-Dist: pymysql==0.9.3
-Requires-Dist: sqlalchemy==1.3.23
-Requires-Dist: pika==1.3.1
-Requires-Dist: PyJWT==2.0.1
-Requires-Dist: requests==2.28.2
-Requires-Dist: redis==4.5.1
-Requires-Dist: tornado>=6.0
-Requires-Dist: loguru>=0.6.0
-Requires-Dist: cryptography==42.0.4
-Requires-Dist: ldap3==2.9
-Requires-Dist: pydantic>=1.10.5
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: platform
-Dynamic: requires-dist
-Dynamic: summary
-
-SDK of the operation and maintenance script logs operate

codosdk-1.0.9/codosdk.egg-info/PKG-INFO

@@ -1,45 +0,0 @@
-Metadata-Version: 2.2
-Name: codosdk
-Version: 1.0.9
-Summary: CODO项目的Python SDK
-Home-page: https://github.com/ss1917/codo_sdk/
-Author: shenshuo
-Author-email: 191715030@qq.com
-License: GPLv3
-Keywords: ops,opencodo,devops
-Platform: any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console :: Curses
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.9
-License-File: LICENSE
-Requires-Dist: fire==0.5.0
-Requires-Dist: shortuuid==1.0.11
-Requires-Dist: pymysql==0.9.3
-Requires-Dist: sqlalchemy==1.3.23
-Requires-Dist: pika==1.3.1
-Requires-Dist: PyJWT==2.0.1
-Requires-Dist: requests==2.28.2
-Requires-Dist: redis==4.5.1
-Requires-Dist: tornado>=6.0
-Requires-Dist: loguru>=0.6.0
-Requires-Dist: cryptography==42.0.4
-Requires-Dist: ldap3==2.9
-Requires-Dist: pydantic>=1.10.5
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: platform
-Dynamic: requires-dist
-Dynamic: summary
-
-SDK of the operation and maintenance script logs operate