cloudoll 2.2.15__tar.gz → 2.2.17__tar.gz

{cloudoll-2.2.15 → cloudoll-2.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.15
+Version: 2.2.17
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur

cloudoll-2.2.17/cloudoll/__init__.py

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

{cloudoll-2.2.15 → cloudoll-2.2.17}/cloudoll/cli.py

@@ -27,11 +27,11 @@ life_cycle = ["on_startup", "on_shutdown", "on_cleanup", "cleanup_ctx"]
 
 
 @cli.command()
-@click.option("-p", "--path",help="Model's relative path,save models or create tables",default="models.py",)
+@click.option("-p", "--path", help="Model's relative path,save models or create tables", default="models.py",)
 @click.option("-c", "--create", help="For create model or table, model / table", default="model")
-@click.option("-t", "--table",help="Table's name or Model's name, split by `,` or 'ALL'",required=True,)
+@click.option("-t", "--table", help="Table's name or Model's name, split by `,` or 'ALL'", required=True,)
 @click.option("-env", "--environment", help="Environment, local / test / prod", default="local")
-@click.option("-db", "--database",help="Database name, pick the database in conf.{env}.yaml",default="mysql",)
+@click.option("-db", "--database", help="Database name, pick the database in conf.{env}.yaml", default="mysql",)
 def gen(path, create, table, environment, database) -> None:
     """Help to create models or tables."""
 
@@ -76,15 +76,15 @@ def gen(path, create, table, environment, database) -> None:
 
 @cli.command()
 @click.option("-env", "--environment", help="Environment, local / test / prod", default="local")
-@click.option("-p", "--port", help="Server's port", default=9001)
-@click.option("-h", "--host", help="Server's host", default='0.0.0.0')
+@click.option("-p", "--port", help="Server's port", default=None)
+@click.option("-h", "--host", help="Server's host", default=None)
 @click.option("-m", "--mode", help="development or production mode", default='development')
-@click.option("-path", "--path",help="Unix file system path to serve on. Specifying a path will cause hostname and port arguments to be ignored.",)
+@click.option("-path", "--path", help="Unix file system path to serve on. Specifying a path will cause hostname and port arguments to be ignored.",)
 @click.option("-e", "--entry", help="Entry point model name. delfault name app", default="app")
 def start(environment, host, port, mode, path, entry) -> None:
     """Start a services."""
     try:
-        print_info("Current mode: " ,mode)
+        print_info("Current mode: ", mode)
         config = get_config(environment)
         # print(environment, host, port, mode, path, entry)
         # return
@@ -95,8 +95,10 @@ def start(environment, host, port, mode, path, entry) -> None:
         aux_app = web.Application(
             logger=None,
         )
-        server = config.get("server", {})
-        server = chainMap(server, {"host": host, "port": port, "path": path})
+        defaults = {"host": "0.0.0.0", "port": 9001, "path": None}
+        conf_server = config.get("server", {})
+        env_server = {"host": host, "port": port, "path": path}
+        server = chainMap(defaults, conf_server, env_server)
         config["server"] = server
 
         aux_port = int(server.port) + 1
@@ -114,7 +116,7 @@ def start(environment, host, port, mode, path, entry) -> None:
         sys.exit(0)
     except Exception as e:
         # print_error(e)
-        print_error(traceback.format_exc())
+        # print_error(traceback.format_exc())
         sys.exit(0)
 
 

{cloudoll-2.2.15 → cloudoll-2.2.17}/cloudoll/orm/model.py

@@ -2,7 +2,8 @@ from .field import Field, Function, Expression
 from ..logging import print_warn
 from functools import reduce
 import operator
-import copy, datetime
+import copy
+import datetime
 
 
 class ModelMetaclass(type):
@@ -31,8 +32,8 @@ class ModelMetaclass(type):
                     if primary_key:
                         print_warn(f"Duplicate primary key for {table_name}")
                     primary_key = k
-                else:
-                    fields.append(k)
+                # else:
+                fields.append(k)
 
         if not primary_key:
             print_warn(f"{table_name} Missing primary key")
@@ -217,6 +218,8 @@ class Model(metaclass=ModelMetaclass):
                 f = getattr(self, k)
                 x = f.value
                 data[k] = x
+        elif args and isinstance(args, dict):
+            data = args
         else:
             for item in args:
                 md = item
@@ -230,10 +233,13 @@ class Model(metaclass=ModelMetaclass):
         params = []
         for k, v in data.items():
             if isinstance(v, Field):
-                value = v.value or v.default
-                if value is not None:
-                    if "CURRENT_TIMESTAMP" in str(value):
+                value = v.value
+                if value is None:
+                    if v.created_generated == True or v.update_generated == True:
                         value = datetime.datetime.now()
+                    else:
+                        value = v.default
+                if value is not None:
                     keys.append("`%s`=?" % k)
                     params.append(value)
             elif v is not None:  # fix sql format %s
@@ -299,19 +305,19 @@ class Model(metaclass=ModelMetaclass):
         self._reset()
         return await self.__pool__.all(sql, args)
 
-    async def update(self, *args) -> bool:
+    async def update(self, *args, **kw) -> bool:
         """
         Update data
         """
         table = self.__table__
-        where = self.__where__
+        # where = self.__where__
+        where = self._literal("WHERE", self.__where__)
 
-        keys, params, md = self._get_key_args(args)
+        keys, params, md = self._get_key_args(args or kw)
 
-        sql = f"update `{table}` set {keys}"
+        sql = f"update `{table}` set {keys} {where}"
 
-        if where is not None:
-            sql += f' where {" and ".join(f for f in where)}'
+        if where is not None and where != "":
             params += self.__params__
         else:
             pk, pkv = self._get_primary()
@@ -327,7 +333,7 @@ class Model(metaclass=ModelMetaclass):
                 params.append(pkv)
             else:
                 raise "Need where or primary key"
-
+        self._reset()
         return await self.__pool__.update(sql, params)
 
     async def delete(self) -> bool:
@@ -335,24 +341,23 @@ class Model(metaclass=ModelMetaclass):
         Delete data
         """
         table = self.__table__
-        where = self.__where__
+        where = self._literal("WHERE", self.__where__)
         args = self.__params__
-        sql = f"delete from `{table}`"
-
-        pk, pkv = self._get_primary()
-        if where is not None:
-            sql += f' where {" and ".join(f for f in where)}'
-        elif pkv is not None:
-            sql += f" where `{pk}`=?"
-            args = [pkv]
-        else:
-            raise "need where or primary"
+        sql = f"delete from `{table}` {where}"
+
+        if where is None or where == "":
+            pk, pkv = self._get_primary()
+            if pkv is not None:
+                sql += f" where `{pk}`=?"
+                args = [pkv]
+            else:
+                raise "need where or primary key"
         self._reset()
         return await self.__pool__.delete(sql, args)
 
-    async def insert(self, *args):
+    async def insert(self, *args, **kw):
         table = self.__table__
-        keys, params, md = self._get_key_args(args)
+        keys, params, md = self._get_key_args(args or kw)
         sql = f"insert into `{table}` set {keys}"
         self._reset()
         return await self.__pool__.create(sql, params)

{cloudoll-2.2.15 → cloudoll-2.2.17}/cloudoll/utils/watch.py

@@ -34,7 +34,7 @@ class WatchTask:
     async def start(self, app: Application) -> None:
         self._app = app
         self.stopper = asyncio.Event()
-        ignore_dirs = self._config["server"]["ignore_dirs"] or []
+        ignore_dirs = self._config["server"].get("ignore_dirs", [])
         self._awatch = awatch(
             self._path,
             stop_event=self.stopper,

{cloudoll-2.2.15 → cloudoll-2.2.17}/cloudoll/web/__init__.py

@@ -12,8 +12,6 @@ import importlib
 import inspect
 import json
 from errno import EADDRINUSE
-import pkgutil
-import sys
 from urllib import parse
 from aiohttp import web
 from aiohttp.web import Response
@@ -37,6 +35,7 @@ from decimal import Decimal
 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
@@ -59,7 +58,7 @@ __ALL__ = (
 )
 
 
-class _Handler(object):
+class RequestHandler(object):
     def __init__(self, cls, fn):
         self.cls = cls
         self.fn = fn
@@ -69,12 +68,12 @@ class _Handler(object):
         # 获取函数参数的名称和默认值
         props = inspect.getfullargspec(self.fn)
         if len(props.args) == 2 and content_type == "multipart/form-data":
-            await _set_session_route(request)
+            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)
+            await set_session_route(request)
             if content_type == "multipart/form-data":
                 data = await request.post()
             elif content_type == "application/json":
@@ -109,7 +108,7 @@ class _Handler(object):
         return render_json(result)
 
 
-async def _set_session_route(request):
+async def set_session_route(request):
     params = dict()
     # match
     rt = request.match_info
@@ -121,29 +120,6 @@ async def _set_session_route(request):
     request.session = session
 
 
-def _get_modules(fd):
-    modules = set()
-    temp = os.path.join(os.path.abspath("."), fd)
-    if not os.path.exists(temp):
-        print_info("Routers not detected")
-        return modules
-    s = find_packages(temp)
-    for pkg in s:
-        # modules.add(pkg)
-        pkg_path = temp + "/" + pkg.replace(".", "/")
-        if sys.version_info.major == 2 or (
-            sys.version_info.major == 3 and sys.version_info.minor < 6
-        ):
-            for _, name, ispkg in pkgutil.iter_modules([pkg_path]):
-                if not ispkg:
-                    modules.add(f".{pkg}.{name}")
-        else:
-            for info in pkgutil.iter_modules([pkg_path]):
-                if not info.ispkg:
-                    modules.add(f".{pkg}.{info.name}")
-    return modules
-
-
 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
@@ -165,21 +141,27 @@ async def check_port_open(port: int, delay: float = 1) -> None:
     raise Exception("The port {} is already is use".format(port))
 
 
-def _reg_middleware():
-    root = "middlewares"
-    mid_dir = os.path.join(os.path.abspath("."), root)
-    # print(mid_dir)
-    if not os.path.exists(mid_dir):
-        print_info("Middlewares not detected")
+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")
         return
-    for f in os.listdir(mid_dir):
-        if not f.startswith("__"):
-            module_name = f"{root}.{os.path.basename(f)[:-3]}"
-            # print(module_name, root)
-            importlib.import_module(module_name, root)
+    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)
+        elif filename.endswith(".py"):
+            module_name = (
+                module_dir.replace(os.sep, ".")
+                + "."
+                + filename[:-3].replace(os.sep, ".")
+            )
+            importlib.import_module(module_name)
 
 
-def _int(num):
+def parse_int(num):
     return eval(num) if isinstance(num, str) else num
 
 
@@ -234,7 +216,7 @@ class Application(object):
         self.config = config
 
         # middlewares
-        _reg_middleware()
+        auto_reg_module("middlewares")
 
         conf_server = config.get("server")
         client_max_size = 1024**2 * 2
@@ -244,7 +226,7 @@ class Application(object):
             logger=None,
             loop=loop,
             middlewares=self._middleware,
-            client_max_size=_int(client_max_size),
+            client_max_size=parse_int(client_max_size),
         )
         # database
         self.app.db = Object()
@@ -257,10 +239,11 @@ class Application(object):
         self.app.on_startup.append(self._init_session)
         # self._init_session()
         #  router:
-        self._reg_router()
+        auto_reg_module("controllers")
+        self.app.add_routes(self._route_table)
 
         # load life
-        entry = conf_server.get('entry',entry_model)
+        entry = conf_server.get("entry", entry_model)
         self._load_life_cycle(entry)
 
         # static
@@ -333,7 +316,7 @@ class Application(object):
             storage = redis_storage.RedisStorage(
                 redis,
                 cookie_name=cookie_name,
-                max_age=_int(max_age),
+                max_age=parse_int(max_age),
                 httponly=httponly,
                 secure=secure,
             )
@@ -348,7 +331,7 @@ class Application(object):
             storage = memcached_storage.MemcachedStorage(
                 mc,
                 cookie_name=cookie_name,
-                max_age=_int(max_age),
+                max_age=parse_int(max_age),
                 httponly=httponly,
                 secure=secure,
             )
@@ -365,23 +348,12 @@ class Application(object):
             storage = cookie_storage.EncryptedCookieStorage(
                 secret_key,
                 cookie_name=cookie_name,
-                max_age=_int(max_age),
+                max_age=parse_int(max_age),
                 httponly=httponly,
             )
             setup(apps, storage)
             print_info("start local cookie.")
 
-    def _reg_router(self):
-        fd = "controllers"
-        modules = _get_modules(fd)
-        for module in modules:
-            # print(module)
-            importlib.import_module(module, fd)
-
-        self.app.add_routes(self._route_table)
-        # for route in self._routes:
-        #     self.app.router.add_route(**route)
-
     def run(self, **kw):
         """
         run app
@@ -417,7 +389,7 @@ class Application(object):
 
     def add_router(self, path, method, name):
         def inner(handler):
-            handler = _Handler(self, handler)
+            handler = RequestHandler(self, handler)
             self.app.router.add_route(method, path, handler, name=name)
             return handler
 
@@ -478,6 +450,8 @@ class JsonEncoder(json.JSONEncoder):
             return list(obj)
         elif isinstance(obj, Model):
             return obj.__dict__
+        elif isinstance(obj, uuid.UUID):
+            return str(obj)
         else:
             return super(JsonEncoder, self).default(obj)
 
@@ -556,8 +530,8 @@ def render_json(data, **kw) -> Response:
         res["data"] = data
     status = kw.get("status", 200)
     if status == 200:
-        res["message"] = "OK"
-        res["code"] = 200
+        res["message"] = kw.get("message", "OK")
+        res["code"] = kw.get("code", 200)
 
     res["timestamp"] = int(datetime.now().timestamp() * 1000)
     text = json.dumps(res, ensure_ascii=False, cls=JsonEncoder)

{cloudoll-2.2.15 → cloudoll-2.2.17}/cloudoll/web/settings.py

@@ -11,6 +11,6 @@ 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) as f:
+    with open(conf_path, "r", encoding="utf-8") as f:
         config = yaml.safe_load(f)
     return config or {}

{cloudoll-2.2.15 → cloudoll-2.2.17}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.15
+Version: 2.2.17
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur

{cloudoll-2.2.15 → cloudoll-2.2.17}/setup.py

@@ -150,4 +150,4 @@ setup(
     },
 )
 
-# python setup.py sdist build && python setup.py bdist_wheel && python setup.py sdist upload
+# python setup.py sdist build && python setup.py bdist_wheel && python setup.py sdist upload

cloudoll-2.2.15/cloudoll/__init__.py

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