cloudoll 2.2.34__tar.gz → 2.2.36__tar.gz

{cloudoll-2.2.34 → cloudoll-2.2.36}/PKG-INFO

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

cloudoll-2.2.36/cloudoll/__init__.py

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

{cloudoll-2.2.34 → cloudoll-2.2.36}/cloudoll/orm/__init__.py

@@ -115,7 +115,7 @@ class Postgres(MeteBase):
     #         self.pool.release(cursor)
 
     async def query(self, sql, params=None, query_type: QueryTypes = 2, size: int = 10):
-        sql = sql.replace("?", "%s").replace('`', '"')
+        sql = sql.replace("?", "%s").replace("`", '"')
         if not self.pool:
             raise ValueError("must be create_engine first.")
         if self.pool._closing or self.pool._closed:
@@ -124,7 +124,7 @@ class Postgres(MeteBase):
         async with self.pool.acquire() as conn:
             if conn.echo:
                 print_info("sql", sql, params)
-                
+
             async with conn.cursor() as cursor:
                 # current_cursor = getattr(cursor, 'lastrowid', None)
                 if (

{cloudoll-2.2.34 → cloudoll-2.2.36}/cloudoll/orm/base.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from typing import Tuple
 
 
 class QueryTypes(Enum):
@@ -47,7 +48,7 @@ class MeteBase:
     async def query(
         self, sql, params=None, query_type: QueryTypes = 2, size: int = 10
     ): ...
-   
+
     async def all(self, sql, params):
         return await self.query(sql, params, QueryTypes.ALL)
 
@@ -62,15 +63,15 @@ class MeteBase:
 
     async def update(self, sql, params):
         return await self.query(sql, params, QueryTypes.UPDATE)
-    
+
     async def update_batch(self, sql, params):
         return await self.query(sql, params, QueryTypes.UPDATEBATCH)
 
     async def delete(self, sql, params):
         return await self.query(sql, params, QueryTypes.DELETE)
 
-    async def create(self, sql, params):
+    async def create(self, sql, params) -> Tuple[bool, int]:
         return await self.query(sql, params, QueryTypes.CREATE)
-    
+
     async def create_batch(self, sql, params):
         return await self.query(sql, params, QueryTypes.CREATEBATCH)

{cloudoll-2.2.34 → cloudoll-2.2.36}/cloudoll/orm/model.py

@@ -6,6 +6,7 @@ import copy
 import re
 import datetime
 from ..utils.common import Object
+from typing import Tuple
 
 __ALL__ = ("models", "Model")
 
@@ -149,7 +150,7 @@ class Model(metaclass=ModelMetaclass):
     @classmethod
     def use(cls, pool=None):
         cls.__pool__ = pool
-        cls.__ispg = cls.__pool__.driver == "postgres"
+        cls.__ispg = cls.__pool__.driver == "postgres" if pool else False
         return cls()
 
     def select(cls, *args):
@@ -432,10 +433,10 @@ class Model(metaclass=ModelMetaclass):
         sql = self._exchange_sql(sql)
         return await self.__pool__.delete(sql, args)
 
-    async def insert(self, *args, **kw):
+    async def insert(self, *args, **kw) -> Tuple[bool, int]:
         table = self.__table__
         keys, params = self._get_insert_key_args("i", args or kw)
-        escape_keys = [f'`{k}`' for k in keys]
+        escape_keys = [f"`{k}`" for k in keys]
         sql = f"insert into `{table}` ({','.join(escape_keys)}) values ({','.join(['?' for k in keys])})"
         self._reset()
         params = tuple(key for key in params)
@@ -446,12 +447,12 @@ class Model(metaclass=ModelMetaclass):
         if len(items) == 0:
             return 0
         keys, params = self._get_batch_keys_values(items)
-        escape_keys = [f'`{k}`' for k in keys]
+        escape_keys = [f"`{k}`" for k in keys]
         sql = f"insert into `{table}` ({','.join(escape_keys)}) values ({','.join(['?' for k in keys])})"
         self._reset()
         return await self.__pool__.create_batch(sql, params)
 
-    async def count(self):
+    async def count(self) -> int:
         __where__ = copy.copy(self.__where__)
         __join__ = copy.copy(self.__join__)
         cls = copy.deepcopy(self)

{cloudoll-2.2.34 → cloudoll-2.2.36}/cloudoll/web/__init__.py

@@ -24,7 +24,6 @@ from aiohttp_session import (
     memcached_storage,
     cookie_storage,
 )
-from setuptools import find_packages
 from .settings import get_config
 import aiomcache
 from redis import asyncio as aioredis
@@ -509,7 +508,7 @@ class JsonEncoder(json.JSONEncoder):
             return list(obj)
         elif isinstance(obj, Model):
             return obj.__dict__
-        elif isinstance(obj, uuid.UUID):
+        elif isinstance(obj, uuid.UUID) or isinstance(obj, Exception):
             return str(obj)
         else:
             return super(JsonEncoder, self).default(obj)

{cloudoll-2.2.34 → cloudoll-2.2.36}/cloudoll.egg-info/PKG-INFO

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

cloudoll-2.2.34/cloudoll/__init__.py

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