cloudoll 2.2.8__tar.gz → 2.2.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.8
+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.8 → 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.8 → 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.8 → cloudoll-2.2.9}/cloudoll/orm/model.py

@@ -72,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)
 

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

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

cloudoll-2.2.8/cloudoll/__init__.py

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