fastgenerateapi 1.1.16__tar.gz → 1.1.20__tar.gz

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/PKG-INFO

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

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/fastgenerateapi/__version__.py

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

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/fastgenerateapi/api_view/get_all_view.py

@@ -174,7 +174,10 @@ class GetAllView(BaseView, GetMixin):
             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)
+                        val_str = val
+                        if type(val) in [list, tuple, set]:
+                            val_str = val[0]
+                        get_all_schema_include.append(key + "__" + val_str)
         self.get_all_schema = self.get_all_schema or get_all_schema_factory(
             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)

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/fastgenerateapi/api_view/get_one_view.py

@@ -71,7 +71,10 @@ class GetOneView(BaseView, GetMixin):
             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)
+                        val_str = val
+                        if type(val) in [list, tuple, set]:
+                            val_str = val[0]
+                        get_one_schema_include.append(key + "__" + val_str)
         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,

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/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-1.1.16 → fastgenerateapi-1.1.20}/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-1.1.16 → fastgenerateapi-1.1.20}/fastgenerateapi/settings/__init__.py

@@ -5,5 +5,3 @@ from .file_settings import *
 from .jwt_settings import *
 from .sms_settings import *
 
-
-

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/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, Type
 
 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,26 @@ 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_dict = etcd_settings.model_dump(exclude_unset=True, by_alias=True, exclude={"ETCD_SETTING_KEY", })
+            etcd = etcd3.client(**{key.removeprefix("ETCD_").lower(): value for key, value in etcd_dict.items()})
+            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,11 +95,28 @@ 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)
+            data_dict = None
+            if os.path.isfile(path):
+                with open(path, 'r', encoding='utf-8') as file:
+                    data_dict = yaml.safe_load(file)
+            else:
+                if not etcd_settings:
+                    etcd_settings = EtcdSettings()
+                if etcd_settings.ETCD_SETTING_KEY:
+                    import etcd3
+                    etcd_dict = etcd_settings.model_dump(exclude_unset=True, by_alias=True, exclude={"ETCD_SETTING_KEY",})
+                    etcd = etcd3.client(**{key.removeprefix("ETCD_").lower(): value for key, value in etcd_dict.items()})
+                    res, metadata = etcd.get(etcd_settings.ETCD_SETTING_KEY)
+                    data_dict = yaml.safe_load(res)
+            if not data_dict:
+                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__, {}))
+                    if hasattr(v.annotation, "Config") and v.annotation.Config.env_prefix:
+                        annotation_dict = {k_i.removeprefix(v.annotation.Config.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)
         global settings

fastgenerateapi-1.1.20/fastgenerateapi/settings/etcd_settings.py

@@ -0,0 +1,32 @@
+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',
+        frozen=True,
+    )
+
+
+
+

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/fastgenerateapi.egg-info/PKG-INFO

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

{fastgenerateapi-1.1.16 → fastgenerateapi-1.1.20}/fastgenerateapi.egg-info/SOURCES.txt

@@ -93,6 +93,7 @@ fastgenerateapi/settings/__init__.py
 fastgenerateapi/settings/all_settings.py
 fastgenerateapi/settings/app_settings.py
 fastgenerateapi/settings/db_settings.py
+fastgenerateapi/settings/etcd_settings.py
 fastgenerateapi/settings/file_settings.py
 fastgenerateapi/settings/jwt_settings.py
 fastgenerateapi/settings/otlp_settings.py