lesscode-flask 0.1.41__tar.gz → 0.1.43__tar.gz

{lesscode-flask-0.1.41 → lesscode-flask-0.1.43}/PKG-INFO

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

{lesscode-flask-0.1.41 → lesscode-flask-0.1.43}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.41'
+__version__ = '0.1.43'
 
 import functools
 import logging

{lesscode-flask-0.1.41 → lesscode-flask-0.1.43}/lesscode_flask/export_data/data_download_handler.py

@@ -1,4 +1,3 @@
-import inspect
 import json
 import logging
 import os
@@ -6,7 +5,8 @@ from datetime import datetime
 
 from flask import current_app
 from openpyxl import Workbook
-from openpyxl.styles import Alignment, Font
+
+from lesscode_flask.utils.file.file_utils import check_or_create_dir
 
 download_func_dict = {}
 
@@ -43,7 +43,7 @@ def upload_result_url(data_list: list, file_name: str = None, describe_text: str
     # ws.add_image(img, "A1")
     # 保存工作簿
     file_key = f'{file_name}-{datetime.now().strftime("%Y%m%d%H%M%S")}.xlsx'
-    path = f'{current_app.config.get("STATIC_PATH", "")}/data_download/{file_key}'
+    path = check_or_create_dir(f'{current_app.config.get("STATIC_PATH", "")}/data_download/{file_key}')
     wb.save(path)
     clear_excel_task()
     return f'{current_app.config.get("OUTSIDE_SCREEN_IP")}/static/data_download/{file_key}', file_key

{lesscode-flask-0.1.41 → lesscode-flask-0.1.43}/lesscode_flask/setup/__init__.py

@@ -1,10 +1,8 @@
 import inspect
-import os
 import uuid
 from datetime import datetime
 from importlib import import_module
 from logging.handlers import TimedRotatingFileHandler
-from os.path import dirname
 
 from flask import current_app
 
@@ -13,6 +11,7 @@ from lesscode_flask.db import db
 from lesscode_flask.export_data.data_download_handler import format_to_table_download, upload_result_url
 from lesscode_flask.log.access_log_handler import AccessLogHandler
 from lesscode_flask.model.user import User
+from lesscode_flask.utils.file.file_utils import check_or_create_dir
 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
@@ -22,12 +21,6 @@ from lesscode_flask.utils.swagger.swagger_util import generate_openapi_spec, rep
 # from flask_swagger_ui import get_swaggerui_blueprint
 
 
-def check_or_create_dir(path):
-    if not os.path.exists(dirname(path)):
-        os.makedirs(dirname(path))
-    return path
-
-
 def setup_logging(app):
     """
     初始化日志配置

lesscode-flask-0.1.43/lesscode_flask/utils/file/file_utils.py

@@ -0,0 +1,8 @@
+import os
+from os.path import dirname
+
+
+def check_or_create_dir(path):
+    if not os.path.exists(dirname(path)):
+        os.makedirs(dirname(path))
+    return path

{lesscode-flask-0.1.41 → lesscode-flask-0.1.43}/lesscode_flask/utils/oss/__init__.py

@@ -6,7 +6,7 @@ from lesscode_flask.utils.oss.ks3_oss import Ks3Oss
 
 
 class CommonOss:
-    def __init__(self, storage_type, data_type="stream", **kwargs):
+    def __init__(self, storage_type=None, data_type="stream", config_key="default", **kwargs):
         """
         初始化OSS
         Args:
@@ -14,10 +14,12 @@ class CommonOss:
             data_type (str): 数据类型，目前支持stream和file_path
             storage_config (dict): 存储配置，目前支持ks3和file,file_name
         """
-        self.storage_type = storage_type
+        _storage_config = app_config.get("STORAGE_CONFIG", {}).get(config_key, {}) or dict()
+        self.storage_type = storage_type if storage_type else _storage_config.get("storage_type", "")
         self.data_type = data_type
-        self.storage_config = kwargs.get("storage_config", {}) if kwargs.get("storage_config", {}) else app_config.get(
-            "STORAGE_CONFIG", {}).get("default", {})
+        self.storage_config = kwargs.get("storage_config", {}) if kwargs.get("storage_config",
+                                                                             {}) else _storage_config.get(
+            "storage_config", {})
 
     def _save(self, key, io_stream: BytesIO = None, file_path: str = None):
         file_url_obj = dict()

{lesscode-flask-0.1.41 → lesscode-flask-0.1.43}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode-flask-0.1.41 → lesscode-flask-0.1.43}/lesscode_flask.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ lesscode_flask/utils/decorator/__init__.py
 lesscode_flask/utils/decorator/cache.py
 lesscode_flask/utils/decorator/swagger.py
 lesscode_flask/utils/file/file_exporter.py
+lesscode_flask/utils/file/file_utils.py
 lesscode_flask/utils/json/NotSortJSONProvider.py
 lesscode_flask/utils/oss/__init__.py
 lesscode_flask/utils/oss/ks3_oss.py