cloudoll 2.2.9__tar.gz → 2.2.10__tar.gz

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

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

cloudoll-2.2.10/cloudoll/__init__.py

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

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/cli.py

@@ -6,11 +6,10 @@ from .utils.m2d import create_models, create_tables
 import asyncio
 import os
 import sys
-from .logging import error, print_info
+from .logging import print_error, print_info
 from pathlib import Path
 from . import __version__
 import traceback
-import logging
 from .utils.watch import AppTask
 from aiohttp import web
 from .utils.common import chainMap
@@ -54,7 +53,6 @@ def gen(path, create, table, environment, database) -> None:
             if sa.pool is None:
                 return
             model_path = os.path.join(os.path.abspath("."), path)
-            # print(model_path)
             tables = None
             if table != "ALL":
                 tables = table.split(",")
@@ -68,8 +66,7 @@ def gen(path, create, table, environment, database) -> None:
                 await create_tables(sa, model_path, tables=tables)
 
         except Exception as e:
-            error(e)
-            print(traceback.print_exc())
+            print_error(traceback.print_exc())
             click.echo("input `cloudoll --help` for more helps.")
         finally:
             await sa.close()
@@ -106,9 +103,9 @@ def start(environment, host, port, path, model) -> None:
             shutdown_timeout=0.1,
         )
     except Exception as e:
-        error(e)
-        print(traceback.format_exc())
-        sys.exit(2)
+        # error(e)
+        print_error(traceback.format_exc())
+        sys.exit(0)
 
 
 _project_existing = click.Path(dir_okay=True)
@@ -120,7 +117,7 @@ def create(project_name) -> None:
     full_path = os.path.join(os.path.abspath("."), project_name)
     # log = logging.getLogger('cloudoll.create')
     if os.path.exists(full_path):
-        logging.exception(f"Project name `{project_name}` already exist.")
+        print_error(f"Project name `{project_name}` already exist.")
         # return None
 
 

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/mail/smtp.py

@@ -46,7 +46,7 @@ from email.mime.multipart import MIMEMultipart
 
 from email.utils import parseaddr, formataddr
 import mimetypes
-from ..logging import info, error
+from ..logging import print_info, print_error
 
 
 def _format_addr(s):
@@ -78,10 +78,10 @@ class Client(object):
             password = self._password
             if account is None or password is None:
                 raise KeyError("请设置账号密码")
-            info("登录中...")
+            print_info("登录中...")
             self._server.login(account, password)
         except BaseException as e:
-            error(e)
+            print_error(e)
             raise
 
     def send(self):

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/orm/__init__.py

@@ -5,6 +5,8 @@ from .base import MeteBase, QueryTypes
 from typing import Any
 from ..logging import print_info, print_error
 import traceback
+from aiomysql import Pool as MYPool
+from aiopg.pool import Pool as PGPool
 
 
 async def create_engine(**kw):
@@ -20,7 +22,7 @@ async def create_engine(**kw):
         driver = kw.get("type")
         configs = kw
 
-    print_info("DB Config:", configs, query)
+    # print_info("DB Config:", configs, query)
 
     if driver == "mysql":
         return await Mysql().create_engine(**configs, **query)
@@ -40,7 +42,7 @@ async def create_engine(**kw):
 
 class Postgres(MeteBase):
     def __init__(self, pool=None):
-        self.pool = pool
+        self.pool: PGPool = pool
         self.driver = "postgres"
 
     def __call__(self, *args: Any, **kwds: Any) -> Any:
@@ -48,9 +50,11 @@ class Postgres(MeteBase):
 
     async def query(self, sql, params=None, query_type: QueryTypes = 2, size: int = 10):
         sql = sql.replace("?", "%s").replace("`", "")
-        print("sql", sql, params)
+        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 conn.cursor() as cursor:
                 # current_cursor = getattr(cursor, 'lastrowid', None)
@@ -131,7 +135,7 @@ class AttrDictCursor(aiomysql.DictCursor):
 
 class Mysql(MeteBase):
     def __init__(self, pool=None):
-        self.pool = pool
+        self.pool: MYPool = pool
         self.driver = "mysql"
 
     def __call__(self, *args: Any, **kwds: Any) -> Any:
@@ -140,9 +144,11 @@ class Mysql(MeteBase):
 
     async def query(self, sql, params=None, query_type: QueryTypes = 2, size: int = 10):
         sql = sql.replace("?", "%s")
-        print("sql", sql, params)
+        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 conn.cursor() as cursor:
                 # current_cursor = getattr(cursor, 'lastrowid', None)

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/orm/model.py

@@ -1,5 +1,5 @@
 from .field import Field, Function, Expression
-from ..logging import warning
+from ..logging import print_warn
 from functools import reduce
 import operator
 import copy, datetime
@@ -29,13 +29,13 @@ class ModelMetaclass(type):
                 # mappings[k] = v
                 if v.primary_key:
                     if primary_key:
-                        warning(f"Duplicate primary key for {table_name}")
+                        print_warn(f"Duplicate primary key for {table_name}")
                     primary_key = k
                 else:
                     fields.append(k)
 
         if not primary_key:
-            warning(f"{table_name} Missing primary key")
+            print_warn(f"{table_name} Missing primary key")
 
         # for k in mappings.keys():
         #     attrs.pop(k)

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/orm/parse.py

@@ -49,7 +49,7 @@ def parse_coon(url: str):
         query = {}
         if configs["query"] is not None:
 
-            for key, value in parse_qsl(configs["query"]):
+            for key, value in parse_sql(configs["query"]):
                 if key in query:
                     query[key] = to_list(query[key])
                     cast("List[str]", query[key]).append(value)
@@ -72,7 +72,7 @@ def to_list(x: Any, default: Optional[List[Any]] = None) -> List[Any]:
         return list(x)
 
 
-def parse_qsl(
+def parse_sql(
     qs,
     keep_blank_values=False,
     strict_parsing=False,

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/orm/postgres.py

@@ -26,7 +26,7 @@ result = await pool.query("sql")
 __author__ = "chuchur/chuchur.com"
 
 from aiopg import create_pool, Pool, Cursor, Connection
-from ..logging import error
+from ..logging import print_error
 from .base import MeteBase
 from typing import Any
 
@@ -59,7 +59,7 @@ class Postgres(MeteBase):
                 minsize=kw.get("pool_size", 5),
             )
         except Exception as e:
-            # error(e)
-            error(f"Database connection failed,the instance : {kw.get('db')}")
+            # print_error(e)
+            print_error(f"Database connection failed,the instance : {kw.get('db')}")
 
         return self

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/robot/dingtalk.py

@@ -8,7 +8,7 @@ import base64
 import hashlib
 import hmac
 import logging
-import requests as http
+from curl_cffi import requests as http
 import time
 from urllib import parse
 

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/robot/feishu.py

@@ -3,7 +3,8 @@
 
 __author__ = "chuchur/chuchur.com"
 
-import hashlib, hmac, time, base64, logging, requests as http
+import hashlib, hmac, time, base64, logging
+from curl_cffi import requests as http
 
 
 class Client(object):

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/utils/m2d.py

@@ -1,7 +1,7 @@
 import enum
 import os
 import re
-from ..logging import print_info, warning
+from ..logging import print_info, print_warn
 import importlib
 
 
@@ -19,7 +19,7 @@ async def create_model(pool, table_name) -> str:
     Create table
     :params table name
     """
-    print(f"create model from {table_name}")
+    print_info(f"create model from {table_name}")
     # rows = await pool.all(f"show full COLUMNS from `{table_name}`", None)
     rows = await get_table_cols(pool, table_name)
     # print(rows)
@@ -133,7 +133,7 @@ async def create_table(pool, models: list, tables: list = None):
             continue
 
         if tb.startswith("v_"):
-            warning(f"{tb} look like a view so skip.")
+            print_warn(f"{tb} look like a view so skip.")
             continue
 
         # sql = f"DROP TABLE IF EXISTS `{tb}`;\n"
@@ -246,7 +246,7 @@ def get_col_sql(field):
         )
     # else:
     # sql += " DEFAULT NULL"
-    print(field.name, field.update_generated)
+    # print(field.name, field.update_generated)
     if field.update_generated:
         sql += " ON UPDATE " + (
             field.default if "(" in field.default else f"'{field.default}'"

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/utils/watch.py

@@ -8,7 +8,7 @@ import sys
 from contextlib import suppress
 from multiprocessing import Process
 from watchfiles import awatch, DefaultFilter
-from ..logging import debug, info, warning, exception
+from ..logging import print_info, print_warn
 import contextlib
 from typing import Any, Iterator, Optional, NoReturn
 from typing import TYPE_CHECKING, Optional, Sequence, Union
@@ -83,7 +83,7 @@ def mian_app(tty_path, config, entry):
                 except KeyboardInterrupt:
                     pass
                 finally:
-                    with contextlib.suppress(asyncio.TimeoutError, KeyboardInterrupt):
+                    with suppress(asyncio.TimeoutError, KeyboardInterrupt):
                         runner.run(app_runner.cleanup())
         else:
             loop = asyncio.new_event_loop()
@@ -96,7 +96,7 @@ def mian_app(tty_path, config, entry):
             except KeyboardInterrupt:
                 pass
             finally:
-                with contextlib.suppress(asyncio.TimeoutError, KeyboardInterrupt):
+                with suppress(asyncio.TimeoutError, KeyboardInterrupt):
                     loop.run_until_complete(runner.cleanup())
 
 
@@ -128,7 +128,7 @@ class AppTask(WatchTask):
             async for changes in self._awatch:
                 self._reloads += 1
                 if any(f.endswith(".py") for _, f in changes):
-                    debug("%d changes, restarting server", len(changes))
+                    print_info(f"{len(changes)} changes, restarting server")
                     await self._stop_dev_server()
                     self._start_dev_server()
                     await asyncio.sleep(1)
@@ -138,7 +138,8 @@ class AppTask(WatchTask):
 
     def _start_dev_server(self) -> None:
         act = "Start" if self._reloads == 0 else "Restart"
-        info(f"{act}ing dev server")
+        print_info(f"{act}ing dev server")
+        print_info(f"Server Running on http://0.0.0.0:{self._config['server']['port']}")
 
         try:
             tty_path = os.ttyname(sys.stdin.fileno())
@@ -156,19 +157,19 @@ class AppTask(WatchTask):
 
     async def _stop_dev_server(self) -> None:
         if self._process.is_alive():
-            print("stopping server process...")
+            print_info("stopping server process...")
             if self._process.pid:
-                debug("sending SIGINT")
+                print_info("sending SIGINT")
                 os.kill(self._process.pid, signal.SIGINT)
             self._process.join(5)
             if self._process.exitcode is None:
-                warning("process has not terminated, sending SIGKILL")
+                print_warn("process has not terminated, sending SIGKILL")
                 self._process.kill()
                 self._process.join(1)
             else:
-                print("process stopped")
+                print_info("process stopped")
         else:
-            warning(
+            print_warn(
                 "server process already dead, exit code: %s", self._process.exitcode
             )
 

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/web/__init__.py

@@ -30,7 +30,7 @@ from setuptools import find_packages
 from .settings import get_config
 import aiomcache
 from redis import asyncio as aioredis
-from ..logging import warning, info
+from ..logging import print_warn, print_info
 from ..orm.model import Model
 from . import jwt
 from decimal import Decimal
@@ -156,7 +156,7 @@ async def check_port_open(port: int, delay: float = 1) -> None:
         except OSError as e:
             if e.errno != EADDRINUSE:
                 raise
-            warning("port %d is already in use, waiting %d...", port, i)
+            print_warn("port %d is already in use, waiting %d...", port, i)
             await asyncio.sleep(delay)
         else:
             server.close()
@@ -191,6 +191,7 @@ class Application(object):
         self._route_table = web.RouteTableDef()
         self._middleware = []
         self.config = {}
+        self.clean_up = False
         # self.args = Object()
 
     def _load_life_cycle(self, entry_model=None):
@@ -205,7 +206,7 @@ class Application(object):
                     cy = getattr(self, cycle)
                     cy.append(getattr(entry, cycle))
         except ImportError:
-            warning(f"Entry model:{entry_model} can not find.")
+            print_warn(f"Entry model:{entry_model} can not find.")
 
     def init_parse(self):
         try:
@@ -267,7 +268,7 @@ class Application(object):
             if conf_st:
                 temp = os.path.join(os.path.abspath("."), "static")
                 self.app.router.add_static(**conf_st, path=temp)
-                warning("Suggest using nginx or others instead.")
+                print_warn("Suggest using nginx or others instead.")
 
         temp = os.path.join(os.path.abspath("."), "templates")
         if os.path.exists(temp):
@@ -289,15 +290,15 @@ class Application(object):
         self.clean_up = True
 
         for db in apps.db:
-            print(f"release database {db}.")
+            print_info(f"release database {db}.")
             await apps.db[db].close()
 
         # close for session
         if "redis" in apps:
-            print(f"release redis session.")
+            print_info(f"release redis session.")
             await apps.redis.close()
         if "memcached" in apps:
-            print(f"release memcached session")
+            print_info(f"release memcached session")
             apps.memcached.close()
 
     async def _init_database(self, apps):
@@ -336,7 +337,7 @@ class Application(object):
                 secure=secure,
             )
             setup(apps, storage)
-            print("start redis session.")
+            print_info("start redis session.")
         elif mcache_conf:
             host = mcache_conf.get("host")
             port = mcache_conf.get("port", 11211)
@@ -351,7 +352,7 @@ class Application(object):
                 secure=secure,
             )
             setup(apps, storage)
-            print("start memcached session.")
+            print_info("start memcached session.")
         else:
             dig = hashlib.sha256(cookie_name.encode()).digest()
             fernet_key = base64.urlsafe_b64encode(dig)
@@ -367,7 +368,7 @@ class Application(object):
                 httponly=httponly,
             )
             setup(apps, storage)
-            print("start local cookie.")
+            print_info("start local cookie.")
 
     def _reg_router(self):
         fd = "controllers"
@@ -393,8 +394,8 @@ class Application(object):
         conf = chainMap(defaults, conf, kw)
         # print(conf)
         # check_port_open(conf["host"], conf["port"])
-        print(f"Server running on http://{conf['host']}:{conf['port']}")
-        print("(Press CTRL+C to quit)")
+        print_info(f"Server running on http://{conf['host']}:{conf['port']}")
+        print_info("(Press CTRL+C to quit)")
         web.run_app(
             self.app,
             loop=self._loop,

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/web/http.py

@@ -3,10 +3,11 @@
 
 __author__ = "chuchur/chuchur.com"
 
-import requests
+from curl_cffi import requests
 import time
-from requests import Response
-from ..logging import error, info
+
+# from requests import Response
+from ..logging import print_error, print_info
 
 PROXIES = {
     "http": "http://127.0.0.1:7890",
@@ -53,7 +54,7 @@ class Client(object):
         while try_times > 0:
             try:
                 fun = getattr(self.session, method, None)
-                result: Response = fun(url, **kw)
+                result: requests.Response = fun(url, **kw)
                 head = result.headers
                 ctype = head["Content-Type"]
                 if result.status_code == 200:
@@ -64,15 +65,15 @@ class Client(object):
                         return result.text
                     return result
                 else:
-                    print(result.json())
-                    error(f"Error : code ->{result.status_code},try gain....")
+                    print_info(result.json())
+                    print_error(f"Error : code ->{result.status_code},try gain....")
                     try_times -= 1
                     time.sleep(2)
             except BaseException as e:
-                error(e)
+                print_error(e)
                 try_times -= 1
                 time.sleep(2)
-                # info(e)
+                # print_info(e)
         return result
 
 
@@ -125,14 +126,14 @@ def download(url, savepath=None, **kw):
     if not savepath:
         return rb.content
     if not rb:
-        error("下载出错")
+        print_error("下载出错")
         return False
     else:
         try:
             with open(savepath, "wb") as f:
                 f.write(rb.content)
-                info("下载完成！")
+                print_info("下载完成！")
         except BaseException as e:
-            error(e)
+            print_error(e)
             return False
     return True

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/web/jwt.py

@@ -4,7 +4,7 @@
 __author__ = "chuchur/chuchur.com"
 
 import jwt, datetime
-from ..logging import error
+from ..logging import print_error
 from typing import Union
 
 def encode(payload, key, exp: Union[int, str] = 3600)->str:
@@ -36,5 +36,5 @@ def decode(token, key):
             return None
         return payload  # 返回自定义内容
     except Exception as e:
-        error(e)
+        print_error(e)
         return None

{cloudoll-2.2.9 → cloudoll-2.2.10}/cloudoll/web/settings.py

@@ -1,6 +1,6 @@
 import yaml
 import os
-from ..logging import error, print_info
+from ..logging import print_error, print_info
 
 
 def get_config(env):
@@ -9,7 +9,7 @@ def get_config(env):
     conf_path = os.path.join(os.path.abspath("."), "config", f"conf.{env}.yaml")
     print_info(f"loading config {conf_path}")
     if not os.path.exists(conf_path):
-        error(f"Configuration file does not exist: {conf_path}")
+        print_error(f"Configuration file does not exist: {conf_path}")
         return {}
     with open(conf_path) as f:
         config = yaml.safe_load(f)

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

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

cloudoll-2.2.9/cloudoll/__init__.py

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