lesscode-flask 0.0.65__tar.gz → 0.0.67__tar.gz

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.65
+Version: 0.0.67
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -11,17 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: Flask==3.0.3
-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: funcy==2.0
-Requires-Dist: Flask-SQLAlchemy==3.1.1
-Requires-Dist: sqlparse==0.5.1
-Requires-Dist: requests==2.32.3
-Requires-Dist: gunicorn==23.0.0
-Requires-Dist: gevent==24.10.2
 
 # lesscode-flask
 

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.65'
+__version__ = '0.0.67'
 
 import functools
 import logging

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/app.py

@@ -6,9 +6,11 @@ import sys
 import time
 import traceback
 import typing as t
-from flask import Flask, typing as ft, abort, Response
+from importlib import import_module
+
+# from flask import Flask, typing as ft, Response
 from flask.globals import request_ctx, request
-from flask_login import current_user
+# from flask_login import current_user
 from lesscode_utils.json_utils import JSONEncoder
 from werkzeug.middleware.proxy_fix import ProxyFix
 
@@ -52,6 +54,10 @@ class Lesscoder(Flask):
 
     def preprocess_request(self) -> ft.ResponseReturnValue | None:
         if self.config.get("AUTHORIZATION_ENABLE"):  # 启动 AUTHORIZATION_ENABLE 才进行权限验证
+            try:
+                flask_login = import_module("flask_login")
+            except ImportError as e:
+                raise Exception(f"flask_login is not exist,run:pip install Flask-Login==0.6.3")
             # 获取当前请求的url
             url = request.path
             # 获取URL 对应的id 与访问权限
@@ -62,13 +68,13 @@ class Lesscoder(Flask):
                 access = app_config.get("AUTH_DEFAULT_ACCESS", "0")
             # '访问权限2：需要权限 1：需要登录 0：游客',
             if str(access) == "1":  # 需要登录
-                if current_user.is_anonymous_user:
+                if flask_login.current_user.is_anonymous_user:
                     # abort(403, "需要登录")
                     ResponseResult.fail("请登录后访问", status_code="403")
             elif str(access) == "2":  # 需要权限
-                if current_user.is_anonymous_user:
+                if flask_login.current_user.is_anonymous_user:
                     ResponseResult.fail("请登录后访问", status_code="403")
-                if not current_user.has_permission(id):
+                if not flask_login.current_user.has_permission(id):
                     ResponseResult.fail("请获取授权后访问", status_code="403")
         return super(Lesscoder, self).preprocess_request()
 
@@ -86,7 +92,8 @@ class Lesscoder(Flask):
         # # 计算请求耗时
         # duration = time.time() - start_time
         # 100 为自定义 'ACCESS' 的日志级别标识
-        logging.log(100,"访问日志", {"request_id": request_id,"start_time":start_time, "end_time": time.time(),"status_code":response.status_code})
+        logging.log(100, "访问日志", {"request_id": request_id, "start_time": start_time, "end_time": time.time(),
+                                      "status_code": response.status_code})
         return response
 
     def dispatch_request(self) -> ft.ResponseReturnValue:
@@ -140,6 +147,7 @@ class Lesscoder(Flask):
         setup_resource_register(self)
         for blueprint_name, blueprint in blueprint_map.items():
             self.register_blueprint(blueprint)
+
     @staticmethod
     def handle_exception(e):
         traceback.print_exc()  # 打印堆栈信息

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/db/__init__.py

@@ -1,4 +1,5 @@
 import logging
+from importlib import import_module
 
 from lesscode_flask.db.executor import QueryExecutor, QueryExecutionError
 from lesscode_flask.model.parameterized_query import ParameterizedQuery
@@ -33,10 +34,14 @@ def execute_query(
         return e
 
 
-from flask_sqlalchemy import SQLAlchemy
+# from flask_sqlalchemy import SQLAlchemy
+try:
+    flask_sqlalchemy = import_module("flask_sqlalchemy")
+except ImportError as e:
+    raise Exception(f"flask_sqlalchemy is not exist,run:pip install Flask-SQLAlchemy==3.1.1")
 
 
-class LessCodeSQLAlchemy(SQLAlchemy):
+class LessCodeSQLAlchemy(flask_sqlalchemy.SQLAlchemy):
     pass
     # def apply_driver_hacks(self, app, info, options):
     #     options.update(json_serializer=json_dumps)

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/log/access_log_handler.py

@@ -1,11 +1,12 @@
+# from flask_login import current_user
+import threading
+from importlib import import_module
 from logging import Handler
 
 from flask import request, copy_current_request_context
-from flask_login import current_user
-import threading
-from lesscode_flask.model.access_log import AccessLog
-from lesscode_flask.model.user import AnonymousUser, ApiUser, User
 
+from lesscode_flask.model.access_log import AccessLog
+from lesscode_flask.model.user import AnonymousUser, ApiUser
 from lesscode_flask.service.access_log_service import AccessLogService
 from lesscode_flask.utils.helpers import app_config
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
@@ -50,19 +51,24 @@ class AccessLogHandler(Handler):
                 resource_label = url_info.get("label", "-")
         except Exception as e:
             pass
+        try:
+            flask_login = import_module("flask_login")
+        except ImportError as e:
+            raise Exception(f"flask_login is not exist,run:pip install Flask-Login==0.6.3")
         '请求类型0:用户请求，1:API用户，2:匿名用户',
-        if isinstance(current_user, AnonymousUser):
+        if isinstance(flask_login.current_user, AnonymousUser):
             type = 2
-        elif isinstance(current_user, ApiUser):
+        elif isinstance(flask_login.current_user, ApiUser):
             type = 1
         else:
             type = 0
 
-        access_log = AccessLog(request_id=request_id, display_name=current_user.display_name,
-                               obj_id=current_user.id, type=type,
+        access_log = AccessLog(request_id=request_id, display_name=flask_login.current_user.display_name,
+                               obj_id=flask_login.current_user.id, type=type,
                                resource_id=resource_id,
                                resource_label=resource_label, url=url, referrer=referrer, client_ip=client_ip,
-                               user_agent=user_agent_string,start_time=start_time, end_time=end_time, duration = end_time-start_time,status_code =status_code,
+                               user_agent=user_agent_string, start_time=start_time, end_time=end_time,
+                               duration=end_time - start_time, status_code=status_code,
                                params=params)
 
         @copy_current_request_context

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/model/parameterized_query.py

@@ -1,14 +1,16 @@
 import re
 from functools import partial
+from importlib import import_module
 from numbers import Number
 
-import pystache
-from dateutil.parser import parse
-from funcy import distinct
-
 from lesscode_flask.utils.helpers import mustache_render
 
 
+# import pystache
+# from dateutil.parser import parse
+# from funcy import distinct
+
+
 def _pluck_name_and_value(default_column, row):
     row = {k.lower(): v for k, v in row.items()}
     name_column = "name" if "name" in row.keys() else default_column.lower()
@@ -30,7 +32,7 @@ def _pluck_name_and_value(default_column, row):
 
 
 def dropdown_values(query_id, org):
-    data = [] # load_result(query_id, org)
+    data = []  # load_result(query_id, org)
     first_column = data["columns"][0]["name"]
     pluck = partial(_pluck_name_and_value, first_column)
     return list(map(pluck, data["rows"]))
@@ -53,6 +55,14 @@ def join_parameter_list_values(parameters, schema):
 
 def _collect_key_names(nodes):
     keys = []
+    try:
+        pystache = import_module("pystache")
+    except ImportError:
+        raise Exception(f"pystache is not exist,run:pip install pystache==0.6.5")
+    try:
+        funcy = import_module("funcy")
+    except ImportError:
+        raise Exception(f"pystache is not exist,run:pip install pystache==0.6.5")
     for node in nodes._parse_tree:
         if isinstance(node, pystache.parser._EscapeNode):
             keys.append(node.key)
@@ -60,10 +70,14 @@ def _collect_key_names(nodes):
             keys.append(node.key)
             keys.extend(_collect_key_names(node.parsed))
 
-    return distinct(keys)
+    return funcy.distinct(keys)
 
 
 def _collect_query_parameters(query):
+    try:
+        pystache = import_module("pystache")
+    except ImportError:
+        raise Exception(f"pystache is not exist,run:pip install pystache==0.6.5")
     nodes = pystache.parse(query)
     keys = _collect_key_names(nodes)
     return keys
@@ -100,7 +114,11 @@ def _is_regex_pattern(value, regex):
 
 
 def _is_date(string):
-    parse(string)
+    try:
+        dateutil_parser = import_module("dateutil.parser")
+    except ImportError:
+        raise Exception(f"python-dateutil is not exist,run:pip install python-dateutil==2.9.0.post0")
+    dateutil_parser.parse(string)
     return True
 
 

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/model/user.py

@@ -1,6 +1,11 @@
 from functools import reduce
+from importlib import import_module
 
-from flask_login import AnonymousUserMixin, UserMixin
+# from flask_login import AnonymousUserMixin, UserMixin
+try:
+    flask_login = import_module("flask_login")
+except ImportError as e:
+    raise Exception(f"flask_login is not exist,run:pip install Flask-Login==0.6.3")
 
 
 class PermissionsCheckMixin:
@@ -17,7 +22,7 @@ class PermissionsCheckMixin:
         return has_permissions
 
 
-class User(UserMixin, PermissionsCheckMixin):
+class User(flask_login.UserMixin, PermissionsCheckMixin):
     """
     在线用户对象类
     """

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/service/base_service.py

@@ -1,7 +1,11 @@
 import logging
+from importlib import import_module
 
-from flask_login import current_user
-
+# from flask_login import current_user
+try:
+    flask_login = import_module("flask_login")
+except ImportError as e:
+    raise Exception(f"flask_login is not exist,run:pip install Flask-Login==0.6.3")
 from lesscode_flask.db import db
 from lesscode_flask.model.base_model import BaseModel
 from lesscode_flask.utils.helpers import result_to_dict, parameter_validation, format_page_index
@@ -28,9 +32,9 @@ class BaseService:
         #     current_user = None
         try:
             if hasattr(item, "create_user_id"):
-                item.create_user_id = current_user.id
+                item.create_user_id = flask_login.current_user.id
             if hasattr(item, "create_user_name"):
-                item.create_user_name = current_user.display_name
+                item.create_user_name = flask_login.current_user.display_name
         except Exception as e:
             if hasattr(item, "create_user_id"):
                 item.create_user_id = "AnonymousUserId"
@@ -49,9 +53,9 @@ class BaseService:
         for item in items:
             try:
                 if hasattr(item, "create_user_id"):
-                    item.create_user_id = current_user.id
+                    item.create_user_id = flask_login.current_user.id
                 if hasattr(item, "create_user_name"):
-                    item.create_user_name = current_user.display_name
+                    item.create_user_name = flask_login.current_user.display_name
             except Exception as e:
                 if hasattr(item, "create_user_id"):
                     item.create_user_id = "AnonymousUserId"
@@ -69,9 +73,9 @@ class BaseService:
 
         try:
             if hasattr(self.model, "modify_user_id"):
-                item["modify_user_id"] = current_user.id
+                item["modify_user_id"] = flask_login.current_user.id
             if hasattr(self.model, "modify_user_name"):
-                item["modify_user_name"] = current_user.display_name
+                item["modify_user_name"] = flask_login.current_user.display_name
         except Exception as e:
             if hasattr(item, "modify_user_id"):
                 item.create_user_id = "AnonymousUserId"
@@ -81,13 +85,13 @@ class BaseService:
         db.session.commit()
         return id
 
-    def update_items(self, filters: list , item: dict):
+    def update_items(self, filters: list, item: dict):
 
         try:
             if hasattr(self.model, "modify_user_id"):
-                item["modify_user_id"] = current_user.id
+                item["modify_user_id"] = flask_login.current_user.id
             if hasattr(self.model, "modify_user_name"):
-                item["modify_user_name"] = current_user.display_name
+                item["modify_user_name"] = flask_login.current_user.display_name
         except Exception as e:
             if hasattr(item, "modify_user_id"):
                 item.create_user_id = "AnonymousUserId"

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/setup/__init__.py

@@ -1,26 +1,24 @@
-import importlib
 import inspect
-
 import uuid
-
 from datetime import datetime
-
+from importlib import import_module
 from logging.handlers import TimedRotatingFileHandler
 
-import redis
 from flask import current_app
-from flask_login import LoginManager
-from flask_swagger_ui import get_swaggerui_blueprint
 
 from lesscode_flask.db import db
 from lesscode_flask.log.access_log_handler import AccessLogHandler
-from lesscode_flask.model.user import AnonymousUser, User
+from lesscode_flask.model.user import AnonymousUser
 from lesscode_flask.service.authentication_service import get_token_user, get_api_user, get_gateway_user
 from lesscode_flask.utils.swagger.swagger_template import split_doc
 from lesscode_flask.utils.swagger.swagger_util import generate_openapi_spec, replace_symbol, get_params_type, \
     get_sample_data
 
 
+# from flask_login import LoginManager
+# from flask_swagger_ui import get_swaggerui_blueprint
+
+
 def setup_logging(app):
     """
     初始化日志配置
@@ -93,7 +91,7 @@ def setup_blueprint(app, path=None, pkg_name="handlers", blueprint_map={}):
         elif os.path.isfile(full_file) and handler_name.lower().endswith("handler.py"):
             # 文件，并且为handler结尾，认为是请求处理器，完成动态装载
             module_path = "{}.{}".format(pkg_name, handler_name.replace(".py", ""))
-            module = importlib.import_module(module_path)  # __import__(module_path)
+            module = import_module(module_path)  # __import__(module_path)
             for name, obj in inspect.getmembers(module):
                 # 找到Blueprint 的属性进行注册
                 if isinstance(obj, Blueprint):
@@ -129,7 +127,11 @@ def setup_sql_alchemy(app):
 
 
 def setup_login_manager(app):
-    login_manager = LoginManager(app)
+    try:
+        flask_login = import_module("flask_login")
+    except ImportError as e:
+        raise Exception(f"flask_login is not exist,run:pip install Flask-Login==0.6.3")
+    login_manager = flask_login.LoginManager(app)
     setattr(app, "login_manager", login_manager)
 
     @login_manager.request_loader
@@ -163,7 +165,11 @@ def setup_swagger(app):
     # API_URL = 'http://127.0.0.1:5001/static/swagger.json'  # Swagger 规范的路径（本地 JSON 文件）
     API_URL = app.config.get("SWAGGER_API_URL", "")  # 接口
     # 创建 Swagger UI 蓝图
-    swagger_ui_blueprint = get_swaggerui_blueprint(
+    try:
+        flask_swagger_ui = import_module("flask_swagger_ui")
+    except ImportError as e:
+        raise Exception(f"flask_swagger_ui is not exist,run:pip install flask-swagger-ui==4.11.1")
+    swagger_ui_blueprint = flask_swagger_ui.get_swaggerui_blueprint(
         SWAGGER_URL,  # Swagger UI 访问路径
         app.config.get("OUTSIDE_SCREEN_IP") + API_URL,  # Swagger 文件路径
         config={  # Swagger UI 配置参数
@@ -187,6 +193,10 @@ def setup_redis(app):
 
     for r in redis_conn_list:
         if r.get("type") == "redis":
+            try:
+                redis = import_module("redis")
+            except ImportError:
+                raise Exception(f"redis is not exist,run:pip install redis==5.1.1")
             conn = redis.Redis(host=r.get("host"), port=r.get("port"), db=r.get("db"), password=r.get("password"),
                                decode_responses=True)
             if not hasattr(current_app, "redis_conn_dict"):
@@ -361,7 +371,7 @@ def setup_resource_register(app):
                                      description=inter_desc, param_list=param_list))
             resource_list.append(resource)
         try:
-            httpx = importlib.import_module("httpx")
+            httpx = import_module("httpx")
         except ImportError as e:
             raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
         with httpx.Client(**{"timeout": None}) as session:

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/utils/decorator/cache.py

@@ -125,7 +125,7 @@ def insert_cache(data, ex, cache_key, conn_name=None):
                 try:
                     json_utils = import_module("lesscode_utils.json_utils")
                 except ImportError:
-                        raise Exception(f"pymysql is not exist,run:pip install lesscode_utils==0.0.22")
+                        raise Exception(f"lesscode_utils is not exist,run:pip install lesscode_utils==0.0.61")
                 RedisHelper(conn_name).sync_set(cache_key, json_utils.JSONEncoder().encode(data), ex=ex)
             except:
                 logging.error(traceback.format_exc())

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask/wsgi.py

@@ -1,15 +1,26 @@
 # -*- coding: utf-8 -*-
 # 解决MonkeyPatchWarning
 import os
+from importlib import import_module
 
-from gevent import monkey  # 导入补丁模块
+# from gevent import monkey  # 导入补丁模块
 
-monkey.patch_all()  # 创建补丁
-from funcy import iteritems
-from gunicorn.app.base import BaseApplication
+# 创建补丁
+# from funcy import iteritems
+try:
+    gunicorn_app_base = import_module("gunicorn.app.base")
+except ImportError as e:
+    raise Exception(f"gunicorn is not exist,run:pip install gunicorn==23.0.0")
 
+try:
+    gevent = import_module("gevent")
+except ImportError as e:
+    raise Exception(f"gevent is not exist,run:pip install gevent==24.10.2")
 
-class Application(BaseApplication):
+gevent.monkey.patch_all()
+
+
+class Application(gunicorn_app_base.BaseApplication):
     def __init__(self, app):
         self.app = app
         cpu_count = os.cpu_count()
@@ -17,7 +28,7 @@ class Application(BaseApplication):
             cpu_count = 5
         options = {
             'bind': f"0.0.0.0:{app.config.get('PORT', 5002)}",  # 绑定地址和端口
-            'workers': cpu_count*2+1,  # 指定 workers 数量
+            'workers': cpu_count * 2 + 1,  # 指定 workers 数量
             'accesslog': "-",  # 输出到标准输出，取消gunicorn接管日志输出
             'worker_class': 'gevent',  # worker 运行方式
             'timeout': 300
@@ -28,9 +39,13 @@ class Application(BaseApplication):
         # self.logger = logging  # 自定义一直输出，如果项目中已经使用了其他的日志框架，而不想让gunicorn接管日志输出，需要将日志框架的对象指定给这里
 
     def load_config(self):
-        config = {key: value for key, value in iteritems(self.options)
+        try:
+            funcy = import_module("funcy")
+        except ImportError:
+            raise Exception(f"pystache is not exist,run:pip install pystache==0.6.5")
+        config = {key: value for key, value in funcy.iteritems(self.options)
                   if key in self.cfg.settings and value is not None}
-        for key, value in iteritems(config):
+        for key, value in funcy.iteritems(config):
             self.cfg.set(key.lower(), value)
 
     def load(self):

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.65
+Version: 0.0.67
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -11,17 +11,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: Flask==3.0.3
-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: funcy==2.0
-Requires-Dist: Flask-SQLAlchemy==3.1.1
-Requires-Dist: sqlparse==0.5.1
-Requires-Dist: requests==2.32.3
-Requires-Dist: gunicorn==23.0.0
-Requires-Dist: gevent==24.10.2
 
 # lesscode-flask
 

lesscode-flask-0.0.67/lesscode_flask.egg-info/requires.txt

@@ -0,0 +1 @@
+Flask==3.0.3

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/redash/query_runner/__init__.py

@@ -2,12 +2,24 @@ import logging
 from collections import defaultdict
 from contextlib import ExitStack
 from functools import wraps
+from importlib import import_module
 
-import sqlparse
+# import sqlparse
 from dateutil import parser
+
 # from rq.timeouts import JobTimeoutException
 # from sshtunnel import open_tunnel
 
+try:
+    sqlparse = import_module("sqlparse")
+except ImportError as e:
+    raise Exception(f"sqlparse is not exist,run:pip install sqlparse==0.5.1")
+
+try:
+    sshtunnel = import_module("sshtunnel")
+except ImportError as e:
+    raise Exception(f"sshtunnel is not exist,run:pip install sshtunnel==0.4.0")
+
 from redash import settings, utils
 from redash.utils.requests_session import (
     # UnacceptableAddressException,
@@ -503,7 +515,7 @@ def with_ssh_tunnel(query_runner, details):
                     "ssh_username": details["ssh_username"],
                     **settings.dynamic_settings.ssh_tunnel_auth(),
                 }
-                server = stack.enter_context(open_tunnel(bastion_address, remote_bind_address=remote_address, **auth))
+                server = stack.enter_context(sshtunnel.open_tunnel(bastion_address, remote_bind_address=remote_address, **auth))
             except Exception as error:
                 raise type(error)("SSH tunnel: {}".format(str(error)))
 

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/redash/query_runner/clickhouse.py

@@ -1,11 +1,12 @@
 import logging
 import re
+from importlib import import_module
 from urllib.parse import urlparse
 
-import requests
-
 from redash.query_runner import *
-from redash.utils import json_dumps, json_loads
+from redash.utils import json_loads
+
+# import requests
 
 logger = logging.getLogger(__name__)
 
@@ -89,6 +90,10 @@ class ClickHouse(BaseSQLQueryRunner):
 
     def _send_query(self, data, stream=False):
         url = self.configuration.get("url", "http://127.0.0.1:8123")
+        try:
+            requests = import_module("requests")
+        except ImportError as e:
+            raise Exception(f"requests is not exist,run:pip install requests==2.32.3")
         try:
             verify = self.configuration.get("verify", True)
             r = requests.post(

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/redash/query_runner/elasticsearch.py

@@ -3,8 +3,12 @@ import sys
 import urllib.request
 import urllib.parse
 import urllib.error
+from importlib import import_module
 
-import requests
+try:
+    requests = import_module("requests")
+except ImportError as e:
+    raise Exception(f"requests is not exist,run:pip install requests==2.32.3")
 from requests.auth import HTTPBasicAuth
 
 from redash.query_runner import *

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/redash/settings/__init__.py

@@ -1,14 +1,15 @@
 import os
+from importlib import import_module
 
 from redash.settings.helpers import parse_boolean, array_from_string
-from funcy import distinct, remove
+
+# from funcy import distinct, remove
 
 # Whether api calls using the json query runner will block private addresses
 ENFORCE_PRIVATE_ADDRESS_BLOCK = parse_boolean(os.environ.get("REDASH_ENFORCE_PRIVATE_IP_BLOCK", "true"))
 # requests
 REQUESTS_ALLOW_REDIRECTS = parse_boolean(os.environ.get("REDASH_REQUESTS_ALLOW_REDIRECTS", "false"))
 
-
 # Query Runners
 default_query_runners = [
     # "redash.query_runner.athena",
@@ -84,7 +85,12 @@ enabled_query_runners = array_from_string(
 additional_query_runners = array_from_string(os.environ.get("REDASH_ADDITIONAL_QUERY_RUNNERS", ""))
 disabled_query_runners = array_from_string(os.environ.get("REDASH_DISABLED_QUERY_RUNNERS", ""))
 
-QUERY_RUNNERS = remove(
+try:
+    funcy = import_module("funcy")
+except ImportError as e:
+    raise Exception(f"funcy is not exist,run:pip install funcy==2.0")
+
+QUERY_RUNNERS = funcy.remove(
     set(disabled_query_runners),
-    distinct(enabled_query_runners + additional_query_runners),
-)
+    funcy.distinct(enabled_query_runners + additional_query_runners),
+)

{lesscode-flask-0.0.65 → lesscode-flask-0.0.67}/redash/utils/requests_session.py

@@ -1,11 +1,18 @@
 # from advocate.exceptions import UnacceptableAddressException  # noqa: F401
+from importlib import import_module
 
 from redash import settings
 
 # if settings.ENFORCE_PRIVATE_ADDRESS_BLOCK:
 #     import advocate as requests_or_advocate
 # else:
-import requests as requests_or_advocate
+
+# import requests as requests_or_advocate
+
+try:
+    requests_or_advocate = import_module("requests")
+except ImportError as e:
+    raise Exception(f"requests is not exist,run:pip install requests==2.32.3")
 
 
 class ConfiguredSession(requests_or_advocate.Session):

lesscode-flask-0.0.65/lesscode_flask.egg-info/requires.txt

@@ -1,12 +0,0 @@
-Flask==3.0.3
-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
-funcy==2.0
-Flask-SQLAlchemy==3.1.1
-sqlparse==0.5.1
-requests==2.32.3
-gunicorn==23.0.0
-gevent==24.10.2