fastgenerateapi 1.2.8__tar.gz → 1.2.9__tar.gz

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

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

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

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

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

@@ -155,13 +155,27 @@ def get_model_validate_text_to_list(fields: Optional[List[str]]) -> dict:
     if not fields:
         return {}
     def func(cls, data):
-        for field in fields:
-            if hasattr(data, field):
-                if getattr(data, field):
-                    field_value = getattr(data, field).split(settings.app_settings.TEXT_TO_LIST_SPLIT_VALUE)
+        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 = []
-                setattr(data, field, field_value)
+                    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 {
@@ -178,12 +192,31 @@ def get_model_validate_list_to_text(fields: Optional[List[str]]) -> dict:
     if not fields:
         return {}
     def func(cls, data: dict):
-        for field in fields:
-            if alias_generator:
-                field = alias_generator(field)
-            value_list = data.get(field, None)
-            if value_list and type(value_list) == list:
-                data[field] = settings.app_settings.TEXT_TO_LIST_SPLIT_VALUE.join(value_list)
+        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 {

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

@@ -156,15 +156,17 @@ def get_all_schema_factory(
     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.8 → fastgenerateapi-1.2.9}/fastgenerateapi.egg-info/PKG-INFO

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