cloudoll 2.3.0__tar.gz → 2.3.2__tar.gz

{cloudoll-2.3.0 → cloudoll-2.3.2}/PKG-INFO

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

cloudoll-2.3.2/cloudoll/__init__.py

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

{cloudoll-2.3.0 → cloudoll-2.3.2}/cloudoll/orm/__init__.py

@@ -10,9 +10,6 @@ from aiomysql import Pool as MYPool
 import aiopg as pg
 from aiopg.pool import Pool as PGPool
 
-# import asyncpg as pg
-# from asyncpg.pool import Pool as PGPool
-
 __ALL__ = "create_engine"
 
 
@@ -55,65 +52,6 @@ class Postgres(MeteBase):
     def __call__(self, *args: Any, **kwds: Any) -> Any:
         self.__init__(*args, **kwds)
 
-    # async def query(self, sql, params=None, query_type: QueryTypes = 2, size: int = 10):
-    #     sql = sql.replace("?", "%s").replace("`", "")
-    #     print_info("sql", sql, params)
-    #     if not self.pool:
-    #         raise ValueError("must be create_engine first.")
-    #     if self.pool._closing or self.pool._closed:
-    #         return None
-
-    #     # async with self.pool.acquire() as conn:
-    #     async with self.pool.acquire() as conn:
-    #         # current_cursor = getattr(cursor, 'lastrowid', None)
-    #         if (
-    #             query_type == QueryTypes.CREATEBATCH
-    #             or query_type == QueryTypes.UPDATEBATCH
-    #         ):
-    #             result = await conn.executemany(sql, params)  # aiopg don't support executemany
-    #         else:
-    #             result = await conn.execute(sql, params)
-
-    #         # result = None
-
-    #         return result
-
-    #         if query_type == QueryTypes.ALL:
-    #             columns = [desc[0] for desc in cursor.description]
-    #             rows = await cursor.fetchall()
-    #             result = [dict(zip(columns, row)) for row in rows]
-    #             return result
-    #         elif query_type == QueryTypes.ONE:
-    #             columns = [desc[0] for desc in cursor.description]
-    #             row = await cursor.fetchone()
-    #             # print("rows_reuslt", rows)
-    #             result = dict(zip(columns, row)) if row else {}
-    #             return result
-    #         elif query_type == QueryTypes.MANY:
-    #             columns = [desc[0] for desc in cursor.description]
-    #             rows = await cursor.fetchmany(size)
-    #             result = [dict(zip(columns, row)) for row in rows]
-    #             return result
-    #         elif query_type == QueryTypes.COUNT:
-    #             rs = await cursor.fetchone()
-    #             return rs[0] if row else 0
-    #         elif query_type == QueryTypes.CREATE:
-    #             result = cursor.rowcount > 0
-    #             id = cursor.lastrowid
-    #             return result, id
-    #         elif query_type == QueryTypes.CREATEBATCH:
-    #             count = cursor.rowcount
-    #             id = cursor.lastrowid
-    #             return count, id
-    #         elif query_type == QueryTypes.UPDATE:
-    #             return cursor.rowcount > 0
-    #         elif query_type == QueryTypes.UPDATEBATCH:
-    #             return cursor.rowcount
-    #         elif query_type == QueryTypes.DELETE:
-    #             return cursor.rowcount > 0
-
-    #         self.pool.release(cursor)
-
     async def query(self, sql, params=None, query_type: QueryTypes = 2, size: int = 10):
         sql = sql.replace("?", "%s").replace("`", '"')
         if not self.pool:
@@ -132,7 +70,7 @@ class Postgres(MeteBase):
                     or query_type == QueryTypes.UPDATEBATCH
                 ):
                     # aiopg don't support executemany
-                    await cursor.executemany(sql, params)
+                    raise RuntimeError("postgres don't support executemany")
                 else:
                     await cursor.execute(sql, params)
 
@@ -146,7 +84,6 @@ class Postgres(MeteBase):
                 elif query_type == QueryTypes.ONE:
                     columns = [desc[0] for desc in cursor.description]
                     row = await cursor.fetchone()
-                    # print("rows_reuslt", rows)
                     result = dict(zip(columns, row)) if row else {}
                     return result
                 elif query_type == QueryTypes.MANY:
@@ -155,8 +92,16 @@ class Postgres(MeteBase):
                     result = [dict(zip(columns, row)) for row in rows]
                     return result
                 elif query_type == QueryTypes.COUNT:
-                    rs = await cursor.fetchone()
-                    return rs[0] if row else 0
+                    result = await cursor.fetchone()
+                    count = 0
+                    if rows is None:
+                        return count
+                    for row in rows:
+                        count = rows[row]
+                    return count
+                elif query_type == QueryTypes.GROUP_COUNT:
+                    result = await cursor.fetchall()
+                    return 0 if not result else len(result)
                 elif query_type == QueryTypes.CREATE:
                     result = cursor.rowcount > 0
                     id = cursor.lastrowid
@@ -182,13 +127,13 @@ class Postgres(MeteBase):
             password = (str(kw.get("password", "")),)
             db = (kw.get("db"),)
             dsn = f"dbname={db[0]} user={user[0]} password={password[0]} host={host[0]} port={port[0]}"  # aiopg
-            # dsn = f"postgres://{user[0]}:{password[0]}@{host[0]}:{port[0]}/{db[0]}" #asyncpg
+            # dsn = f"postgres://{user[0]}:{password[0]}@{host[0]}:{port[0]}/{db[0]}" # asyncpg
             self.pool = await pg.create_pool(
                 dsn=dsn,
                 timeout=kw.get("timeout"),
                 echo=kw.get("echo", False),  # aiopg
-                # max_size=kw.get("maxsize", 10), #asyncpg
-                # min_size=kw.get("minsize", 5), #asyncpg
+                # max_size=kw.get("maxsize", 10), # asyncpg
+                # min_size=kw.get("minsize", 5), # asyncpg
                 maxsize=kw.get("maxsize", 10),  # aiopg
                 minsize=kw.get("minsize", 5),  # aiopg
             )
@@ -246,11 +191,7 @@ class Mysql(MeteBase):
                 else:
                     await cursor.execute(sql, params)
 
-                # if query_type.value > 4:
-                # if self.driver == "mysql":
                 await conn.commit()
-                # elif self.driver == "postgres":
-                # columns = [desc[0] for desc in cursor.description]
 
                 if query_type == QueryTypes.ALL:
                     return await cursor.fetchall()
@@ -259,11 +200,16 @@ class Mysql(MeteBase):
                 elif query_type == QueryTypes.MANY:
                     return await cursor.fetchmany(size)
                 elif query_type == QueryTypes.COUNT:
-                    rs = await cursor.fetchone()
-                    value = 0
-                    for r in rs:
-                        value = rs[r]
-                    return value
+                    rows = await cursor.fetchone()
+                    count = 0
+                    if rows is None:
+                        return count
+                    for row in rows:
+                        count = rows[row]
+                    return count
+                elif query_type == QueryTypes.GROUP_COUNT:
+                    result = await cursor.fetchall()
+                    return 0 if not result else len(result)
                 elif query_type == QueryTypes.CREATE:
                     result = cursor.rowcount > 0
                     id = cursor.lastrowid
@@ -299,7 +245,6 @@ class Mysql(MeteBase):
             )
             print_info(f"Database connection successfuly for mysql/{kw.get('db')}.")
         except Exception as e:
-            # print(e)
             # print(traceback.format_exc())
             print_error(
                 f"Database connection failed,the instance : mysql/{kw.get('db')}"

{cloudoll-2.3.0 → cloudoll-2.3.2}/cloudoll/orm/base.py

@@ -12,6 +12,7 @@ class QueryTypes(Enum):
     DELETE = 7
     CREATEBATCH = 8
     UPDATEBATCH = 9
+    GROUP_COUNT = 10
 
 
 class MeteBase:
@@ -60,6 +61,8 @@ class MeteBase:
 
     async def count(self, sql, params):
         return await self.query(sql, params, QueryTypes.COUNT)
+    async def group_count(self, sql, params):
+        return await self.query(sql, params, QueryTypes.GROUP_COUNT)
 
     async def update(self, sql, params):
         return await self.query(sql, params, QueryTypes.UPDATE)

{cloudoll-2.3.0 → cloudoll-2.3.2}/cloudoll/orm/model.py

@@ -228,7 +228,9 @@ class Model(metaclass=ModelMetaclass):
             for item in args:
                 if isinstance(item, Model):
                     for k in item.__dict__:
-                        if (action == "u" and item[k].value is not None) or action == "i":
+                        if (
+                            action == "u" and item[k].value is not None
+                        ) or action == "i":
                             data[k] = item[k]
 
                 else:  # for object
@@ -458,10 +460,13 @@ class Model(metaclass=ModelMetaclass):
         cls = copy.deepcopy(self)
         JOIN = cls._literal("LEFT JOIN", __join__)
         WHERE = cls._literal("WHERE", __where__)
-        aft = " ".join([JOIN, WHERE])
+        GROUPBY = self._literal("GROUP BY", self.__group_by__)
+        aft = " ".join([JOIN, WHERE, GROUPBY])
         sql = f"SELECT COUNT(*) FROM {cls.__table__} {aft}"
         args = cls.__params__
         sql = self._exchange_sql(sql)
+        if GROUPBY is not None and GROUPBY != "":
+            return await cls.__pool__.group_count(sql, args)
         return await cls.__pool__.count(sql, args)
 
 

{cloudoll-2.3.0 → cloudoll-2.3.2}/cloudoll/web/__init__.py

@@ -23,6 +23,7 @@ from .core import (
     render_json,
     render_error,
     render_view,
+    render,
     middleware,
     redirect,
 )
@@ -44,6 +45,7 @@ __all__: Tuple[str, ...] = (
     "render_json",
     "render_error",
     "render_view",
+    "render",
     "middleware",
     "redirect",
     "jwt",

{cloudoll-2.3.0 → cloudoll-2.3.2}/cloudoll.egg-info/PKG-INFO

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

cloudoll-2.3.0/cloudoll/__init__.py

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