lesscode-flask 0.0.40__tar.gz → 0.0.42__tar.gz

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/PKG-INFO

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

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.40'
+__version__ = '0.0.42'
 
 import functools
 import logging

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/lesscode_flask/app.py

@@ -5,17 +5,17 @@ import logging
 import os
 import time
 import traceback
-
-from flask import Flask, typing as ft, abort, Response
 import typing as t
+from flask import Flask, typing as ft, abort, Response
 from flask.globals import request_ctx, request
 from flask_login import current_user
 from lesscode_utils.json_utils import JSONEncoder
 from werkzeug.middleware.proxy_fix import ProxyFix
-from lesscode_flask.utils.helpers import inject_args, generate_uuid, app_config
+
 from lesscode_flask.model.response_result import ResponseResult
 from lesscode_flask.setup import setup_blueprint, setup_logging, setup_query_runner, setup_swagger, setup_sql_alchemy, \
     setup_redis, setup_login_manager
+from lesscode_flask.utils.helpers import inject_args, generate_uuid, app_config
 from lesscode_flask.utils.json.NotSortJSONProvider import NotSortJSONProvider
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
 
@@ -41,8 +41,12 @@ class Lesscoder(Flask):
         # 这里的ProxyFix通常用于修复在反向代理环境下WSGI应用收到的客户端地址和主机头信息。
         self.wsgi_app = ProxyFix(self.wsgi_app, x_for=1, x_host=1)
         # # Configure Redash using our settings
-        setting_name = "setting.config_{}.Config".format(os.getenv("profile")) if os.getenv(
-            "profile") else "setting.config.Config"
+        profile_list = [item for item in sys.argv if item.__contains__("--profile=")]
+        if profile_list:  # 如果有指定配置文件，更新参数，如果指定多次，取最后一次
+            profile = profile_list[-1].replace('--profile=', '')
+            setting_name = "setting.config_{}.Config".format(profile)
+        else:
+            setting_name = "setting.config.Config"
         self.config.from_object(setting_name)
         self.register_error_handler(Exception, self.handle_exception)
 

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/lesscode_flask/db/__init__.py

@@ -21,7 +21,8 @@ def execute_query(
         if parameters is None:
             parameters = {}
         query.apply(parameters)
-        query_text = query_runner.apply_auto_limit(query.text, should_apply_auto_limit)
+        query_text = query.query
+        # query_text = query_runner.apply_auto_limit(query.text, should_apply_auto_limit)
         logging.info("query_text:{}".format(query_text))
         return QueryExecutor(
             query_text,

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/lesscode_flask/service/base_service.py

@@ -4,7 +4,8 @@ from flask_login import current_user
 
 from lesscode_flask.db import db
 from lesscode_flask.model.base_model import BaseModel
-from lesscode_flask.utils.helpers import serialize_result_to_dict, parameter_validation, alchemy_result_to_dict
+from lesscode_flask.utils.helpers import serialize_result_to_dict, parameter_validation, alchemy_result_to_dict, \
+    format_page_index
 
 logger = logging.getLogger(__name__)
 
@@ -168,6 +169,7 @@ class BaseService:
             data = alchemy_result_to_dict(items)
         else:
             data = serialize_result_to_dict(items)
+        format_page_index(data, page_num, page_size)
         result = {"dataSource": data, "total": total,
                   "has_prev": has_prev,
                   "has_next": has_next}

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/lesscode_flask/utils/helpers.py

@@ -109,8 +109,12 @@ def inject_args(req, func, view_args={}):
     args = req.args
     form = req.form
     files = req.files
-    if req.mimetype == 'application/json' and req.json is not None:
-        jsons = req.json
+    if req.mimetype == 'application/json':
+        try:
+            if req.json is not None:
+                jsons = req.json
+        except Exception as e:
+            pass
     # 合并args、form和json参数字典
     arguments = dict(**args, **form, **jsons, **files, **view_args)
     # 获取处理方法的 参数签名
@@ -160,3 +164,29 @@ def mustache_render(template, **kwargs):
     template = Template(template)
     # 渲染模板
     return template.render(**kwargs)
+
+
+def format_list_index(data_list, index=1, index_key="index"):
+    """
+    为数据源提供
+    :param data_list:
+    :param index:
+    :param index_key:
+    :return:
+    """
+    for data in data_list:
+        data[index_key] = str(index)
+        index = index + 1
+
+
+def format_page_index(data_list, page_num, page_size, index_key="index"):
+    """
+
+    :param data_list:
+    :param page_num:
+    :param page_size:
+    :param index_key:
+    :return:
+    """
+    index = (page_num - 1) * page_size + 1
+    format_list_index(data_list, index, index_key=index_key)

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/lesscode_flask/utils/request/request.py

@@ -1,4 +1,5 @@
 import importlib
+import logging
 import random
 import uuid
 
@@ -26,6 +27,7 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
     with httpx.Client(**connect_config) as session:
         try:
             res = session.request(method.upper(), url=base_url + path, params=params, data=data, json=json, **kwargs)
+            logging.error("res返回值是{}".format(res))
             if result_type == "json":
                 res = res.json()
                 if not pack:

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/redash/query_runner/clickhouse.py

@@ -1,28 +1,15 @@
 import logging
 import re
 from urllib.parse import urlparse
-from uuid import uuid4
 
 import requests
 
-from redash.query_runner import (
-    TYPE_DATE,
-    TYPE_DATETIME,
-    TYPE_FLOAT,
-    TYPE_INTEGER,
-    TYPE_STRING,
-    BaseSQLQueryRunner,
-    register,
-    split_sql_statements,
-)
+from redash.query_runner import *
+from redash.utils import json_dumps, json_loads
 
 logger = logging.getLogger(__name__)
 
 
-def split_multi_query(query):
-    return [st for st in split_sql_statements(query) if st != ""]
-
-
 class ClickHouse(BaseSQLQueryRunner):
     noop_query = "SELECT 1"
 
@@ -52,6 +39,10 @@ class ClickHouse(BaseSQLQueryRunner):
             "secret": ["password"],
         }
 
+    @classmethod
+    def type(cls):
+        return "clickhouse"
+
     @property
     def _url(self):
         return urlparse(self.configuration["url"])
@@ -82,7 +73,9 @@ class ClickHouse(BaseSQLQueryRunner):
         results, error = self.run_query(query, None)
 
         if error is not None:
-            self._handle_run_query_error(error)
+            raise Exception("Failed getting schema.")
+
+        results = json_loads(results)
 
         for row in results["rows"]:
             table_name = "{}.{}".format(row["database"], row["table"])
@@ -94,49 +87,31 @@ class ClickHouse(BaseSQLQueryRunner):
 
         return list(schema.values())
 
-    def _send_query(self, data, session_id=None, session_check=None):
+    def _send_query(self, data, stream=False):
         url = self.configuration.get("url", "http://127.0.0.1:8123")
-        timeout = self.configuration.get("timeout", 30)
-
-        params = {
-            "user": self.configuration.get("user", "default"),
-            "password": self.configuration.get("password", ""),
-            "database": self.configuration["dbname"],
-            "default_format": "JSON",
-        }
-
-        if session_id:
-            params["session_id"] = session_id
-            params["session_check"] = "1" if session_check else "0"
-            params["session_timeout"] = timeout
-
         try:
             verify = self.configuration.get("verify", True)
             r = requests.post(
                 url,
-                data=data.encode("utf-8", "ignore"),
-                stream=False,
-                timeout=timeout,
-                params=params,
+                data=data.encode("utf-8","ignore"),
+                stream=stream,
+                timeout=self.configuration.get("timeout", 30),
+                params={
+                    "user": self.configuration.get("user", "default"),
+                    "password": self.configuration.get("password", ""),
+                    "database": self.configuration["dbname"],
+                },
                 verify=verify,
             )
-
-            if not r.ok:
+            if r.status_code != 200:
                 raise Exception(r.text)
-
-            # In certain situations the response body can be empty even if the query was successful, for example
-            # when creating temporary tables.
-            if not r.text:
-                return {}
-
-            response = r.json()
-            if "exception" in response:
-                raise Exception(response["exception"])
-
-            return response
+            # logging.warning(r.json())
+            return r.json()
         except requests.RequestException as e:
             if e.response:
-                details = "({}, Status Code: {})".format(e.__class__.__name__, e.response.status_code)
+                details = "({}, Status Code: {})".format(
+                    e.__class__.__name__, e.response.status_code
+                )
             else:
                 details = "({})".format(e.__class__.__name__)
             raise Exception("Connection error to: {} {}.".format(url, details))
@@ -158,30 +133,29 @@ class ClickHouse(BaseSQLQueryRunner):
         else:
             return TYPE_STRING
 
-    def _clickhouse_query(self, query, session_id=None, session_check=None):
-        logger.debug(f"{self.name()} is about to execute query: %s", query)
-
+    def _clickhouse_query(self, query):
         query += "\nFORMAT JSON"
-
-        response = self._send_query(query, session_id, session_check)
-
+        result = self._send_query(query)
         columns = []
         columns_int64 = []  # db converts value to string if its type equals UInt64
         columns_totals = {}
 
-        meta = response.get("meta", [])
-        for r in meta:
+        for r in result["meta"]:
             column_name = r["name"]
             column_type = self._define_column_type(r["type"])
 
             if r["type"] in ("Int64", "UInt64", "Nullable(Int64)", "Nullable(UInt64)"):
                 columns_int64.append(column_name)
             else:
-                columns_totals[column_name] = "Total" if column_type == TYPE_STRING else None
+                columns_totals[column_name] = (
+                    "Total" if column_type == TYPE_STRING else None
+                )
 
-            columns.append({"name": column_name, "friendly_name": column_name, "type": column_type})
+            columns.append(
+                {"name": column_name, "friendly_name": column_name, "type": column_type}
+            )
 
-        rows = response.get("data", [])
+        rows = result["data"]
         for row in rows:
             for column in columns_int64:
                 try:
@@ -189,8 +163,8 @@ class ClickHouse(BaseSQLQueryRunner):
                 except TypeError:
                     row[column] = None
 
-        if "totals" in response:
-            totals = response["totals"]
+        if "totals" in result:
+            totals = result["totals"]
             for column, value in columns_totals.items():
                 totals[column] = value
             rows.append(totals)
@@ -198,27 +172,15 @@ class ClickHouse(BaseSQLQueryRunner):
         return {"columns": columns, "rows": rows}
 
     def run_query(self, query, user):
-        queries = split_multi_query(query)
-
-        if not queries:
-            data = None
+        logger.debug("Clickhouse is about to execute query: %s", query)
+        if query == "":
+            json_data = None
             error = "Query is empty"
-            return data, error
-
+            return json_data, error
         try:
-            # If just one query was given no session is needed
-            if len(queries) == 1:
-                data = self._clickhouse_query(queries[0])
-            else:
-                # If more than one query was given, a session is needed. Parameter session_check must be false
-                # for the first query
-                session_id = "redash_{}".format(uuid4().hex)
-
-                data = self._clickhouse_query(queries[0], session_id, session_check=False)
-
-                for query in queries[1:]:
-                    data = self._clickhouse_query(query, session_id, session_check=True)
-
+            q = self._clickhouse_query(query)
+            # data = json_dumps(q)
+            data = q
             error = None
         except Exception as e:
             data = None

{lesscode_flask-0.0.40 → lesscode_flask-0.0.42}/redash/query_runner/elasticsearch.py

@@ -436,7 +436,8 @@ class Kibana(BaseElasticSearch):
                 # TODO: Handle complete ElasticSearch queries (JSON based sent over HTTP POST)
                 raise Exception("Advanced queries are not supported")
 
-            json_data = json_dumps({"columns": result_columns, "rows": result_rows})
+            # json_data = json_dumps({"columns": result_columns, "rows": result_rows})
+            json_data = {"columns": result_columns, "rows": result_rows}
         except requests.HTTPError as e:
             logger.exception(e)
             error = "Failed to execute query. Return Code: {0}   Reason: {1}".format(