codosdk 1.0.18__tar.gz → 1.0.20__tar.gz

{codosdk-1.0.18 → codosdk-1.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.18
+Version: 1.0.20
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.18 → codosdk-1.0.20}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.18
+Version: 1.0.20
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.18 → codosdk-1.0.20}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from setuptools import setup, find_packages
 
-VERSION = '1.0.18'
+VERSION = '1.0.20'
 
 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.')

{codosdk-1.0.18 → codosdk-1.0.20}/websdk2/crud_utils.py

@@ -5,14 +5,16 @@ Author : shenshuo
 Date   : 2025年02月08日
 Desc   : 存储类
 """
-
+import json
 import time
 import logging
 from sqlalchemy import true
 from sqlalchemy.exc import IntegrityError
+from typing import List, Union, Optional
 from .db_context import DBContextV2 as DBContext
 from .utils.pydantic_utils import sqlalchemy_to_pydantic, ValidationError, PydanticDelList
 from .sqlalchemy_pagination import paginate
+from .model_utils import model_to_dict
 
 
 def get_millisecond_timestamp() -> int:
@@ -32,6 +34,28 @@ class ModelCRUDView:
     def prepare(self):
         pass
 
+    @staticmethod
+    def parse_id_list(id_list: Union[str, List[int]]) -> Optional[List[int]]:
+        """
+        解析和验证 id_list 参数。
+        """
+        if isinstance(id_list, str):
+            try:
+                id_list = json.loads(id_list)
+            except json.JSONDecodeError as e:
+                logging.error(f"Failed to parse id_list: {e}, input: {id_list}")
+                return None
+        if isinstance(id_list, list):
+            try:
+                # 尝试将所有元素转换为整数
+                id_list = [int(i) for i in id_list]
+                return id_list
+            except Exception as e:
+                logging.error(f"Invalid id_list element: {e}, input: {id_list}")
+                return None
+        logging.error(f"Invalid id_list format: {id_list}")
+        return None
+
     @staticmethod
     def del_data(data) -> dict:
         for key in ['_index', '_rowKey', 'update_time']:
@@ -53,7 +77,7 @@ class ModelCRUDView:
                             msg='获取成功',
                             reason="",
                             timestamp=get_millisecond_timestamp(),
-                            data={'item': _info.to_dict()}
+                            data={'item': model_to_dict(_info)}
                             )
         except Exception as e:
             logging.error(f"Database query failed: {e}")
@@ -81,8 +105,8 @@ class ModelCRUDView:
         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.")
+            # 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}")
@@ -90,8 +114,10 @@ class ModelCRUDView:
         try:
             with DBContext('r') as session:
                 query = session.query(self.model).filter(filter_condition).filter_by(**filter_map)
-                if id_list and isinstance(id_list, list):
+                id_list = self.parse_id_list(id_list)
+                if id_list:
                     query = query.filter(self.model.id.in_(id_list))
+
                 page = paginate(query, **params)
         except Exception as e:
             return dict(code=2, msg='查询失败', data=None, reason=str(e), timestamp=get_millisecond_timestamp())
@@ -103,7 +129,6 @@ class ModelCRUDView:
             timestamp=get_millisecond_timestamp(),
             data={
                 'items': page.items,
-                'current_page': page.page,  # 当前页
                 'total_pages': page.pages,  # 总页数
                 'count': page.total  # 总数
             }
@@ -117,6 +142,8 @@ class ModelCRUDView:
         except ValidationError as e:
             return dict(code=-1, msg='数据格式出错', reason=str(e), data=None, timestamp=get_millisecond_timestamp())
 
+        data.pop("id", None)
+
         try:
             with DBContext('w', None, True) as db:
                 __record = self.model(**data)

{codosdk-1.0.18 → codosdk-1.0.20}/websdk2/sqlalchemy_pagination.py

@@ -28,26 +28,6 @@ class Page(object):
         self.pages = int(math.ceil(total / float(page_size)))
 
 
-# def paginate(query, order_by: str = None, **query_params):
-#     page = int(query_params.get('page', 1)) if 'page' in query_params else int(query_params.get('page_number', 1))
-#     page_size = int(query_params.get('limit')) if 'limit' in query_params else int(query_params.get('page_size', 10))
-#
-#     if 'order_by' in query_params: order_by = query_params.get('order_by')
-#     items_not_to_list = query_params.get('items_not_to_list')  # 如果不序列化要额外加参数，主要为了连表查询
-#
-#     if page <= 0: raise AttributeError('page needs to be >= 1')
-#     if page_size <= 0: raise AttributeError('page_size needs to be >= 1')
-#     if order_by:
-#         items = query.order_by(order_by).all() if page_size >= 200 else query.order_by(order_by).limit(
-#             page_size).offset((page - 1) * page_size).all()
-#     else:
-#         items = query.all() if page_size >= 200 else query.limit(page_size).offset((page - 1) * page_size).all()
-#
-#     total = query.order_by(order_by).count()
-#     if not items_not_to_list: items = queryset_to_list(items)
-#     return Page(items, page, page_size, total)
-
-
 def paginate(query, order_by: str = None, **query_params):
     page = int(query_params.get('page', 1)) if 'page' in query_params else int(query_params.get('page_number', 1))
     page_size = int(query_params.get('limit')) if 'limit' in query_params else int(query_params.get('page_size', 10))