sanic-api 0.3.0a1__tar.gz → 0.3.0a3__tar.gz

{sanic_api-0.3.0a1 → sanic_api-0.3.0a3}/.gitignore

@@ -10,6 +10,8 @@ __pycache__/
 # pycharm
 .idea/
 
+.DS_Store
+
 # rye
 .python-version
 

{sanic_api-0.3.0a1 → sanic_api-0.3.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sanic-api
-Version: 0.3.0a1
+Version: 0.3.0a3
 Summary: Sanic 框架实用API工具集，拥有自动生成文档、参数校验、配置的导入、日志功能的优化等功能，更好的助力接口的开发
 Project-URL: homepage, https://github.com/x-haose/sanic-api
 Project-URL: repository, https://github.com/x-haose/sanic-api
@@ -28,7 +28,7 @@ Requires-Dist: loki-logger-handler>=0.1.4
 Requires-Dist: orjson>=3.8.6
 Requires-Dist: pydantic-settings[toml,yaml]>=2.5.2
 Requires-Dist: pydantic[dotenv]>=2.9.2
-Requires-Dist: requests>=2.32.3
+Requires-Dist: requests<2.32.dev0,>=2.31.0
 Requires-Dist: sanic-ext>=23.12.0
 Requires-Dist: sanic>=23.12.0
 Requires-Dist: sentry-sdk>=2.17.0

{sanic_api-0.3.0a1 → sanic_api-0.3.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sanic-api"
-version = "0.3.0a1"
+version = "0.3.0a3"
 keywords = ["Sanic", "异步", "Sanic扩展"]
 description = "Sanic 框架实用API工具集，拥有自动生成文档、参数校验、配置的导入、日志功能的优化等功能，更好的助力接口的开发"
 authors = [
@@ -44,7 +44,7 @@ dependencies = [
     "sentry-sdk>=2.17.0",
     # loki日志推送
     "loki-logger-handler>=0.1.4",
-    "requests>=2.32.3",
+    "requests>=2.31.0,<2.32.dev0",
 ]
 
 [project.urls]

{sanic_api-0.3.0a1 → sanic_api-0.3.0a3}/requirements-dev.lock

@@ -30,9 +30,9 @@ hs-config==0.1.3a5
 html5tagger==1.3.0
     # via sanic
     # via tracerite
-httptools==0.6.1
+httptools==0.6.4
     # via sanic
-identify==2.6.1
+identify==2.6.2
     # via pre-commit
 idna==3.10
     # via requests
@@ -44,7 +44,7 @@ multidict==6.1.0
     # via sanic
 nodeenv==1.9.1
     # via pre-commit
-orjson==3.10.7
+orjson==3.10.11
     # via sanic-api
 platformdirs==4.3.6
     # via virtualenv
@@ -55,7 +55,7 @@ pydantic==2.9.2
     # via sanic-api
 pydantic-core==2.23.4
     # via pydantic
-pydantic-settings==2.5.2
+pydantic-settings==2.6.1
     # via hs-config
     # via sanic-api
 python-dotenv==1.0.1
@@ -64,7 +64,7 @@ pyyaml==6.0.2
     # via pre-commit
     # via pydantic-settings
     # via sanic-ext
-requests==2.32.3
+requests==2.31.0
     # via sanic-api
 sanic==24.6.0
     # via sanic-api
@@ -72,11 +72,11 @@ sanic-ext==23.12.0
     # via sanic-api
 sanic-routing==23.12.0
     # via sanic
-sentry-sdk==2.17.0
+sentry-sdk==2.18.0
     # via sanic-api
-setuptools==75.1.0
+setuptools==75.5.0
     # via sanic
-tomli==2.0.2
+tomli==2.1.0
     # via pydantic-settings
 tracerite==1.1.1
     # via sanic
@@ -92,7 +92,7 @@ urllib3==2.2.3
     # via sentry-sdk
 uvloop==0.21.0
     # via sanic
-virtualenv==20.26.6
+virtualenv==20.27.1
     # via pre-commit
-websockets==13.1
+websockets==14.1
     # via sanic

{sanic_api-0.3.0a1 → sanic_api-0.3.0a3}/requirements.lock

@@ -24,7 +24,7 @@ hs-config==0.1.3a5
 html5tagger==1.3.0
     # via sanic
     # via tracerite
-httptools==0.6.1
+httptools==0.6.4
     # via sanic
 idna==3.10
     # via requests
@@ -34,7 +34,7 @@ loki-logger-handler==0.1.4
     # via sanic-api
 multidict==6.1.0
     # via sanic
-orjson==3.10.7
+orjson==3.10.11
     # via sanic-api
 pydantic==2.9.2
     # via hs-config
@@ -42,7 +42,7 @@ pydantic==2.9.2
     # via sanic-api
 pydantic-core==2.23.4
     # via pydantic
-pydantic-settings==2.5.2
+pydantic-settings==2.6.1
     # via hs-config
     # via sanic-api
 python-dotenv==1.0.1
@@ -50,7 +50,7 @@ python-dotenv==1.0.1
 pyyaml==6.0.2
     # via pydantic-settings
     # via sanic-ext
-requests==2.32.3
+requests==2.31.0
     # via sanic-api
 sanic==24.6.0
     # via sanic-api
@@ -58,11 +58,11 @@ sanic-ext==23.12.0
     # via sanic-api
 sanic-routing==23.12.0
     # via sanic
-sentry-sdk==2.17.0
+sentry-sdk==2.18.0
     # via sanic-api
-setuptools==75.1.0
+setuptools==75.5.0
     # via sanic
-tomli==2.0.2
+tomli==2.1.0
     # via pydantic-settings
 tracerite==1.1.1
     # via sanic
@@ -78,5 +78,5 @@ urllib3==2.2.3
     # via sentry-sdk
 uvloop==0.21.0
     # via sanic
-websockets==13.1
+websockets==14.1
     # via sanic

{sanic_api-0.3.0a1 → sanic_api-0.3.0a3}/src/sanic_api/__init__.py

@@ -1,3 +1,3 @@
 from sanic_api.logger.extension import LoggerExtend
 
-__version__ = "0.3.0a1"
+__version__ = "0.3.0a3"

{sanic_api-0.3.0a1 → sanic_api-0.3.0a3}/src/sanic_api/api/request.py

@@ -12,15 +12,15 @@ class Request(SanicRequest):
     加入便于接口参数获取校验的方法
     """
 
-    request_type: type["Request"] | None
-    json_data_type: type[BaseModel] | None
-    form_data_type: type[BaseModel] | None
-    query_data_type: type[BaseModel] | None
-
     json_data: BaseModel
     form_data: BaseModel
     query_data: BaseModel
 
+    _request_type: type["Request"] | None
+    _json_data_type: type[BaseModel] | None
+    _form_data_type: type[BaseModel] | None
+    _query_data_type: type[BaseModel] | None
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -64,22 +64,22 @@ class Request(SanicRequest):
         """
 
         # 从函数参数注解上面获取类型
-        self.json_data_type = self._get_type("json_data", BaseModel)
-        self.form_data_type = self._get_type("form_data", BaseModel)
-        self.query_data_type = self._get_type("query_data", BaseModel)
-        self.request_type = self._get_type("request", Request)
+        self._json_data_type = self._get_type("json_data", BaseModel)
+        self._form_data_type = self._get_type("form_data", BaseModel)
+        self._query_data_type = self._get_type("query_data", BaseModel)
+        self._request_type = self._get_type("request", Request)
 
         # 没有json_data参数 但是有自定义的request类就从request类上面获取json_data类型
-        if self.request_type and not self.json_data_type:
-            self.json_data_type = self.request_type.__annotations__.get("json_data")
+        if self._request_type and not self._json_data_type:
+            self._json_data_type = self._request_type.__annotations__.get("json_data")
 
         # 没有form_data参数 但是有自定义的request类就从request类上面获取form_data类型
-        if self.request_type and not self.form_data_type:
-            self.form_data_type = self.request_type.__annotations__.get("form_data")
+        if self._request_type and not self._form_data_type:
+            self._form_data_type = self._request_type.__annotations__.get("form_data")
 
         # 没有query_data参数 但是有自定义的request类就从request类上面获取query_data类型
-        if self.request_type and not self.query_data_type:
-            self.query_data_type = self.request_type.__annotations__.get("query_data")
+        if self._request_type and not self._query_data_type:
+            self._query_data_type = self._request_type.__annotations__.get("query_data")
 
     # noinspection PyBroadException
     def _load_data(self):
@@ -113,8 +113,8 @@ class Request(SanicRequest):
             json_data = self.json
         except Exception:
             json_data = None
-        if json_data and self.json_data_type:
-            self.json_data = self.json_data_type(**json_data)
+        if json_data and self._json_data_type:
+            self.json_data = self._json_data_type(**json_data)
             _set_arg("json_data", self.json_data)
 
         # 由于form和query的参数的key是可以重复的，所以默认类型是类似dict[str, list]的
@@ -123,16 +123,16 @@ class Request(SanicRequest):
             form_data = self.form
         except Exception:
             form_data = None
-        if form_data and self.form_data_type:
-            form_data = _proc_param_data(form_data, self.form_data_type)
-            self.form_data = self.form_data_type(**form_data)
+        if form_data and self._form_data_type:
+            form_data = _proc_param_data(form_data, self._form_data_type)
+            self.form_data = self._form_data_type(**form_data)
             _set_arg("form_data", self.form_data)
 
         try:
             query_data = self.args
         except Exception:
             query_data = None
-        if query_data and self.query_data_type:
-            query_data = _proc_param_data(query_data, self.query_data_type)
-            self.query_data = self.query_data_type(**query_data)
+        if query_data and self._query_data_type:
+            query_data = _proc_param_data(query_data, self._query_data_type)
+            self.query_data = self._query_data_type(**query_data)
             _set_arg("query_data", self.query_data)