lesscode-flask 0.0.97__tar.gz → 0.0.99__tar.gz

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/PKG-INFO

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

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.97'
+__version__ = '0.0.99'
 
 import functools
 import logging

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/lesscode_flask/log/access_log_handler.py

@@ -46,9 +46,7 @@ class AccessLogHandler(Handler):
         resource_label = "-"
         client_id = "-"
         try:
-            url_info = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(url_info_key,
-                                                                                            ["id", "label",
-                                                                                             "client_id"])
+            url_info = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(url_info_key)
             if url_info:
                 resource_id = url_info.get("id", "-")
                 resource_label = url_info.get("label", "-")

lesscode_flask-0.0.99/lesscode_flask/static/swagger.py

@@ -0,0 +1,67 @@
+swagger_json = {
+  "openapi": "3.0.0",
+  "info": {
+    "title": "Example API",
+    "version": "1.0.0",
+    "description": "This is an example API that demonstrates OpenAPI 3.0 features."
+  },
+  "servers": [
+    {
+      "url": "https://api.example.com/v1",
+      "description": "Main production server"
+    }
+  ],
+  "paths": {
+    "/api/v1/greet": {
+      "get": {
+        "summary": "Get a greeting message",
+        "description": "This endpoint returns a greeting message to the user.",
+        "operationId": "getGreeting",
+        "security": [
+          {
+            "BearerAuth": []
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A greeting message",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Greeting"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request - Missing or invalid Authorization header"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "securitySchemes": {
+      "BearerAuth": {
+        "type": "http",
+        "scheme": "bearer",
+        "bearerFormat": "JWT"
+      }
+    },
+    "schemas": {
+      "Greeting": {
+        "type": "object",
+        "properties": {
+          "message": {
+            "type": "string",
+            "example": "Hello, John Doe!"
+          },
+          "lang": {
+            "type": "string",
+            "example": "en"
+          }
+        }
+      }
+    }
+  }
+}

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/lesscode_flask/utils/swagger/swagger_template.py

@@ -38,12 +38,20 @@ def get_request_body(body, required, request_type):
 def get_header_template():
     return [
         {
-            "name": "Authorization",
+            "name": "App-Key",
             "in": "header",
             "required": False,
             "schema": {
                 "type": "string",
-                "description": "Authorization token"
+                "description": "App-Key"
+            }
+        }, {
+            "name": "Data-Source-Id",
+            "in": "header",
+            "required": False,
+            "schema": {
+                "type": "string",
+                "description": "Data-Source-Id"
             }
         }
     ]

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/lesscode_flask/utils/swagger/swagger_util.py

@@ -28,7 +28,12 @@ def generate_openapi_spec(app):
                 "tags": [rule.endpoint.split('.')[0]],
                 # "description": f"Description for {method} {rule.rule}",
                 "description": description,
-                "responses": get_response_template()
+                "responses": get_response_template(),
+                "security": [
+                    {
+                        "BearerAuth": []
+                    }
+                ],
             }
 
             if method_ == "post":
@@ -63,7 +68,16 @@ def generate_openapi_spec(app):
             "version": "1.0.0"
         },
         "tags": [{"name": k} for k in app.blueprints],
-        "paths": paths
+        "paths": paths,
+        "components": {
+            "securitySchemes": {
+                "BearerAuth": {
+                    "type": "http",
+                    "scheme": "bearer",
+                    "bearerFormat": "JWT"
+                }
+            }
+        }
     }
     return openapi_spec
 

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/lesscode_flask.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ lesscode_flask/service/access_log_service.py
 lesscode_flask/service/base_service.py
 lesscode_flask/setting/__init__.py
 lesscode_flask/setup/__init__.py
+lesscode_flask/static/swagger.py
 lesscode_flask/utils/__init__.py
 lesscode_flask/utils/helpers.py
 lesscode_flask/utils/decorator/__init__.py

{lesscode_flask-0.0.97 → lesscode_flask-0.0.99}/redash/query_runner/elasticsearch.py

@@ -1,25 +1,11 @@
 import logging
-import sys
-import urllib.request
-import urllib.parse
 import urllib.error
-from importlib import import_module
-
-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
+import urllib.parse
 
+from lesscode_flask.utils.request.request import get_basic_auth, sync_common_request_origin
 from redash.query_runner import *
 from redash.utils import json_dumps, json_loads
 
-try:
-    import http.client as http_client
-except ImportError:
-    # Python 2
-    import http.client as http_client
-
 logger = logging.getLogger(__name__)
 
 ELASTICSEARCH_TYPES_MAPPING = {
@@ -75,8 +61,6 @@ class BaseElasticSearch(BaseQueryRunner):
         self.syntax = "json"
 
         if self.DEBUG_ENABLED:
-            http_client.HTTPConnection.debuglevel = 1
-
             # you need to initialize logging, otherwise you will not see anything from requests
             logging.basicConfig()
             logging.getLogger().setLevel(logging.DEBUG)
@@ -94,25 +78,18 @@ class BaseElasticSearch(BaseQueryRunner):
         basic_auth_password = self.configuration.get("basic_auth_password", None)
         self.auth = None
         if basic_auth_user and basic_auth_password:
-            self.auth = HTTPBasicAuth(basic_auth_user, basic_auth_password)
+            self.auth = get_basic_auth(basic_auth_user, basic_auth_password)
 
     def _get_mappings(self, url):
-        mappings = {}
         error = None
         try:
-            r = requests.get(url, auth=self.auth)
+            r = sync_common_request_origin(url=url, method="get", auth=self.auth)
             r.raise_for_status()
 
             mappings = r.json()
-        except requests.HTTPError as e:
+        except Exception as e:
             logger.exception(e)
-            error = "Failed to execute query. Return Code: {0}   Reason: {1}".format(
-                r.status_code, r.text
-            )
-            mappings = None
-        except requests.exceptions.RequestException as e:
-            logger.exception(e)
-            error = "Connection refused"
+            error = f"Failed to execute query. Reason: {e}"
             mappings = None
 
         return mappings, error
@@ -178,10 +155,10 @@ class BaseElasticSearch(BaseQueryRunner):
         return list(schema.values())
 
     def _parse_results(
-        self, mappings, result_fields, raw_result, result_columns, result_rows
+            self, mappings, result_fields, raw_result, result_columns, result_rows
     ):
         def add_column_if_needed(
-            mappings, column_name, friendly_name, result_columns, result_columns_index
+                mappings, column_name, friendly_name, result_columns, result_columns_index
         ):
             if friendly_name not in result_columns_index:
                 result_columns.append(
@@ -210,7 +187,7 @@ class BaseElasticSearch(BaseQueryRunner):
             row[key] = value
 
         def collect_aggregations(
-            mappings, rows, parent_key, data, row, result_columns, result_columns_index
+                mappings, rows, parent_key, data, row, result_columns, result_columns_index
         ):
             if isinstance(data, dict):
                 for key, value in data.items():
@@ -345,20 +322,13 @@ class BaseElasticSearch(BaseQueryRunner):
 
     def test_connection(self):
         try:
-            r = requests.get(
-                "{0}/_cluster/health".format(self.server_url), auth=self.auth
-            )
+            r = sync_common_request_origin(url="{0}/_cluster/health".format(self.server_url), method="get",
+                                           auth=self.auth
+                                           )
             r.raise_for_status()
-        except requests.HTTPError as e:
+        except Exception as e:
             logger.exception(e)
-            raise Exception(
-                "Failed to execute query. Return Code: {0}   Reason: {1}".format(
-                    r.status_code, r.text
-                )
-            )
-        except requests.exceptions.RequestException as e:
-            logger.exception(e)
-            raise Exception("Connection refused")
+            raise Exception(f"Failed to execute query.Reason: {e}")
 
 
 class Kibana(BaseElasticSearch):
@@ -367,10 +337,10 @@ class Kibana(BaseElasticSearch):
         return True
 
     def _execute_simple_query(
-        self, url, auth, _from, mappings, result_fields, result_columns, result_rows
+            self, url, auth, _from, mappings, result_fields, result_columns, result_rows
     ):
         url += "&from={0}".format(_from)
-        r = requests.get(url, auth=self.auth)
+        r = sync_common_request_origin(url=url, method="get", auth=self.auth)
         r.raise_for_status()
 
         raw_result = r.json()
@@ -442,15 +412,9 @@ class Kibana(BaseElasticSearch):
 
             # 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(
-                r.status_code, r.text
-            )
-            json_data = None
-        except requests.exceptions.RequestException as e:
+        except Exception as e:
             logger.exception(e)
-            error = "Connection refused"
+            error = f"Failed to execute query. Reason: {e}"
             json_data = None
 
         return json_data, error
@@ -488,7 +452,7 @@ class ElasticSearch(BaseElasticSearch):
 
             logger.debug("Using URL: %s", url)
             logger.debug("Using query: %s", query_dict)
-            r = requests.get(url, json=query_dict, auth=self.auth)
+            r = sync_common_request_origin(url=url, method="get", json=query_dict, auth=self.auth)
             r.raise_for_status()
             logger.debug("Result: %s", r.json())
 
@@ -499,18 +463,9 @@ class ElasticSearch(BaseElasticSearch):
             )
 
             json_data = json_dumps({"columns": result_columns, "rows": result_rows})
-        except (KeyboardInterrupt, JobTimeoutException):
-            logger.exception(e)
-            raise
-        except requests.HTTPError as e:
-            logger.exception(e)
-            error = "Failed to execute query. Return Code: {0}   Reason: {1}".format(
-                r.status_code, r.text
-            )
-            json_data = None
-        except requests.exceptions.RequestException as e:
+        except Exception as e:
             logger.exception(e)
-            error = "Connection refused"
+            error = f"Failed to execute query.  Reason: {e}"
             json_data = None
 
         return json_data, error