cloudoll 2.2.7__tar.gz → 2.2.9__tar.gz

{cloudoll-2.2.7 → cloudoll-2.2.9}/PKG-INFO

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

cloudoll-2.2.9/cloudoll/__init__.py

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

{cloudoll-2.2.7 → cloudoll-2.2.9}/cloudoll/logging/__init__.py

@@ -19,6 +19,7 @@ __ALL__ = (
     "critical",
     "print_info",
     "print_error",
+    "print_warn",
 )
 _COLORS = {
     # 终端输出日志颜色配置
@@ -40,9 +41,11 @@ 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[%(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",
     # 日志输出格式
-    "log_format": "[%(levelname)s]-%(asctime)s-%(pathname)s-%(module)s-%(funcName)s-[line:%(lineno)d]: %(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_SIZE = 1024 * 1024 * 1  # 1MB 日志最大1MB
@@ -138,12 +141,23 @@ class HandleLog:
 _handler = None
 
 
-def print_info(*msg, **kw):
-    print(f"{ColorAnsi.GREEN}{msg}{kw}{ColorAnsi.END}")
+def print_format(color_ansi, type, *args):
+    ft = color_ansi + "{}" + ColorAnsi.END
+    timestamp = ft.format(datetime.now().strftime("%Y-%m-%d %H:%M:%S") + " " + type)
+    text = " ".join(ft.format(str(arg)) for arg in args)
+    print(timestamp, text)
 
 
-def print_error(*msg, **kw):
-    print(f"{ColorAnsi.RED}{msg}{kw}{ColorAnsi.END}")
+def print_info(*args):
+    print_format(ColorAnsi.GREEN, "INFO", *args)
+
+
+def print_error(*args):
+    print_format(ColorAnsi.RED, "ERROR", *args)
+
+
+def print_warn(*args):
+    print_format(ColorAnsi.YELLOW, "WARN", *args)
 
 
 def _get_handle():

{cloudoll-2.2.7 → cloudoll-2.2.9}/cloudoll/orm/__init__.py

@@ -3,7 +3,7 @@ from .parse import parse_coon
 import aiopg, aiomysql
 from .base import MeteBase, QueryTypes
 from typing import Any
-from ..logging import error, print_info
+from ..logging import print_info, print_error
 import traceback
 
 
@@ -35,7 +35,7 @@ async def create_engine(**kw):
             url = f"{driver}://{configs['username']}:{configs['password']}@{configs['host']}:{configs['port']}/{configs['db']}"
         return await aioredis.from_url(url, **query)
     else:
-        error("Not suport this database type.")
+        print_error("Not suport this database type.")
 
 
 class Postgres(MeteBase):
@@ -104,11 +104,13 @@ class Postgres(MeteBase):
                 maxsize=kw.get("maxsize", 10),
                 minsize=kw.get("pool_size", 5),
             )
-            print(f"Database connection successfuly for postgres/{kw.get('db')}")
+            print_info(f"Database connection successfuly for postgres/{kw.get('db')}")
         except Exception as e:
-            error(e)
+            # error(e)
             # print(traceback.format_exc())
-            error(f"Database connection failed,the instance : postgres/{kw.get('db')}")
+            print_error(
+                f"Database connection failed,the instance : postgres/{kw.get('db')}"
+            )
 
         return self
 
@@ -191,9 +193,11 @@ class Mysql(MeteBase):
                 cursorclass=AttrDictCursor,
                 loop=loop,
             )
-            print(f"Database connection successfuly for mysql/{kw.get('db')}.")
+            print_info(f"Database connection successfuly for mysql/{kw.get('db')}.")
         except Exception as e:
-            print(e)
+            # print(e)
             # print(traceback.format_exc())
-            error(f"Database connection failed,the instance : mysql/{kw.get('db')}")
+            print_error(
+                f"Database connection failed,the instance : mysql/{kw.get('db')}"
+            )
         return self

{cloudoll-2.2.7 → cloudoll-2.2.9}/cloudoll/orm/field.py

@@ -53,7 +53,7 @@ OP = objdict(
 )
 
 
-class FieldBase:
+class FieldBase(object):
     def _op(op, inverse=False):
         def inner(self, rhs):
             if inverse:

{cloudoll-2.2.7 → cloudoll-2.2.9}/cloudoll/orm/model.py

@@ -21,10 +21,12 @@ class ModelMetaclass(type):
         table_name = attrs.get("__table__", None) or name
         primary_key = None
         fields = []
+        # mappings = dict()
         for k, v in attrs.items():
             if isinstance(v, Field):
                 v.name = k
                 v.full_name = f"`{table_name}`.{k}"
+                # mappings[k] = v
                 if v.primary_key:
                     if primary_key:
                         warning(f"Duplicate primary key for {table_name}")
@@ -55,7 +57,6 @@ class ModelMetaclass(type):
         attrs["__offset__"] = None
 
         model = type.__new__(mcs, name, bases, attrs)
-        # sa.__MODELS__.append(model)
         return model
 
     def __repr__(self):
@@ -71,14 +72,7 @@ class Model(metaclass=ModelMetaclass):
             f = getattr(self, k, None)
             f.value = None
         for k, v in kw.items():
-            # print(f"{k}----{v}")
-            f = getattr(self, k, None)
-            if isinstance(f, Field):
-                if v is None:
-                    v = f.default
-                f.value = v
-            else:
-                setattr(self, k, v)
+            self[k] = v
 
         # super().__init__(self, **kw)
 
@@ -114,7 +108,9 @@ class Model(metaclass=ModelMetaclass):
         if hasattr(self, name):
             f = getattr(self, name)
             if isinstance(f, Field):
-                f.value = value
+                s = copy.copy(f)
+                s.value = value
+                super().__setattr__(name, s)
             else:
                 super().__setattr__(name, value)
         else:
@@ -314,15 +310,23 @@ class Model(metaclass=ModelMetaclass):
 
         sql = f"update `{table}` set {keys}"
 
-        pk, pkv = self._get_primary()
         if where is not None:
             sql += f' where {" and ".join(f for f in where)}'
             params += self.__params__
-        elif pkv is not None:
-            sql += f" where `{pk}`=?"
-            params.append(pkv)
         else:
-            raise "Need where or primary key"
+            pk, pkv = self._get_primary()
+            if pkv is None:
+                for arg in args:
+                    if isinstance(arg, dict) and pk in arg:
+                        pkv = arg[pk]
+                    elif isinstance(arg, Model):
+                        pkv = arg.get(pk)
+
+            if pkv is not None:
+                sql += f" where `{pk}`=?"
+                params.append(pkv)
+            else:
+                raise "Need where or primary key"
 
         return await self.__pool__.update(sql, params)
 

{cloudoll-2.2.7 → cloudoll-2.2.9}/cloudoll/utils/watch.py

@@ -74,7 +74,6 @@ def set_tty(tty_path: Optional[str]) -> Iterator[None]:
 
 def mian_app(tty_path, config, entry):
     with set_tty(tty_path):
-
         if sys.version_info >= (3, 11):
             with asyncio.Runner() as runner:
                 app_runner = runner.run(create_main_app(config, entry))

{cloudoll-2.2.7 → cloudoll-2.2.9}/cloudoll/web/__init__.py

@@ -51,6 +51,7 @@ __ALL__ = (
     "put",
     "delete",
     "render_json",
+    "render_error",
     "middleware",
     "render_view",
     "redirect",
@@ -64,29 +65,29 @@ class _Handler(object):
         self.fn = fn
 
     async def __call__(self, request):
-        c_type = request.content_type
+        content_type = request.content_type
         # 获取函数参数的名称和默认值
         props = inspect.getfullargspec(self.fn)
-        if len(props.args) == 2 and c_type == "multipart/form-data":
+        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 c_type == "multipart/form-data":
+            if content_type == "multipart/form-data":
                 data = await request.post()
-            elif c_type == "application/json":
+            elif content_type == "application/json":
                 data = await request.json()
             else:
                 data = await request.post()
-            q_s = request.query_string
+            query_string = request.query_string
             body = {}
             for k in data:
                 body[k] = data[k]
             qs = {}
-            if q_s:
-                for k, v in parse.parse_qs(q_s, True).items():
+            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)
@@ -536,6 +537,10 @@ def all(path: str):
     return app.route_table.view(path)
 
 
+def render_error(msg, status=500) -> Response:
+    return render_json({"message": msg, "code": status}, status=status)
+
+
 def render_json(data, **kw) -> Response:
     res = {}
     if isinstance(data, list):
@@ -547,6 +552,11 @@ def render_json(data, **kw) -> Response:
         res.update(data)
     else:
         res["data"] = data
+    status = kw.get("status", 200)
+    if status == 200:
+        res["message"] = "OK"
+        res["code"] = 200
+
     res["timestamp"] = int(datetime.now().timestamp() * 1000)
     text = json.dumps(res, ensure_ascii=False, cls=JsonEncoder)
     return web.json_response(text=text, **kw)

{cloudoll-2.2.7 → cloudoll-2.2.9}/cloudoll.egg-info/PKG-INFO

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

cloudoll-2.2.7/cloudoll/__init__.py

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