sanic-api 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

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/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.6.dist-info → sanic_api-0.2.8.dist-info}/METADATA

@@ -1,16 +1,15 @@
 Metadata-Version: 2.1
 Name: sanic-api
-Version: 0.2.6
+Version: 0.2.8
 Summary: Sanic 框架实用API工具集，拥有自动生成文档、参数校验、配置的导入、日志功能的优化等功能，更好的助力接口的开发
 License: MIT
 Author-email: 昊色居士 <xhrtxh@gmail.com>
-Requires-Python: >=3.8
+Requires-Python: >=3.8,<3.12
+Requires-Dist: hs-config>=0.1.0
 Requires-Dist: loguru>=0.6.0
 Requires-Dist: orjson>=3.8.6
-Requires-Dist: pydantic[dotenv]>=1.10.2
 Requires-Dist: pygments>=2.13.0
-Requires-Dist: sanic-ext>=22.12
-Requires-Dist: sanic>=22.3
+Requires-Dist: sanic[ext]>=23.6.0
 Requires-Dist: setuptools>=68.0.0
 Requires-Dist: ujson>=5.7.0
 Description-Content-Type: text/markdown

{sanic_api-0.2.6.dist-info → sanic_api-0.2.8.dist-info}/RECORD

@@ -21,10 +21,9 @@ sanic_api/api/handle_exception.py,sha256=Opq18Y1loRfBKtr_UTAyLMLT-C4vORnHFRhHKFN
 sanic_api/api/model.py,sha256=Sd9B1YHHHlmL11xvJuqbDoMvpL7h6qKj82qrAjhbZFk,1032
 sanic_api/api/validators.py,sha256=TCb0eRfKfTt11HN-x6u7Ci2j6cpH6UKDKGceaKU2TxE,2078
 sanic_api/config/__init__.py,sha256=O4wPd23Hbm4-i8q0z6k0_BvAPMkCByDByAvJITxYhSk,68
-sanic_api/config/base.py,sha256=-rrOKptdbMYdFJeDmR3oCnF3Afqy69RsNSnkBgU-BBw,3229
 sanic_api/config/sanic.py,sha256=BLKJgwsLVJvT1YlmW21FQXEwxSIHAhngu9Zwqe8Qh6M,636
 sanic_api/config/sanic_api.py,sha256=jIgrlOizjh3eXxiUhQ9RFiG5noAuvjTju27a4mL-xgU,373
-sanic_api/config/setting.py,sha256=5U4tpYIrsTUpxPi0_-E8jKHhewgvMJ1vfgmrPfqyB2s,735
+sanic_api/config/setting.py,sha256=oGvqkUhQVbPWhoPLPZ6uVOwwSpw8JWqJtzjvYa4YLFA,719
 sanic_api/enum.py,sha256=bBbYeys4CHI22sD_My8EIewOOznXb0nQmuIPKzZn-EM,2040
 sanic_api/logger/__init__.py,sha256=HPUhYmmzI-NHOo6uf8NGmMlSSN3gkGrmUN6TB5Qhxmc,33
 sanic_api/logger/config.py,sha256=1eEEp3YpoTCywgOeE8OZp4X0ghF4E9W52FBEAlTCVfw,2511
@@ -32,8 +31,8 @@ sanic_api/logger/extend.py,sha256=rD7NxUFZE2esPUbpOlYul5ZNnDTjepPsu9iLgZ9JA00,19
 sanic_api/logger/sanic_http.py,sha256=Nl1dM54XLTRO99rmzUbpR_vi-wSN_eK_9pei1kNJ7UE,2102
 sanic_api/openapi/__init__.py,sha256=_n-pklcQHcaor8WrJMGxc4HYNggZBfe3mmbkCN57fVI,146
 sanic_api/openapi/openapi.py,sha256=2Y3J8CJeT5LTLJGsQoCS98QGAZcyE3HgRTKWT2LKoao,4147
-sanic_api/utils.py,sha256=8n3iak6pMJbz0fKvKIH1uAUnFut_Q49DZZU0ReI6TyU,3574
-sanic_api-0.2.6.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-sanic_api-0.2.6.dist-info/METADATA,sha256=Otri2M2hDYW2S06Ab2NbhH6MjootpGYxfbfZb1AZHAM,2339
-sanic_api-0.2.6.dist-info/licenses/LICENSE.txt,sha256=T20w-F8AfuFO9CHy2mSk_An6T9eV4X4rGA01i-gp4M4,1090
-sanic_api-0.2.6.dist-info/RECORD,,
+sanic_api/utils.py,sha256=9dv_FWHb6ynuzoupOvIFPkar5Y0dlrFF977LjKIysHc,3564
+sanic_api-0.2.8.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+sanic_api-0.2.8.dist-info/METADATA,sha256=hORLgaxUiKD_uM7BP2t0wvNzMxwJHbjper4jUFIWTrw,2312
+sanic_api-0.2.8.dist-info/licenses/LICENSE.txt,sha256=T20w-F8AfuFO9CHy2mSk_An6T9eV4X4rGA01i-gp4M4,1090
+sanic_api-0.2.8.dist-info/RECORD,,

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)