cloudoll 2.2.10__tar.gz → 2.2.12__tar.gz

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

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

cloudoll-2.2.12/cloudoll/__init__.py

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

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

@@ -76,23 +76,31 @@ def gen(path, create, table, environment, database) -> None:
 
 @cli.command()
 @click.option("-env", "--environment", help="Environment, local / test / prod", default="local")
-@click.option("-p", "--port", help="Server's port", default=None)
-@click.option("-h", "--host", help="Server's host", default=None)
+@click.option("-p", "--port", help="Server's port", default=9001)
+@click.option("-h", "--host", help="Server's host", default='0.0.0.0')
+@click.option("-m", "--mode", help="development or production mode", default='development')
 @click.option("-path", "--path",help="Unix file system path to serve on. Specifying a path will cause hostname and port arguments to be ignored.",)
-@click.option("-m", "--model", help="Entry point model name. delfault name app", default="app")
-def start(environment, host, port, path, model) -> None:
+@click.option("-e", "--entry", help="Entry point model name. delfault name app", default="app")
+def start(environment, host, port, mode, path, entry) -> None:
     """Start a services."""
     try:
+        print_info("Current mode: " ,mode)
+        config = get_config(environment)
+        # print(environment, host, port, mode, path, entry)
+        # return
+        if mode == 'production':
+            App = app.create(config=config)
+            App.run()
+            return
         aux_app = web.Application(
             logger=None,
         )
-        config = get_config(environment)
         server = config.get("server", {})
         server = chainMap(server, {"host": host, "port": port, "path": path})
         config["server"] = server
 
         aux_port = int(server.port) + 1
-        task = AppTask(Path(".").resolve(), config, entry=model)
+        task = AppTask(Path(".").resolve(), config, entry=entry)
         aux_app.cleanup_ctx.append(task.cleanup_ctx)
         web.run_app(
             aux_app,
@@ -102,8 +110,10 @@ def start(environment, host, port, path, model) -> None:
             print=None,
             shutdown_timeout=0.1,
         )
+    except KeyboardInterrupt:
+        sys.exit(0)
     except Exception as e:
-        # error(e)
+        # print_error(e)
         print_error(traceback.format_exc())
         sys.exit(0)
 

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

@@ -107,7 +107,7 @@ class Client(object):
             self._server.sendmail(self._account, to_addr, msg.as_string())
             self._server.quit()
         except BaseException as er:
-            error(er)
+            print_error(er)
 
     def add_to_addr(self, nick, addr):
         """
@@ -139,7 +139,7 @@ class Client(object):
             if len(mime_types) > 0:
                 mime_type = mime_types[0]
             else:
-                error("无法匹配附件类型,可以尝试安装httpd服务")
+                print_error("无法匹配附件类型,可以尝试安装httpd服务")
             ## 这里如果拿不到type 需要安装httpd ,dnf install httpd
             [t, n] = mime_type.split("/")
             filename = os.path.basename(filepath)  # 'a.txt'

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

@@ -110,7 +110,7 @@ class Postgres(MeteBase):
             )
             print_info(f"Database connection successfuly for postgres/{kw.get('db')}")
         except Exception as e:
-            # error(e)
+            # print_error(e)
             # print(traceback.format_exc())
             print_error(
                 f"Database connection failed,the instance : postgres/{kw.get('db')}"

{cloudoll-2.2.10 → cloudoll-2.2.12}/cloudoll/orm/base.py

@@ -36,7 +36,7 @@ class MeteBase:
     #             await fun(cursor)
     #             await conn.commit()
     #         except Exception as e:
-    #             error(e)
+    #             print_error(e)
     #             await conn.rollback()
     #         finally:
     #             if cursor:

{cloudoll-2.2.10 → cloudoll-2.2.12}/cloudoll/orm/mysql.py

@@ -30,7 +30,7 @@ from aiomysql.pool import Pool
 
 # from aiomysql.cursors import Cursor
 # from aiomysql.connection import Connection
-from cloudoll.logging import error, warning
+from cloudoll.logging import print_error
 
 # from inspect import isclass, isfunction
 from .base import MeteBase
@@ -76,8 +76,9 @@ class Mysql(MeteBase):
                 maxsize=kw.get("maxsize", 10),
                 minsize=kw.get("pool_size", 5),
                 cursorclass=AttrDictCursor,
+                connect_timeout=kw.get("connect_timeout", 10),
                 loop=loop,
             )
         except Exception as e:
-            error(f"Database connection failed,the instance : {kw.get('db')}")
+            print_error(f"Database connection failed,the instance : {kw.get('db')}")
         return self

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

@@ -53,10 +53,15 @@ class Postgres(MeteBase):
             dsn = f"dbname={db[0]} user={user[0]} password={password[0]} host={host[0]} port={port[0]}"
             self.pool = await create_pool(
                 dsn=dsn,
-                timeout=kw.get("timeout"),
+                timeout=kw.get("timeout", 10.0),
+                enable_json=kw.get("enable_json"),
+                enable_hstore=kw.get("enable_hstore"),
+                enable_uuid=kw.get("enable_uuid"),
+                enable_uuid=kw.get("enable_uuid"),
+                pool_recycle=kw.get("pool_recycle", 10),
                 echo=kw.get("echo", False),
-                maxsize=kw.get("maxsize", 10),
                 minsize=kw.get("pool_size", 5),
+                maxsize=kw.get("pool_size", 10),
             )
         except Exception as e:
             # print_error(e)

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

@@ -7,7 +7,7 @@ __author__ = "chuchur/chuchur.com"
 import base64
 import hashlib
 import hmac
-import logging
+from ..logging import print_error
 from curl_cffi import requests as http
 import time
 from urllib import parse
@@ -22,7 +22,7 @@ class Client(object):
     def _get_sign(self):
         secret = self._secret
         if not secret:
-            logging.error("缺少secret")
+            print_error("缺少secret")
             return None, None
 
         # 拼接timestamp和secret
@@ -48,7 +48,7 @@ class Client(object):
         """
         access_token = self._access_token
         if not access_token:
-            logging.error("请配置access_token")
+            print_error("请配置access_token")
             return False
         url = "https://oapi.dingtalk.com/media/upload?access_token=%s" % access_token
         with open(filepath, "rb") as f:
@@ -58,7 +58,7 @@ class Client(object):
             if res["errcode"] == 0:
                 return res
             else:
-                logging.error(res["errmsg"])
+                print_error(res["errmsg"])
 
     def send(self, data: dict):
         """
@@ -67,7 +67,7 @@ class Client(object):
         """
         webhook = self._webhook
         if not webhook:
-            logging.error("缺少webhook")
+            print_error("缺少webhook")
             return False
         timestamp, sign = self._get_sign()
         if not timestamp or not sign:
@@ -82,11 +82,11 @@ class Client(object):
         if result:
             res = result.json()
             if res["errcode"] == 0:
-                logging.info("发送成功！")
+                print_error("发送成功！")
                 return True
             else:
-                logging.info("发送失败")
-                logging.error(res["errmsg"])
+                print_error("发送失败")
+                print_error(res["errmsg"])
                 return False
 
     def send_text(self, text: str):

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

@@ -3,9 +3,9 @@
 
 __author__ = "chuchur/chuchur.com"
 
-import hashlib, hmac, time, base64, logging
+import hashlib, hmac, time, base64
 from curl_cffi import requests as http
-
+from ..logging import print_error,print_info
 
 class Client(object):
     def __init__(self, **kw):
@@ -15,7 +15,7 @@ class Client(object):
     def _get_sign(self):
         secret = self._secret
         if not secret:
-            logging.error("缺少secret")
+            print_error("缺少secret")
             return None, None
         # 拼接timestamp和secret
         timestamp = int(time.time())
@@ -36,7 +36,7 @@ class Client(object):
         """
         webhook = self._webhook
         if not webhook:
-            logging.error("缺少webhook")
+            print_error("缺少webhook")
             return False
         timestamp, sign = self._get_sign()
         if not timestamp or not sign:
@@ -48,10 +48,10 @@ class Client(object):
         if result:
             res = result.json()
             if res["StatusCode"] == 0:
-                logging.info("发送成功")
+                print_info("发送成功")
                 return False
             else:
-                logging.info("发送失败！")
+                print_error("发送失败！")
                 return True
 
     def send_text(self, text: str):

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

@@ -139,7 +139,9 @@ class AppTask(WatchTask):
     def _start_dev_server(self) -> None:
         act = "Start" if self._reloads == 0 else "Restart"
         print_info(f"{act}ing dev server")
-        print_info(f"Server Running on http://0.0.0.0:{self._config['server']['port']}")
+        print_info(
+            f"Server Running on http://{self._config['server']['host']}:{self._config['server']['port']}"
+        )
 
         try:
             tty_path = os.ttyname(sys.stdin.fileno())

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

@@ -125,7 +125,7 @@ def _get_modules(fd):
     modules = set()
     temp = os.path.join(os.path.abspath("."), fd)
     if not os.path.exists(temp):
-        info("Routers not detected")
+        print_info("Routers not detected")
         return modules
     s = find_packages(temp)
     for pkg in s:
@@ -170,7 +170,7 @@ def _reg_middleware():
     mid_dir = os.path.join(os.path.abspath("."), root)
     # print(mid_dir)
     if not os.path.exists(mid_dir):
-        info("Middlewares not detected")
+        print_info("Middlewares not detected")
         return
     for f in os.listdir(mid_dir):
         if not f.startswith("__"):
@@ -387,7 +387,7 @@ class Application(object):
         :params prot default  9001
         :params host default 127.0.0.1
         """
-        defaults = {"host": "127.0.0.1", "port": 9001, "path": None}
+        defaults = {"host": "0.0.0.0", "port": 9001, "path": None}
         conf = self.config.get("server", {})
         # args_conf = {"host": self.args.host, "port": self.args.port}
         # print(conf)
@@ -409,7 +409,7 @@ class Application(object):
         # if self.loop is None:
         #     return web.run_app(self.app, host=host, port=port, **kw)
         # else:
-        #     logging.info(f"Server run at http://{host}:{port}")
+        #     print_info(f"Server run at http://{host}:{port}")
         #     return self.loop.create_server(
         #         self.app.make_handler(), host=host, port=port, **kw
         #     )

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

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

{cloudoll-2.2.10 → cloudoll-2.2.12}/cloudoll.egg-info/requires.txt

@@ -1,4 +1,4 @@
-requests
+watchfilescurl_cffi
 colorlog
 aiomysql
 aiopg

{cloudoll-2.2.10 → cloudoll-2.2.12}/setup.py

@@ -24,7 +24,8 @@ VERSION = version.__version__
 
 # What packages are required for this module to be executed?
 REQUIRED = [
-    "requests",
+    "watchfiles"
+    "curl_cffi",
     "colorlog",
     "aiomysql",
     "aiopg",

cloudoll-2.2.10/cloudoll/__init__.py

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