cloudoll 2.2.27__tar.gz → 2.2.29__tar.gz

{cloudoll-2.2.27 → cloudoll-2.2.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.27
+Version: 2.2.29
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -15,11 +15,29 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.6.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: watchfiles
+Requires-Dist: curl_cffi
+Requires-Dist: colorlog
+Requires-Dist: aiomysql
+Requires-Dist: aiopg
+Requires-Dist: aiohttp
+Requires-Dist: redis[hiredis]
+Requires-Dist: aiomcache
+Requires-Dist: jinja2
+Requires-Dist: pyjwt
+Requires-Dist: aiohttp_session[secure]
+Requires-Dist: PyYAML
+Requires-Dist: click
 
 
 # cloudoll 云端玩具
 
 ## 更新日志
+
+`2.2.28` 2023-07-04
+- 多数据库支持
+- 优化orm
+- 
 `2.0.14` 2023-07-04
 - 加入cli,devtoll
 - 优化orm

{cloudoll-2.2.27 → cloudoll-2.2.29}/README.md

@@ -1,6 +1,11 @@
 # cloudoll 云端玩具
 
 ## 更新日志
+
+`2.2.28` 2023-07-04
+- 多数据库支持
+- 优化orm
+- 
 `2.0.14` 2023-07-04
 - 加入cli,devtoll
 - 优化orm

cloudoll-2.2.29/cloudoll/__init__.py

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

{cloudoll-2.2.27 → cloudoll-2.2.29}/cloudoll/cli.py

@@ -89,7 +89,7 @@ def start(environment, host, port, mode, path, entry) -> None:
         # print(environment, host, port, mode, path, entry)
         # return
         if mode == 'production':
-            App = app.create(config=config, entry_model=entry)
+            App = app.create(env=environment, config=config, entry_model=entry)
             App.run()
             return
         aux_app = web.Application(
@@ -102,7 +102,7 @@ def start(environment, host, port, mode, path, entry) -> None:
         config["server"] = server
 
         aux_port = int(server.port) + 1
-        task = AppTask(Path(".").resolve(), config, entry=entry)
+        task = AppTask(Path(".").resolve(), config, entry=entry, env=environment)
         aux_app.cleanup_ctx.append(task.cleanup_ctx)
         web.run_app(
             aux_app,

{cloudoll-2.2.27 → cloudoll-2.2.29}/cloudoll/orm/__init__.py

@@ -116,13 +116,15 @@ class Postgres(MeteBase):
 
     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:
+            if conn.echo:
+                print_info("sql", sql, params)
+                
             async with conn.cursor() as cursor:
                 # current_cursor = getattr(cursor, 'lastrowid', None)
                 if (
@@ -226,12 +228,14 @@ class Mysql(MeteBase):
 
     async def query(self, sql, params=None, query_type: QueryTypes = 2, size: int = 10):
         sql = sql.replace("?", "%s")
-        # 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:
+            if conn.echo:
+                print_info("sql", sql, params)
+
             async with conn.cursor() as cursor:
                 # current_cursor = getattr(cursor, 'lastrowid', None)
                 if (

{cloudoll-2.2.27 → cloudoll-2.2.29}/cloudoll/orm/field.py

@@ -31,6 +31,8 @@ OP = objdict(
     AVG="AVG",
     AS="AS",
     SUM="SUM",
+    MAX="MAX",
+    MIN="MIN",
     IS_TODAY="IS_TODAY",
     IS_THIS_WEEK="THIS_WEEK",
     IS_THIS_MONTH="THIS_MONTH",
@@ -50,6 +52,7 @@ OP = objdict(
     DATE_FORMAT="DATE_FORMAT",
     JSON_CONTAINS_OBJECT="JSON_CONTAINS_OBJECT",
     JSON_CONTAINS_ARRAY="JSON_CONTAINS_ARRAY",
+    GROUP_CONCAT='GROUP_CONCAT',
     COUNT="COUNT",
     COUNT_WHEN="COUNT_WHEN",
     IS_NOT="IS NOT",
@@ -119,6 +122,9 @@ class FieldBase(object):
     def count(self):
         return Function(self, OP.COUNT)
 
+    def max(self):
+        return Function(self, OP.MAX)
+
     def count_when(self, value):
         return Function(self, OP.COUNT_WHEN, value)
 
@@ -284,7 +290,9 @@ class Function(FieldBase):
             return f"{col_name} < NOW() - INTERVAL {self.rpt} MINUTE", None
         elif op == OP.BEFORE_SECONDS:
             return f"{col_name} < NOW() - INTERVAL {self.rpt} SECOND", None
-
+        elif op == OP.CONTAINS:
+            return f"{col_name} LIKE CONCAT('%%',?,'%%')", [self.rpt]
+            # return f"CONTAINS({col_name},?)", [self.rpt]
         elif op == OP.JSON_CONTAINS_OBJECT:
             _k, _v = self.rpt
             key = _k.full_name if isinstance(_k, Field) else f"'{_k}'"
@@ -300,6 +308,16 @@ class Function(FieldBase):
             return f"COUNT({col_name})", None
         elif op == OP.COUNT_WHEN:
             return f"COUNT(CASE WHEN {col_name} = ? THEN 1 END)", [self.rpt]
+        elif op == OP.SUM:
+            return f"SUM({col_name})", None
+        elif op == OP.AVG:
+            return f"AVG({col_name})", None
+        elif op == OP.MAX:
+            return f"MAX({col_name})", None
+        elif op == OP.MIN:
+            return f"MIN({col_name})", None
+        elif op == OP.GROUP_CONCAT:
+            return f"GROUP_CONCAT({col_name})", None
 
 
 class Expression(FieldBase):

{cloudoll-2.2.27 → cloudoll-2.2.29}/cloudoll/utils/m2d.py

@@ -201,6 +201,7 @@ def get_col(field, driver="mysql"):
             "default": field["Default"],
             "charset": field["Collation"],
             "max_length": None,
+            "scale_length":None,
             "auto_increment": field["Extra"] == "auto_increment",
             "NOT_NULL": field["Null"] == "NO",
             "created_generated": "DEFAULT_GENERATED" == field["Extra"],

{cloudoll-2.2.27 → cloudoll-2.2.29}/cloudoll/utils/watch.py

@@ -72,11 +72,11 @@ def set_tty(tty_path: Optional[str]) -> Iterator[None]:
         yield
 
 
-def mian_app(tty_path, config, entry):
+def mian_app(tty_path, config, entry, env):
     with set_tty(tty_path):
         if sys.version_info >= (3, 11):
             with asyncio.Runner() as runner:
-                app_runner = runner.run(create_main_app(config, entry))
+                app_runner = runner.run(create_main_app(config, entry, env))
                 try:
                     runner.run(start_main_app(app_runner, config["server"]["port"]))
                     runner.get_loop().run_forever()
@@ -87,7 +87,7 @@ def mian_app(tty_path, config, entry):
                         runner.run(app_runner.cleanup())
         else:
             loop = asyncio.new_event_loop()
-            runner = loop.run_until_complete(create_main_app(config, entry))
+            runner = loop.run_until_complete(create_main_app(config, entry, env))
             try:
                 loop.run_until_complete(
                     start_main_app(runner, config["server"]["port"])
@@ -100,9 +100,9 @@ def mian_app(tty_path, config, entry):
                     loop.run_until_complete(runner.cleanup())
 
 
-async def create_main_app(config, entry):
+async def create_main_app(config, entry, env):
     await check_port_open(config["server"]["port"])
-    App = app.create(config=config, entry_model=entry)
+    App = app.create(env=env, config=config, entry_model=entry)
     return web.AppRunner(App.app, shutdown_timeout=0.1)
 
 
@@ -113,9 +113,10 @@ async def start_main_app(runner, port):
 
 
 class AppTask(WatchTask):
-    def __init__(self, watch_path: str, config, entry: None):
+    def __init__(self, watch_path: str, config, entry: None, env: str):
         self._config = config
         self._entry = entry
+        self._env = env
         self._reloads = 0
         assert watch_path
         super().__init__(watch_path)
@@ -153,7 +154,7 @@ class AppTask(WatchTask):
             tty_path = None
 
         self._process = Process(
-            target=mian_app, args=(tty_path, self._config, self._entry)
+            target=mian_app, args=(tty_path, self._config, self._entry, self._env)
         )
         self._process.start()
 

{cloudoll-2.2.27 → cloudoll-2.2.29}/cloudoll/web/__init__.py

@@ -203,6 +203,7 @@ class Application(object):
 
     def create(self, env: str = None, entry_model: str = None, config=None):
         # self.init_parse()
+        self.env = env
         loop = asyncio.get_event_loop()
         if loop is None:
             loop = asyncio.new_event_loop()
@@ -233,6 +234,7 @@ class Application(object):
         self.app.on_startup.append(self._init_database)
         self.app.on_cleanup.append(self._close_database)
         self.app.config = config
+        self.app.env = env
         self.app.jwt_encode = self.jwt_encode
         self.app.jwt_decode = self.jwt_decode
         # session

{cloudoll-2.2.27 → cloudoll-2.2.29}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudoll
-Version: 2.2.27
+Version: 2.2.29
 Summary: 辅助快速创建可分布的微服务。
 Home-page: https://gitee.com/chuchur/cloudoll-py
 Author: chuchur
@@ -15,11 +15,29 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.6.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: watchfiles
+Requires-Dist: curl_cffi
+Requires-Dist: colorlog
+Requires-Dist: aiomysql
+Requires-Dist: aiopg
+Requires-Dist: aiohttp
+Requires-Dist: redis[hiredis]
+Requires-Dist: aiomcache
+Requires-Dist: jinja2
+Requires-Dist: pyjwt
+Requires-Dist: aiohttp_session[secure]
+Requires-Dist: PyYAML
+Requires-Dist: click
 
 
 # cloudoll 云端玩具
 
 ## 更新日志
+
+`2.2.28` 2023-07-04
+- 多数据库支持
+- 优化orm
+- 
 `2.0.14` 2023-07-04
 - 加入cli,devtoll
 - 优化orm

cloudoll-2.2.27/cloudoll/__init__.py

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