cloudoll 2.2.38__tar.gz → 2.3.0__tar.gz

{cloudoll-2.2.38 → cloudoll-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloudoll
-Version: 2.2.38
+Version: 2.3.0
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -29,6 +29,17 @@ Requires-Dist: aiohttp_session[secure]
 Requires-Dist: PyYAML
 Requires-Dist: click
 Requires-Dist: envyaml
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 # cloudoll 云端玩具

cloudoll-2.3.0/cloudoll/__init__.py

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

{cloudoll-2.2.38 → cloudoll-2.3.0}/cloudoll/cli.py

@@ -5,7 +5,7 @@ import sys
 from .logging import print_error
 from . import __version__
 from typing import Any
-from .utils.cli_mian import run_app, run_gen
+from .utils.cli_main import run_app, run_gen
 sys.path.append(os.path.abspath("."))
 
 

{cloudoll-2.2.38 → cloudoll-2.3.0}/cloudoll/logging/__init__.py

@@ -42,10 +42,10 @@ class ColorAnsi:
 _FORMATS = {
     # 终端输出格式
     # "console_format": "%(log_color)s[%(levelname)s]-%(asctime)s-%(pathname)s-%(module)s-%(funcName)s-[line:%(lineno)d]: %(message)s",
-    "console_format": "%(log_color)s%(asctime)s %(levelname)s %(funcName)s %(message)s",
+    "console_format": "%(log_color)s%(asctime)s %(levelname)s %(message)s",
     # 日志输出格式
     # "log_format": "[%(levelname)s]-%(asctime)s-%(pathname)s-%(module)s-%(funcName)s-[line:%(lineno)d]: %(message)s",
-    "log_format": "%(asctime)s %(levelname)s %(funcName)s %(message)s",
+    "log_format": "%(asctime)s %(levelname)s %(message)s",
 }
 
 _LOG_SIZE = 1024 * 1024 * 1  # 1MB 日志最大1MB

{cloudoll-2.2.38 → cloudoll-2.3.0}/cloudoll/orm/model.py

@@ -1,5 +1,5 @@
 from .field import Field, Function, Expression
-from ..logging import print_warn
+from ..logging import warning
 from functools import reduce
 import operator
 import copy
@@ -35,13 +35,13 @@ class ModelMetaclass(type):
                 # mappings[k] = v
                 if v.primary_key:
                     if primary_key:
-                        print_warn(f"Duplicate primary key for {table_name}")
+                        warning(f"Duplicate primary key for {table_name}")
                     primary_key = k
                 # else:
                 fields.append(k)
 
         if not primary_key:
-            print_warn(f"{table_name} Missing primary key")
+            warning(f"{table_name} Missing primary key")
 
         # for k in mappings.keys():
         #     attrs.pop(k)

cloudoll-2.2.38/cloudoll/utils/cli_mian.py → cloudoll-2.3.0/cloudoll/utils/cli_main.py

@@ -1,14 +1,12 @@
-
-
 from typing import Any
 from ..web.settings import get_config
 from ..logging import print_info
 from .common import Object, chainMap
-from ..utils.watch import AppTask
+from .watch import AppTask
 from aiohttp import web
 from ..web import app
 from pathlib import Path
-from ..utils.m2d import create_models, create_tables
+from .m2d import create_models, create_tables
 from ..orm import create_engine
 import os
 

cloudoll-2.3.0/cloudoll/utils/common.py

@@ -0,0 +1,51 @@
+import asyncio
+class Object(dict):
+    # __setattr__ = dict.__setitem__
+    # __getattr__ = dict.__getitem__
+    def __setattr__(self, key, value):
+        self[key] = value
+
+    def __getattr__(self, key):
+        return self.get(key, None)
+    
+    def __delattr__(self, key):
+        try:
+            del self[key]
+        except KeyError:
+            raise AttributeError(f"'DotDict' object has no attribute '{key}'")
+    
+    def __getstate__(self):
+        '''to fix pickle.dumps '''
+        return dict(self)
+
+    def __setstate__(self, state):
+        self.update(state)
+
+def chainMap(*dicts):
+    merged_dict = Object()
+    for d in dicts:
+        for key, value in d.items():
+            if key not in merged_dict or value is not None:
+                merged_dict[key] = value
+    return merged_dict
+
+
+async def check_port_open(port: int, delay: float = 1) -> None:
+    loop = asyncio.get_running_loop()
+    # the "s = socket.socket; s.bind" approach sometimes says a port is in use when it's not
+    # this approach replicates aiohttp so should always give the same answer
+    for i in range(5, 0, -1):
+        try:
+            server = await loop.create_server(
+                asyncio.Protocol, host="0.0.0.0", port=port
+            )
+        except OSError as e:
+            if e.errno != EADDRINUSE:
+                raise
+            warning("port %d is already in use, waiting %d...", port, i)
+            await asyncio.sleep(delay)
+        else:
+            server.close()
+            await server.wait_closed()
+            return
+    raise Exception("The port {} is already is use".format(port))

{cloudoll-2.2.38 → cloudoll-2.3.0}/cloudoll/utils/watch.py

@@ -1,6 +1,6 @@
 from typing import AsyncIterator, Optional, Union
 from pathlib import Path
-from ..web import Application, app, check_port_open
+from ..web import Application, app
 import asyncio
 import os
 import signal
@@ -8,13 +8,13 @@ import sys
 from contextlib import suppress
 from multiprocessing import Process
 from watchfiles import awatch, DefaultFilter
-from ..logging import print_info, print_warn
+from ..logging import info, warning, error
 import contextlib
 from typing import Iterator, Optional
 from typing import Optional, Union
 from aiohttp import web
 import traceback
-
+from .common import check_port_open
 
 class CloudollFilter(DefaultFilter):
     def __init__(self, ignore_dirs: tuple = None) -> None:
@@ -90,14 +90,10 @@ def mian_app(tty_path, config, entry, env):
             loop = asyncio.new_event_loop()
             runner = loop.run_until_complete(create_main_app(config, entry, env))
             try:
-                loop.run_until_complete(
-                    start_main_app(runner, config["server"]["port"])
-                )
+                loop.run_until_complete(start_main_app(runner, config["server"]["port"]))
                 loop.run_forever()
             except KeyboardInterrupt:
                 pass
-            except Exception as e:
-                traceback.print_exc()
             finally:
                 with suppress(asyncio.TimeoutError, KeyboardInterrupt):
                     loop.run_until_complete(runner.cleanup())
@@ -112,6 +108,8 @@ async def create_main_app(config, entry, env):
 async def start_main_app(runner, port):
     await runner.setup()
     site = web.TCPSite(runner, host="0.0.0.0", port=port)
+    info(f"Server running on http://0.0.0.0:{port}")
+    info("(Press CTRL+C to quit)")
     await site.start()
 
 
@@ -131,7 +129,7 @@ class AppTask(WatchTask):
             async for changes in self._awatch:
                 self._reloads += 1
                 if any(f.endswith(".py") for _, f in changes):
-                    print_info(f"{len(changes)} changes, restarting server")
+                    info(f"{len(changes)} changes, restarting server")
                     await self._stop_dev_server()
                     self._start_dev_server()
                     await asyncio.sleep(1)
@@ -142,8 +140,7 @@ class AppTask(WatchTask):
 
     def _start_dev_server(self) -> None:
         act = "Start" if self._reloads == 0 else "Restart"
-        print_info(f"{act}ing dev server")
-        
+        info(f"{act}ing dev server")
 
         try:
             tty_path = os.ttyname(sys.stdin.fileno())
@@ -171,29 +168,23 @@ class AppTask(WatchTask):
             )
             self._process.start()
         except Exception as e:
-            print(f"Error starting server: {e}")
-        
-        print_info(
-            f"Server Running on http://{self._config['server']['host']}:{self._config['server']['port']}"
-        )
-        print_info("(Press CTRL+C to quit)")
-        
+            error(f"Error starting server: {e}")
 
     async def _stop_dev_server(self) -> None:
         if self._process.is_alive():
-            print_info("stopping server process...")
+            info("stopping server process...")
             if self._process.pid:
-                print_info("sending SIGINT")
+                info("sending SIGINT")
                 os.kill(self._process.pid, signal.SIGINT)
             self._process.join(5)
             if self._process.exitcode is None:
-                print_warn("process has not terminated, sending SIGKILL")
+                warning("process has not terminated, sending SIGKILL")
                 self._process.kill()
                 self._process.join(1)
             else:
-                print_info("process stopped")
+                info("process stopped")
         else:
-            print_warn(
+            warning(
                 "server process already dead, exit code: %s", self._process.exitcode
             )
 

cloudoll-2.3.0/cloudoll/web/__init__.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+__author__ = "chuchur/chuchur.com"
+from typing import Tuple
+
+from .settings import get_config
+from . import jwt
+from .core import (
+    Application,
+    app,
+    Response,
+    WebSocketResponse,
+    WebSocket,
+    WebStream,
+    WSMsgType,
+    View,
+    routes,
+    get,
+    put,
+    delete,
+    post,
+    render_json,
+    render_error,
+    render_view,
+    middleware,
+    redirect,
+)
+
+__all__: Tuple[str, ...] = (
+    "Application",
+    "app",
+    "WebSocket",
+    "Response",
+    "WebSocketResponse",
+    "WebStream",
+    "WSMsgType",
+    "View",
+    "routes",
+    "get",
+    "put",
+    "delete",
+    "post",
+    "render_json",
+    "render_error",
+    "render_view",
+    "middleware",
+    "redirect",
+    "jwt",
+    "get_config",
+)

cloudoll-2.2.38/cloudoll/web/__init__.py → cloudoll-2.3.0/cloudoll/web/core.py

@@ -27,7 +27,7 @@ from aiohttp_session import (
 from .settings import get_config
 import aiomcache
 from redis import asyncio as aioredis
-from ..logging import print_warn, print_info
+from ..logging import warning, info
 from ..orm.model import Model
 from . import jwt
 from decimal import Decimal
@@ -35,80 +35,19 @@ from datetime import datetime, date
 from ..utils.common import chainMap, Object
 from ..orm import create_engine, parse_coon
 import uuid
-
-# from ..orm.mysql import Mysql
 from typing import Optional, Iterable, Callable, Awaitable
 
-__ALL__ = (
-    "app",
-    "WebSocket",
-    "Response",
-    "WebStream",
-    "WSMsgType",
-    "View",
-    "routes" "get",
-    "put",
-    "delete",
-    "post",
-    "render_json",
-    "render_error",
-    "render_view",
-    "middleware",
-    "redirect",
-    "jwt",
-)
-
 
 class RequestHandler(object):
     def __init__(self, fn):
         self.fn = fn
 
     async def __call__(self, request):
-        content_type = request.content_type
-        # 获取函数参数的名称和默认值
-        props = inspect.getfullargspec(self.fn)
-        if len(props.args) == 2 and content_type == "multipart/form-data":
-            await set_session_route(request)
-            multipart = await request.multipart()
-            field = await multipart.next()
-            result = await self.fn(request, field)
-        elif len(props.args) == 1:
-            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 self.fn(request)
-        else:
-            result = await self.fn()
-        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)
+        info(f"{request.method} {request.path}")
+        return await _render_result(request, self.fn)
 
 
-async def set_session_route(request):
+async def _set_session_route(request):
     params = dict()
     # match
     rt = request.match_info
@@ -120,39 +59,17 @@ async def set_session_route(request):
     request.session = session
 
 
-async def check_port_open(port: int, delay: float = 1) -> None:
-    loop = asyncio.get_running_loop()
-    # the "s = socket.socket; s.bind" approach sometimes says a port is in use when it's not
-    # this approach replicates aiohttp so should always give the same answer
-    for i in range(5, 0, -1):
-        try:
-            server = await loop.create_server(
-                asyncio.Protocol, host="0.0.0.0", port=port
-            )
-        except OSError as e:
-            if e.errno != EADDRINUSE:
-                raise
-            print_warn("port %d is already in use, waiting %d...", port, i)
-            await asyncio.sleep(delay)
-        else:
-            server.close()
-            await server.wait_closed()
-            return
-    raise Exception("The port {} is already is use".format(port))
-
-
-def auto_reg_module(module_dir: str):
-    
+def _auto_reg_module(module_dir: str):
     module_path = os.path.join(os.path.abspath("."), module_dir)
     if not os.path.exists(module_path):
-        print_info(f"{module_dir} not detected")
+        info(f"{module_dir} not detected")
         return
     for filename in os.listdir(module_dir):
         if filename.startswith("__") or filename.startswith("."):
             continue
         full_path = os.path.join(os.path.abspath("."), module_dir, filename)
         if os.path.isdir(full_path):
-            auto_reg_module(module_dir + os.sep + filename)
+            _auto_reg_module(module_dir + os.sep + filename)
         elif filename.endswith(".py"):
             module_name = (
                 module_dir.replace(os.sep, ".")
@@ -162,10 +79,75 @@ def auto_reg_module(module_dir: str):
             importlib.import_module(module_name)
 
 
-def parse_int(num):
+async def _render_result(request, func):
+    content_type = request.content_type
+    # 获取函数参数的名称和默认值
+    props = inspect.getfullargspec(func)
+    args = list(props.args)
+    if "self" in args:
+        args.remove("self")
+
+    if len(args) == 2 and content_type == "multipart/form-data":
+        await _set_session_route(request)
+        multipart = await request.multipart()
+        field = await multipart.next()
+        result = await func(request, field)
+    elif len(args) == 1:
+        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 func(request)
+    else:
+        result = await func()
+    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)
+
+
+def _sa_ignore_hash(method, path):
+    md5 = hashlib.md5()
+    hashstr = f"{method}{path}"
+    md5.update(hashstr.encode("utf-8"))
+    return md5.hexdigest()
+
+
+def _parse_int(num):
     return eval(num) if isinstance(num, str) else num
 
 
+def _sa_ignore_middleware():
+    async def set_ignore(ctx, handler):
+        hashstr = _sa_ignore_hash(ctx.method, ctx.path)
+        ctx.is_sa_ignore = hashstr in ctx.app.ignore_paths
+        return await handler(ctx)
+
+    return set_ignore
+
+
 class Application(object):
     def __init__(self):
         self._loop = None
@@ -175,7 +157,6 @@ class Application(object):
         self._middleware = []
         self.config = {}
         self.clean_up = False
-        # self.args = Object()
 
     def _load_life_cycle(self, entry_model=None):
         try:
@@ -189,9 +170,9 @@ class Application(object):
                     cy = getattr(self, cycle)
                     cy.append(getattr(entry, cycle))
         except ImportError:
-            print_warn(f"Entry model:{entry_model} can not find.")
+            warning(f"Entry model:{entry_model} can not find.")
 
-    def init_parse(self):
+    def _init_parse(self):
         try:
             parser = argparse.ArgumentParser(description="Cloudapp parse")
 
@@ -209,17 +190,17 @@ class Application(object):
         if loop is None:
             loop = asyncio.new_event_loop()
         self._loop = loop
-        # if env is None:
-        # env = self.args.env
         if not config:
             config = get_config(env or "local")
-        # print(config)
-        # self._args = args
         self.config = config
 
+        sa_ignore_mid = _sa_ignore_middleware()
+        sa_ignore_mid.__middleware_version__ = 1
+        self._middleware.append(sa_ignore_mid)
+
         # middlewares
-        auto_reg_module("middlewares")
-        print_info("auto register middlewares")
+        _auto_reg_module("middlewares")
+        info("auto register middlewares")
 
         conf_server = config.get("server")
         client_max_size = 1024**2 * 2
@@ -229,9 +210,11 @@ class Application(object):
             logger=None,
             loop=loop,
             middlewares=self._middleware,
-            client_max_size=parse_int(client_max_size),
+            client_max_size=_parse_int(client_max_size),
         )
+
         # database
+        self.app.ignore_paths = set()
         self.app.db = Object()
         self.app.on_startup.append(self._init_database)
         self.app.on_cleanup.append(self._close_database)
@@ -241,11 +224,10 @@ class Application(object):
         self.app.jwt_decode = self.jwt_decode
         # session
         self.app.on_startup.append(self._init_session)
-        # self._init_session()
-        #  router:
-        auto_reg_module("controllers")
-        print_info("auto register controllers")
-        
+        # router:
+        _auto_reg_module("controllers")
+        info("auto register controllers")
+
         self.app.add_routes(self._route_table)
 
         # load life
@@ -258,7 +240,7 @@ class Application(object):
             if conf_st:
                 temp = os.path.join(os.path.abspath("."), "static")
                 self.app.router.add_static(**conf_st, path=temp)
-                print_warn("Suggest using nginx or others instead.")
+                info("Suggest using nginx or others instead.")
 
         temp = os.path.join(os.path.abspath("."), "templates")
         if os.path.exists(temp):
@@ -280,15 +262,15 @@ class Application(object):
         self.clean_up = True
 
         for db in apps.db:
-            print_info(f"release database {db}.")
+            info(f"release database {db}.")
             await apps.db[db].close()
 
         # close for session
         if "redis" in apps:
-            print_info(f"release redis session.")
+            info(f"release redis session.")
             await apps.redis.close()
         if "memcached" in apps:
-            print_info(f"release memcached session")
+            info(f"release memcached session")
             apps.memcached.close()
 
     async def _init_database(self, apps):
@@ -322,12 +304,12 @@ class Application(object):
             storage = redis_storage.RedisStorage(
                 redis,
                 cookie_name=cookie_name,
-                max_age=parse_int(max_age),
+                max_age=_parse_int(max_age),
                 httponly=httponly,
                 secure=secure,
             )
             setup(apps, storage)
-            print_info("start redis session.")
+            info("start redis session.")
         elif mcache_conf:
             host = mcache_conf.get("host")
             port = mcache_conf.get("port", 11211)
@@ -337,12 +319,12 @@ class Application(object):
             storage = memcached_storage.MemcachedStorage(
                 mc,
                 cookie_name=cookie_name,
-                max_age=parse_int(max_age),
+                max_age=_parse_int(max_age),
                 httponly=httponly,
                 secure=secure,
             )
             setup(apps, storage)
-            print_info("start memcached session.")
+            info("start memcached session.")
         else:
             dig = hashlib.sha256(cookie_name.encode()).digest()
             fernet_key = base64.urlsafe_b64encode(dig)
@@ -354,11 +336,11 @@ class Application(object):
             storage = cookie_storage.EncryptedCookieStorage(
                 secret_key,
                 cookie_name=cookie_name,
-                max_age=parse_int(max_age),
+                max_age=_parse_int(max_age),
                 httponly=httponly,
             )
             setup(apps, storage)
-            print_info("start local cookie.")
+            info("start local cookie.")
 
     def run(self, **kw):
         """
@@ -368,13 +350,9 @@ class Application(object):
         """
         defaults = {"host": "0.0.0.0", "port": 9001, "path": None}
         conf = self.config.get("server", {})
-        # args_conf = {"host": self.args.host, "port": self.args.port}
-        # print(conf)
         conf = chainMap(defaults, conf, kw)
-        # print(conf)
-        # check_port_open(conf["host"], conf["port"])
-        print_info(f"Server running on http://{conf['host']}:{conf['port']}")
-        print_info("(Press CTRL+C to quit)")
+        info(f"Server running on http://{conf['host']}:{conf['port']}")
+        info("(Press CTRL+C to quit.)")
         web.run_app(
             self.app,
             loop=self._loop,
@@ -384,30 +362,22 @@ class Application(object):
             access_log=None,
             print=None,
         )
-        # # old
-        # if self.loop is None:
-        #     return web.run_app(self.app, host=host, port=port, **kw)
-        # else:
-        #     print_info(f"Server run at http://{host}:{port}")
-        #     return self.loop.create_server(
-        #         self.app.make_handler(), host=host, port=port, **kw
-        #     )
-
-    def add_router(self, path, method, name):
+
+    def add_router(self, path, method, name, sa_ignore):
         def inner(handler):
             handler = RequestHandler(handler)
-            self.app.router.add_route(method, path, handler, name=name)
+            self.router.add_route(method, path, handler, name=name)
             return handler
 
+        if sa_ignore:
+            hashstr = _sa_ignore_hash(method, path)
+            self.app.ignore_paths.add(hashstr)
         return inner
 
-    def add_middleware(self):
-        def wrapper(func):
-            mid = func()
-            mid.__middleware_version__ = 1
-            self._middleware.append(mid)
-
-        return wrapper
+    def add_middleware(self, func):
+        func.__middleware_version__ = 1
+        self._middleware.append(func)
+        return func
 
     def jwt_encode(self, payload):
         jwt_conf = self.config.get("jwt", {})
@@ -426,6 +396,14 @@ class Application(object):
     def route_table(self):
         return self._route_table
 
+    @property
+    def router(self):
+        return self.app.router
+
+    @property
+    def middlewares(self):
+        return self.app.middlewares
+
     @property
     def on_startup(self):
         return self.app.on_startup
@@ -448,55 +426,11 @@ class View(web.View):
         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:
+        func: Optional[Callable[[], Awaitable[StreamResponse]]]
+        func = getattr(self, request.method.lower(), None)
+        if func 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)
+        return await _render_result(request, func)
 
 
 app = Application()
@@ -556,23 +490,24 @@ async def WebStream(
     return stream
 
 
-def get(path: str, name=None):
-    return app.add_router(path, "GET", name)
+def get(path: str, name=None, sa_ignore=False):
+    return app.add_router(path, "GET", name, sa_ignore)
 
 
-def post(path: str, name=None):
-    return app.add_router(path, "POST", name)
+def post(path: str, name=None, sa_ignore=False):
+    return app.add_router(path, "POST", name, sa_ignore)
 
 
-def put(path: str, name=None):
-    return app.add_router(path, "PUT", name)
+def put(path: str, name=None, sa_ignore=False):
+    return app.add_router(path, "PUT", name, sa_ignore)
 
 
-def delete(path: str, name=None):
-    return app.add_router(path, "DELETE", name)
+def delete(path: str, name=None, sa_ignore=False):
+    return app.add_router(path, "DELETE", name, sa_ignore)
 
 
-def routes(path: str):
+def routes(path: str, sa_ignore=False):
+    # todo: sa_ignore
     return app.route_table.view(path)
 
 
@@ -601,8 +536,8 @@ def render_json(data, **kw) -> Response:
     return web.json_response(text=text, **kw)
 
 
-def middleware():
-    return app.add_middleware()
+def middleware(func):
+    return app.add_middleware(func)
 
 
 def render(**kw) -> Response:

cloudoll-2.3.0/cloudoll/web/http.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+__author__ = "chuchur/chuchur.com"
+# from aiohttp.web import middleware
+from curl_cffi import requests
+
+
+class Client(object):
+    def __init__(self):
+        self.session = requests.Session()
+
+    def requests(self, method, url, **kw) -> requests.Response:
+        impersonate = kw.get("impersonate", None)
+        if not impersonate:
+            kw["impersonate"] = "chrome133a"
+        fun = getattr(self.session, method, None)
+        result: requests.Response = fun(url, **kw)
+        return result
+
+
+http = Client()
+
+
+def get(url, **kw):
+    """
+    get 请求
+    :params params=dict() 传参
+    """
+    return http.requests("get", url, **kw)
+
+
+def post(url, **kw):
+    """
+    post 请求
+    :params data=dict() or json=dict() 传参
+    """
+    return http.requests("post", url, **kw)
+
+
+def put(url, **kw):
+    """
+    post 请求
+    data=dict()传参
+    """
+    return http.requests("put", url, **kw)
+
+
+def delete(url, **kw):
+    return http.requests("delete", url, **kw)
+
+
+def head(url, **kw):
+    return http.requests("head", url, **kw)
+
+
+def option(url, **kw):
+    return http.requests("option", url, **kw)
+
+
+def download(url, savepath=None, **kw):
+    """
+    下载文件
+    :params url 文件的地址
+    :params savepath 保存路径
+    """
+    response = http.requests("get", url, **kw)
+    if response.status_code == 200:
+        # 如果传入了保存路径，保存文件
+        if savepath:
+            with open(savepath, "wb") as file:
+                file.write(response.content)
+            print(f"File saved to {savepath}")
+        else:
+            # 如果没有传入保存路径，返回文件内容
+            return response.content
+    else:
+        print(f"Failed to download the file. Status code: {response.status_code}")
+        return None

{cloudoll-2.2.38 → cloudoll-2.3.0}/cloudoll/web/settings.py

@@ -1,6 +1,6 @@
 import yaml
 import os
-from ..logging import print_error, print_info
+from ..logging import error, info
 from envyaml import EnvYAML
 
 
@@ -8,9 +8,9 @@ def get_config(env):
     if env is None:
         return {}
     conf_path = os.path.join(os.path.abspath("."), "config", f"conf.{env}.yaml")
-    print_info(f"loading config {conf_path}")
+    info(f"loading config {conf_path}")
     if not os.path.exists(conf_path):
-        print_error(f"Configuration file does not exist: {conf_path}")
+        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)
@@ -18,5 +18,5 @@ def get_config(env):
         config_ori = EnvYAML(conf_path, strict=False)
         config = dict(config_ori)
     except BaseException as e:
-        print_error(e)
+        error(e)
     return config or {}

{cloudoll-2.2.38 → cloudoll-2.3.0}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloudoll
-Version: 2.2.38
+Version: 2.3.0
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -29,6 +29,17 @@ Requires-Dist: aiohttp_session[secure]
 Requires-Dist: PyYAML
 Requires-Dist: click
 Requires-Dist: envyaml
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 # cloudoll 云端玩具

{cloudoll-2.2.38 → cloudoll-2.3.0}/cloudoll.egg-info/SOURCES.txt

@@ -28,13 +28,14 @@ cloudoll/robot/dingtalk.py
 cloudoll/robot/feishu.py
 cloudoll/robot/slack.py
 cloudoll/utils/__init__.py
-cloudoll/utils/cli_mian.py
+cloudoll/utils/cli_main.py
 cloudoll/utils/common.py
 cloudoll/utils/m2d.py
 cloudoll/utils/patch_loop.py
 cloudoll/utils/snowflake.py
 cloudoll/utils/watch.py
 cloudoll/web/__init__.py
+cloudoll/web/core.py
 cloudoll/web/exception.py
 cloudoll/web/html.py
 cloudoll/web/http.py

{cloudoll-2.2.38 → cloudoll-2.3.0}/setup.py

@@ -123,9 +123,6 @@ setup(
         exclude=["tests", "*.tests", "*.tests.*", "tests.*"]),
     # If your package is a single module, use this instead of 'packages':
     # py_modules=['mypackage'],
-    # entry_points={
-    #     'console_scripts': ['mycli=mymodule:cli'],
-    # },
     install_requires=REQUIRED,
     entry_points={
         'console_scripts': [

cloudoll-2.2.38/cloudoll/__init__.py

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

cloudoll-2.2.38/cloudoll/utils/common.py

@@ -1,29 +0,0 @@
-class Object(dict):
-    # __setattr__ = dict.__setitem__
-    # __getattr__ = dict.__getitem__
-    def __setattr__(self, key, value):
-        self[key] = value
-
-    def __getattr__(self, key):
-        return self.get(key, None)
-    
-    def __delattr__(self, key):
-        try:
-            del self[key]
-        except KeyError:
-            raise AttributeError(f"'DotDict' object has no attribute '{key}'")
-    
-    def __getstate__(self):
-        '''to fix pickle.dumps '''
-        return dict(self)
-
-    def __setstate__(self, state):
-        self.update(state)
-
-def chainMap(*dicts):
-    merged_dict = Object()
-    for d in dicts:
-        for key, value in d.items():
-            if key not in merged_dict or value is not None:
-                merged_dict[key] = value
-    return merged_dict

cloudoll-2.2.38/cloudoll/web/http.py

@@ -1,139 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-__author__ = "chuchur/chuchur.com"
-
-from curl_cffi import requests
-import time
-
-# from requests import Response
-from ..logging import print_error, print_info
-
-PROXIES = {
-    "http": "http://127.0.0.1:7890",
-    "https": "http://127.0.0.1:7890",
-}
-
-HEADERS = {
-    "sec-ch-ua": '"Not A;Brand";v="99", "Chromium";v="102", "Google Chrome";v="102"',
-    "sec-ch-ua-mobile": "?0",
-    "sec-ch-ua-platform": "Windows",
-    "sec-fetch-dest": "empty",
-    "sec-fetch-mode": "cors",
-    "Expires": "0",
-    "Pragma": "no-cache",
-    "Cache": "no-cache",
-    "Cache-control": "no-cache",
-    "Connection": "keep-alive",
-    # "Content-Type": "application/json; charset=UTF-8",
-    "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36",
-}
-
-
-class Client(object):
-    def __init__(self):
-        self.session = requests.Session()
-
-    def requests(self, method, url, **kw):
-        headers = kw.get("headers", None)
-        if headers is None:
-            headers = HEADERS
-        else:
-            headers = {**headers, **HEADERS}
-        kw["headers"] = headers
-        proxies = kw.get("proxies", False)
-        if proxies:
-            if proxies is True:
-                kw["proxies"] = PROXIES
-            else:
-                kw["proxies"] = proxies
-        try_times = kw.get("try_times", 2)
-        if kw.get("try_times"):
-            kw.pop("try_times")
-        result = None
-        while try_times > 0:
-            try:
-                fun = getattr(self.session, method, None)
-                result: requests.Response = fun(url, **kw)
-                head = result.headers
-                ctype = head["Content-Type"]
-                if result.status_code == 200:
-                    try_times = 0
-                    if "application/json" in ctype:
-                        return result.json()
-                    elif "text/html" in ctype:
-                        return result.text
-                    return result
-                else:
-                    print_info(result.json())
-                    print_error(f"Error : code ->{result.status_code},try gain....")
-                    try_times -= 1
-                    time.sleep(2)
-            except BaseException as e:
-                print_error(e)
-                try_times -= 1
-                time.sleep(2)
-                # print_info(e)
-        return result
-
-
-http = Client()
-
-
-def get(url, **kw):
-    """
-    get 请求
-    :params params=dict() 传参
-    """
-    return http.requests("get", url, **kw)
-
-
-def post(url, **kw):
-    """
-    post 请求
-    :params data=dict() or json=dict() 传参
-    """
-    return http.requests("post", url, **kw)
-
-
-def put(url, **kw):
-    """
-    post 请求
-    data=dict()传参
-    """
-    return http.requests("put", url, **kw)
-
-
-def delete(url, **kw):
-    return http.requests("delete", url, **kw)
-
-
-def head(url, **kw):
-    return http.requests("head", url, **kw)
-
-
-def option(url, **kw):
-    return http.requests("option", url, **kw)
-
-
-def download(url, savepath=None, **kw):
-    """
-    下载文件
-    :params url 文件的地址
-    :params savepath 保存路径
-    """
-    rb = http.requests("get", url, **kw)
-    if not savepath:
-        return rb.content
-    if not rb:
-        print_error("下载出错")
-        return False
-    else:
-        try:
-            with open(savepath, "wb") as f:
-                f.write(rb.content)
-                print_info("下载完成！")
-        except BaseException as e:
-            print_error(e)
-            return False
-    return True