fastgenerateapi 1.2.2__tar.gz → 1.2.3__tar.gz

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.2
+Version: 1.2.3
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -94,7 +94,7 @@ uvicorn.run(app)
 - get_one_include, get_one_exclude
   - 与include同时生效，无include自动包含数据库模型搜友字段
   - 可添加跨表字段，自动生成校验和文档
-  - 其他字段: ("test", Optioanl[str], FieldInfo(..., description="文档描述"))
+  - 其他字段: ("test", Optional[str], FieldInfo(..., description="文档描述"))
 - get_all_include, get_all_exclude
 - create_include, create_exclude
 - update_include, update_exclude
@@ -131,7 +131,7 @@ class XxxView(APIView):
         文档Summary注释
         生成 get方法，路由为 前缀/user_list
         """
-        return xxx
+        return self.success(data={"list": []})
 ```
 
 

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/README.md

@@ -76,7 +76,7 @@ uvicorn.run(app)
 - get_one_include, get_one_exclude
   - 与include同时生效，无include自动包含数据库模型搜友字段
   - 可添加跨表字段，自动生成校验和文档
-  - 其他字段: ("test", Optioanl[str], FieldInfo(..., description="文档描述"))
+  - 其他字段: ("test", Optional[str], FieldInfo(..., description="文档描述"))
 - get_all_include, get_all_exclude
 - create_include, create_exclude
 - update_include, update_exclude
@@ -113,7 +113,7 @@ class XxxView(APIView):
         文档Summary注释
         生成 get方法，路由为 前缀/user_list
         """
-        return xxx
+        return self.success(data={"list": []})
 ```
 
 

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/fastgenerateapi/api_view/update_view.py

@@ -34,8 +34,8 @@ class UpdateView(BaseView, SaveMixin):
     @atomic()
     async def update(self, pk: str, request_data, *args, **kwargs):
         model = await self.get_object(pk, self.model_class, self.is_with_prefetch)
-        data_dict = await self.set_update_fields(request_data=request_data, *args, **kwargs)
-        data_dict = await self.set_save_fields(data_dict, request_data=request_data, *args, **kwargs)
+        data_dict = await self.set_update_fields(model=model, request_data=request_data, *args, **kwargs)
+        data_dict = await self.set_save_fields(data_dict, model=model, request_data=request_data, *args, **kwargs)
 
         await self.check_unique_field(data_dict, model_class=self.model_class, model=model)
         model = await self.set_update_model(model, data_dict, request_data=request_data, *args, **kwargs)
@@ -43,7 +43,7 @@ class UpdateView(BaseView, SaveMixin):
 
         return model
 
-    async def set_update_fields(self, request_data, *args, **kwargs) -> dict:
+    async def set_update_fields(self, model, request_data, *args, **kwargs) -> dict:
         """
         修改属性:
             data_dict = request_data.dict(exclude_unset=True)

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/fastgenerateapi/schemas_factory/common_function.py

@@ -1,6 +1,6 @@
 from typing import Type, Optional, Union
 
-from pydantic import validator, field_validator
+from pydantic import field_validator
 from pydantic.fields import FieldInfo
 from tortoise import Model
 
@@ -144,7 +144,10 @@ def get_validate_dict_from_fields(fields_info: dict) -> dict:
     for filed, field_tuple in fields_info.items():
         if field_tuple[0] == str:
             method_name = "check_%s" % filed
-            validator_method = validator(filed, pre=True, allow_reuse=True)(remove_blank_strings)
+            # v1
+            # validator_method = validator(filed, pre=True, allow_reuse=True)(remove_blank_strings)
+            # v2
+            validator_method = field_validator(filed, mode='before')(remove_blank_strings)
             validator_dict[method_name] = validator_method
     return validator_dict
 

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/fastgenerateapi/settings/all_settings.py

@@ -108,6 +108,8 @@ class SettingsModel(BaseModel):
             etcd_settings = EtcdSettings(**data_dict.get("EtcdSettings", {}))
             if etcd_settings.ETCD_SETTING_KEY:
                 res, metadata = etcd_settings.client.get(etcd_settings.ETCD_SETTING_KEY)
+                if not res:
+                    raise ValidationException("未读取到Etcd的配置文件")
                 data_dict.update(yaml.safe_load(res))
             if not data_dict:
                 raise ValidationException(errors="配置错误")

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/fastgenerateapi/settings/app_settings.py

@@ -8,7 +8,8 @@ from fastgenerateapi.pydantic_utils.base_settings import BaseSettings
 
 class AppSettings(BaseSettings):
     # 字段配置 驼峰格式：新版本(pydantic.alias_generators:to_camel)、老版本(pydantic.utils.to_lower_camel)
-    ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_snake", description="序列化参数命名方法路径")
+    # 下划线：pydantic.alias_generators.to_snake
+    ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_camel", description="序列化参数命名方法路径")
 
     # 分页对应字段以及配置默认值
     CURRENT_PAGE_FIELD: Optional[str] = Field(default="page", description="当前页字段")

{fastgenerateapi-1.2.2 → fastgenerateapi-1.2.3}/fastgenerateapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastgenerateapi
-Version: 1.2.2
+Version: 1.2.3
 Summary: FastAPIView Class View
 Author: ShiLiang
 Author-email: 2509144896@qq.com
@@ -94,7 +94,7 @@ uvicorn.run(app)
 - get_one_include, get_one_exclude
   - 与include同时生效，无include自动包含数据库模型搜友字段
   - 可添加跨表字段，自动生成校验和文档
-  - 其他字段: ("test", Optioanl[str], FieldInfo(..., description="文档描述"))
+  - 其他字段: ("test", Optional[str], FieldInfo(..., description="文档描述"))
 - get_all_include, get_all_exclude
 - create_include, create_exclude
 - update_include, update_exclude
@@ -131,7 +131,7 @@ class XxxView(APIView):
         文档Summary注释
         生成 get方法，路由为 前缀/user_list
         """
-        return xxx
+        return self.success(data={"list": []})
 ```