fastgenerateapi 1.1.15__py2.py3-none-any.whl → 1.1.18__py2.py3-none-any.whl

fastgenerateapi/__version__.py

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

fastgenerateapi/api_view/get_all_view.py

@@ -33,6 +33,7 @@ class GetAllView(BaseView, GetMixin):
     filter_schema: Optional[Type[PYDANTIC_SCHEMA]] = None
     filter_fields: Union[None, list] = None
     order_by_fields: Union[None, list] = None
+    auto_add_id_order: bool = True
     """
     get_all_route: 获取详情路由开关，可以放依赖函数列表
     get_all_schema: 返回序列化
@@ -45,6 +46,7 @@ class GetAllView(BaseView, GetMixin):
     filter_fields: 筛选对应字段
         example： name__contains or (create_at__gt, datetime) or (create_at__gt, datetime, create_time)
     order_by_fields: 排序对应字段
+    auto_add_id_order: 是否自动在 order_by_fields 后面追加id排序
     """
 
     async def get_all(self, search: Optional[str], filters: dict, *args, **kwargs) -> Union[BaseModel, dict, None]:
@@ -60,10 +62,11 @@ class GetAllView(BaseView, GetMixin):
         queryset = await self.filter_queryset(queryset, filters, *args, **kwargs)
         queryset = self.filter_controller.query(queryset=queryset, values=filters)
         queryset = queryset.prefetch_related(*self.prefetch_related_fields.keys())
+        if self.auto_add_id_order:
+            self.order_by_fields = self.order_by_fields or []
+            self.order_by_fields.append("id")
         if self.order_by_fields:
-            queryset = queryset.order_by(*self.order_by_fields, "id")
-        else:
-            queryset = queryset.order_by("id")
+            queryset = queryset.order_by(*self.order_by_fields)
 
         return queryset
 
@@ -166,9 +169,15 @@ class GetAllView(BaseView, GetMixin):
             return
         self.search_controller = SearchController(self.get_base_filter(self.search_fields))
         self.filter_controller = FilterController(self.get_base_filter(self.filter_fields, self.filter_schema))
+        get_all_schema_include = []
+        if self.prefetch_related_fields:
+            for key, value in self.prefetch_related_fields.items():
+                if value and type(value) in [list, tuple, set]:
+                    for val in value:
+                        get_all_schema_include.append(key + "__" + val)
         self.get_all_schema = self.get_all_schema or get_all_schema_factory(
-            self.model_class) or self.get_one_schema if hasattr(self, "get_one_schema") else get_one_schema_factory(
-            self.model_class)
+            self.model_class, include=get_all_schema_include
+        ) or self.get_one_schema if hasattr(self, "get_one_schema") else get_one_schema_factory(self.model_class)
         self.get_page_schema = get_page_schema_factory(self.get_all_schema)
         self.get_list_schema = get_list_schema_factory(self.get_all_schema)
         self.get_all_response_schema = response_factory(self.get_page_schema, name="GetPage")

fastgenerateapi/api_view/get_one_view.py

@@ -66,7 +66,16 @@ class GetOneView(BaseView, GetMixin):
     def _handler_get_one_settings(self):
         if not self.get_one_route:
             return
-        self.get_one_schema = self.schema or self.get_one_schema or get_one_schema_factory(model_class=self.model_class)
+        get_one_schema_include = []
+        if self.is_with_prefetch and self.prefetch_related_fields:
+            for key, value in self.prefetch_related_fields.items():
+                if value and type(value) in [list, tuple, set]:
+                    for val in value:
+                        get_one_schema_include.append(key + "__" + val)
+        self.get_one_schema = self.schema or self.get_one_schema or get_one_schema_factory(
+            model_class=self.model_class,
+            include=get_one_schema_include,
+        )
         self.get_one_response_schema = response_factory(self.get_one_schema, name="GetOne")
         doc = self.get_one.__doc__
         summary = doc.strip().split("\n")[0] if self.get_one.__doc__ else "Get One"

fastgenerateapi/pydantic_utils/json_encoders.py

@@ -40,8 +40,9 @@ common_format_with_s_time = new_time_type("COMMON_FORMAT_WITH_S_TIME", format_st
 
 JSON_ENCODERS = {
     time: lambda v: v.strftime(TIME_FORMAT_TIME_COMMON),
-    date: lambda v: v.strftime(DATE_FORMAT_COMMON),
+    # date: lambda v: v.strftime(DATE_FORMAT_COMMON),
     # datetime: lambda v: v.strftime(DATETIME_FORMAT_COMMON),
+    date: lambda v: int(datetime.combine(v, time.min).timestamp() * 1000),
     datetime: lambda v: int(v.timestamp() * 1000),
 
     # special date type

fastgenerateapi/schemas_factory/common_function.py

@@ -15,15 +15,14 @@ def get_field_info(value, description="", default_field_type=None) -> (Type, Fie
     required = False
     if value.field_type is None:
         if default_field_type:
-            field_type = Optional[default_field_type]
+            value.field_type = default_field_type
         else:
-            field_type = Optional[str]
+            value.field_type = str
+    if hasattr(value, "null") and value.null:
+        field_type = Optional[value.field_type]
     else:
-        if hasattr(value, "null") and value.null:
-            field_type = Optional[value.field_type]
-        else:
-            field_type = value.field_type
-            required = True
+        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)

fastgenerateapi/schemas_factory/get_all_schema_factory.py

@@ -16,14 +16,14 @@ def get_all_schema_factory(
         include: Union[list, tuple, set] = None,
         extra_include: Union[list, tuple, set] = None,
         exclude: Union[list, tuple, set] = None,
-        name: Optional[str] = None
+        name: Optional[str] = None,
 ) -> Optional[Type[T]]:
     """
     Is used to create a GetAllSchema
     """
     if not hasattr(model_class, "PydanticMeta"):
         return None
-    if not hasattr(model_class.PydanticMeta, "get_all_include") and not hasattr(model_class.PydanticMeta, "get_all_exclude"):
+    if not include and not extra_include and not exclude and not hasattr(model_class.PydanticMeta, "get_all_include") and not hasattr(model_class.PydanticMeta, "get_all_exclude"):
         return None
 
     all_fields_info = get_dict_from_model_fields(model_class)

fastgenerateapi/settings/all_settings.py

@@ -1,11 +1,14 @@
+import os
 from functools import lru_cache
 from pathlib import Path
-from typing import Union
+from typing import Union, Optional
 
 import yaml
+from fastapi.exceptions import ValidationException
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
 
+from fastgenerateapi.settings.etcd_settings import EtcdSettings
 from fastgenerateapi.settings.redis_settings import RedisSettings
 from fastgenerateapi.settings.app_settings import AppSettings
 from fastgenerateapi.settings.system_settings import SystemSettings
@@ -20,12 +23,17 @@ class SettingsModel(BaseModel):
     redis_settings: RedisSettings = RedisSettings()
 
     @classmethod
-    def generate_file(cls, path='./.env'):
+    def generate_file(
+            cls,
+            path='./.env',
+            etcd_settings: Optional[EtcdSettings] = None,
+    ):
         """
         生成配置文件
         .env 会增加前缀
         .yaml 忽略前缀
         :param path: 可选 .env / application.yaml
+        :param etcd_settings:
         :return:
         """
         content = ''
@@ -57,15 +65,25 @@ class SettingsModel(BaseModel):
                         else:
                             content += f"  # {v.description}\n"
                     content += "\n"
-        with open(file=path, mode='w', encoding='utf-8') as f:
-            f.writelines(content)
+        if etcd_settings and etcd_settings.ETCD_SETTING_KEY:
+            import etcd3
+            etcd = etcd3.client(**etcd_settings.model_dump(exclude_unset=True))
+            etcd.put(etcd_settings.ETCD_SETTING_KEY, content)
+        else:
+            with open(file=path, mode='w', encoding='utf-8') as f:
+                f.writelines(content)
 
     @classmethod
     @lru_cache
-    def get_global_settings(cls, path: Union[Path, str, None] = '.env'):
+    def get_global_settings(
+            cls,
+            path: Union[Path, str, None] = '.env',
+            etcd_settings: Optional[EtcdSettings] = None,
+    ):
         """
         get global settings and set into cache
-        :param path: 可选 .env / application.yaml
+        :param path: 可选 .env / application.yaml / etcd.yaml
+        :param etcd_settings: 当储配置 存在etcd 时
         :return:
         """
         setting_models = cls.model_fields.copy()
@@ -76,8 +94,16 @@ class SettingsModel(BaseModel):
                 if isinstance(v, FieldInfo):
                     setting_dict[k] = v.annotation(_env_file=str(path))
         elif str(path).__contains__('.yaml'):
-            with open(path, 'r', encoding='utf-8') as file:
-                data_dict = yaml.safe_load(file)
+            if os.path.isfile(path):
+                with open(path, 'r', encoding='utf-8') as file:
+                    data_dict = yaml.safe_load(file)
+            elif etcd_settings and etcd_settings.ETCD_SETTING_KEY:
+                import etcd3
+                etcd = etcd3.client(**etcd_settings.model_dump(exclude_unset=True))
+                res, metadata = etcd.get(etcd_settings.ETCD_SETTING_KEY)
+                data_dict = yaml.safe_load(res)
+            else:
+                raise ValidationException(errors="配置错误")
             for k, v in setting_models.items():
                 if isinstance(v, FieldInfo):
                     setting_dict[k] = v.annotation(**data_dict.get(v.annotation.__name__, {}))

fastgenerateapi/settings/etcd_settings.py

@@ -0,0 +1,31 @@
+from typing import Optional, Any
+
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class EtcdSettings(BaseSettings):
+    """
+        Etcd Settings
+    """
+    ETCD_SETTING_KEY: Optional[str] = Field(default=None, description="当使用etcd做配置储存时的键值")
+    ETCD_HOST: Optional[str] = Field(default='localhost', description="地址")
+    ETCD_PORT: Optional[int] = Field(default=2379, description="端口")
+    ETCD_CA_CERT: Optional[str] = Field(default=None, description="Ca证书")
+    ETCD_CERT_KEY: Optional[str] = Field(default=None, description="证书key")
+    ETCD_CERT_CERT: Optional[str] = Field(default=None, description="证书密钥")
+    ETCD_TIMEOUT: Optional[int] = Field(default=None, description="超时试剂")
+    ETCD_USER: Optional[str] = Field(default=None, description="账号")
+    ETCD_PASSWORD: Optional[str] = Field(default=None, description="密码")
+    ETCD_GRPC_OPTIONS: Optional[Any] = Field(default=None, description="grpc参数")
+
+    model_config = SettingsConfigDict(
+        env_prefix="",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+
+
+

{fastgenerateapi-1.1.15.dist-info → fastgenerateapi-1.1.18.dist-info}/METADATA

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

{fastgenerateapi-1.1.15.dist-info → fastgenerateapi-1.1.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fastgenerateapi/__init__.py,sha256=eh2qtp7FbjrgaRX5b3H3UWpasFdNHbVFqLUhpqVbaTU,1287
-fastgenerateapi/__version__.py,sha256=xBtsy-NUQVaGP7Hm3DtCo0658h55Q8n5OKAyXfNPKL8,497
+fastgenerateapi/__version__.py,sha256=gGiH1aF2jZOpi5oIq-BQ3smPy88ykxJZykKfGpmDlVM,497
 fastgenerateapi/api_view/__init__.py,sha256=zkaTX5JxsNfjF-dFeEbHfUB58vhPMjm6Iiqx9HgJOrY,14
 fastgenerateapi/api_view/api_view.py,sha256=mfD8GB-hnyI2XO3tkSOlEa2FfBLdq0_Wqvp8gFrXFKU,1160
 fastgenerateapi/api_view/base_view.py,sha256=AUWMd2Ys5mVwifN5iOs7BjpBqCF_ktv23oEp7sHR1g0,9984
@@ -7,8 +7,8 @@ fastgenerateapi/api_view/create_view.py,sha256=NvJ0ocD2UMHcdipA4W7MYamxAw8sYeXAc
 fastgenerateapi/api_view/delete_filter_view.py,sha256=ZP9pmRNeCTu_Go4ErfnDPnkPMShEh_Ql18iNCfMNJ3s,2838
 fastgenerateapi/api_view/delete_tree_view.py,sha256=oqkWQNlA7TNZHHRTJJwxidOHxOgmvUpcnu81cT3oTA0,4083
 fastgenerateapi/api_view/delete_view.py,sha256=FvaltPR1ttLfUvBoRoSHP-dGb79LRZlEMSEbYzE_W1E,3497
-fastgenerateapi/api_view/get_all_view.py,sha256=pWzob708aytugsZUWGBqqddPmUKizpHC18O6eB30Iao,9178
-fastgenerateapi/api_view/get_one_view.py,sha256=t16hdoLpOGAIXzCg-HDJFXEYgL-MtcUCfFC3MqkrR9c,3780
+fastgenerateapi/api_view/get_all_view.py,sha256=KnbjEZZ6FxxoVDbIqkgL4DoVmzqVjelmeLOZCcg-FOI,9721
+fastgenerateapi/api_view/get_one_view.py,sha256=N54M5F_vtjDlB7XlnPNhIbzEJ-KHyN5q4_jnIGkZ5eo,4201
 fastgenerateapi/api_view/get_relation_view.py,sha256=coVqhD29WW7SzdAeqM5LFtNzMulzzJyELT2En-56CF4,9780
 fastgenerateapi/api_view/get_tree_view.py,sha256=8BQomoOU954bXrqGzeFrKS8ydHL9VPxQfwvhV59rQxg,9312
 fastgenerateapi/api_view/sql_get_view.py,sha256=wxYI0JuH8Gw99LfMMwA4rQ_a_tBrKYxYhA7MNGQOx3A,6691
@@ -69,13 +69,13 @@ fastgenerateapi/my_fields/validator.py,sha256=0mPsV4tOIw1YYuBCN7YJPYCWstIsCsy9K3
 fastgenerateapi/pydantic_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastgenerateapi/pydantic_utils/base_model.py,sha256=kHFcx48UbpMgLfKdNT351p74PZCdPxx3vVs3ho0qrgs,2600
 fastgenerateapi/pydantic_utils/base_settings.py,sha256=JydmNHS_vl3ys7yiXwkZuRZ-4tIgf0a_kfft7WNf4kY,533
-fastgenerateapi/pydantic_utils/json_encoders.py,sha256=NPvaYDHu9GBtYNnNpbh35VUd1JWy4Mx4nAzOK4cvVo0,2868
+fastgenerateapi/pydantic_utils/json_encoders.py,sha256=EdQfpADCB5Ims3EWtTxhGZj4ypTm7EMmmnjS9-IzPWI,2946
 fastgenerateapi/schemas_factory/__init__.py,sha256=X9U96fiyRfCY0u6SzaCYG62RdpEGFX7yOZh_cJl6R2E,472
-fastgenerateapi/schemas_factory/common_function.py,sha256=PQCZl5nocxz06ZCBy4MJZE_HjnV0gG2BumE5ghAdErw,5628
+fastgenerateapi/schemas_factory/common_function.py,sha256=ECTCFEVuMg2uQMuFGq66XhcIPZWeXLNba2PUXC4FGvA,5589
 fastgenerateapi/schemas_factory/common_schema_factory.py,sha256=ac_tYOcBqpnGVSkx4NCAZz3Hd1PHmwSocBRld5Jxro4,2904
 fastgenerateapi/schemas_factory/create_schema_factory.py,sha256=rkah8geyfMkfqA6IhHDxq-lFomn8DA3bca1AtFcrLpQ,3733
 fastgenerateapi/schemas_factory/filter_schema_factory.py,sha256=T4Kpv8G9VAOOZKnRDh2oD3tE_xhsjw2FtEmncJa_MYM,1531
-fastgenerateapi/schemas_factory/get_all_schema_factory.py,sha256=gM2pYAGxNiqy3cmwW5lYcZHucilhI1aqCVRj2nt0EWw,5177
+fastgenerateapi/schemas_factory/get_all_schema_factory.py,sha256=RYqEtlwWHXu1Ti7P2MPP2C9xfQ_JJzoeSk-0qps9AA0,5232
 fastgenerateapi/schemas_factory/get_one_schema_factory.py,sha256=cgKoCOSK-4Lky8xUoZHIMAZmVSyWOW5-DmxaM6RAQEY,3431
 fastgenerateapi/schemas_factory/get_relation_schema_factory.py,sha256=VvzWaxAwOnMdtaUYxmWw1tOw3KP0KBwmR6J3UAld2x0,3111
 fastgenerateapi/schemas_factory/get_tree_schema_factory.py,sha256=v0DAf7kwB-17rHbkzVscLkm6Jh53qa2cieQ7awH78pw,7259
@@ -83,9 +83,10 @@ fastgenerateapi/schemas_factory/response_factory.py,sha256=C-E3lqIdfIJCIZhvmSaAi
 fastgenerateapi/schemas_factory/sql_get_all_schema_factory.py,sha256=dhgMvXZIq4av7puIMiQOTuVqNOuBoMvBZVd98GWJTRg,1810
 fastgenerateapi/schemas_factory/update_schema_factory.py,sha256=E-86vF98Ed92Q2VFqtS35xqxr_c34du9ok42JBfnj1g,3729
 fastgenerateapi/settings/__init__.py,sha256=dlyJb7BNh8Svau-UOrV4pxfoSYnNTA6eE41fu43vlT8,173
-fastgenerateapi/settings/all_settings.py,sha256=ylABCKJzh_US4ZfZQgDEYFYm75Zz-0mL8pqziFdgudY,3795
+fastgenerateapi/settings/all_settings.py,sha256=X-qzZ3bkZhgILDk4l6y7fQkT83D4ZBwbaa5HCezIdZI,4913
 fastgenerateapi/settings/app_settings.py,sha256=kq0O4FZMveiLdzwRkkH1E1byccoNGlLyz7G4fNTZm6w,7357
 fastgenerateapi/settings/db_settings.py,sha256=duTgLjMHO6MTDfEZ2tkAGiSXrTKuHSLBJW00l5_rv7g,1570
+fastgenerateapi/settings/etcd_settings.py,sha256=z93EoutIrrbc0ZMae-6lA2Vik1z3D_hO9OXtjtfRV5I,1205
 fastgenerateapi/settings/file_settings.py,sha256=8Ra5H0nxRp1r_Ib_RGbNO0rUFaxqYMjuJT9A4fHE3Oo,857
 fastgenerateapi/settings/jwt_settings.py,sha256=mRtzLZz1bntrl6UXAnIq6xilEEN8NS8oJSv62CGXOEs,971
 fastgenerateapi/settings/otlp_settings.py,sha256=4haWpSdJBeor-rq_rBOgQl6oYRv9eppdwm1yWGt6GyE,3161
@@ -103,8 +104,8 @@ fastgenerateapi/utils/snowflake.py,sha256=GiFVkE10sPiqJ094sMfrPsaV7Y9Y3c1djrSfgs
 fastgenerateapi/utils/str_util.py,sha256=c-jUlCFw-Dz4W1W9Jc1TqGZw3JXu-qN5ovnE6fjc9j0,3445
 fastgenerateapi/utils/swagger_to_js.py,sha256=pPPTag6TYtxdbKMHD3m8lJvc8Gv9HC97CGHt4esU1-E,530
 script/__init__.py,sha256=26UWatnbm6ZIwQMuu9NNzQ0IW1ACO4Oe9caModuTpWM,4
-fastgenerateapi-1.1.15.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
-fastgenerateapi-1.1.15.dist-info/METADATA,sha256=dqiF4ikzsUQrERAf5j2V8xmt5r-_BtyCGWdO_TLpjys,6025
-fastgenerateapi-1.1.15.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-fastgenerateapi-1.1.15.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
-fastgenerateapi-1.1.15.dist-info/RECORD,,
+fastgenerateapi-1.1.18.dist-info/LICENSE,sha256=gcuuhKKc5-dwvyvHsXjlC9oM6N5gZ6umYbC8ewW1Yvg,35821
+fastgenerateapi-1.1.18.dist-info/METADATA,sha256=oGrQjDP8H9tk33ek2X-_Q7fg3pfkZmyu5g3rAK3juh8,6025
+fastgenerateapi-1.1.18.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+fastgenerateapi-1.1.18.dist-info/top_level.txt,sha256=CW2SlpYjTRdacF-5ufnPMtwpYcR0XYn_bDxa2ZrrTBI,23
+fastgenerateapi-1.1.18.dist-info/RECORD,,