lesscode-flask 0.0.53__tar.gz → 0.0.54__tar.gz

{lesscode_flask-0.0.53 → lesscode_flask-0.0.54}/PKG-INFO

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

{lesscode_flask-0.0.53 → lesscode_flask-0.0.54}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.53'
+__version__ = '0.0.54'
 
 import functools
 import logging

{lesscode_flask-0.0.53 → lesscode_flask-0.0.54}/lesscode_flask/setting/__init__.py

@@ -111,3 +111,6 @@ class BaseConfig:
     # 资源注册相关
     REGISTER_ENABLE = False
     REGISTER_SERVER = "http://127.0.0.1:8976"
+
+    # 本地环境
+    ENV = "local"

{lesscode_flask-0.0.53 → lesscode_flask-0.0.54}/lesscode_flask/setup/__init__.py

@@ -281,7 +281,6 @@ def setup_resource_register(app):
 
     def package_resource(label, symbol, access, type, method="", url="", description="", param_list: list = None):
         """
-
         :param label: 展示中文名称
         :param symbol: 标识符号
         :param access: 访问权限2：需要权限 1：需要登录 0：游客
@@ -331,12 +330,6 @@ def setup_resource_register(app):
 
             for child_resource in url_rules_dict[parent_resource]:
                 view_func = app.view_functions[child_resource.endpoint]
-                if view_func.__doc__:
-
-                    description = view_func.__doc__.strip().splitlines()[
-                        0] if view_func.__doc__.strip().splitlines() else None
-                else:
-                    description = ""
 
                 method = list(child_resource.methods - {'HEAD', 'OPTIONS'})[0]
                 inter_desc, param_desc_dict, return_desc = split_doc(child_resource, app)
@@ -356,9 +349,10 @@ def setup_resource_register(app):
                 else:
                     param_list = []
                 resource["children"].append(
-                    package_resource(label="", symbol=child_resource.rule, access=1, type=2, method=method,
+                    package_resource(label=view_func._title, symbol=child_resource.rule, access=1, type=2,
+                                     method=method,
                                      url=child_resource.rule,
-                                     description=description, param_list=param_list))
+                                     description=inter_desc, param_list=param_list))
             resource_list.append(resource)
         try:
             httpx = importlib.import_module("httpx")

{lesscode_flask-0.0.53 → lesscode_flask-0.0.54}/lesscode_flask/utils/helpers.py

@@ -29,40 +29,38 @@ def result_to_dict(result):
         return {k: v for k, v in result.__dict__.items() if not k.startswith('_')}
     return result
 
-# def serialize_result_to_dict(result):
-#     """
-#     结果对象序列化为字典
-#     :param result:
-#     :return:
-#     """
-#     if isinstance(result, list):
-#         return [serialize_result_to_dict(r) for r in result]
-#     if not hasattr(result, "__dict__"):
-#         return result
-#     return {k: v for k, v in result.__dict__.items() if not k.startswith('_')}
-#
-#
-# def alchemy_result_to_dict(result):
-#     """
-#     alchemy 指定字段查询后返回的数据解析为字典
-#     :param result:
-#     :return:
-#     """
-#     data_list = []
-#     if not result:
-#         return result
-#     if isinstance(result, list):
-#         key_list = list(result[0]._fields)
-#         for d in result:
-#             dict_data = dict(zip(key_list, d))
-#             data_list.append(dict_data)
-#         return data_list
-#     else:
-#         if result:
-#             key_list = list(result._fields)
-#             return dict(zip(key_list, result))
-#         else:
-#             return {}
+
+def build_tree(data, parent: str = "parent_id"):
+    """
+    构建树形结构数据。
+    根据给定的数据列表和父节点标识，将平面数据结构转换为树形结构。
+
+    参数:
+    - data: 平面数据列表，每个元素包含一个节点及其父节点ID。
+    - parent: 字段名字符串，默认为"parent_id"，用于查找父节点。
+
+    返回:
+    - tree: 转换后的树形结构数据列表。
+    """
+    # 创建一个字典来快速查找节点
+    node_map = {item['id']: item for item in data}
+
+    # 初始化根节点列表
+    tree_data = []
+
+    for item in data:
+        parent_id = item[parent]
+        if parent_id in node_map:
+            # 如果存在父节点，则将当前节点添加为父节点的子节点
+            parent_node = node_map[parent_id]
+            if 'children' not in parent_node:
+                parent_node['children'] = []
+            parent_node['children'].append(item)
+        else:
+            # 如果没有父节点，则当前节点为根节点
+            tree_data.append(item)
+
+    return tree_data
 
 
 def generate_uuid():

{lesscode_flask-0.0.53 → lesscode_flask-0.0.54}/lesscode_flask/utils/request/request.py

@@ -10,16 +10,15 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
         httpx = importlib.import_module("httpx")
     except ImportError as e:
         raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
-    project_name = current_app.config.get("PROJECT_NAME", "").encode("utf-8")
     if not base_url:
         base_url = current_app.config.get("CAPABILITY_PLATFORM_SERVER", "")
-    if not kwargs.get("headers"):
-        kwargs.update({"headers": {
-            "Project-Name": project_name,
-            "Request-Id": uuid.uuid1().hex
-        }})
-    else:
-        kwargs["headers"].update({"Project-Name": project_name, "Request-Id": uuid.uuid1().hex})
+    headers = kwargs.get("headers", {})
+    if not headers.get("Request-Id"):
+        headers["Request-Id"] = uuid.uuid1().hex
+    if not headers.get("Project-Name"):
+        project_name = current_app.config.get("PROJECT_NAME", "").encode("utf-8")
+        headers["Project-Name"] = project_name
+    kwargs["headers"] = headers
     if not connect_config or not isinstance(connect_config, dict):
         connect_config = {"timeout": None}
     with httpx.Client(**connect_config) as session:

{lesscode_flask-0.0.53 → lesscode_flask-0.0.54}/lesscode_flask.egg-info/PKG-INFO

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