fastgenerateapi 1.1.7__py2.py3-none-any.whl → 1.1.9__py2.py3-none-any.whl

fastgenerateapi/example/models.py

@@ -13,7 +13,7 @@ class StaffInfo(Model):
     """
         员工信息
     """
-    delete_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
+    deleted_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
     created_at: Optional[datetime.datetime] = fields.DatetimeField(null=True, auto_now_add=True, description="创建时间")
     category: Optional[IntEnumClass] = my_fields.IntEnumField(enum_list=["总经理", '主管', '员工'], description="职位分类")
     name: Optional[str] = fields.CharField(description="名字", max_length=255)
@@ -31,7 +31,7 @@ class StaffInfo(Model):
 
     class PydanticMeta:
         # 以下内容仅用于演示，存在重复和多余写法
-        exclude = ["delete_at", "created_at"]
+        exclude = ["deleted_at", "created_at"]
         get_include = ["category_name", "name"]
         get_all_include = ["company__name"]
         get_one_include = [("test", Optional[str], FieldInfo(default="", description="测试字段")), ]
@@ -42,7 +42,7 @@ class CompanyInfo(Model):
     """
         公司信息
     """
-    delete_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
+    deleted_at: Optional[datetime.datetime] = my_fields.SoftDeleteField()
     name: str = fields.CharField(description="岗位名称", max_length=255)
     boss_name: str = fields.CharField(description="老板名字", max_length=255)
     parent: fields.ForeignKeyNullableRelation["CompanyInfo"] = fields.ForeignKeyField(
@@ -53,7 +53,7 @@ class CompanyInfo(Model):
         description='父级')
 
     class PydanticMeta:
-        exclude = ["delete_at"]
+        exclude = ["deleted_at"]
 
 
 

fastgenerateapi/model/base_model.py

@@ -45,12 +45,21 @@ class BaseActiveMixin(models.Model):
     class Meta:
         abstract = True
 
-
 class TortoiseOrmAbstractModel(PrimaryKeyMixin, TimestampMixin, BaseDeleteMixin):
     ...
 
     class PydanticMeta:
-        exclude = ["delete_at"]
+        exclude = ["deleted_at"]
+
+    class Meta:
+        abstract = True
+
+
+class TortoiseOrmAbstractBaseModel(PrimaryKeyMixin, TimestampMixin, BaseActiveMixin):
+    ...
+
+    class PydanticMeta:
+        exclude = ["is_active"]
 
     class Meta:
         abstract = True

fastgenerateapi/my_fields/enum_field.py

@@ -1,4 +1,4 @@
-from enum import IntEnum
+from enum import IntEnum, Enum
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -23,7 +23,8 @@ if TYPE_CHECKING:  # pragma: nocoverage
 
 class IntEnumField(IntEnumFieldInstance):
     """
-    传入参数数组，默认生成枚举类，数字从 1 开始
+    传入参数数组，默认生成枚举类，数字从 0 开始
+    可以通过 start_num=1 设置从1开始
     例如：
         enum_list = ["A", "B"]
     相当于枚举
@@ -33,10 +34,11 @@ class IntEnumField(IntEnumFieldInstance):
     通过方法 get_name 获取对应的值， "A"
     """
 
-    def __init__(self, enum_list: List[any], **kwargs: Any) -> None:
+    def __init__(self, enum_list: List[any], start_num=0, **kwargs: Any) -> None:
         self.enum_list = enum_list
-        self.description = kwargs.get("description", "") + " >> " + self.get_description(enum_list)
-        super().__init__(enum_type=self.create_enum(enum_list), **kwargs)
+        self.description = kwargs.get("description", "") + " >> " + self.get_description(enum_list, start_num)
+        kwargs["description"] = self.description
+        super().__init__(enum_type=self.create_enum(enum_list, start_num=start_num), **kwargs)
 
     @property
     def constraints(self) -> dict:
@@ -65,18 +67,19 @@ class IntEnumField(IntEnumFieldInstance):
         if value is not None:
             value = int(value)  # pylint: disable=E1102
         self.validate(value)
-        return IntEnumClass(value, self.enum_list)
+        return value
 
-    def get_description(self, enum_list):
+    @staticmethod
+    def get_description(enum_list, start_num=0):
         description = ""
-        for index, val in enumerate(enum_list, 1):
+        for index, val in enumerate(enum_list, start_num):
             description += f"{index}:{val};"
         return description
 
-    def create_enum(self, enum_list):
+    def create_enum(self, enum_list, start_num=0) -> Type[IntEnum]:
         # 创建枚举类的成员字典，确保值是唯一的
 
-        members = {self.number_to_words(name): name for name, _ in enumerate(enum_list, 0)}
+        members = {self.number_to_words(name): name for name, _ in enumerate(enum_list, start_num)}
 
         # 使用Enum的元类EnumMeta来动态创建枚举类
         enum_class = IntEnum("CategoryEnum", members)

fastgenerateapi/schemas_factory/filter_schema_factory.py

@@ -32,7 +32,11 @@ def filter_schema_factory(model_class: Type[Model], fields: list[str, tuple[str,
                 ))
         })
 
-    filter_params_model: Type[BaseModel] = create_model("CommonFilterParams", **model_fields, __config__=model_config)
+    filter_params_model: Type[BaseModel] = create_model(
+        model_class.__name__+"CommonFilterParams",
+        **model_fields,
+        __config__=model_config
+    )
 
     return filter_params_model
 

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

@@ -29,13 +29,13 @@ def response_factory(schema_cls: Union[Type[T], BaseModel, None] = None, name: s
     else:
         fields.setdefault(
             settings.app_settings.DATA_RESPONSE_FIELD,
-            (Union[dict, str, None], FieldInfo(default={}, description="数据内容"))
+            (Union[dict, list, str, None], FieldInfo(default={}, description="数据内容"))
         )
 
     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/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,29 @@ 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_prefix="",
+        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 +40,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,7 +1,7 @@
 from typing import Optional
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class FileServerSettings(BaseSettings):
@@ -12,11 +12,18 @@ 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_prefix="FILESERVER_",
+        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/auto_discover.py

@@ -55,7 +55,7 @@ def discover_routes(
 
 
 if __name__ == '__main__':
-    # print(discover_models("../../modules"))
-    print(get_path_list("../../modules", "router"))
+    print(discover_models("../../apps"))
+    # print(get_path_list("../../apps", "router"))
 
 

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.7.dist-info → fastgenerateapi-1.1.9.dist-info}/METADATA

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