cloudoll 3.0.4__tar.gz → 3.0.5__tar.gz

{cloudoll-3.0.4 → cloudoll-3.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 3.0.4
+Version: 3.0.5
 Summary: Assist in quickly creating distributable microservices based on aiohttp, with a focus on simplicity and ease of use.
 Home-page: https://github.com/smallerqiu/cloudoll-py
 Author: Qiu

cloudoll-3.0.5/cloudoll/__init__.py

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

{cloudoll-3.0.4 → cloudoll-3.0.5}/cloudoll/orm/field.py

@@ -141,7 +141,7 @@ class FieldBase(object):
 
     def max_when(self, *arg):
         """
-        input: max_when(A.field > 10 ,A.field) \n 
+        input: max_when(A.field > 10 ,A.field) \n
         output: max(case when A.field > 10 then A.field end)
         """
         return Function(self, OP.MAX_WHEN, arg)
@@ -151,7 +151,7 @@ class FieldBase(object):
 
     def min_when(self, *arg):
         """
-        input: min_when(A.field > 10 ,A.field) \n 
+        input: min_when(A.field > 10 ,A.field) \n
         output: min(case when A.field > 10 then A.field end)
         """
         return Function(self, OP.MIN_WHEN, arg)
@@ -288,14 +288,14 @@ class ExpList(FieldBase):
 def deconstruct(args):
     f = args[0] if len(args) > 0 else None
     v1 = args[1] if len(args) > 1 else 1
-    v2 = args[2] if len(args) > 2 and args[2] is not None else 'NULL'
+    v2 = args[2] if len(args) > 2 and args[2] is not None else "NULL"
     c = None
     v = None
     if isinstance(f, FieldBase):
         c = f"{f.lhs.full_name} {f.op} ?"
         v = f.rhs
     if isinstance(v1, FieldBase):
-        v1 = v1.name
+        v1 = v1.full_name
     return c, v, v1, v2
 
 
@@ -355,32 +355,46 @@ class Function(FieldBase):
             return f"json_contains({col_name},json_object({key},?))", [_v]
         elif op == OP.JSON_CONTAINS_ARRAY:
             if is_field:
-                return f"json_contains({col_name},json_array({self.rpt.full_name}))", None
+                return (
+                    f"json_contains({col_name},json_array({self.rpt.full_name}))",
+                    None,
+                )
             return f"json_contains({col_name},json_array(?))", [self.rpt]
         elif op == OP.COUNT:
             return f"COUNT({col_name})", None
         elif op == OP.COUNT_WHEN:
             c, v, v1, v2 = deconstruct(self.rpt)
+            if v2 == "NULL":
+                return f"COUNT(CASE WHEN {c} THEN {v1} END)", [v]
             return f"COUNT(CASE WHEN {c} THEN {v1} ELSE {v2} END)", [v]
         elif op == OP.SUM:
             return f"SUM({col_name})", None
         elif op == OP.SUM_WHEN:
             c, v, v1, v2 = deconstruct(self.rpt)
+            if v2 == "NULL":
+                return f"SUM(CASE WHEN {c} THEN {v1} END)", [v]
             return f"SUM(CASE WHEN {c} THEN {v1} ELSE {v2} END)", [v]
         elif op == OP.AVG:
             return f"AVG({col_name})", None
         elif op == OP.AVG_WHEN:
             c, v, v1, v2 = deconstruct(self.rpt)
+            print("avg", v2)
+            if v2 == "NULL":
+                return f"AVG(CASE WHEN {c} THEN {v1} END)", [v]
             return f"AVG(CASE WHEN {c} THEN {v1} ELSE {v2} END)", [v]
         elif op == OP.MAX:
             return f"MAX({col_name})", None
         elif op == OP.MAX_WHEN:
             c, v, v1, v2 = deconstruct(self.rpt)
+            if v2 == "NULL":
+                return f"MAX(CASE WHEN {c} THEN {v1} END)", [v]
             return f"MAX(CASE WHEN {c} THEN {v1} ELSE {v2} END)", [v]
         elif op == OP.MIN:
             return f"MIN({col_name})", None
         elif op == OP.MIN_WHEN:
             c, v, v1, v2 = deconstruct(self.rpt)
+            if v2 == "NULL":
+                return f"MIN(CASE WHEN {c} THEN {v1} END)", [v]
             return f"MIN(CASE WHEN {c} THEN {v1} ELSE {v2} END)", [v]
         elif op == OP.GROUP_CONCAT:
             arg = self.rpt

{cloudoll-3.0.4 → cloudoll-3.0.5}/cloudoll/orm/model.py

@@ -339,7 +339,7 @@ class Model(metaclass=ModelMetaclass):
         return self
 
     def test(self):
-        return self._sql()
+        return self._sql(), self.__params__
 
     async def one(self):
         self.limit(1)

cloudoll-3.0.5/cloudoll/orm/test_sql.py

@@ -0,0 +1,89 @@
+from model import models, Model
+
+
+class A(Model):
+
+    __table__ = "a"
+
+    id = models.BigIntegerField(
+        primary_key=True, max_length=64, not_null=True, comment="ID"
+    )
+    source = models.IntegerField(max_length=16, not_null=True, comment="状态")
+    param = models.TextField(not_null=True)
+    gmt_create = models.TimestampField(
+        max_length=3, default="CURRENT_TIMESTAMP(3)", not_null=True, comment="创建时间"
+    )
+
+
+class B(Model):
+
+    __table__ = "b"
+
+    id = models.BigIntegerField(primary_key=True, max_length=64, not_null=True)
+    task_id = models.BigIntegerField(max_length=64, default="0", not_null=True)
+    employee_id = models.BigIntegerField(max_length=64, default="0", not_null=True)
+    agency_id = models.BigIntegerField(max_length=64, default="0", not_null=True)
+    proxy_str = models.VarCharField(max_length=512, default="", not_null=True)
+    proxy_scheme = models.VarCharField(max_length=16, default="", not_null=True)
+    proxy_ip = models.VarCharField(max_length=64, default="", not_null=True)
+    proxy_region = models.VarCharField(max_length=32, default="", not_null=True)
+    proxy_order_no = models.VarCharField(max_length=64, default="", not_null=True)
+    proxy_merchant = models.VarCharField(max_length=32, default="", not_null=True)
+    proxy_subnet = models.VarCharField(max_length=128, default="", not_null=True)
+    channel_type = models.IntegerField(max_length=16, default="0", not_null=True)
+    channel = models.VarCharField(max_length=512, default="", not_null=True)
+    type = models.IntegerField(max_length=16, default="0", not_null=True)
+    url = models.VarCharField(max_length=512, default="", not_null=True)
+    gmt_create = models.TimestampField(
+        max_length=3, default="CURRENT_TIMESTAMP(3)", not_null=True
+    )
+    timeout = models.IntegerField(max_length=32, default="0", not_null=True)
+
+
+class C(Model):
+
+    __table__ = "i_network_speed_result"
+
+    id = models.BigIntegerField(primary_key=True, max_length=64, not_null=True)
+    pack_id = models.BigIntegerField(max_length=64, default="0", not_null=True)
+    delay = models.IntegerField(max_length=32, default="-1", not_null=True)
+    finish_load = models.IntegerField(max_length=32, default="-1", not_null=True)
+    ip = models.VarCharField(max_length=64, default="", not_null=True)
+    region = models.VarCharField(max_length=32, default="", not_null=True)
+    gmt_create = models.TimestampField(
+        max_length=3, default="CURRENT_TIMESTAMP(3)", not_null=True
+    )
+    speed = models.NumericField(
+        max_length=12, scale_length=2, default="0", not_null=True
+    )
+    packet_loss_rate = models.NumericField(
+        max_length=12, scale_length=2, default="0", not_null=True
+    )
+    is_failed = models.BooleanField(default="true", not_null=True)
+    is_timeout = models.BooleanField(default="true", not_null=True)
+
+
+if __name__ == "__main__":
+    sql, arg = (
+        B.use()
+        .select(
+            B.proxy_order_no.As("host_no"),
+            B.proxy_order_no.count().As("total_count"),
+            C.region.As("region"),
+            C.is_failed.avg_when(C.is_failed == False, C.finish_load).As("avg_val"),
+            C.is_failed.min_when(C.is_failed == False, C.finish_load).As("min_val"),
+            C.is_failed.max_when(C.is_failed == False, C.finish_load).As("max_val"),
+            C.is_failed.sum_when(C.is_failed == False, 1, 0).As("success_count"),
+            C.is_failed.sum_when(C.is_failed == True, 1, 0).As("failure_count"),
+        )
+        .join(C, C.pack_id == B.id)
+        .where(
+            B.channel_type == 1,
+            B.type == int(1),
+            B.proxy_order_no.In(tuple(["aa"])),
+        )
+        .group_by(B.proxy_order_no, C.region)
+        .test()
+    )
+    # sql = B()._exchange_sql(sql)
+    print(sql, arg)

{cloudoll-3.0.4 → cloudoll-3.0.5}/cloudoll/web/core.py

@@ -282,8 +282,13 @@ class Application(object):
     async def _init_database(self, apps):
         conf_db = self.config.get("database")
         if conf_db:
-            for db_key in conf_db:
-                apps.db[db_key] = await create_engine(**conf_db[db_key])
+            # for db_key in conf_db:
+            #     apps.db[db_key] = await create_engine(**conf_db[db_key])
+            
+            tasks = [create_engine(**conf_db[db_key]) for db_key in conf_db]
+            engines = await asyncio.gather(*tasks)
+            for db_key, engine in zip(conf_db.keys(), engines):
+                apps.db[db_key] = engine
 
     async def _init_session(self, apps):
         config = self.config or {}

{cloudoll-3.0.4 → cloudoll-3.0.5}/cloudoll.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudoll
-Version: 3.0.4
+Version: 3.0.5
 Summary: Assist in quickly creating distributable microservices based on aiohttp, with a focus on simplicity and ease of use.
 Home-page: https://github.com/smallerqiu/cloudoll-py
 Author: Qiu

{cloudoll-3.0.4 → cloudoll-3.0.5}/cloudoll.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ cloudoll/orm/model.py
 cloudoll/orm/mysql.py
 cloudoll/orm/parse.py
 cloudoll/orm/postgres.py
+cloudoll/orm/test_sql.py
 cloudoll/template/__init__.py
 cloudoll/utils/__init__.py
 cloudoll/utils/common.py

{cloudoll-3.0.4 → cloudoll-3.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cloudoll"
-version = "3.0.4" 
+version = "3.0.5" 
 description = "Assist in quickly creating distributable microservices based on aiohttp, with a focus on simplicity and ease of use."
 authors = [
   {name = "Qiu", email = "smallerqiu@gmail.com"},

cloudoll-3.0.4/cloudoll/__init__.py

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