fastgenerateapi 1.1.8__py2.py3-none-any.whl → 1.1.10__py2.py3-none-any.whl

fastgenerateapi/schemas_factory/get_all_schema_factory.py

@@ -81,22 +81,22 @@ def get_all_schema_factory(
     return schema
 
 
-def get_list_schema_factory(schema_cls: Type[T] = None) -> Type[T]:
+def get_list_schema_factory(schema_cls: Type[T] = None, name: str = "") -> Type[T]:
     if schema_cls:
         fields = {
             settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List[schema_cls]], FieldInfo(default=[], description="数据返回")),
         }
-        name = schema_cls.__name__ + "GetListSchema"
+        name = schema_cls.__name__ + name + "GetListSchema"
     else:
         fields = {
             settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List], FieldInfo(default=[], description="数据返回")),
         }
-        name = "GetListSchema" + str(time.time())
+        name = name + "GetListSchema"
     schema: Type[T] = create_model(name, **fields, __config__=model_config)
     return schema
 
 
-def get_page_schema_factory(schema_cls: Type[T] = None) -> Type[T]:
+def get_page_schema_factory(schema_cls: Type[T] = None, name: str = "") -> Type[T]:
     fields = {
         settings.app_settings.CURRENT_PAGE_FIELD: (Optional[int], FieldInfo(default=1, description="当前页")),
         settings.app_settings.PAGE_SIZE_FIELD: (Optional[int], FieldInfo(default=settings.app_settings.DEFAULT_PAGE_SIZE, description="每页数量")),
@@ -104,10 +104,10 @@ def get_page_schema_factory(schema_cls: Type[T] = None) -> Type[T]:
     }
     if schema_cls:
         fields.update({settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List[schema_cls]], FieldInfo(default=[], description="数据返回"))})
-        name = schema_cls.__name__ + "GetPageSchema"
+        name = schema_cls.__name__ + name + "GetPageSchema"
     else:
         fields.update({settings.app_settings.LIST_RESPONSE_FIELD: (Optional[List], FieldInfo(default=[], description="数据返回"))})
-        name = "GetPageSchema" + str(time.time())
+        name = name + "GetPageSchema"
     schema: Type[T] = create_model(name, **fields, __config__=model_config)
     return schema
 

fastgenerateapi/schemas_factory/response_factory.py

@@ -33,9 +33,9 @@ def response_factory(schema_cls: Union[Type[T], BaseModel, None] = None, name: s
         )
 
     try:
-        name = schema_cls.__name__ + name + "Response" + str(time.time())
+        name = schema_cls.__name__ + name + "Response"
     except:
-        name = "CommonResponse"
+        name = name + "CommonResponse"
     schema: Type[T] = create_model(name, **fields, __config__=model_config)
 
     return schema

fastgenerateapi/settings/all_settings.py

@@ -1,5 +1,10 @@
+from functools import lru_cache
+from pathlib import Path
+from typing import Union
 
+import yaml
 from pydantic import BaseModel
+from pydantic.fields import FieldInfo
 
 from fastgenerateapi.settings.redis_settings import RedisSettings
 from fastgenerateapi.settings.app_settings import AppSettings
@@ -14,78 +19,80 @@ class SettingsModel(BaseModel):
     # 缓存配置
     redis_settings: RedisSettings = RedisSettings()
 
-    # pydantic v2 不支持 ModelField, v.type_
-    # @classmethod
-    # def generate_file(cls, path='./.env'):
-    #     """
-    #     生成配置文件
-    #     .env 会增加前缀
-    #     .yaml 忽略前缀
-    #     :param path: 可选 .env / application.yaml
-    #     :return:
-    #     """
-    #     content = ''
-    #     setting_models = cls.__fields__.copy()
-    #     if path.__contains__('.env'):
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 content += f"[{sub_setting_class.__name__}]\n"
-    #                 fields = sub_setting_class.__fields__.copy()
-    #                 for k, v in fields.items():
-    #                     field_name = f'{sub_setting_class.Config.env_prefix}{k}'
-    #                     if v.field_info.description is None:
-    #                         content += f"{field_name}={v.default}\n"
-    #                     else:
-    #                         content += f"# {v.field_info.description}\n{field_name}={v.default}\n"
-    #                 content += "\n"
-    #     elif path.__contains__('.yaml'):
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 content += f"{sub_setting_class.__name__}:\n"
-    #                 fields = sub_setting_class.__fields__.copy()
-    #                 for k, v in fields.items():
-    #                     content += f"  {k}: {v.default}"
-    #                     if v.field_info.description is None:
-    #                         content += f"\n"
-    #                     else:
-    #                         content += f"  # {v.field_info.description}\n"
-    #                 content += "\n"
-    #     with open(file=path, mode='w', encoding='utf-8') as f:
-    #         f.writelines(content)
-    #
-    # @classmethod
-    # @lru_cache
-    # def get_global_settings(cls, path: Union[types.Path, str, None] = '.env'):
-    #     """
-    #     get global settings and set into cache
-    #     :param path: 可选 .env / application.yaml
-    #     :return:
-    #     """
-    #     setting_models = cls.__fields__.copy()
-    #
-    #     setting_dict = {}
-    #     if str(path).__contains__('.env'):
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 setting_dict[k] = sub_setting_class(_env_file=str(path))
-    #     elif str(path).__contains__('.yaml'):
-    #         with open(path, 'r', encoding='utf-8') as file:
-    #             data_dict = yaml.safe_load(file)
-    #         for k, v in setting_models.items():
-    #             if issubclass(type(v), ModelField):
-    #                 sub_setting_class = v.type_
-    #                 setting_dict[k] = sub_setting_class(**data_dict.get(sub_setting_class.__name__, {}))
-    #
-    #     setting_data = cls(**setting_dict)
-    #     global settings
-    #     settings.app_settings = setting_data.app_settings
-    #     settings.system_settings = setting_data.system_settings
-    #     settings.redis_settings = setting_data.redis_settings
-    #     return setting_data
+    @classmethod
+    def generate_file(cls, path='./.env'):
+        """
+        生成配置文件
+        .env 会增加前缀
+        .yaml 忽略前缀
+        :param path: 可选 .env / application.yaml
+        :return:
+        """
+        content = ''
+        setting_models = cls.model_fields.copy()
+        if path.__contains__('.env'):
+            for k, v in setting_models.items():
+                if isinstance(v, FieldInfo):
+                    content += f"[{v.annotation.__name__}]\n"
+                    env_prefix = v.annotation.model_config.get("env_prefix", "")
+                    fields = v.annotation.model_fields.copy()
+                    for k, v in fields.items():
+                        field_name = f'{env_prefix}{k}'
+                        if v.description is None:
+                            content += f"{field_name}={v.default}\n"
+                        else:
+                            content += f"# {v.description}\n{field_name}={v.default}\n"
+                    content += "\n"
+        elif path.__contains__('.yaml'):
+            for k, v in setting_models.items():
+                if isinstance(v, FieldInfo):
+                    content += f"[{v.annotation.__name__}]\n"
+                    env_prefix = v.annotation.model_config.get("env_prefix", "")
+                    fields = v.annotation.model_fields.copy()
+                    for k, v in fields.items():
+                        field_name = f'{env_prefix}{k}'
+                        content += f"  {field_name}: {v.default}"
+                        if v.description is None:
+                            content += f"\n"
+                        else:
+                            content += f"  # {v.description}\n"
+                    content += "\n"
+        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'):
+        """
+        get global settings and set into cache
+        :param path: 可选 .env / application.yaml
+        :return:
+        """
+        setting_models = cls.model_fields.copy()
+
+        setting_dict = {}
+        if str(path).__contains__('.env'):
+            for k, v in setting_models.items():
+                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)
+            for k, v in setting_models.items():
+                if isinstance(v, FieldInfo):
+                    setting_dict[k] = v.annotation(**data_dict.get(v.annotation.__name__, {}))
+
+        setting_data = cls(**setting_dict)
+        global settings
+        settings.app_settings = setting_data.app_settings
+        settings.system_settings = setting_data.system_settings
+        settings.redis_settings = setting_data.redis_settings
+        return setting_data
 
 
 settings = SettingsModel()
 
+
+if __name__ == '__main__':
+    settings.generate_file()
+

fastgenerateapi/settings/app_settings.py

@@ -1,6 +1,8 @@
 from typing import Optional
 
 from pydantic import Field
+from pydantic_settings import SettingsConfigDict
+
 from fastgenerateapi.pydantic_utils.base_settings import BaseSettings
 
 
@@ -79,11 +81,18 @@ class AppSettings(BaseSettings):
     FILTER_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="筛选是否双下划线转单下划线")
     SCHEMAS_UNDERLINE_WHETHER_DOUBLE_TO_SINGLE: Optional[bool] = Field(default=True, description="序列化字段是否双下划线转单下划线")
 
-    class Config:
-        env_prefix = "APP_"
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="APP_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = "APP_"
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/db_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class DBSettings(BaseSettings):
@@ -9,22 +9,28 @@ class DBSettings(BaseSettings):
         Database Settings
     """
 
-    TYPE: Optional[str] = Field(default='mysql', description="数据库类型")
-    HOST: Optional[str] = Field(default='127.0.0.1', description="数据库域名")
-    PORT: Optional[str] = Field(default='3306', description="数据库端口")
-    DATABASE: Optional[str] = Field(default='admin', description="数据库名")
-    USERNAME: Optional[str] = Field(default='root', description="数据库用户名")
-    PASSWORD: Optional[str] = Field(default='', description="数据库密码")
+    DB_TYPE: Optional[str] = Field(default='mysql', description="数据库类型")
+    DB_HOST: Optional[str] = Field(default='127.0.0.1', description="数据库域名")
+    DB_PORT: Optional[str] = Field(default='3306', description="数据库端口")
+    DB_DATABASE: Optional[str] = Field(default='admin', description="数据库名")
+    DB_USERNAME: Optional[str] = Field(default='root', description="数据库用户名")
+    DB_PASSWORD: Optional[str] = Field(default='', description="数据库密码")
 
     @property
     def dsn(self):
-        return f"{self.TYPE.lower()}://{self.USERNAME}:{self.PASSWORD}@{self.HOST}:{self.PORT}/{self.DATABASE}"
+        return f"{self.DB_TYPE.lower()}://{self.DB_USERNAME}:{self.DB_PASSWORD}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}"
 
-    class Config:
-        env_prefix = 'DB_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = ''
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 class PostgresqlSettings(DBSettings):
@@ -33,36 +39,20 @@ class PostgresqlSettings(DBSettings):
     """
     TYPE: Optional[str] = Field(default='postgres', description="数据库类型")
 
-    class Config:
-        env_prefix = 'Postgresql_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
-
 
 class MySQLSettings(DBSettings):
     """
         MySQL Settings
     """
-
-    class Config:
-        env_prefix = 'MYSQL_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    ...
 
 
 class LocalSettings(DBSettings):
     """
-        MySQL Settings
+        Local Settings
     """
     TYPE: str = Field(..., description="数据库类型")
 
-    class Config:
-        env_prefix = 'LOCAL_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
 
 
 

fastgenerateapi/settings/file_settings.py

@@ -1,10 +1,10 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
-class FileServerSettings(BaseSettings):
+class FileSettings(BaseSettings):
     """
     文件配置
     """
@@ -12,11 +12,17 @@ class FileServerSettings(BaseSettings):
     FILE_URL: Optional[str] = Field(default='/static/', description="文件路径前缀", title="file url prefix")
     FILE_ROOT: Optional[str] = Field(default='static', description="文件储存路径", title="file storage path")
 
-    class Config:
-        env_prefix = 'FileServer_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'FILESERVER_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/jwt_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class JWTSettings(BaseSettings):
@@ -13,11 +13,18 @@ class JWTSettings(BaseSettings):
     ACCESS_TOKEN_EXPIRE_MINUTES: Optional[int] = Field(default=30, description="过期时间 (分钟)", title="JWT Access Token")
     REFRESH_TOKEN_EXPIRE_MINUTES: Optional[int] = Field(default=60, description="过期时间（分钟）", title="JWT Refresh Token")
 
-    class Config:
-        env_prefix = 'JWT_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="JWT_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'JWT_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/otlp_settings.py

@@ -15,14 +15,14 @@ from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class OpenTelemetrySettings(BaseSettings):
     """
     跟踪和指标配置
     """
-    ENDPOINT: Optional[str] = Field(default=None, description="访问接口", example="http://127.0.0.1")
+    ENDPOINT: Optional[str] = Field(default=None, description="访问接口", examples=["http://127.0.0.1"])
     AUTHORIZATION: Optional[str] = Field(default=None, description="认证字符串")
 
     def setup_open_telemetry(self, app: FastAPI, service_name: str):
@@ -62,8 +62,15 @@ class OpenTelemetrySettings(BaseSettings):
             TortoiseORMInstrumentor().instrument(tracer_provider=tracer_provider)
             HTTPXClientInstrumentor().instrument(tracer_provider=tracer_provider)
 
-    class Config:
-        env_prefix = 'OTLP_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="OTLP_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'OTLP_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'

fastgenerateapi/settings/redis_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class RedisSettings(BaseSettings):
@@ -9,8 +9,15 @@ class RedisSettings(BaseSettings):
     PORT: Optional[int] = Field(default=6379, description="映射端口")
     PASSWORD: Optional[str] = Field(default="", description="密码")
 
-    class Config:
-        env_prefix = 'REDIS_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="REDIS_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'REDIS_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'

fastgenerateapi/settings/sms_settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class SmsSettings(BaseSettings):
@@ -15,11 +15,18 @@ class SmsSettings(BaseSettings):
     CHECK_CODE_RESEND_TIME: Optional[int] = Field(default=1, description="验证码重新发送时间", title="check code resend time (minute)")
     DEFAULT_CODE: Optional[int] = Field(default="654123", description="默认验证码", title="sms default code")
 
-    class Config:
-        env_prefix = 'Sms_'
-        env_file = "./.env"
-        case_sensitive = True
-        extra = 'allow'
+    model_config = SettingsConfigDict(
+        env_prefix="SMS_",
+        env_file=".env",
+        case_sensitive=True,
+        extra='ignore'
+    )
+
+    # class Config:
+    #     env_prefix = 'SMS_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 
 

fastgenerateapi/settings/system_settings.py

@@ -22,9 +22,15 @@ class SystemSettings(BaseSettings):
     DATACENTER_ID: Optional[int] = Field(default='1', description="机器ID")
 
     class Config:
-        env_prefix = ''
+        env_prefix = 'SYSTEM_'
         env_file = "./.env"
         case_sensitive = True
-        extra = 'allow'
+        extra = 'ignore'
+
+    # class Config:
+    #     env_prefix = 'SYSTEM_'
+    #     env_file = "./.env"
+    #     case_sensitive = True
+    #     extra = 'allow'
 
 

fastgenerateapi/utils/snowflake.py

@@ -125,7 +125,7 @@ class IdWorker(object):
 
         new_id = ((timestamp - TWEPOCH) << TIMESTAMP_LEFT_SHIFT) | (self.datacenter_id << DATACENTER_ID_SHIFT) | \
                  (self.worker_id << WOKER_ID_SHIFT) | self.sequence
-        return new_id
+        return str(new_id)
 
     def _til_next_millis(self, last_timestamp):
         """

{fastgenerateapi-1.1.8.dist-info → fastgenerateapi-1.1.10.dist-info}/METADATA

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