cloudoll 2.2.32__tar.gz → 2.2.34__tar.gz

{cloudoll-2.2.32 → cloudoll-2.2.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.32
+Version: 2.2.34
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -28,6 +28,7 @@ Requires-Dist: pyjwt
 Requires-Dist: aiohttp_session[secure]
 Requires-Dist: PyYAML
 Requires-Dist: click
+Requires-Dist: envyaml
 
 
 # cloudoll 云端玩具

cloudoll-2.2.34/cloudoll/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.2.34"

{cloudoll-2.2.32 → cloudoll-2.2.34}/cloudoll/cli.py

@@ -115,8 +115,8 @@ def start(environment, host, port, mode, path, entry) -> None:
     except KeyboardInterrupt:
         sys.exit(0)
     except Exception as e:
-        # print_error(e)
-        # print_error(traceback.format_exc())
+        print_error(e)
+        print_error(traceback.format_exc())
         sys.exit(0)
 
 

{cloudoll-2.2.32 → cloudoll-2.2.34}/cloudoll/web/__init__.py

@@ -13,7 +13,7 @@ import inspect
 import json
 from errno import EADDRINUSE
 from urllib import parse
-from aiohttp import web
+from aiohttp import web, hdrs
 from aiohttp.web import Response
 from aiohttp.web_ws import WebSocketResponse, StreamResponse, WSMsgType
 from aiohttp.web_response import LooseHeaders
@@ -38,7 +38,7 @@ from ..orm import create_engine, parse_coon
 import uuid
 
 # from ..orm.mysql import Mysql
-from typing import Optional, Iterable
+from typing import Optional, Iterable, Callable, Awaitable
 
 __ALL__ = (
     "app",
@@ -46,21 +46,22 @@ __ALL__ = (
     "Response",
     "WebStream",
     "WSMsgType",
-    "get",
+    "View",
+    "routes" "get",
     "put",
     "delete",
+    "post",
     "render_json",
     "render_error",
-    "middleware",
     "render_view",
+    "middleware",
     "redirect",
     "jwt",
 )
 
 
 class RequestHandler(object):
-    def __init__(self, cls, fn):
-        self.cls = cls
+    def __init__(self, fn):
         self.fn = fn
 
     async def __call__(self, request):
@@ -182,7 +183,7 @@ class Application(object):
                 return
             entry = importlib.import_module(entry_model, ".")
 
-            life_cycle = ["on_startup", "on_shutdown", "on_cleanup", "cleanup_ctx"]
+            life_cycle = ["on_startup", "on_shutdown", "on_cleanup", "on_task"]
             for cycle in life_cycle:
                 if hasattr(entry, cycle):
                     cy = getattr(self, cycle)
@@ -391,7 +392,7 @@ class Application(object):
 
     def add_router(self, path, method, name):
         def inner(handler):
-            handler = RequestHandler(self, handler)
+            handler = RequestHandler(handler)
             self.app.router.add_route(method, path, handler, name=name)
             return handler
 
@@ -435,10 +436,66 @@ class Application(object):
         return self.app.on_cleanup
 
     @property
-    def cleanup_ctx(self):
+    def on_task(self):
         return self.app.cleanup_ctx
 
 
+class View(web.View):
+    async def _iter(self) -> StreamResponse:
+        request = self.request
+        if request.method not in hdrs.METH_ALL:
+            self._raise_allowed_methods()
+        method: Optional[Callable[[], Awaitable[StreamResponse]]]
+        method = getattr(self, request.method.lower(), None)
+        if method is None:
+            self._raise_allowed_methods()
+        # result = await method()
+        # assert isinstance(ret, StreamResponse)
+        # return ret
+        content_type = request.content_type
+        # 获取函数参数的名称和默认值
+        props = inspect.getfullargspec(method)
+        if len(props.args) == 3 and content_type == "multipart/form-data":
+            await set_session_route(request)
+            multipart = await request.multipart()
+            field = await multipart.next()
+            result = await method(request, field)
+        elif len(props.args) == 2:
+            await set_session_route(request)
+            if content_type == "multipart/form-data":
+                data = await request.post()
+            elif content_type == "application/json":
+                data = await request.json()
+            else:
+                data = await request.post()
+            query_string = request.query_string
+            body = {}
+            for k in data:
+                body[k] = data[k]
+            qs = {}
+            if query_string:
+                for k, v in parse.parse_qs(query_string, True).items():
+                    qs[k] = v[0]
+            request.qs = Object(qs)
+            request.body = Object(body)
+            result = await method(request)
+        else:
+            result = await method()
+        try:
+            if isinstance(result, Response):
+                return result
+            if isinstance(result, StreamResponse):
+                return result
+            if isinstance(result, WebSocketResponse):  # maybe catch error
+                return result
+            if "content_type" in result and "text/html" in result["content_type"]:
+                return result
+        except:
+            pass
+
+        return render_json(result)
+
+
 app = Application()
 
 
@@ -510,8 +567,7 @@ def delete(path: str, name=None):
     return app.add_router(path, "DELETE", name)
 
 
-def all(path: str):
-    #     return app._actions(path, 'GET')
+def routes(path: str):
     return app.route_table.view(path)
 
 

{cloudoll-2.2.32 → cloudoll-2.2.34}/cloudoll/web/settings.py

@@ -1,4 +1,4 @@
-# import yaml
+import yaml
 import os
 from ..logging import print_error, print_info
 from envyaml import EnvYAML
@@ -12,7 +12,11 @@ def get_config(env):
     if not os.path.exists(conf_path):
         print_error(f"Configuration file does not exist: {conf_path}")
         return {}
-    # with open(conf_path, "r", encoding="utf-8") as f:
-    # config = yaml.safe_load(f)
-    config = EnvYAML(conf_path)
+    with open(conf_path, "r", encoding="utf-8") as f:
+        config = yaml.safe_load(f)
+    try:
+        config_ori = EnvYAML(conf_path, strict=False)
+        config = dict(config_ori)
+    except BaseException as e:
+        print_error(e)
     return config or {}

{cloudoll-2.2.32 → cloudoll-2.2.34}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.32
+Version: 2.2.34
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -28,6 +28,7 @@ Requires-Dist: pyjwt
 Requires-Dist: aiohttp_session[secure]
 Requires-Dist: PyYAML
 Requires-Dist: click
+Requires-Dist: envyaml
 
 
 # cloudoll 云端玩具

{cloudoll-2.2.32 → cloudoll-2.2.34}/cloudoll.egg-info/requires.txt

@@ -11,3 +11,4 @@ pyjwt
 aiohttp_session[secure]
 PyYAML
 click
+envyaml

{cloudoll-2.2.32 → cloudoll-2.2.34}/setup.py

@@ -36,7 +36,8 @@ REQUIRED = [
     "pyjwt",
     "aiohttp_session[secure]",
     "PyYAML",
-    "click"
+    "click",
+    "envyaml"
 ]
 
 # What packages are optional?

cloudoll-2.2.32/cloudoll/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.2.32"