fastgenerateapi 1.2.18__tar.gz → 1.2.20__tar.gz

{fastgenerateapi-1.2.18 → fastgenerateapi-1.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.18
+Version: 1.2.20
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com

{fastgenerateapi-1.2.18 → fastgenerateapi-1.2.20}/fastgenerateapi/__version__.py

@@ -8,7 +8,7 @@
 #                                                  d8888P
 
 
-VERSION = (1, 2, 18)
+VERSION = (1, 2, 20)
 
 __version__ = '.'.join(map(str, VERSION))
 

{fastgenerateapi-1.2.18 → fastgenerateapi-1.2.20}/fastgenerateapi/api_view/mixin/dbmodel_mixin.py

@@ -12,7 +12,10 @@ class DBModelMixin:
         "lt": "小于",
         "lte": "小于等于",
         "contains": "模糊搜索",
+        "icontains": "模糊搜索",
         "in": "范围",
+        "not_in": "范围之外",
+        "isnull": "是空值",
     }
 
     @staticmethod

{fastgenerateapi-1.2.18 → fastgenerateapi-1.2.20}/fastgenerateapi/controller/filter_controller.py

@@ -2,6 +2,7 @@ from datetime import datetime, date, time
 from typing import Union, Any, Optional, Type
 
 from pydantic.fields import FieldInfo
+from pytz import timezone
 from tortoise import Model
 from tortoise.expressions import Q
 from tortoise.queryset import QuerySet
@@ -12,6 +13,12 @@ from fastgenerateapi.pydantic_utils.base_model import alias_generator
 
 class FilterUtils:
 
+    @staticmethod
+    def datetime_to_shanghai(d: datetime) -> datetime:
+        if d.tzinfo is None:
+            return d.replace(tzinfo=timezone('Asia/Shanghai'))
+        return d.astimezone(timezone('Asia/Shanghai'))
+
     @staticmethod
     def date_to_datetime_23(date_value: Union[None, str, date, datetime]) -> Optional[datetime]:
         """
@@ -114,16 +121,16 @@ class BaseFilter:
         :param value:
         :return:
         """
-        q_dict = {}
-        # if isinstance(value, (str, datetime, date, time)):
-        if isinstance(value, str):
-            if hasattr(value, "upper") and value.upper() in ["NONE", "NULL", "NIL"]:
-                q_dict[self.model_field] = None
-            else:
-                q_dict[self.model_field] = str(value)
-        else:
-            q_dict[self.model_field] = value
-        return Q(**q_dict)
+        # q_dict = {}
+        # # if isinstance(value, (str, datetime, date, time)):
+        # if isinstance(value, str):
+        #     if hasattr(value, "upper") and value.upper() in ["NONE", "NULL", "NIL"]:
+        #         q_dict[self.model_field] = None
+        #     else:
+        #         q_dict[self.model_field] = str(value)
+        # else:
+        #     q_dict[self.model_field] = value
+        return Q(**{ self.model_field: value })
 
     def query(self, queryset: QuerySet, value: Union[str, list, bool]) -> QuerySet:
         """

{fastgenerateapi-1.2.18 → fastgenerateapi-1.2.20}/fastgenerateapi/fastapi_utils/tortoise_utils.py

@@ -28,7 +28,7 @@ def _get_connection(connection_name: Optional[str]) -> BaseDBAsyncClient:
         connection = connections.get(connection_name)
     elif len(connections.db_config) >= 1:
         # 默认选排序第一个
-        connection_name = connections.db_config.get("default") or next(iter(connections.db_config.keys()))
+        connection_name = "default" if "default" in connections.db_config else next(iter(connections.db_config.keys()))
         connection = connections.get(connection_name)
     else:
         raise ParamsError(

{fastgenerateapi-1.2.18 → fastgenerateapi-1.2.20}/fastgenerateapi/my_fields/enum_field.py

@@ -37,7 +37,8 @@ class IntEnumField(IntEnumFieldInstance):
     def __init__(self, enum_list: List[any], start_num=0, **kwargs: Any) -> None:
         self.start_num = start_num
         self.enum_list = enum_list
-        self.description = kwargs.get("description", "") + " >> " + self.get_description(enum_list, start_num)
+        self._description = kwargs.get("description", "")
+        self.description = self._description + " >> " + self.get_description(enum_list, start_num)
         kwargs["description"] = self.description
         super().__init__(enum_type=self.create_enum(enum_list, start_num=start_num), **kwargs)
 

{fastgenerateapi-1.2.18 → fastgenerateapi-1.2.20}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.18
+Version: 1.2.20
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com