lesscode-flask 0.0.31__tar.gz → 0.0.33__tar.gz

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.31
+Version: 0.0.33
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -10,27 +10,19 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: blinker==1.6.2
 Requires-Dist: Flask==3.0.3
-Requires-Dist: itsdangerous==2.2.0
-Requires-Dist: Jinja2==3.1.4
-Requires-Dist: MarkupSafe==2.1.3
-Requires-Dist: Werkzeug==3.0.3
-Requires-Dist: zipp==3.17.0
-Requires-Dist: gunicorn==23.0.0
+Requires-Dist: lesscode-utils==0.0.61
+Requires-Dist: Flask-Login==0.6.3
+Requires-Dist: redis==5.1.1
+Requires-Dist: flask-swagger-ui==4.11.1
+Requires-Dist: pystache==0.6.5
 Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: sqlparse==0.5.1
+Requires-Dist: funcy==2.0
 Requires-Dist: Flask-SQLAlchemy==3.1.1
-Requires-Dist: sqlalchemy_utils==0.41.2
+Requires-Dist: sqlparse==0.5.1
 Requires-Dist: requests==2.32.3
-Requires-Dist: advocate==1.0.0
-Requires-Dist: rq==1.16.2
-Requires-Dist: sshtunnel==0.4.0
-Requires-Dist: funcy==2.0
-Requires-Dist: pystache==0.6.5
-Requires-Dist: flask-swagger-ui==4.11.1
-Requires-Dist: lesscode-utils==0.0.61
-Requires-Dist: Flask-Login==0.6.3
+Requires-Dist: gunicorn==23.0.0
+Requires-Dist: gevent==24.10.2
 
 # lesscode-flask
 

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.31'
+__version__ = '0.0.33'
 
 import functools
 import logging

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/lesscode_flask/app.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import json
 import logging
 import os
 import time
 import traceback
 
-from flask import Flask, typing as ft
+from flask import Flask, typing as ft, abort, Response
 import typing as t
 from flask.globals import request_ctx, request
 from flask_login import current_user
@@ -17,6 +19,9 @@ from lesscode_flask.utils.json.NotSortJSONProvider import NotSortJSONProvider
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
 
 
+# import collections.abc as cabc
+
+
 class Lesscoder(Flask):
     """A custom Flask app for lesscode-flask"""
 
@@ -39,13 +44,50 @@ class Lesscoder(Flask):
             "profile") else "setting.config.Config"
         self.config.from_object(setting_name)
         self.register_error_handler(Exception, self.handle_exception)
-        # 请求开始时间存储的字典
-        # self.register_error_handler(code_or_exception, f)
+
+    def preprocess_request(self) -> ft.ResponseReturnValue | None:
+        if self.config.get("AUTHORIZATION_ENABLE"):  # 启动 AUTHORIZATION_ENABLE 才进行权限验证
+            # 获取当前请求的url
+            url = request.path
+            # 获取URL 对应的id 与访问权限
+            id, access = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hmget(f"upms:url_info:{url}",
+                                                                                            ["id", "access"])
+            if not id:
+                # 如果没有进行注册的url 默认需要登录权限
+                access = app_config.get("AUTH_DEFAULT_ACCESS", "0")
+            # '访问权限2：需要权限 1：需要登录 0：游客',
+            if str(access) == "1":  # 需要登录
+                if current_user.is_anonymous_user:
+                    # abort(403, "需要登录")
+                    ResponseResult.fail("请登录后访问", status_code="403")
+            elif str(access) == "2":  # 需要权限
+                if current_user.is_anonymous_user:
+                    ResponseResult.fail("请登录后访问", status_code="403")
+                if not current_user.has_permission(id):
+                    ResponseResult.fail("请获取授权后访问", status_code="403")
+        return super(Lesscoder, self).preprocess_request()
+
+    def full_dispatch_request(self) -> Response:
+        logging.info("full_dispatch_request")
+        # 生成请求标识
+        request_id = request.headers.get('Request-Id')
+        if request_id is None:
+            request_id = generate_uuid()
+        # 设置请求标识
+        request.request_id = request_id
+        start_time = time.time()
+        response = super(Lesscoder, self).full_dispatch_request()
+        # 为响应设置请求标识
+        response.headers['Request-Id'] = request_id
+        # 计算请求耗时
+        duration = time.time() - start_time
+        # 100 为自定义 'ACCESS' 的日志级别标识
+        logging.log(100, duration, {"request_id": request_id, "duration": duration})
+        return response
 
     def dispatch_request(self) -> ft.ResponseReturnValue:
         """ 实现参数自动注入功能，对父级代码进行重写
         """
-
         # 此处开始  均为原代码直接拷贝
         req = request_ctx.request
         if req.routing_exception is not None:
@@ -102,10 +144,6 @@ class Lesscoder(Flask):
             return ResponseResult.make_response(message=str(e), data=str(e), http_code=500, status_code="500")
 
 
-# 请求开始时间的集合
-request_start_time = {}
-
-
 def create_app():
     app = Lesscoder()
     app.json = NotSortJSONProvider(app)  # 设置自定义的 JSON provider
@@ -113,45 +151,43 @@ def create_app():
         app.setup()
 
     @app.before_request
-    def before_request():
-        # 生成请求标识
-        request_id = request.headers.get('Request-Id')
-        if request_id is None:
-            request_id = generate_uuid()
-        request.request_id = request_id
-        # 记录请求开始时间
-        request_start_time[request_id] = time.time()
-        if app.config.get("AUTHORIZATION_ENABLE"):  # 启动 AUTHORIZATION_ENABLE 才进行权限验证
-            # 获取当前请求的url
-            url = request.path
-            # 获取URL 对应的id 与访问权限
-            id, access = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hmget(f"upms:url_info:{url}",
-                                                                                            ["id", "access"])
-            if not id:
-                # 如果没有进行注册的url 默认需要登录权限
-                access = app_config.get("AUTH_DEFAULT_ACCESS", "0")
-            # '访问权限2：需要权限 1：需要登录 0：游客',
-            if str(access) == "1":  # 需要登录
-                if current_user.is_anonymous_user:
-                    # abort(403, "需要登录")
-                    ResponseResult.fail("请登录后访问", status_code="403")
-            elif str(access) == "2":  # 需要权限
-                if current_user.is_anonymous_user:
-                    ResponseResult.fail("请登录后访问", status_code="403")
-                if not current_user.has_permission(id):
-                    ResponseResult.fail("请获取授权后访问", status_code="403")
+    def before_request1():
+        abort(403, "请求被拦截")
 
-    @app.after_request
-    def after_request(response):
-        # 每个请求后执行
-        request_id = request.request_id
-        response.headers['Request-Id'] = request.request_id
-        # 计算请求耗时
-        start_time = request_start_time.pop(request_id, None)
-        if start_time:
-            duration = time.time() - start_time
-        # 100 为自定义 'ACCESS' 的日志级别标识
-        logging.log(100, duration, {"request_id": request_id, "duration": duration})
-        return response
+    # @app.before_request
+    # def before_request():
+    #     logging.info("before_request")
+    #     if app.config.get("AUTHORIZATION_ENABLE"):  # 启动 AUTHORIZATION_ENABLE 才进行权限验证
+    #         # 获取当前请求的url
+    #         url = request.path
+    #         # 获取URL 对应的id 与访问权限
+    #         id, access = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hmget(f"upms:url_info:{url}",
+    #                                                                                         ["id", "access"])
+    #         if not id:
+    #             # 如果没有进行注册的url 默认需要登录权限
+    #             access = app_config.get("AUTH_DEFAULT_ACCESS", "0")
+    #         # '访问权限2：需要权限 1：需要登录 0：游客',
+    #         if str(access) == "1":  # 需要登录
+    #             if current_user.is_anonymous_user:
+    #                 # abort(403, "需要登录")
+    #                 ResponseResult.fail("请登录后访问", status_code="403")
+    #         elif str(access) == "2":  # 需要权限
+    #             if current_user.is_anonymous_user:
+    #                 ResponseResult.fail("请登录后访问", status_code="403")
+    #             if not current_user.has_permission(id):
+    #                 ResponseResult.fail("请获取授权后访问", status_code="403")
+
+    # @app.after_request
+    # def after_request(response):
+    #     # 每个请求后执行
+    #     request_id = request.request_id
+    #     response.headers['Request-Id'] = request.request_id
+    #     # 计算请求耗时
+    #     start_time = request.start_time
+    #     if start_time:
+    #         duration = time.time() - start_time
+    #     # 100 为自定义 'ACCESS' 的日志级别标识
+    #     logging.log(100, duration, {"request_id": request_id, "duration": duration})
+    #     return response
 
     return app

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/lesscode_flask/db/datasource.py

@@ -1,4 +1,4 @@
-from redash.query_runner import get_query_runner, with_ssh_tunnel
+from redash.query_runner import get_query_runner
 
 
 class DataSource():
@@ -20,8 +20,8 @@ class DataSource():
     @property
     def query_runner(self):
         query_runner = get_query_runner(self.options.get("type"), self.options)
-        uses_ssh_tunnel = self.options.get("ssh_tunnel", False)
-        if uses_ssh_tunnel:
-            query_runner = with_ssh_tunnel(query_runner, self.options.get("ssh_tunnel"))
+        # uses_ssh_tunnel = self.options.get("ssh_tunnel", False)
+        # if uses_ssh_tunnel:
+        #     query_runner = with_ssh_tunnel(query_runner, self.options.get("ssh_tunnel"))
 
         return query_runner

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.31
+Version: 0.0.33
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -10,27 +10,19 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: blinker==1.6.2
 Requires-Dist: Flask==3.0.3
-Requires-Dist: itsdangerous==2.2.0
-Requires-Dist: Jinja2==3.1.4
-Requires-Dist: MarkupSafe==2.1.3
-Requires-Dist: Werkzeug==3.0.3
-Requires-Dist: zipp==3.17.0
-Requires-Dist: gunicorn==23.0.0
+Requires-Dist: lesscode-utils==0.0.61
+Requires-Dist: Flask-Login==0.6.3
+Requires-Dist: redis==5.1.1
+Requires-Dist: flask-swagger-ui==4.11.1
+Requires-Dist: pystache==0.6.5
 Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: sqlparse==0.5.1
+Requires-Dist: funcy==2.0
 Requires-Dist: Flask-SQLAlchemy==3.1.1
-Requires-Dist: sqlalchemy_utils==0.41.2
+Requires-Dist: sqlparse==0.5.1
 Requires-Dist: requests==2.32.3
-Requires-Dist: advocate==1.0.0
-Requires-Dist: rq==1.16.2
-Requires-Dist: sshtunnel==0.4.0
-Requires-Dist: funcy==2.0
-Requires-Dist: pystache==0.6.5
-Requires-Dist: flask-swagger-ui==4.11.1
-Requires-Dist: lesscode-utils==0.0.61
-Requires-Dist: Flask-Login==0.6.3
+Requires-Dist: gunicorn==23.0.0
+Requires-Dist: gevent==24.10.2
 
 # lesscode-flask
 

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/lesscode_flask.egg-info/requires.txt

@@ -1,21 +1,13 @@
-blinker==1.6.2
 Flask==3.0.3
-itsdangerous==2.2.0
-Jinja2==3.1.4
-MarkupSafe==2.1.3
-Werkzeug==3.0.3
-zipp==3.17.0
-gunicorn==23.0.0
+lesscode-utils==0.0.61
+Flask-Login==0.6.3
+redis==5.1.1
+flask-swagger-ui==4.11.1
+pystache==0.6.5
 python-dateutil==2.9.0.post0
-sqlparse==0.5.1
+funcy==2.0
 Flask-SQLAlchemy==3.1.1
-sqlalchemy_utils==0.41.2
+sqlparse==0.5.1
 requests==2.32.3
-advocate==1.0.0
-rq==1.16.2
-sshtunnel==0.4.0
-funcy==2.0
-pystache==0.6.5
-flask-swagger-ui==4.11.1
-lesscode-utils==0.0.61
-Flask-Login==0.6.3
+gunicorn==23.0.0
+gevent==24.10.2

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/redash/query_runner/__init__.py

@@ -5,12 +5,12 @@ from functools import wraps
 
 import sqlparse
 from dateutil import parser
-from rq.timeouts import JobTimeoutException
-from sshtunnel import open_tunnel
+# from rq.timeouts import JobTimeoutException
+# from sshtunnel import open_tunnel
 
 from redash import settings, utils
 from redash.utils.requests_session import (
-    UnacceptableAddressException,
+    # UnacceptableAddressException,
     requests_or_advocate,
     requests_session,
 )
@@ -21,7 +21,7 @@ __all__ = [
     "BaseQueryRunner",
     "BaseHTTPQueryRunner",
     "InterruptException",
-    "JobTimeoutException",
+    # "JobTimeoutException",
     "BaseSQLQueryRunner",
     "TYPE_DATETIME",
     "TYPE_BOOLEAN",
@@ -394,9 +394,9 @@ class BaseHTTPQueryRunner(BaseQueryRunner):
             logger.exception(exc)
             error = "Failed to execute query. "
             f"Return Code: {response.status_code} Reason: {response.text}"
-        except UnacceptableAddressException as exc:
-            logger.exception(exc)
-            error = "Can't query private addresses."
+        # except UnacceptableAddressException as exc:
+        #     logger.exception(exc)
+        #     error = "Can't query private addresses."
         except requests_or_advocate.RequestException as exc:
             # Catch all other requests exceptions and return the error.
             logger.exception(exc)

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/redash/query_runner/kingbase.py

@@ -19,7 +19,7 @@ from redash.query_runner import (
     TYPE_STRING,
     BaseSQLQueryRunner,
     InterruptException,
-    JobTimeoutException,
+    # JobTimeoutException,
     register,
 )
 
@@ -216,7 +216,8 @@ class KingBase(BaseSQLQueryRunner):
         except pg8000.DatabaseError as e:
             error = str(e)
             data = None
-        except (KeyboardInterrupt, InterruptException, JobTimeoutException):
+        # except (KeyboardInterrupt, InterruptException, JobTimeoutException):
+        except (KeyboardInterrupt, InterruptException):
             connection.cancel()
             raise
         finally:

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/redash/query_runner/mysql.py

@@ -11,7 +11,7 @@ from redash.query_runner import (
     TYPE_STRING,
     BaseSQLQueryRunner,
     InterruptException,
-    JobTimeoutException,
+    # JobTimeoutException,
     register,
 )
 from redash.settings import parse_boolean
@@ -20,7 +20,7 @@ try:
     import pymysql
     enabled = True
 except ImportError:
-    logging.error(traceback.format_exc())
+    # logging.error(traceback.format_exc())
     logging.error(f"pymysql is not exist,run:pip install pymysql==1.0.1")
     enabled = False
 
@@ -190,7 +190,8 @@ class Mysql(BaseSQLQueryRunner):
             # t.start()
             # while not ev.wait(1):
             #     pass
-        except (KeyboardInterrupt, InterruptException, JobTimeoutException):
+        # except (KeyboardInterrupt, InterruptException, JobTimeoutException):
+        except (KeyboardInterrupt, InterruptException):
             self._cancel(thread_id)
             #  t.join()
             raise

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/redash/query_runner/pg.py

@@ -22,7 +22,7 @@ from redash.query_runner import (
     TYPE_STRING,
     BaseSQLQueryRunner,
     InterruptException,
-    JobTimeoutException,
+    # JobTimeoutException,
     register,
 )
 
@@ -271,7 +271,8 @@ class PostgreSQL(BaseSQLQueryRunner):
         except pg8000.DatabaseError as e:
             error = str(e)
             data = None
-        except (KeyboardInterrupt, InterruptException, JobTimeoutException):
+        # except (KeyboardInterrupt, InterruptException, JobTimeoutException):
+        except (KeyboardInterrupt, InterruptException):
             connection.cancel()
             raise
         finally:

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/redash/settings/__init__.py

@@ -23,7 +23,7 @@ default_query_runners = [
     # "redash.query_runner.url",
     # "redash.query_runner.influx_db",
     # "redash.query_runner.influx_db_v2",
-    # "redash.query_runner.elasticsearch",
+    "redash.query_runner.elasticsearch",
     # "redash.query_runner.elasticsearch2",
     # "redash.query_runner.amazon_elasticsearch",
     # "redash.query_runner.trino",

{lesscode_flask-0.0.31 → lesscode_flask-0.0.33}/redash/utils/requests_session.py

@@ -1,11 +1,11 @@
-from advocate.exceptions import UnacceptableAddressException  # noqa: F401
+# from advocate.exceptions import UnacceptableAddressException  # noqa: F401
 
 from redash import settings
 
-if settings.ENFORCE_PRIVATE_ADDRESS_BLOCK:
-    import advocate as requests_or_advocate
-else:
-    import requests as requests_or_advocate
+# if settings.ENFORCE_PRIVATE_ADDRESS_BLOCK:
+#     import advocate as requests_or_advocate
+# else:
+import requests as requests_or_advocate
 
 
 class ConfiguredSession(requests_or_advocate.Session):