cloudoll 2.2.38__tar.gz → 2.3.1__tar.gz

{cloudoll-2.2.38 → cloudoll-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloudoll
-Version: 2.2.38
+Version: 2.3.1
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -29,6 +29,17 @@ Requires-Dist: aiohttp_session[secure]
 Requires-Dist: PyYAML
 Requires-Dist: click
 Requires-Dist: envyaml
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 # cloudoll 云端玩具

cloudoll-2.3.1/cloudoll/__init__.py

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

{cloudoll-2.2.38 → cloudoll-2.3.1}/cloudoll/cli.py

@@ -5,7 +5,7 @@ import sys
 from .logging import print_error
 from . import __version__
 from typing import Any
-from .utils.cli_mian import run_app, run_gen
+from .utils.cli_main import run_app, run_gen
 sys.path.append(os.path.abspath("."))
 
 

{cloudoll-2.2.38 → cloudoll-2.3.1}/cloudoll/logging/__init__.py

@@ -42,10 +42,10 @@ 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%(asctime)s %(levelname)s %(funcName)s %(message)s",
+    "console_format": "%(log_color)s%(asctime)s %(levelname)s %(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_format": "%(asctime)s %(levelname)s %(message)s",
 }
 
 _LOG_SIZE = 1024 * 1024 * 1  # 1MB 日志最大1MB

{cloudoll-2.2.38 → cloudoll-2.3.1}/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)
 
@@ -155,8 +93,7 @@ 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
+                    return cursor.rowcount
                 elif query_type == QueryTypes.CREATE:
                     result = cursor.rowcount > 0
                     id = cursor.lastrowid
@@ -182,13 +119,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 +183,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 +192,7 @@ 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
+                    return cursor.rowcount
                 elif query_type == QueryTypes.CREATE:
                     result = cursor.rowcount > 0
                     id = cursor.lastrowid
@@ -299,7 +228,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.2.38 → cloudoll-2.3.1}/cloudoll/orm/model.py

@@ -1,5 +1,5 @@
 from .field import Field, Function, Expression
-from ..logging import print_warn
+from ..logging import warning
 from functools import reduce
 import operator
 import copy
@@ -35,13 +35,13 @@ class ModelMetaclass(type):
                 # mappings[k] = v
                 if v.primary_key:
                     if primary_key:
-                        print_warn(f"Duplicate primary key for {table_name}")
+                        warning(f"Duplicate primary key for {table_name}")
                     primary_key = k
                 # else:
                 fields.append(k)
 
         if not primary_key:
-            print_warn(f"{table_name} Missing primary key")
+            warning(f"{table_name} Missing primary key")
 
         # for k in mappings.keys():
         #     attrs.pop(k)
@@ -458,7 +458,8 @@ 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)
@@ -468,14 +469,14 @@ class Model(metaclass=ModelMetaclass):
 class Models(object):
     class CharField(Field):
         def __init__(
-            self,
-            name=None,
-            primary_key=False,
-            default=None,
-            charset=None,
-            max_length=None,
-            not_null=False,
-            comment=None,
+                self,
+                name=None,
+                primary_key=False,
+                default=None,
+                charset=None,
+                max_length=None,
+                not_null=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -490,14 +491,14 @@ class Models(object):
 
     class VarCharField(Field):
         def __init__(
-            self,
-            name=None,
-            primary_key=False,
-            default=None,
-            charset=None,
-            max_length=None,
-            not_null=False,
-            comment=None,
+                self,
+                name=None,
+                primary_key=False,
+                default=None,
+                charset=None,
+                max_length=None,
+                not_null=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -512,7 +513,7 @@ class Models(object):
 
     class BooleanField(Field):
         def __init__(
-            self, name=None, default=False, not_null=False, comment=None, unsigned=False
+                self, name=None, default=False, not_null=False, comment=None, unsigned=False
         ):
             super().__init__(
                 name,
@@ -525,15 +526,15 @@ class Models(object):
 
     class IntegerField(Field):
         def __init__(
-            self,
-            name=None,
-            primary_key=False,
-            default=None,
-            auto_increment=False,
-            not_null=False,
-            unsigned=False,
-            comment=None,
-            max_length=None,
+                self,
+                name=None,
+                primary_key=False,
+                default=None,
+                auto_increment=False,
+                not_null=False,
+                unsigned=False,
+                comment=None,
+                max_length=None,
         ):
             super().__init__(
                 name,
@@ -549,15 +550,15 @@ class Models(object):
 
     class BigIntegerField(Field):
         def __init__(
-            self,
-            name=None,
-            primary_key=False,
-            default=None,
-            auto_increment=False,
-            not_null=False,
-            unsigned=False,
-            comment=None,
-            max_length=None,
+                self,
+                name=None,
+                primary_key=False,
+                default=None,
+                auto_increment=False,
+                not_null=False,
+                unsigned=False,
+                comment=None,
+                max_length=None,
         ):
             super().__init__(
                 name,
@@ -573,13 +574,13 @@ class Models(object):
 
     class DoubleField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            not_null=False,
-            max_length=None,
-            unsigned=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                not_null=False,
+                max_length=None,
+                unsigned=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -593,14 +594,14 @@ class Models(object):
 
     class FloatField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            not_null=False,
-            max_length=None,
-            scale_length=None,
-            unsigned=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                not_null=False,
+                max_length=None,
+                scale_length=None,
+                unsigned=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -615,14 +616,14 @@ class Models(object):
 
     class NumericField(Field):
         def __init__(
-            self,
-            name=None,
-            default=0.0,
-            not_null=False,
-            max_length=None,
-            scale_length=None,
-            unsigned=False,
-            comment=None,
+                self,
+                name=None,
+                default=0.0,
+                not_null=False,
+                max_length=None,
+                scale_length=None,
+                unsigned=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -637,14 +638,14 @@ class Models(object):
 
     class DecimalField(Field):
         def __init__(
-            self,
-            name=None,
-            default=0.0,
-            not_null=False,
-            max_length=None,
-            scale_length=None,
-            unsigned=False,
-            comment=None,
+                self,
+                name=None,
+                default=0.0,
+                not_null=False,
+                max_length=None,
+                scale_length=None,
+                unsigned=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -659,13 +660,13 @@ class Models(object):
 
     class TextField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            charset=None,
-            max_length=None,
-            not_null=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                charset=None,
+                max_length=None,
+                not_null=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -679,13 +680,13 @@ class Models(object):
 
     class LongTextField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            charset=None,
-            max_length=None,
-            not_null=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                charset=None,
+                max_length=None,
+                not_null=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -699,13 +700,13 @@ class Models(object):
 
     class MediumTextField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            charset=None,
-            max_length=None,
-            not_null=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                charset=None,
+                max_length=None,
+                not_null=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -719,14 +720,14 @@ class Models(object):
 
     class DatetimeField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            max_length=None,
-            not_null=False,
-            created_generated=False,
-            update_generated=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                max_length=None,
+                not_null=False,
+                created_generated=False,
+                update_generated=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -741,14 +742,14 @@ class Models(object):
 
     class DateField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            max_length=None,
-            not_null=False,
-            created_generated=False,
-            update_generated=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                max_length=None,
+                not_null=False,
+                created_generated=False,
+                update_generated=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -763,14 +764,14 @@ class Models(object):
 
     class TimestampField(Field):
         def __init__(
-            self,
-            name=None,
-            default=None,
-            max_length=None,
-            not_null=False,
-            created_generated=False,
-            update_generated=False,
-            comment=None,
+                self,
+                name=None,
+                default=None,
+                max_length=None,
+                not_null=False,
+                created_generated=False,
+                update_generated=False,
+                comment=None,
         ):
             super().__init__(
                 name,
@@ -786,7 +787,7 @@ class Models(object):
 
     class JsonField(Field):
         def __init__(
-            self, name=None, default=None, charset=None, not_null=False, comment=None
+                self, name=None, default=None, charset=None, not_null=False, comment=None
         ):
             super().__init__(
                 name,

cloudoll-2.2.38/cloudoll/utils/cli_mian.py → cloudoll-2.3.1/cloudoll/utils/cli_main.py

@@ -1,14 +1,12 @@
-
-
 from typing import Any
 from ..web.settings import get_config
 from ..logging import print_info
 from .common import Object, chainMap
-from ..utils.watch import AppTask
+from .watch import AppTask
 from aiohttp import web
 from ..web import app
 from pathlib import Path
-from ..utils.m2d import create_models, create_tables
+from .m2d import create_models, create_tables
 from ..orm import create_engine
 import os
 

cloudoll-2.3.1/cloudoll/utils/common.py

@@ -0,0 +1,51 @@
+import asyncio
+class Object(dict):
+    # __setattr__ = dict.__setitem__
+    # __getattr__ = dict.__getitem__
+    def __setattr__(self, key, value):
+        self[key] = value
+
+    def __getattr__(self, key):
+        return self.get(key, None)
+    
+    def __delattr__(self, key):
+        try:
+            del self[key]
+        except KeyError:
+            raise AttributeError(f"'DotDict' object has no attribute '{key}'")
+    
+    def __getstate__(self):
+        '''to fix pickle.dumps '''
+        return dict(self)
+
+    def __setstate__(self, state):
+        self.update(state)
+
+def chainMap(*dicts):
+    merged_dict = Object()
+    for d in dicts:
+        for key, value in d.items():
+            if key not in merged_dict or value is not None:
+                merged_dict[key] = value
+    return merged_dict
+
+
+async def check_port_open(port: int, delay: float = 1) -> None:
+    loop = asyncio.get_running_loop()
+    # the "s = socket.socket; s.bind" approach sometimes says a port is in use when it's not
+    # this approach replicates aiohttp so should always give the same answer
+    for i in range(5, 0, -1):
+        try:
+            server = await loop.create_server(
+                asyncio.Protocol, host="0.0.0.0", port=port
+            )
+        except OSError as e:
+            if e.errno != EADDRINUSE:
+                raise
+            warning("port %d is already in use, waiting %d...", port, i)
+            await asyncio.sleep(delay)
+        else:
+            server.close()
+            await server.wait_closed()
+            return
+    raise Exception("The port {} is already is use".format(port))