cloudoll 2.2.6__tar.gz → 2.2.8__tar.gz

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

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

cloudoll-2.2.8/cloudoll/__init__.py

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

{cloudoll-2.2.6 → cloudoll-2.2.8}/cloudoll/orm/__init__.py

@@ -88,7 +88,7 @@ class Postgres(MeteBase):
                     return cursor.rowcount > 0
 
         self.pool.release(conn)
-        
+
     async def create_engine(self, **kw):
         try:
             host = (kw.get("host", "localhost"),)
@@ -172,8 +172,9 @@ class Mysql(MeteBase):
                     return cursor.rowcount > 0
                 elif query_type == QueryTypes.DELETE:
                     return cursor.rowcount > 0
-        
+
         self.pool.release(conn)
+
     async def create_engine(self, loop=None, **kw):
         try:
             self.pool = await aiomysql.create_pool(

{cloudoll-2.2.6 → cloudoll-2.2.8}/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.6 → cloudoll-2.2.8}/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):
@@ -67,6 +68,9 @@ class ModelMetaclass(type):
 
 class Model(metaclass=ModelMetaclass):
     def __init__(self, **kw):
+        for k in self.__fields__:
+            f = getattr(self, k, None)
+            f.value = None
         for k, v in kw.items():
             # print(f"{k}----{v}")
             f = getattr(self, k, None)
@@ -77,7 +81,7 @@ class Model(metaclass=ModelMetaclass):
             else:
                 setattr(self, k, v)
 
-        # super(Model, self).__init__(self, **kw)
+        # super().__init__(self, **kw)
 
     def __str__(self):
         return "<Model: %s>" % self.__class__.__name__
@@ -111,7 +115,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:
@@ -143,7 +149,7 @@ class Model(metaclass=ModelMetaclass):
     @classmethod
     def use(cls, pool=None):
         cls.__pool__ = pool
-        return cls()  # () if isinstance(cls, type) else cls
+        return cls()
 
     def select(cls, *args):
         cols = []
@@ -215,14 +221,16 @@ class Model(metaclass=ModelMetaclass):
         md = None
         if args is None or not args:
             for f in self.__fields__:
-                data[f] = getattr(self, f).value
+                f = getattr(self, f)
+                x = f.value
+                data[f] = x
         else:
             for item in args:
                 md = item
                 if isinstance(item, Model):
                     for k in item.__dict__:
                         data[k] = item[k]
-                else: # for object
+                else:  # for object
                     for k, v in item.items():
                         data[k] = v
         keys = []
@@ -309,15 +317,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.6 → cloudoll-2.2.8}/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.6 → cloudoll-2.2.8}/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.6 → cloudoll-2.2.8}/cloudoll.egg-info/PKG-INFO

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

cloudoll-2.2.6/cloudoll/__init__.py

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