fastgenerateapi 1.2.3__tar.gz → 1.2.5__tar.gz

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

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

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/__init__.py

@@ -8,6 +8,7 @@
 #                                                  d8888P
 
 author="石亮"
+from fastgenerateapi.fastapi_utils.tortoise_utils import *
 from fastgenerateapi.api_view.api_view import APIView, CreateView, GetOneView, GetAllView, UpdateView, DeleteView, \
     SwitchView
 from fastgenerateapi.api_view.get_tree_view import GetTreeView

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

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

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/create_view.py

@@ -89,17 +89,18 @@ class CreateView(BaseView, SaveMixin):
                 *args,
                 **kwargs
             )
+            if isinstance(data, Model):
+                if settings.app_settings.WHETHER_CREATE_RESPONSE_DATA:
+                    if self.is_with_prefetch:
+                        data = await self.get_object(data.id, self.model_class, self.is_with_prefetch)
+                        await self.setattr_model(data, prefetch_related_fields=self.prefetch_related_fields)
+
+                    return self.success(data=self.create_response_schema.model_validate(data))
+                return self.success()
             if isinstance(data, JSONResponse):
                 return data
-            if isinstance(data, PydanticBaseModel):
-                return self.success(data=data)
-            if settings.app_settings.WHETHER_CREATE_RESPONSE_DATA:
-                if self.is_with_prefetch:
-                    data = await self.get_object(data.id, self.model_class, self.is_with_prefetch)
-                    await self.setattr_model(data, prefetch_related_fields=self.prefetch_related_fields)
-
-                return self.success(data=self.create_response_schema.model_validate(data))
-            return self.success()
+            return self.success(data=data)
+
         return route
 
     def _handler_create_settings(self):

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/delete_filter_view.py

@@ -42,14 +42,16 @@ class DeleteFilterView(BaseView):
                 filters: dict = Depends(filter_params_deps(model_class=self.model_class, fields=self.filter_fields)),
                 token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
-            await self.destroy_filter(
+            data = await self.destroy_filter(
                 search=search,
                 filters=filters,
                 request=request,
                 token=token,
                 *args, **kwargs
             )
-            return self.success(msg="删除成功")
+            if isinstance(data, JSONResponse):
+                return data
+            return self.success(msg="删除成功", data=data)
         return route
 
     def _handler_destroy_filter_settings(self):

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/delete_tree_view.py

@@ -68,13 +68,15 @@ class DeleteTreeView(BaseView):
                 request: Request,
                 token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
-            await self.destroy_tree(
+            data = await self.destroy_tree(
                 request_data=request_data,
                 request=request,
                 token=token,
                 *args, **kwargs
             )
-            return self.success(msg="删除成功")
+            if isinstance(data, JSONResponse):
+                return data
+            return self.success(msg="删除成功", data=data)
         return route
 
     def _handler_delete_tree_settings(self):

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/delete_view.py

@@ -58,13 +58,16 @@ class DeleteView(BaseView):
                 request: Request,
                 token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
-            await self.destroy(
+            data = await self.destroy(
                 request_data=request_data,
                 request=request,
                 token=token,
                 *args, **kwargs
             )
-            return self.success(msg="删除成功")
+
+            if isinstance(data, JSONResponse):
+                return data
+            return self.success(msg="删除成功", data=data)
         return route
 
     def _handler_delete_settings(self):

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/get_all_view.py

@@ -161,6 +161,8 @@ class GetAllView(BaseView, GetMixin):
                 *args,
                 **kwargs
             )
+            if isinstance(data, JSONResponse):
+                return data
             return self.success(data=data)
 
         return route

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/get_one_view.py

@@ -62,6 +62,8 @@ class GetOneView(BaseView, GetMixin):
                 token=token,
                 *args, **kwargs
             )
+            if isinstance(data, JSONResponse):
+                return data
             return self.success(data=data)
         return route
 

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/get_relation_view.py

@@ -175,6 +175,8 @@ class GetRelationView(BaseView):
                 *args,
                 **kwargs
             )
+            if isinstance(data, JSONResponse):
+                return data
             return self.success(data=data)
         return route
 

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/get_tree_view.py

@@ -170,6 +170,8 @@ class GetTreeView(BaseView):
                 *args,
                 **kwargs
             )
+            if isinstance(data, JSONResponse):
+                return data
             return self.success(data=data)
         return route
 

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/switch_view.py

@@ -48,6 +48,8 @@ class SwitchView(BaseView):
                 token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
             data = await self.switch(pk=pk, request=request, filed=filed, token=token, *args, **kwargs)
+            if isinstance(data, JSONResponse):
+                return data
             return self.success(data=data)
         return route
 

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/api_view/update_relation_view.py

@@ -61,14 +61,16 @@ class UpdateRelationView(BaseView, SaveMixin):
                 request: Request,
                 token: Optional[str] = Depends(OAuth2PasswordBearer(tokenUrl="token", auto_error=False)),
         ) -> JSONResponse:
-            await self.update_relation(
+            data = await self.update_relation(
                 pk=pk,
                 request_data=request_data,
                 request=request,
                 token=token,
                 *args, **kwargs
             )
-            return self.success()
+            if isinstance(data, JSONResponse):
+                return data
+            return self.success(data=data)
         return route
 
     def _handler_update_relation_settings(self):

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

@@ -81,18 +81,18 @@ class UpdateView(BaseView, SaveMixin):
                 token=token,
                 *args, **kwargs
             )
+            if isinstance(data, Model):
+                if settings.app_settings.WHETHER_UPDATE_RESPONSE_DATA:
+                    if self.is_with_prefetch:
+                        await self.setattr_model(data, prefetch_related_fields=self.prefetch_related_fields, *args,
+                                                 **kwargs)
+
+                    return self.success(data=self.update_response_schema.model_validate(data))
+                return self.success()
             if isinstance(data, JSONResponse):
                 return data
-            if isinstance(data, PydanticBaseModel):
-                return self.success(data=data)
-            if settings.app_settings.WHETHER_UPDATE_RESPONSE_DATA:
-                if self.is_with_prefetch:
-                    await self.setattr_model(data, prefetch_related_fields=self.prefetch_related_fields, *args,
-                                             **kwargs)
+            return self.success(data=data)
 
-                return self.success(data=self.update_response_schema.model_validate(data))
-
-            return self.success()
         return route
 
     def _handler_update_settings(self):

fastgenerateapi-1.2.5/fastgenerateapi/fastapi_utils/tortoise_utils.py

@@ -0,0 +1,39 @@
+from typing import Optional
+
+from tortoise import BaseDBAsyncClient, connections, transactions
+from tortoise.exceptions import ParamsError
+
+
+def _get_connection(connection_name: Optional[str]) -> BaseDBAsyncClient:
+    # tortoise-orm==0.25.1
+    # if connection_name:
+    #     connection = connections.get(connection_name)
+    # elif len(connections.db_config) == 1:
+    #     connection_name = next(iter(connections.db_config.keys()))
+    #     connection = connections.get(connection_name)
+    # else:
+    #     raise ParamsError(
+    #         "You are running with multiple databases, so you should specify"
+    #         f" connection_name: {list(connections.db_config)}"
+    #     )
+    # 修改后
+    if connection_name:
+        connection = connections.get(connection_name)
+    elif len(connections.db_config) >= 1:
+        # 默认选排序第一个
+        connection_name = next(iter(connections.db_config.keys()))
+        connection = connections.get(connection_name)
+    else:
+        raise ParamsError(
+            "You are running with multiple databases, so you should specify"
+            f" connection_name: {list(connections.db_config)}"
+        )
+    return connection
+
+
+transactions._get_connection = _get_connection
+
+
+
+
+

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi/my_fields/enum_field.py

@@ -35,6 +35,7 @@ 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)
         kwargs["description"] = self.description
@@ -43,8 +44,8 @@ class IntEnumField(IntEnumFieldInstance):
     @property
     def constraints(self) -> dict:
         return {
-            "ge": 0,
-            "le": len(self.enum_list),
+            "ge": self.start_num,
+            "lt": len(self.enum_list) + self.start_num,
         }
 
     def to_db_value(self, value: Any, instance: "Union[Type[Model], Model]") -> Any:

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

@@ -26,28 +26,17 @@ 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 and hasattr(value, "default") and not hasattr(value.default, '__call__'):
         field_info_dict.setdefault("default", value.default)
     if hasattr(value, "description"):
         field_info_dict.setdefault("description", description + (value.description or ""))
     if hasattr(value, "alias"):
         field_info_dict.setdefault("alias", value.alias)
-    if hasattr(value, "gt"):
-        field_info_dict.setdefault("gt", value.gt)
-    if hasattr(value, "ge"):
-        field_info_dict.setdefault("ge", value.ge)
-    if hasattr(value, "lt"):
-        field_info_dict.setdefault("lt", value.lt)
-    if hasattr(value, "le"):
-        field_info_dict.setdefault("le", value.le)
-    if hasattr(value, "min_length"):
-        field_info_dict.setdefault("min_length", value.min_length)
-    if hasattr(value, "max_length"):
-        field_info_dict.setdefault("max_length", value.max_length)
-    if hasattr(value, "regex"):
-        field_info_dict.setdefault("regex", value.regex)
+    if hasattr(value, 'constraints'):
+        constraints = getattr(value, 'constraints')
+        if constraints:
+            for key, val in constraints.items():
+                field_info_dict.setdefault(key, val)
     return field_type, FieldInfo(**field_info_dict)
 
 

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

@@ -79,52 +79,51 @@ class SettingsModel(BaseModel):
     ):
         """
         get global settings and set into cache
-        :param path:
-            None时，自动检测本地文件，优先级 application.yaml，.env
-            推荐参数 .env / application.yaml / etcd.yaml
+        :param path: 指定本地文件，指定的文件不能用于修改 SettingsModel、EtcdSettings 的属性
+
+        Etcd配置优先级：
+            application.yaml > path指定文件 > .env
+        其他属性优先级：
+            Etcd配置文件 > application.yaml > path指定文件 > .env
+            除了.env，其他都是yaml格式
         :return:
         """
-        is_yaml = False
-        if path:
-            if str(path).__contains__('.yaml'):
-                is_yaml = True
-        elif os.path.isfile("application.yaml"):
-            path = "application.yaml"
-            is_yaml = True
-        else:
-            path = ".env"
+        data_dict = {}
+        if path and path != "application.yaml":
+            if not os.path.isfile(path):
+                raise ValidationException(f"指定哦欸之文件【{path}】不存在")
+            if str(path).endswith('.yaml'):
+                with open(path, 'r', encoding='utf-8') as file:
+                    data_dict.update(yaml.safe_load(file) or {})
+            else:
+                raise ValidationException("不支持指定非yaml格式")
+        if os.path.isfile("application.yaml"):
+            with open("application.yaml", 'r', encoding='utf-8') as file:
+                data_dict.update(yaml.safe_load(file) or {})
+
+        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))
 
-        setting_models = cls.model_fields.copy()
         setting_dict = {}
-        if not is_yaml:
-            for k, v in setting_models.items():
-                if isinstance(v, FieldInfo):
-                    setting_dict[k] = v.annotation(_env_file=str(path))
-        else:
-            data_dict = {}
-            if os.path.isfile(path):
-                with open(path, 'r', encoding='utf-8') as file:
-                    data_dict = yaml.safe_load(file) or {}
-            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="配置错误")
-            for k, v in setting_models.items():
-                if isinstance(v, FieldInfo):
-                    env_prefix = None
-                    if hasattr(v.annotation, "Config") and v.annotation.Config.env_prefix:
-                        env_prefix = v.annotation.Config.env_prefix
-                    if not env_prefix and hasattr(v.annotation, "model_config"):
-                        env_prefix = v.annotation.model_config.get("env_prefix")
-                    if env_prefix:
-                        annotation_dict = {k_i.removeprefix(env_prefix): v_i for k_i, v_i in data_dict.get(v.annotation.__name__, {}).items()}
-                    else:
-                        annotation_dict = data_dict.get(v.annotation.__name__, {})
-                    setting_dict[k] = v.annotation(**annotation_dict)
+        setting_models = cls.model_fields.copy()
+        for k, v in setting_models.items():
+            if isinstance(v, FieldInfo):
+                env_prefix = None
+                if hasattr(v.annotation, "Config") and v.annotation.Config.env_prefix:
+                    env_prefix = v.annotation.Config.env_prefix
+                if not env_prefix and hasattr(v.annotation, "model_config"):
+                    env_prefix = v.annotation.model_config.get("env_prefix")
+                if env_prefix:
+                    annotation_dict = {
+                        k_i.removeprefix(env_prefix): v_i for k_i, v_i in data_dict.get(v.annotation.__name__, {}).items()
+                    }
+                else:
+                    annotation_dict = data_dict.get(v.annotation.__name__, {})
+                setting_dict[k] = v.annotation(**annotation_dict)
 
         setting_data = cls(**setting_dict)
 

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

@@ -9,7 +9,7 @@ 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_camel", description="序列化参数命名方法路径")
+    ALIAS_GENERATOR: Optional[str] = Field(default="pydantic.alias_generators.to_snake", description="序列化参数命名方法路径")
 
     # 分页对应字段以及配置默认值
     CURRENT_PAGE_FIELD: Optional[str] = Field(default="page", description="当前页字段")

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

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

{fastgenerateapi-1.2.3 → fastgenerateapi-1.2.5}/fastgenerateapi.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ fastgenerateapi/fastapi_utils/__init__.py
 fastgenerateapi/fastapi_utils/all.py
 fastgenerateapi/fastapi_utils/param_utils.py
 fastgenerateapi/fastapi_utils/response_utils.py
+fastgenerateapi/fastapi_utils/tortoise_utils.py
 fastgenerateapi/model/__init__.py
 fastgenerateapi/model/base_model.py
 fastgenerateapi/my_fields/__init__.py