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

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

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

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

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

{lesscode_flask-0.0.99 → lesscode_flask-0.1.1}/lesscode_flask/app.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
+import copy
 import json
 import logging
+import os
 import sys
 import time
 import traceback
 import typing as t
-from importlib import import_module
 
 from flask import Flask, typing as ft, Response
 from flask.globals import request_ctx, request
@@ -20,6 +21,7 @@ from lesscode_flask.setup import setup_blueprint, setup_logging, setup_query_run
 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
+from lesscode_flask.utils.swagger.swagger_util import generate_openapi_spec
 
 
 # import collections.abc as cabc
@@ -90,7 +92,7 @@ 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})
+                                      "status_code": response.status_code})
         return response
 
     def dispatch_request(self) -> ft.ResponseReturnValue:
@@ -160,9 +162,26 @@ class Lesscoder(Flask):
             return ResponseResult.make_response(message=str(e), data=str(e), http_code=500, status_code="500")
 
 
+def gen_swagger_json_file(app):
+    swagger_json = generate_openapi_spec(app)
+    _port = app.config.get("PORT") or 5004
+    _swagger_json = copy.deepcopy(swagger_json)
+    _swagger_json["servers"] = app.config.get("SWAGGER_SERVERS", []) if app.config.get("SWAGGER_SERVERS", []) else [
+        {"url": f"http://127.0.0.1:{_port}", "description": "本地环境"}]
+    project_path = os.path.abspath(os.path.dirname(sys.argv[0]))
+    static_path = os.path.join(project_path, "static")
+    swagger_json_path = os.path.join(static_path, "swagger.json")
+    if not os.path.exists(static_path):
+        os.mkdir(static_path)
+    if not os.path.exists(swagger_json_path):
+        with open(swagger_json_path, "w", encoding="utf-8") as f:
+            f.write(json.dumps(_swagger_json, indent=4, ensure_ascii=False))
+
+
 def create_app():
     app = Lesscoder()
     app.json = NotSortJSONProvider(app)  # 设置自定义的 JSON provider
     with app.app_context():
         app.setup()
+    gen_swagger_json_file(app)
     return app

{lesscode_flask-0.0.99 → lesscode_flask-0.1.1}/lesscode_flask/utils/helpers.py

@@ -49,8 +49,13 @@ def build_tree(data, parent: str = "parent_id"):
     - tree: 转换后的树形结构数据列表。
     """
     # 创建一个字典来快速查找节点
-    node_map = {item['id']: item for item in data}
-
+    node_map = {}
+    _sort_key = 0
+    # 为数据增加一个_sort_key属性用于排序
+    for item in data:
+        item['_sort_key'] = _sort_key
+        node_map[item['id']] = item
+        _sort_key += 1
     # 初始化根节点列表
     tree_data = []
 
@@ -66,9 +71,14 @@ def build_tree(data, parent: str = "parent_id"):
             # 如果没有父节点，则当前节点为根节点
             tree_data.append(item)
 
-    return tree_data
-
+    def sort_tree(data):
+        data.sort(key=lambda x: x['_sort_key'])
+        for child in data:
+            if 'children' in child:
+                sort_tree(child['children'])
 
+    sort_tree(tree_data)
+    return tree_data
 def generate_uuid():
     """
     生成UUID

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

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