cloudoll 2.2.15__tar.gz → 2.2.16__tar.gz

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

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

cloudoll-2.2.16/cloudoll/__init__.py

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

{cloudoll-2.2.15 → cloudoll-2.2.16}/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

{cloudoll-2.2.15 → cloudoll-2.2.16}/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
@@ -299,19 +302,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 +330,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 +338,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.16}/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.16}/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.16}/cloudoll.egg-info/PKG-INFO

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

{cloudoll-2.2.15 → cloudoll-2.2.16}/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"