fastgenerateapi 1.2.7__tar.gz → 1.2.9__tar.gz

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/PKG-INFO

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

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/api_view/base_view.py

@@ -29,7 +29,7 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
     schema: Optional[Type[BaseModel]] = None  # 返回序列化[未使用]
     dependencies: Optional[Sequence[params.Depends]] = None
     tags: Optional[List[str]] = None  # swagger标签
-    check_ignore_error_fields: List[str] = None # 检查唯一字段报错时，不展示这个字段
+    check_ignore_error_fields: Optional[List[str]] = None # 检查唯一字段报错时，不展示这个字段
 
     """
     # 增加外键字段显示
@@ -143,9 +143,8 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         )
         return schema.model_validate(model_dict)
 
-    @classmethod
     async def check_unique_field(
-            cls,
+            self,
             data_dict: dict,
             model_class: Type[Model],
             model: Union[Model, None] = None,
@@ -159,15 +158,21 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
         :param check_ignore_error_fields: 错误提示忽略字段，会合并类上的字段
         :return:
         """
-        check_unique_fields = cls._get_unique_fields(model_class)
-        check_unique_together_fields = cls._get_unique_together_fields(model_class)
+        check_unique_fields = self._get_unique_fields(model_class)
+        check_unique_together_fields = self._get_unique_together_fields(model_class)
         for unique_field in check_unique_fields:
             if unique_field in data_dict:
                 unique_field_value = data_dict.get(unique_field)
                 if model and unique_field_value == getattr(model, unique_field):
                     continue
                 if await model_class.filter(**{unique_field: unique_field_value}).first():
-                    return cls.error(msg=f"{cls.get_field_description(model_class, unique_field)}已存在相同值：{unique_field_value}")
+                    return self.error(msg=f"{self.get_field_description(model_class, unique_field)}已存在相同值：{unique_field_value}")
+        # 聚合忽略错误提示字段
+        ignore_error_field_list = check_ignore_error_fields or []
+        if settings.app_settings.CHECK_IGNORE_ERROR_FIELDS:
+            ignore_error_field_list.extend(settings.app_settings.CHECK_IGNORE_ERROR_FIELDS.split(","))
+        if self.check_ignore_error_fields:
+            ignore_error_field_list.extend(self.check_ignore_error_fields)
         for unique_together_fields in check_unique_together_fields:
             filter_fields = {}
             is_equal = True
@@ -192,33 +197,15 @@ class BaseView(BaseMixin, ResponseMixin, ToolMixin, DBModelMixin):
                 continue
 
             if await model_class.filter(**filter_fields).first():
-                ignore_error_field_list = check_ignore_error_fields or []
                 if settings.app_settings.WHETHER_DELETE_FIELD in description_fields:
                     description_fields.remove(settings.app_settings.WHETHER_DELETE_FIELD)
-                return cls.error(
-                    msg=f"{cls.get_field_description(model_class, description_fields)}已存在相同值：{[filter_fields.get(field) for field in description_fields]}"
+                for ignore_error_field in ignore_error_field_list:
+                    if ignore_error_field in description_fields:
+                        description_fields.remove(ignore_error_field)
+                return self.error(
+                    msg=f"{self.get_field_description(model_class, description_fields)}已存在相同值：{[filter_fields.get(field) for field in description_fields]}"
                 )
 
-    # @staticmethod
-    # async def setattr_model_rpc(
-    #         rpc_class,
-    #         model: Model,
-    #         rpc_param: Union[Dict[str, Dict[str, List[Union[str, tuple]]]], Type[RPCParam]],
-    #         *args, **kwargs
-    # ) -> Model:
-    #     if rpc_class is None or not model or not rpc_param:
-    #         return model
-    #     if not isinstance(rpc_param, RPCParam):
-    #         rpc_param = RPCParam(rpc_param, model)
-    #     rpc_obj = rpc_class(**rpc_param.request_param)
-    #     await rpc_obj.get_data()
-    #     for base_rpc_param in rpc_param.data:
-    #         setattr(
-    #             model,
-    #             base_rpc_param.response_field_alias_name,
-    #             rpc_obj.filter(base_rpc_param.model_field_value).get(base_rpc_param.response_field_name))
-    #     return model
-
     @staticmethod
     async def get_params(request: Request) -> dict:
         result = {}

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/api_view/delete_view.py

@@ -69,7 +69,7 @@ class DeleteView(BaseView):
             self.delete_response_schema_factory = response_factory(self.delete_response_schema, name="Delete")
         if not self.delete_summary:
             doc = self.destroy.__doc__
-            summary = doc.strip().split("\n")[0] if doc else "Delete All"
+            self.delete_summary = doc.strip().split("\n")[0] if doc else "Delete"
         path = f"/{settings.app_settings.ROUTER_DELETE_SUFFIX_FIELD}" if settings.app_settings.ROUTER_WHETHER_ADD_SUFFIX else ""
         self._add_api_route(
             path=path,

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/controller/filter_controller.py

@@ -1,6 +1,7 @@
 from datetime import datetime, date, time
 from typing import Union, Any, Optional
 
+from pydantic.fields import FieldInfo
 from tortoise.expressions import Q
 from tortoise.queryset import QuerySet
 
@@ -56,11 +57,17 @@ class BaseFilter:
         """
         :param filter_str:  Union[str, tuple]
             当tuple时，第一个为str，后面参数无顺序和数量要求，可以是 类型、重命名字符串、用于修改传值的方法
-        example： name__contains or (create_at__gt, datetime) or (create_at__gt, datetime, create_time)
+        example：
+            name__contains
+            (create_at__gt, datetime)
+            (create_at__gt, datetime, create_time)
+            (publish_date, datetime, FilterUtils.date_to_datetime_23)
+            (publish_date, datetime, FieldInfo())
         """
         field_type = str
         model_field = filter_str
         filter_field = None
+        field_info = None
         filter_func = None
         # 判断filter表达式的类型
         if isinstance(filter_str, tuple):
@@ -71,6 +78,8 @@ class BaseFilter:
                     field_type = f
                 elif type(f) == str:
                     filter_field = f
+                elif isinstance(f, FieldInfo):
+                    field_info = f
                 elif callable(f):
                     filter_func = f
         if not filter_field:
@@ -81,6 +90,7 @@ class BaseFilter:
         self.field_type = field_type
         self.model_field = model_field
         self.filter_field = filter_field
+        self.field_info = field_info
         self.filter_func = filter_func
 
     def generate_q(self, value: Union[str, list, bool]) -> Q:

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/schemas_factory/common_function.py

@@ -1,10 +1,11 @@
-from typing import Type, Optional, Union
+from typing import Type, Optional, Union, List
 
-from pydantic import field_validator
+from pydantic import field_validator, model_validator
 from pydantic.fields import FieldInfo
 from tortoise import Model
 
 from fastgenerateapi.api_view.mixin.dbmodel_mixin import DBModelMixin
+from fastgenerateapi.pydantic_utils.base_model import alias_generator
 from fastgenerateapi.settings.all_settings import settings
 
 
@@ -26,8 +27,12 @@ def get_field_info(value, description="", default_field_type=None) -> (Type, Fie
         field_type = value.field_type
         required = True
     field_info_dict["required"] = required
-    if not required and hasattr(value, "default") and not hasattr(value.default, '__call__'):
-        field_info_dict.setdefault("default", value.default)
+
+    if not required:
+        if hasattr(value, "default") and not hasattr(value.default, '__call__'):
+            field_info_dict.setdefault("default", value.default)
+        else:
+            field_info_dict["default"] = None
     if hasattr(value, "description"):
         field_info_dict.setdefault("description", description + (value.description or ""))
     if hasattr(value, "alias"):
@@ -141,5 +146,80 @@ def get_validate_dict_from_fields(fields_info: dict) -> dict:
     return validator_dict
 
 
+def get_model_validate_text_to_list(fields: Optional[List[str]]) -> dict:
+    """
+    详情列表用于返回
+    :param fields:
+    :return:
+    """
+    if not fields:
+        return {}
+    def func(cls, data):
+        if isinstance(data, dict):
+            for field in fields:
+                value_str = data.get(field, None)
+                if isinstance(value_str, (list, tuple, set)):
+                    field_value = list(value_str)
+                elif isinstance(value_str, str):
+                    field_value = value_str.split(settings.app_settings.TEXT_TO_LIST_SPLIT_VALUE)
+                else:
+                    field_value = value_str
+                data[field] = field_value
+        else:
+            for field in fields:
+                if hasattr(data, field):
+                    value_str = getattr(data, field)
+                    if isinstance(value_str, (list, tuple, set)):
+                        field_value = list(value_str)
+                    elif isinstance(value_str, str):
+                        field_value = getattr(data, field).split(settings.app_settings.TEXT_TO_LIST_SPLIT_VALUE)
+                    else:
+                        field_value = []
+                    setattr(data, field, field_value)
+        return data
+
+    return {
+        "text_to_list_func": model_validator(mode='before')(func)
+    }
 
 
+def get_model_validate_list_to_text(fields: Optional[List[str]]) -> dict:
+    """
+    创建修改用于保存
+    :param fields:
+    :return:
+    """
+    if not fields:
+        return {}
+    def func(cls, data: dict):
+        if isinstance(data, dict):
+            for field in fields:
+                if alias_generator:
+                    field = alias_generator(field)
+                value_list = data.get(field, None)
+                if isinstance(value_list, (list, tuple, set)):
+                    field_value = settings.app_settings.TEXT_TO_LIST_SPLIT_VALUE.join(list(value_list))
+                elif isinstance(value_list, str):
+                    field_value = value_list
+                else:
+                    field_value = None
+                data[field] = field_value
+        else:
+            for field in fields:
+                if alias_generator:
+                    field = alias_generator(field)
+                if hasattr(data, field):
+                    value_list = getattr(data, field)
+                    if isinstance(value_list, (list, tuple, set)):
+                        field_value = settings.app_settings.TEXT_TO_LIST_SPLIT_VALUE.join(list(value_list))
+                    elif isinstance(value_list, str):
+                        field_value = value_list
+                    else:
+                        field_value = None
+                    setattr(data, field, field_value)
+        return data
+
+    return {
+        "list_to_text_func": model_validator(mode='before')(func)
+    }
+

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/schemas_factory/create_schema_factory.py

@@ -1,4 +1,4 @@
-from typing import Type, Union, Optional
+from typing import Type, Union, Optional, List
 
 from fastgenerateapi.settings.all_settings import settings
 
@@ -8,7 +8,7 @@ from tortoise import Model
 
 from fastgenerateapi.data_type.data_type import T
 from fastgenerateapi.schemas_factory.common_function import get_dict_from_model_fields, get_dict_from_pydanticmeta, \
-    get_validate_dict_from_fields
+    get_validate_dict_from_fields, get_model_validate_list_to_text
 
 
 def create_schema_factory(
@@ -23,6 +23,7 @@ def create_schema_factory(
         pydantic_meta_save_exclude: Optional[bool] = True,
         pydantic_meta_create_include: Optional[bool] = True,
         pydantic_meta_create_exclude: Optional[bool] = True,
+        pydantic_meta_text_to_list: Optional[bool] = True,
         name: Optional[str] = None
 ) -> Type[T]:
     """
@@ -71,6 +72,7 @@ def create_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
+    text_to_list_fields = set()
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
@@ -102,6 +104,12 @@ def create_schema_factory(
                 exclude_fields.update(model_class.PydanticMeta.save_exclude)
             if pydantic_meta_create_exclude and hasattr(model_class.PydanticMeta, "create_exclude"):
                 exclude_fields.update(model_class.PydanticMeta.create_exclude)
+            if pydantic_meta_text_to_list and hasattr(model_class.PydanticMeta, "text_to_list"):
+                text_to_list_fields = getattr(model_class.PydanticMeta, "text_to_list")
+                for field in text_to_list_fields:
+                    field_info = all_fields_info.get(field)[1]
+                    field_type = Union[List[str], str] if field_info.is_required() else Union[List[str], str, None]
+                    all_fields_info.update({field: (field_type, field_info)})
         else:
             include_fields.update(all_fields_info.keys())
 
@@ -128,11 +136,12 @@ def create_schema_factory(
     schema_name = name if name else model_class.__name__ + "CreateSchema"
     schema_field_dict = {field: all_fields_info[field] for field in all_fields}
     validators_dict = get_validate_dict_from_fields(schema_field_dict)
+    text_to_list_validators_dict = get_model_validate_list_to_text(text_to_list_fields)
     schema: Type[T] = create_model(
         schema_name,
         **schema_field_dict,
         __config__=model_config,
-        __validators__=validators_dict,
+        __validators__={**validators_dict, **text_to_list_validators_dict},
     )
     return schema
 

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/schemas_factory/filter_schema_factory.py

@@ -18,21 +18,29 @@ def filter_schema_factory(model_class: Type[Model], fields: list[str, tuple[str,
     """
     model_fields = {}
 
-    for field_info in fields or []:
-        if not isinstance(field_info, BaseFilter):
-            field_info = BaseFilter(field_info)
-        f = field_info.filter_field
-        t = field_info.field_type
-        description = DBModelMixin.get_field_description(model_class, field_info.model_field)
-        model_fields.update({
-            f: (
-                Optional[t],
-                FieldInfo(
-                    title=f"{description}",
-                    default=Query("", description=description),
-                    description=f"{description}"
-                ))
-        })
+    for base_field in fields or []:
+        if not isinstance(base_field, BaseFilter):
+            base_field = BaseFilter(base_field)
+        f = base_field.filter_field
+        t = base_field.field_type
+        if base_field.field_info:
+            model_fields.update({
+                f: (
+                    Optional[t],
+                    base_field.field_info
+                )
+            })
+        else:
+            description = DBModelMixin.get_field_description(model_class, base_field.model_field)
+            model_fields.update({
+                f: (
+                    Optional[t],
+                    FieldInfo(
+                        title=f"{description}",
+                        default=Query("", description=description),
+                        description=f"{description}"
+                    ))
+            })
 
     filter_params_model: Type[BaseModel] = create_model(
         model_class.__name__+"CommonFilterParams",

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/schemas_factory/get_all_schema_factory.py

@@ -7,7 +7,8 @@ from pydantic import create_model
 
 from fastgenerateapi.data_type.data_type import T
 from fastgenerateapi.pydantic_utils.base_model import model_config
-from fastgenerateapi.schemas_factory.common_function import get_dict_from_model_fields, get_dict_from_pydanticmeta
+from fastgenerateapi.schemas_factory.common_function import get_dict_from_model_fields, get_dict_from_pydanticmeta, \
+    get_model_validate_text_to_list
 from fastgenerateapi.settings.all_settings import settings
 
 
@@ -29,6 +30,7 @@ def get_all_schema_factory(
         pydantic_meta_get_exclude: Optional[bool] = True,
         pydantic_meta_get_all_include: Optional[bool] = True,
         pydantic_meta_get_all_exclude: Optional[bool] = True,
+        pydantic_meta_text_to_list: Optional[bool] = True,
         name: Optional[str] = None,
 ) -> Optional[Type[T]]:
     """
@@ -86,6 +88,7 @@ def get_all_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
+    text_to_list_fields = set()
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
@@ -119,6 +122,12 @@ def get_all_schema_factory(
                 include_fields.update(get_all_include_fields_dict.keys())
             if pydantic_meta_get_all_exclude and hasattr(model_class.PydanticMeta, "get_all_exclude"):
                 exclude_fields.update(model_class.PydanticMeta.get_all_exclude)
+            if pydantic_meta_text_to_list and hasattr(model_class.PydanticMeta, "text_to_list"):
+                text_to_list_fields = getattr(model_class.PydanticMeta, "text_to_list")
+                for field in text_to_list_fields:
+                    field_info = all_fields_info.get(field)[1]
+                    field_type = List[str] if field_info.is_required() else Optional[List[str]]
+                    all_fields_info.update({field: (field_type, field_info)})
         else:
             include_fields.update(all_fields_info.keys())
 
@@ -137,20 +146,27 @@ def get_all_schema_factory(
             ...
 
     schema_name = name if name else model_class.__name__ + "GetAllSchema"
+    text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
     schema: Type[T] = create_model(
-        schema_name, **{field: all_fields_info[field] for field in all_fields}, __config__=model_config)
+        schema_name,
+        **{field: all_fields_info[field] for field in all_fields},
+        __config__=model_config,
+        __validators__={**text_to_list_validators_dict},
+    )
     return schema
 
 
-def get_list_schema_factory(schema_cls: Type[T] = None, name: str = "") -> Type[T]:
+def get_list_schema_factory(schema_cls: Type[T] = None, response_field: Optional[str] = None, name: str = "") -> Type[T]:
+    if not response_field:
+        response_field = settings.app_settings.LIST_RESPONSE_FIELD
     if schema_cls:
         fields = {
-            settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List[schema_cls]], FieldInfo(default=[], description="数据返回")),
+            response_field: (Optional[List[schema_cls]], FieldInfo(default=[], description="数据返回")),
         }
         name = schema_cls.__name__ + name + "GetListSchema"
     else:
         fields = {
-            settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List], FieldInfo(default=[], description="数据返回")),
+            response_field: (Optional[List], FieldInfo(default=[], description="数据返回")),
         }
         name = name + "GetListSchema"
     schema: Type[T] = create_model(name, **fields, __config__=model_config)

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/schemas_factory/get_one_schema_factory.py

@@ -1,4 +1,6 @@
-from typing import Type, Optional, Union
+from typing import Type, Optional, Union, List
+
+from pydantic_core import PydanticUndefined
 
 from fastgenerateapi.settings.all_settings import settings
 
@@ -8,7 +10,8 @@ from tortoise import Model
 
 from fastgenerateapi.data_type.data_type import T
 from fastgenerateapi.pydantic_utils.base_model import model_config
-from fastgenerateapi.schemas_factory.common_function import get_dict_from_model_fields, get_dict_from_pydanticmeta
+from fastgenerateapi.schemas_factory.common_function import get_dict_from_model_fields, get_dict_from_pydanticmeta, \
+    get_model_validate_text_to_list
 
 
 def get_one_schema_factory(
@@ -22,6 +25,7 @@ def get_one_schema_factory(
         pydantic_meta_get_exclude: Optional[bool] = True,
         pydantic_meta_get_one_include: Optional[bool] = True,
         pydantic_meta_get_one_exclude: Optional[bool] = True,
+        pydantic_meta_text_to_list: Optional[bool] = True,
         name: Optional[str] = None
 ) -> Type[T]:
     """
@@ -76,6 +80,7 @@ def get_one_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
+    text_to_list_fields = set()
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
@@ -109,6 +114,12 @@ def get_one_schema_factory(
                 include_fields.update(get_one_include_fields_dict.keys())
             if pydantic_meta_get_one_exclude and hasattr(model_class.PydanticMeta, "get_one_exclude"):
                 exclude_fields.update(model_class.PydanticMeta.get_one_exclude)
+            if pydantic_meta_text_to_list and hasattr(model_class.PydanticMeta, "text_to_list"):
+                text_to_list_fields = getattr(model_class.PydanticMeta, "text_to_list")
+                for field in text_to_list_fields:
+                    field_info = all_fields_info.get(field)[1]
+                    field_type = List[str] if field_info.is_required() else Optional[List[str]]
+                    all_fields_info.update({field: (field_type, field_info)})
         else:
             include_fields.update(all_fields_info.keys())
 
@@ -128,8 +139,13 @@ def get_one_schema_factory(
             ...
 
     schema_name = name if name else model_class.__name__ + "GetOneSchema"
+    text_to_list_validators_dict = get_model_validate_text_to_list(text_to_list_fields)
     schema: Type[T] = create_model(
-        schema_name, **{field: all_fields_info[field] for field in all_fields}, __config__=model_config)
+        schema_name,
+        **{field: all_fields_info[field] for field in all_fields},
+        __config__=model_config,
+        __validators__={**text_to_list_validators_dict},
+    )
     return schema
 
 

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/schemas_factory/update_schema_factory.py

@@ -1,4 +1,6 @@
-from typing import Type, Union, Optional
+from typing import Type, Union, Optional, List
+
+from pydantic_core import PydanticUndefined
 
 from fastgenerateapi.settings.all_settings import settings
 
@@ -8,7 +10,7 @@ from tortoise import Model
 
 from fastgenerateapi.data_type.data_type import T
 from fastgenerateapi.schemas_factory.common_function import get_dict_from_model_fields, get_dict_from_pydanticmeta, \
-    get_validate_dict_from_fields
+    get_validate_dict_from_fields, get_model_validate_list_to_text
 
 
 def update_schema_factory(
@@ -23,6 +25,7 @@ def update_schema_factory(
         pydantic_meta_save_exclude: Optional[bool] = True,
         pydantic_meta_update_include: Optional[bool] = True,
         pydantic_meta_update_exclude: Optional[bool] = True,
+        pydantic_meta_text_to_list: Optional[bool] = True,
         name: Optional[str] = None
 ) -> Type[T]:
     """
@@ -71,6 +74,7 @@ def update_schema_factory(
 
     include_fields = set()
     exclude_fields = set()
+    text_to_list_fields = set()
     if include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, include)
         all_fields_info.update(include_fields_dict)
@@ -102,6 +106,14 @@ def update_schema_factory(
                 exclude_fields.update(model_class.PydanticMeta.save_exclude)
             if pydantic_meta_update_exclude and hasattr(model_class.PydanticMeta, "update_exclude"):
                 exclude_fields.update(model_class.PydanticMeta.update_exclude)
+            if pydantic_meta_text_to_list and hasattr(model_class.PydanticMeta, "text_to_list"):
+                text_to_list_fields = getattr(model_class.PydanticMeta, "text_to_list")
+                for field in text_to_list_fields:
+                    field_info = all_fields_info.get(field)[1]
+                    field_type = Union[List[str], str] if field_info.is_required() else Union[List[str], str, None]
+                    all_fields_info.update({field: (field_type, field_info)})
+        else:
+            include_fields.update(all_fields_info.keys())
 
     if extra_include:
         include_fields_dict = get_dict_from_pydanticmeta(model_class, extra_include)
@@ -126,10 +138,11 @@ def update_schema_factory(
     schema_name = name if name else model_class.__name__ + "UpdateSchema"
     schema_field_dict = {field: all_fields_info[field] for field in all_fields}
     validators_dict = get_validate_dict_from_fields(schema_field_dict)
+    text_to_list_validators_dict = get_model_validate_list_to_text(text_to_list_fields)
     schema: Type[T] = create_model(
         schema_name,
         **schema_field_dict,
         __config__=model_config,
-        __validators__=validators_dict,
+        __validators__={**validators_dict, **text_to_list_validators_dict},
     )
     return schema

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/settings/all_settings.py

@@ -109,7 +109,6 @@ class SettingsModel(BaseModel):
             yaml_dict = yaml.safe_load(res)
             data_dict = {**yaml_dict, **data_dict}
 
-        setting_dict = {}
         setting_models = cls.model_fields.copy()
         for k, v in setting_models.items():
             if isinstance(v, FieldInfo):
@@ -125,15 +124,13 @@ class SettingsModel(BaseModel):
                     }
                 else:
                     annotation_dict = data_dict.get(v.annotation.__name__, {})
-                setting_dict[k] = v.annotation(**annotation_dict)
+                setattr(cls, k, v.annotation(**annotation_dict))
 
-        setting_data = cls(**setting_dict)
-
-        return setting_data
+        return cls
 
     def watch(self):
         """
-        监听文件或这etcd变化，待完善
+        监听文件或者etcd变化，待完善
         借用 etcd.watch(target)
         :return:
         """

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi/settings/app_settings.py

@@ -7,10 +7,10 @@ from fastgenerateapi.pydantic_utils.base_settings import BaseSettings
 
 
 class AppSettings(BaseSettings):
+    # #######################################  请求参数相关  ###############################################
     # 字段配置 驼峰格式：新版本(pydantic.alias_generators:to_camel)、老版本(pydantic.utils.to_lower_camel)
     # 下划线：pydantic.alias_generators.to_snake
     ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_snake", description="序列化参数命名方法路径")
-
     # 分页对应字段以及配置默认值
     CURRENT_PAGE_FIELD: Optional[str] = Field(default="page", description="当前页字段")
     PAGE_SIZE_FIELD: Optional[str] = Field(default="page_size", description="每页数量字段")
@@ -20,18 +20,36 @@ class AppSettings(BaseSettings):
     DEFAULT_WHETHER_PAGE: Optional[bool] = Field(default=False, description="默认是否分页")
     DEFAULT_PAGE_SIZE: Optional[int] = Field(default=10, description="默认每页数量")
     DEFAULT_MAX_PAGE_SIZE: Optional[int] = Field(default=200, description="默认最大每页数量")
+    # GetAll 筛选是否双下划线转单下划线
+    FILTER_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="筛选是否双下划线转单下划线")
+    SCHEMAS_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="序列化字段是否双下划线转单下划线")
+
+    # #######################################  返回值相关  ###############################################
+    # 返回格式字段配置默认值
+    CODE_RESPONSE_FIELD: Optional[bool] = Field(default=True, description="code返回字段")
+    CODE_SUCCESS_DEFAULT_VALUE: Optional[int] = Field(default=200, description="code成功返回值")
+    CODE_FAIL_DEFAULT_VALUE: Optional[int] = Field(default=-1, description="code失败返回值")
+    SUCCESS_RESPONSE_FIELD: Optional[bool] = Field(default=True, description="success返回字段")
+    MESSAGE_RESPONSE_FIELD: Optional[str] = Field(default="msg", description="消息返回字段")
+    DATA_RESPONSE_FIELD: Optional[str] = Field(default="data", description="数据返回字段")
+    LIST_RESPONSE_FIELD: Optional[str] = Field(default="list", description="列表页返回字段")
 
+    # #######################################  业务代码相关  ###############################################
+    # 检查为一只忽略部分字段错误提示
+    CHECK_IGNORE_ERROR_FIELDS: Optional[str] = Field(default=None, description="【多个字段,分割】创建和修改联合索引时，错误提示忽略部分字段")
+    # Pydantic适用
+    TEXT_TO_LIST_SPLIT_VALUE: Optional[str] = Field(default="**@**", description="数据库字段TEXT返回前端List适用的分割值")
     # 方法优化项
     METHOD_TREE_CHOICE: Optional[str] = Field(default="map", description="树状查询方式{sql: sql循环查询,map: 内存查询}")
+    # 创建和修改是否返回详情
+    WHETHER_CREATE_RESPONSE_DATA: Optional[bool] = Field(default=False, description="创建是否返回详情")
+    WHETHER_UPDATE_RESPONSE_DATA: Optional[bool] = Field(default=False, description="修改是否返回详情")
+    # 递归字段
+    DEFAULT_TREE_PARENT_FIELD: Optional[str] = Field(default="parent", description="默认递归父级字段")
+    DEFAULT_TREE_CHILDREN_FIELD: Optional[str] = Field(default="children", description="默认递归子级字段")
+    DEFAULT_TREE_FILTER_FIELD: Optional[str] = Field(default="node_id", description="默认递归筛选开始节点字段")
 
-    # 缓存配置参数
-    CACHE_GET_ONE_WHETHER_OPEN: Optional[bool] = Field(default=False, description="查询详情是否打开缓存")
-    CACHE_GET_ONE_SECONDS: int = Field(default=300, description="查询详情缓存时间，单位秒")
-    CACHE_GET_ALL_WHETHER_OPEN: Optional[bool] = Field(default=False, description="查询列表是否打开缓存")
-    CACHE_GET_ALL_SECONDS: int = Field(default=300, description="查询列表缓存时间，单位秒")
-    CACHE_TREE_WHETHER_OPEN: Optional[bool] = Field(default=False, description="树状查询是否打开缓存")
-    CACHE_TREE_SECONDS: int = Field(default=3600, description="树状查询缓存时间，单位秒")
-
+    # #######################################  路由相关  ###############################################
     # 路由后缀字段是否添加以及配置默认值
     ROUTER_WHETHER_UNDERLINE_TO_STRIKE: Optional[bool] = Field(default=False, description="路由是否下划线转中划线")
     ROUTER_WHETHER_ADD_SUFFIX: Optional[bool] = Field(default=True, description="增删改查路由是否添加后缀")
@@ -43,7 +61,6 @@ class AppSettings(BaseSettings):
     ROUTER_DELETE_SUFFIX_FIELD: Optional[str] = Field(default="delete", description="删除路由后缀字段")
     ROUTER_RECURSION_DELETE_SUFFIX_FIELD: Optional[str] = Field(default="delete_tree", description="递归删除路由后缀字段")
     ROUTER_FILTER_DELETE_SUFFIX_FIELD: Optional[str] = Field(default="delete_filter", description="递归删除路由后缀字段")
-
     # 函数转换路由时，默认添加字段，（遵循restful规范时，get路由处理方案）
     RESTFUL_GET_ROUTER_ADD_PREFIX: Optional[str] = Field(default="", description="函数转换路由时：前缀添加字段")
     RESTFUL_GET_ROUTER_ADD_SUFFIX: Optional[str] = Field(default="", description="函数转换路由时：后缀pk前添加字段")
@@ -54,36 +71,23 @@ class AppSettings(BaseSettings):
     RESTFUL_DELETE_ROUTER_ADD_PREFIX: Optional[str] = Field(default="", description="函数转换路由时：前缀添加字段")
     RESTFUL_DELETE_ROUTER_ADD_SUFFIX: Optional[str] = Field(default="", description="函数转换路由时：后缀pk前添加字段")
 
+    # #######################################  数据库相关  ###############################################
     # 分布式id
     WORKER_ID: Optional[int] = Field(default=1, description="数据中心（机器区域）ID")
     DATACENTER_ID: Optional[int] = Field(default=1, description="机器ID")
-
     # 数据库字段默认值
     WHETHER_DELETE_FIELD: Optional[str] = Field(default="deleted_at", description="是否删除字段;推荐命名 >> deleted_at;is_active")
     DELETE_FIELD_TYPE: Optional[str] = Field(default="time", description="删除字段类型;推荐命名 >> time;bool")
-    # ACTIVE_DEFAULT_VALUE: Optional[bool] = Field(default=True, description="有效的默认值")
     GET_EXCLUDE_ACTIVE_VALUE: Optional[bool] = Field(default=True, description="查询结果是否排除有效字段")
     CREATE_EXCLUDE_ACTIVE_VALUE: Optional[bool] = Field(default=True, description="创建是否排除有效字段")
     UPDATE_EXCLUDE_ACTIVE_VALUE: Optional[bool] = Field(default=True, description="修改是否排除有效字段")
-    DEFAULT_TREE_PARENT_FIELD: Optional[str] = Field(default="parent", description="默认递归父级字段")
-    DEFAULT_TREE_CHILDREN_FIELD: Optional[str] = Field(default="children", description="默认递归子级字段")
-    DEFAULT_TREE_FILTER_FIELD: Optional[str] = Field(default="node_id", description="默认递归筛选开始节点字段")
-
-    # 返回格式字段配置默认值
-    CODE_RESPONSE_FIELD: Optional[bool] = Field(default=True, description="code返回字段")
-    CODE_SUCCESS_DEFAULT_VALUE: Optional[int] = Field(default=200, description="code成功返回值")
-    CODE_FAIL_DEFAULT_VALUE: Optional[int] = Field(default=-1, description="code失败返回值")
-    SUCCESS_RESPONSE_FIELD: Optional[bool] = Field(default=True, description="success返回字段")
-    MESSAGE_RESPONSE_FIELD: Optional[str] = Field(default="msg", description="消息返回字段")
-    DATA_RESPONSE_FIELD: Optional[str] = Field(default="data", description="数据返回字段")
-    LIST_RESPONSE_FIELD: Optional[str] = Field(default="list", description="列表页返回字段")
-    # 创建和修改是否返回详情
-    WHETHER_CREATE_RESPONSE_DATA: Optional[bool] = Field(default=False, description="创建是否返回详情")
-    WHETHER_UPDATE_RESPONSE_DATA: Optional[bool] = Field(default=False, description="修改是否返回详情")
-
-    # GetAll 筛选是否双下划线转单下划线
-    FILTER_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="筛选是否双下划线转单下划线")
-    SCHEMAS_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="序列化字段是否双下划线转单下划线")
+    # 缓存配置参数
+    CACHE_GET_ONE_WHETHER_OPEN: Optional[bool] = Field(default=False, description="查询详情是否打开缓存")
+    CACHE_GET_ONE_SECONDS: int = Field(default=300, description="查询详情缓存时间，单位秒")
+    CACHE_GET_ALL_WHETHER_OPEN: Optional[bool] = Field(default=False, description="查询列表是否打开缓存")
+    CACHE_GET_ALL_SECONDS: int = Field(default=300, description="查询列表缓存时间，单位秒")
+    CACHE_TREE_WHETHER_OPEN: Optional[bool] = Field(default=False, description="树状查询是否打开缓存")
+    CACHE_TREE_SECONDS: int = Field(default=3600, description="树状查询缓存时间，单位秒")
 
     model_config = SettingsConfigDict(
         env_prefix="APP_",

{fastgenerateapi-1.2.7 → fastgenerateapi-1.2.9}/fastgenerateapi.egg-info/PKG-INFO

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