lesscode-py 0.3.121__tar.gz → 0.3.123__tar.gz

{lesscode-py-0.3.121 → lesscode-py-0.3.123}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-py
-Version: 0.3.121
+Version: 0.3.123
 Summary: lesscode-python 是基于tornado的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://gitee.com/yongchao9/lesscode-python
 Author: Chao.yy

{lesscode-py-0.3.121 → lesscode-py-0.3.123}/lesscode/db/generic/generic_pool.py

@@ -48,5 +48,17 @@ class GenericPool(BaseConnectionPool):
             pooled_db = importlib.import_module("dbutils.pooled_db")
         except ImportError:
             raise Exception(f"DBUtils is not exist,run:pip install DBUtils==3.0.2")
-        pool = pooled_db.PooledDB(creator=generic, **params)
+        blocking = params.pop("blocking", True)
+        mincached = params.pop("mincached", self.conn_info.min_size)
+        maxusage = params.pop("maxusage", self.conn_info.min_size)
+        maxshared = params.pop("maxshared", self.conn_info.max_size)
+        maxcached = params.pop("maxcached", self.conn_info.max_size)
+        reset = params.pop("reset", True)
+        setsession = params.pop("setsession", None)
+        failures = params.pop("failures", None)
+        ping = params.pop("ping", 1)
+        pool = pooled_db.PooledDB(creator=generic, mincached=mincached, maxcached=maxcached,
+                                  maxshared=maxshared, maxconnections=self.conn_info.max_size, blocking=blocking,
+                                  maxusage=maxusage, setsession=setsession, reset=reset,
+                                  failures=failures, ping=ping, **params)
         return pool

{lesscode-py-0.3.121 → lesscode-py-0.3.123}/lesscode/db/sqlalchemy/sqlachemy_model_service.py

@@ -9,35 +9,11 @@ class SQLAlchemyModelBaseService:
     __connect_name__ = ""
 
     @classmethod
-    def find_one(cls, _id, find_column: list = None):
-        try:
-            sqlalchemy = importlib.import_module("sqlalchemy")
-        except ImportError:
-            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
-        filters = [cls.__model__.id == _id]
-        with SqlAlchemyHelper(cls.__connect_name__).make_session() as session:
-            if not find_column:
-                statement = sqlalchemy.select(cls.__model__).where(*filters)
-                res = session.execute(statement).scalars().first() or {}
-                res = result_to_json(res)
-            else:
-                statement = sqlalchemy.select(*[sqlalchemy.column(_) for _ in find_column]).where(*filters)
-                res = session.execute(statement).first() or {}
-                res = result_to_json(res)
-            return res
-
-    @classmethod
-    def find_page(cls, filter_data: Union[list, dict] = None, find_column: list = None, sort_list: list = None,
-                  page_num: int = 1, page_size: int = 10):
-        try:
-            sqlalchemy = importlib.import_module("sqlalchemy")
-        except ImportError:
-            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+    def convert_filter(cls, filter_data: Union[list, dict] = None):
         try:
             sqlalchemy_utils = importlib.import_module("lesscode_utils.sqlalchemy_utils")
         except ImportError:
             raise Exception(f"lesscode_utils is not exist,run:pip install lesscode_utils==0.0.48")
-
         filters = []
         if filter_data:
             if isinstance(filter_data, list):
@@ -67,6 +43,85 @@ class SQLAlchemyModelBaseService:
                                                                    _position)
                         else:
                             sqlalchemy_utils.condition_by_relation(filters, cls.__model__, field, "eq", value)
+        return filters
+
+    @classmethod
+    def count(cls, filter_data: Union[list, dict] = None, find_column: list = None, count_key="count"):
+        try:
+            sqlalchemy = importlib.import_module("sqlalchemy")
+        except ImportError:
+            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+        filters = cls.convert_filter(filter_data)
+        with SqlAlchemyHelper(cls.__connect_name__).make_session() as session:
+            field_list = []
+            group_list = []
+            if not find_column:
+                field_list.append(sqlalchemy.func.count())
+                statement = sqlalchemy.select(sqlalchemy.func.count()).select_from(cls.__model__).filter(
+                    *filters)
+                res = session.execute(statement).scalar()
+                return res
+            else:
+                for _ in find_column:
+                    field_list.append(sqlalchemy.column(_))
+                    group_list.append(sqlalchemy.column(_))
+                field_list.append(sqlalchemy.func.count().label(count_key))
+                statement = sqlalchemy.select(*field_list).select_from(cls.__model__).filter(*filters).group_by(
+                    *group_list)
+                res = session.execute(statement).all()
+                return result_to_json(res)
+
+    @classmethod
+    def find_one(cls, _id, find_column: list = None):
+        try:
+            sqlalchemy = importlib.import_module("sqlalchemy")
+        except ImportError:
+            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+        filters = [cls.__model__.id == _id]
+        with SqlAlchemyHelper(cls.__connect_name__).make_session() as session:
+            if not find_column:
+                statement = sqlalchemy.select(cls.__model__).where(*filters)
+                res = session.execute(statement).scalars().first() or {}
+            else:
+                statement = sqlalchemy.select(*[sqlalchemy.column(_) for _ in find_column]).select_from(
+                    cls.__model__).where(*filters)
+                res = session.execute(statement).first() or {}
+            res = result_to_json(res)
+            return res
+
+    @classmethod
+    def find_one_by_filed(cls, field: str = None, value: str = None, find_column: list = None):
+        try:
+            sqlalchemy = importlib.import_module("sqlalchemy")
+        except ImportError:
+            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+        filters = []
+        if field is not None and value is not None:
+            filters.append(getattr(cls.__model__, field) == value)
+        with SqlAlchemyHelper(cls.__connect_name__).make_session() as session:
+            if not find_column:
+                statement = sqlalchemy.select(cls.__model__).where(*filters)
+                res = session.execute(statement).scalars().first() or {}
+            else:
+                statement = sqlalchemy.select(*[sqlalchemy.column(_) for _ in find_column]).select_from(
+                    cls.__model__).where(*filters)
+                res = session.execute(statement).first() or {}
+            res = result_to_json(res)
+            return res
+
+    @classmethod
+    def find_page(cls, filter_data: Union[list, dict] = None, find_column: list = None, sort_list: list = None,
+                  page_num: int = 1, page_size: int = 10):
+        try:
+            sqlalchemy = importlib.import_module("sqlalchemy")
+        except ImportError:
+            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+        try:
+            sqlalchemy_utils = importlib.import_module("lesscode_utils.sqlalchemy_utils")
+        except ImportError:
+            raise Exception(f"lesscode_utils is not exist,run:pip install lesscode_utils==0.0.48")
+
+        filters = cls.convert_filter(filter_data)
 
         sort_list = sort_list or []
         sort_list = sqlalchemy_utils.single_model_format_order(cls.__model__, sort_list)
@@ -106,35 +161,7 @@ class SQLAlchemyModelBaseService:
             sqlalchemy_utils = importlib.import_module("lesscode_utils.sqlalchemy_utils")
         except ImportError:
             raise Exception(f"lesscode_utils is not exist,run:pip install lesscode_utils==0.0.48")
-        filters = []
-        if filter_data:
-            if isinstance(filter_data, list):
-                for field in filter_data:
-                    _column = field.get('column')
-                    _value = field.get('value')
-                    _end_value = field.get('end_value')
-                    # ["in","like","between","not in","not like","is null","not null","not in list","eq","=","not eq","!=","gt",">","gte",">=","lt","<","lte",">="]
-                    _relation = field.get('relation', "in")
-                    _position = field.get('position', "LR")
-                    sqlalchemy_utils.condition_by_relation(filters, cls.__model__, _column, _relation, _value,
-                                                           _end_value,
-                                                           _position)
-            elif isinstance(filter_data, dict):
-                for field, value in filter_data.items():
-                    if value:
-                        if isinstance(value, list):
-                            sqlalchemy_utils.condition_by_relation(filters, cls.__model__, field, "in", value)
-                        elif isinstance(value, dict):
-                            _value = value.get('value')
-                            _end_value = value.get('end_value')
-                            # ["in","like","between","not in","not like","is null","not null","not in list","eq","=","not eq","!=","gt",">","gte",">=","lt","<","lte",">="]
-                            _relation = value.get('relation', "in")
-                            _position = value.get('position', "LR")
-                            sqlalchemy_utils.condition_by_relation(filters, cls.__model__, field, _relation, _value,
-                                                                   _end_value,
-                                                                   _position)
-                        else:
-                            sqlalchemy_utils.condition_by_relation(filters, cls.__model__, field, "eq", value)
+        filters = cls.convert_filter(filter_data)
         sort_list = sort_list or []
         sort_list = sqlalchemy_utils.single_model_format_order(cls.__model__, sort_list)
         with SqlAlchemyHelper(cls.__connect_name__).make_session() as session:
@@ -191,39 +218,7 @@ class SQLAlchemyModelBaseService:
             sqlalchemy = importlib.import_module("sqlalchemy")
         except ImportError:
             raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
-        try:
-            sqlalchemy_utils = importlib.import_module("lesscode_utils.sqlalchemy_utils")
-        except ImportError:
-            raise Exception(f"lesscode_utils is not exist,run:pip install lesscode_utils==0.0.48")
-        filters = []
-        if filter_data:
-            if isinstance(filter_data, list):
-                for field in filter_data:
-                    _column = field.get('column')
-                    _value = field.get('value')
-                    _end_value = field.get('end_value')
-                    # ["in","like","between","not in","not like","is null","not null","not in list","eq","=","not eq","!=","gt",">","gte",">=","lt","<","lte",">="]
-                    _relation = field.get('relation', "in")
-                    _position = field.get('position', "LR")
-                    sqlalchemy_utils.condition_by_relation(filters, cls.__model__, _column, _relation, _value,
-                                                           _end_value,
-                                                           _position)
-            elif isinstance(filter_data, dict):
-                for field, value in filter_data.items():
-                    if value:
-                        if isinstance(value, list):
-                            sqlalchemy_utils.condition_by_relation(filters, cls.__model__, field, "in", value)
-                        elif isinstance(value, dict):
-                            _value = value.get('value')
-                            _end_value = value.get('end_value')
-                            # ["in","like","between","not in","not like","is null","not null","not in list","eq","=","not eq","!=","gt",">","gte",">=","lt","<","lte",">="]
-                            _relation = value.get('relation', "in")
-                            _position = value.get('position', "LR")
-                            sqlalchemy_utils.condition_by_relation(filters, cls.__model__, field, _relation, _value,
-                                                                   _end_value,
-                                                                   _position)
-                        else:
-                            sqlalchemy_utils.condition_by_relation(filters, cls.__model__, field, "eq", value)
+        filters = cls.convert_filter(filter_data)
         with SqlAlchemyHelper(cls.__connect_name__).make_session() as session:
             statement = sqlalchemy.delete(cls.__model__).where(*filters)
             res = session.execute(statement)

{lesscode-py-0.3.121 → lesscode-py-0.3.123}/lesscode/version.py

@@ -5,4 +5,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.3.121"
+__version__ = "0.3.123"

{lesscode-py-0.3.121 → lesscode-py-0.3.123}/lesscode_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-py
-Version: 0.3.121
+Version: 0.3.123
 Summary: lesscode-python 是基于tornado的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://gitee.com/yongchao9/lesscode-python
 Author: Chao.yy