sanic-api 0.2.7__tar.gz → 0.2.9__tar.gz

{sanic-api-0.2.7 → sanic-api-0.2.9}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: sanic-api
-Version: 0.2.7
+Version: 0.2.9
 Summary: Sanic 框架实用API工具集，拥有自动生成文档、参数校验、配置的导入、日志功能的优化等功能，更好的助力接口的开发
 License: MIT
 Author-email: 昊色居士 <xhrtxh@gmail.com>
-Requires-Python: >=3.8
+Requires-Python: >=3.8,<3.12
 Description-Content-Type: text/markdown
 
 ![logo](https://images.haose.pro/2022/12/19/logo_17%3A34%3A07_qkt9yi4d7u.png)

{sanic-api-0.2.7 → sanic-api-0.2.9}/pyproject.toml

@@ -1,28 +1,25 @@
 [project]
 name = "sanic-api"
-version = "0.2.7"
+version = "0.2.9"
 description = "Sanic 框架实用API工具集，拥有自动生成文档、参数校验、配置的导入、日志功能的优化等功能，更好的助力接口的开发"
 authors = [
     { name = "昊色居士", email = "xhrtxh@gmail.com" },
 ]
 dependencies = [
-    "sanic>=22.3",
-    "pydantic[dotenv]>=1.10.2",
-    "sanic-ext>=22.12",
+    "sanic[ext]>=23.6.0",
     "loguru>=0.6.0",
     "pygments>=2.13.0",
     "ujson>=5.7.0",
     "orjson>=3.8.6",
     "setuptools>=68.0.0",
+    "hs-config>=0.1.0",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.8,<3.12"
 readme = "README.MD"
 
 [project.license]
 text = "MIT"
 
-[project.optional-dependencies]
-
 [build-system]
 requires = [
     "pdm-pep517>=1.0.0",

{sanic-api-0.2.7 → sanic-api-0.2.9}/sanic_api/api/model.py

@@ -1,7 +1,8 @@
 from typing import Optional, Union
 
-from pydantic.fields import ModelField, ModelPrivateAttr
+from pydantic.fields import ModelPrivateAttr
 from pydantic.main import BaseModel
+from pydantic_core.core_schema import ModelField
 
 
 class ResponseModel(BaseModel):
@@ -10,7 +11,7 @@ class ResponseModel(BaseModel):
     """
 
     def __new__(cls, *args, **kwargs):
-        for _field, value in cls.__fields__.items():
+        for _field, value in cls.model_fields.items():
             if not isinstance(value, ModelField):
                 continue
             value.required = False

{sanic-api-0.2.7 → sanic-api-0.2.9}/sanic_api/config/__init__.py

@@ -1,2 +1 @@
-from .base import SettingsBase
 from .setting import DefaultSettings

{sanic-api-0.2.7 → sanic-api-0.2.9}/sanic_api/config/setting.py

@@ -1,12 +1,12 @@
+from hs_config import ConfigBase
 from pydantic import Field
 
-from sanic_api.config.base import SettingsBase
 from sanic_api.config.sanic import SanicConfig
 from sanic_api.config.sanic_api import SanicApiConfig
 from sanic_api.enum import RunModeEnum
 
 
-class DefaultSettings(SettingsBase):
+class DefaultSettings(ConfigBase):
     """
     配置类
     """

{sanic-api-0.2.7 → sanic-api-0.2.9}/sanic_api/utils.py

@@ -75,9 +75,9 @@ def auto_blueprint(sanic_app: Sanic, base_api_module_name: str) -> None:
 
     # 遍历所有__init__.py文件，查找蓝图并创建对应的蓝图组
     init_files: List[Path] = list(base_api_dir.glob("**/__init__.py"))
-    for init_file in reversed(init_files):
+    for file in reversed(init_files):
         # 忽略__init__.py
-        init_file: Path = init_file.parent
+        init_file: Path = file.parent
         # 获取该蓝图所在的模块路径和名称
         module_path: str = init_file.relative_to(base_api_dir.parent).with_suffix("").as_posix()
         module_name: str = module_path.replace("/", ".")

sanic-api-0.2.7/sanic_api/config/base.py

@@ -1,110 +0,0 @@
-import json
-from configparser import ConfigParser
-from pathlib import Path
-from typing import Any, Dict, Tuple
-
-import yaml
-from pydantic import BaseSettings
-from pydantic.env_settings import SettingsSourceCallable
-
-from sanic_api.utils import getpath_by_root
-
-
-class CustomSettingsSource:
-    """
-    自定义的配置文件来源基类
-    """
-
-    def __init__(self, path: Path):
-        self.path = path
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}(path={self.path!r})"
-
-
-class JsonSettingsSource(CustomSettingsSource):
-    """
-    json文件来源导入配置项
-    """
-
-    def __call__(self, settings: BaseSettings) -> Dict[str, Any]:
-        encoding = settings.__config__.env_file_encoding
-        return json.loads(self.path.read_text(encoding))
-
-
-class IniSettingsSource(CustomSettingsSource):
-    """
-    ini文件来源导入配置项
-    """
-
-    def __call__(self, settings: BaseSettings) -> Dict[str, Any]:
-        encoding = settings.__config__.env_file_encoding
-        parser = ConfigParser()
-        parser.read(self.path, encoding)
-        return getattr(parser, "_sections", {}).get("settings", {})
-
-
-class YamlSettingsSource(CustomSettingsSource):
-    """
-    Yaml文件来源导入配置项
-    """
-
-    def __call__(self, settings: BaseSettings) -> Dict[str, Any]:
-        encoding = settings.__config__.env_file_encoding
-        return yaml.safe_load(self.path.read_text(encoding))
-
-
-class SettingsBase(BaseSettings):
-    """
-    项目设置的基类
-    """
-
-    class Config:
-        root_config_dir = getpath_by_root("./configs")
-        env_file = root_config_dir / ".env"
-        env_file_encoding = "utf-8"
-        env_nested_delimiter = "__"
-
-        @classmethod
-        def customise_sources(
-            cls,
-            init_settings: SettingsSourceCallable,
-            env_settings: SettingsSourceCallable,
-            file_secret_settings: SettingsSourceCallable,
-        ) -> Tuple[SettingsSourceCallable, ...]:
-            """
-            自定义配置来源
-            Args:
-                init_settings: 初始化设置
-                env_settings:环境变量设置
-                file_secret_settings:加密文件设置
-
-            Returns:
-
-            """
-            # 默认的设置
-            default_settings = {
-                init_settings,
-                env_settings,
-                file_secret_settings,
-            }
-
-            # json 配置文件
-            json_file = cls.root_config_dir / "settings.json"
-            if json_file.exists():
-                json_settings_source = JsonSettingsSource(json_file)
-                default_settings.add(json_settings_source)
-
-            # ini配置文件
-            ini_file = cls.root_config_dir / "settings.ini"
-            if ini_file.exists():
-                ini_settings_source = IniSettingsSource(ini_file)
-                default_settings.add(ini_settings_source)
-
-            # yaml配置文件
-            yaml_file = cls.root_config_dir / "settings.yaml"
-            if yaml_file.exists():
-                yaml_settings_source = YamlSettingsSource(yaml_file)
-                default_settings.add(yaml_settings_source)
-
-            return tuple(default_settings)