lesscode-py 0.3.22__tar.gz → 0.3.24__tar.gz

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/PKG-INFO

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

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/lesscode/db/sqlalchemy/sqlalchemy_helper.py

@@ -1,14 +1,11 @@
 import importlib
-from decimal import Decimal
+from contextlib import contextmanager
 
-from sqlalchemy.orm import declarative_base
 from tornado.options import options
 
 sqlalchemy_orm = None
-sqlalchemy_util_compat = None
 try:
     sqlalchemy_orm = importlib.import_module("sqlalchemy.orm")
-    sqlalchemy_util_compat = importlib.import_module("sqlalchemy.util.compat")
 except ImportError as e:
     raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
 
@@ -24,7 +21,7 @@ class SqlAlchemyHelper:
         else:
             self.pool = pool
 
-    @sqlalchemy_util_compat.contextmanager
+    @contextmanager
     def make_session(self, **kwargs):
         db_session = sqlalchemy_orm.scoped_session(sqlalchemy_orm.sessionmaker(bind=self.pool, **kwargs))
         session = db_session()
@@ -70,28 +67,31 @@ def sqlalchemy_paging(Query, limit_number, offset_number):
 def covert_relationship_property(attr, attr_value):
     if attr.__class__.__name__ == 'ColumnProperty':
         return attr_value
-    elif attr.__class__.__name__ == 'RelationshipProperty':
+    elif attr.__class__.__name__ in ['RelationshipProperty', 'Relationship']:
         attrs = []
         for ar, ar_value in attr.mapper.attrs.items():
             if ar_value.__class__.__name__ == 'ColumnProperty' and ar not in attrs:
                 attrs.append(ar)
-        if attr_value.__class__.__name__ == 'InstrumentedList':
+        if attr_value.__class__.__name__ == 'InstrumentedList' or isinstance(attr_value, list):
             new_data = []
             for item in attr_value:
                 info = dict()
                 for ar in attrs:
                     new_attr_value = getattr(item, ar)
-                    if not item.__class__.__name__ == 'RelationshipProperty':
+                    if new_attr_value.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
                         info[ar] = new_attr_value
                     else:
                         info = covert_relationship_property(ar, new_attr_value)
-                new_data.append(info)
+                if info:
+                    new_data.append(info)
             return new_data
         else:
             new_data = dict()
             for column, value in attr.entity.attrs.items():
-                if not value.__class__.__name__ == 'RelationshipProperty':
-                    new_data[column] = getattr(attr_value, column)
+                if value.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
+                    val = getattr(attr_value, column)
+                    if val.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
+                        new_data[column] = val
             return new_data
     else:
         return attr_value
@@ -107,7 +107,8 @@ def query_set_to_dict(obj):
                 attr_value = getattr(obj, column)
                 value = covert_relationship_property(attr, attr_value)
                 if not value.__class__.__name__ == 'RelationshipProperty':
-                    obj_dict[column] = value
+                    if value:
+                        obj_dict[column] = value
 
         return obj_dict
     elif hasattr(obj, "keys"):

lesscode-py-0.3.24/lesscode/utils/json.py

@@ -0,0 +1,17 @@
+import json
+
+
+class JSONEncoder(json.JSONEncoder):
+    def default(self, o):
+        object_class_name = o.__class__.__name__
+        if object_class_name == "ObjectId":
+            return str(o)
+        elif object_class_name == "datetime":
+            return str(o)
+        elif object_class_name == "bytes":
+            return str(o, encoding="utf-8")
+        elif object_class_name == "set":
+            return list(o)
+        elif object_class_name == "Decimal":
+            return str(o)
+        return json.JSONEncoder.default(self, o)

lesscode-py-0.3.24/lesscode/version.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+
+"""
+lesscode python version file.
+"""
+
+__version__ = "0.3.24"

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/lesscode/web/base_handler.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-# author:chao.yy
-# email:yuyc@ishangqi.com
-# date:2021/11/4 4:39 下午
-# Copyright (C) 2021 The lesscode Team
 
+import importlib
 import inspect
 import json
 import logging
@@ -11,12 +8,11 @@ import time
 import traceback
 import types
 import uuid
+from contextlib import contextmanager
 from datetime import datetime
-from decimal import Decimal
 from typing import Optional, Awaitable, Any
 from urllib.parse import unquote
 
-from bson import ObjectId
 from tornado import httputil
 from tornado.escape import utf8
 from tornado.ioloop import IOLoop
@@ -25,10 +21,10 @@ from tornado.web import RequestHandler, Application
 
 from lesscode.task.task_helper import TaskHelper
 from lesscode.utils.es_log.record_log import es_record_log
-from lesscode.web.status_code import StatusCode
 from lesscode.web.business_exception import BusinessException
 from lesscode.web.response_result import ResponseResult
 from lesscode.web.router_mapping import RouterMapping
+from lesscode.web.status_code import StatusCode
 
 
 class BaseHandler(RequestHandler):
@@ -97,6 +93,19 @@ class BaseHandler(RequestHandler):
         if data is not None:
             self.write(json.dumps(ResponseResult(data=data), ensure_ascii=False, cls=JSONEncoder))
 
+    @contextmanager
+    def make_session(self, pool, **kwargs):
+        pool, _ = options.database[pool]
+        try:
+            sqlalchemy_orm = importlib.import_module("sqlalchemy.orm")
+        except ImportError as e:
+            raise Exception(f"sqlalchemy is not exist,run:pip install sqlalchemy==1.4.36")
+        db_session = sqlalchemy_orm.scoped_session(sqlalchemy_orm.sessionmaker(bind=pool, **kwargs))
+        session = db_session()
+        yield session
+        session.commit()
+        session.close()
+
     async def get(self):
         """
         重写父类get请求处理方法，直接调用post方法统一处理
@@ -360,15 +369,16 @@ class BaseHandler(RequestHandler):
 
 class JSONEncoder(json.JSONEncoder):
     def default(self, o):
-        if isinstance(o, ObjectId):
+        object_class_name = o.__class__.__name__
+        if object_class_name == "ObjectId":
             return str(o)
-        elif isinstance(o, datetime):
+        elif object_class_name == "datetime":
             return str(o)
-        elif isinstance(o, bytes):
+        elif object_class_name == "bytes":
             return str(o, encoding="utf-8")
-        elif isinstance(o, set):
+        elif object_class_name == "set":
             return list(o)
-        elif isinstance(o, Decimal):
+        elif object_class_name == "Decimal":
             return str(o)
         return json.JSONEncoder.default(self, o)
 

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/lesscode/web/business_exception.py

@@ -1,8 +1,4 @@
 # -*- coding: utf-8 -*-
-# author:chao.yy
-# email:yuyc@ishangqi.com
-# date:2021/11/10 7:52 下午
-# Copyright (C) 2021 The lesscode Team
 
 
 class BusinessException(RuntimeError):

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/lesscode/web/response_result.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
-# author:chao.yy
-# email:yuyc@ishangqi.com
-# date:2021/11/10 3:57 下午
-# Copyright (C) 2021 The lesscode Team
+
 
 from datetime import datetime
 
@@ -13,6 +10,7 @@ class ResponseResult(dict):
     """
     ResponseResult 类用于统一包装数据返回格式
     """
+
     def __init__(self, status_code=StatusCode.SUCCESS, data=""):
         super(ResponseResult, self).__init__()
         # 业务请求状态编码

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/lesscode/web/router_mapping.py

@@ -1,20 +1,16 @@
 # -*- coding: utf-8 -*-
-# author:chao.yy
-# email:yuyc@ishangqi.com
-# date:2021/11/4 11:00 上午
-# Copyright (C) 2021 The lesscode Team
+
 import logging
 import threading
 
 import tornado.options
+from tornado.options import define
 from tornado.web import RequestHandler
 
-from lesscode.db.redis.redis_helper import RedisHelper
 from lesscode.utils.doc.interface_doc_handler import parser_swagger
 from lesscode.utils.upms_util import upms_register
 from lesscode.web.business_exception import BusinessException
 from lesscode.web.status_code import StatusCode
-from tornado.options import define
 
 define("route_prefix", default="", type=str, help="路由前缀")
 tornado.options.options.route_prefix = ""

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/lesscode/web/status_code.py

@@ -1,10 +1,4 @@
 # -*- coding: utf-8 -*-
-# author:chao.yy
-# email:yuyc@ishangqi.com
-# date:2021/11/9 4:47 下午
-# Copyright (C) 2021 The lesscode Team
-
-from typing import Tuple
 
 
 class StatusCode:

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/lesscode_py.egg-info/PKG-INFO

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

{lesscode-py-0.3.22 → lesscode-py-0.3.24}/setup.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-# author:chao.yy
-# email:yuyc@ishangqi.com
-# date:2021/11/18 4:41 下午
+
 import shutil
 
 import setuptools
 from setuptools.command.install_scripts import install_scripts
+
 from lesscode.version import __version__
 
 with open("README.md", "r") as fh:

lesscode-py-0.3.22/lesscode/utils/json.py

@@ -1,25 +0,0 @@
-import datetime
-import importlib
-import json
-from decimal import Decimal
-
-try:
-    bson = importlib.import_module("bson")
-
-except ImportError as e:
-    raise Exception(f"pymongo is not exist,run:pip install pymongo==3.13.0")
-
-
-class JSONEncoder(json.JSONEncoder):
-    def default(self, o):
-        if isinstance(o, bson.ObjectId):
-            return str(o)
-        elif isinstance(o, datetime.datetime):
-            return str(o)
-        elif isinstance(o, bytes):
-            return str(o, encoding="utf-8")
-        elif isinstance(o, set):
-            return list(o)
-        elif isinstance(o, Decimal):
-            return str(o)
-        return json.JSONEncoder.default(self, o)

lesscode-py-0.3.22/lesscode/version.py

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-# author:chao.yy
-# email:yuyc@ishangqi.com
-# date:2021/11/24 9:29 上午
-# Copyright (C) 2021 The lesscode Team
-
-"""
-lesscode python version file.
-"""
-
-__version__ = "0.3.22"