lesscode-flask 0.1.62__tar.gz → 0.1.64__tar.gz

{lesscode_flask-0.1.62 → lesscode-flask-0.1.64}/PKG-INFO

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

{lesscode_flask-0.1.62 → lesscode-flask-0.1.64}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.62'
+__version__ = '0.1.64'
 
 import functools
 import logging

{lesscode_flask-0.1.62 → lesscode-flask-0.1.64}/lesscode_flask/app.py

@@ -18,7 +18,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix
 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, setup_resource_register, setup_data_download, setup_scheduler, \
-    setup_common_resource
+    setup_common_resource, setup_task
 from lesscode_flask.signals import app_runed
 from lesscode_flask.utils.helpers import inject_args, generate_uuid, app_config
 from lesscode_flask.utils.json.NotSortJSONProvider import NotSortJSONProvider
@@ -151,6 +151,7 @@ class Lesscoder(Flask):
         setup_resource_register(self)
         setup_data_download(self)
         setup_scheduler(self)
+        setup_task(self)
 
     #  setup_static(self)
 

{lesscode_flask-0.1.62 → lesscode-flask-0.1.64}/lesscode_flask/setup/__init__.py

@@ -430,6 +430,27 @@ def setup_data_download(app):
         return url
 
 
+def setup_task(app):
+    task_routes = SQ_Blueprint("后台任务", url_prefix=f'{app.config.get("ROUTE_PREFIX", "")}')
+
+    @task_routes.post_route(f"运行任务", methods=['POST'])
+    def task_run(func_key: str, task_params: dict = None):
+        print(request.headers)
+        module, qualname = func_key.split(":")
+        m = import_module(module)
+        func = m
+        if "." in qualname:
+            tmp = qualname.split(".")
+            for t in tmp:
+                func = getattr(func, t)
+        else:
+            func = getattr(m, qualname)
+        task_params = task_params or dict()
+        func(**task_params)
+
+    app.register_blueprint(task_routes)
+
+
 def setup_scheduler(app):
     if current_app.config.get("SCHEDULER_ENABLE", False):
         try:

{lesscode_flask-0.1.62 → lesscode-flask-0.1.64}/lesscode_flask/utils/decorator/cache.py

@@ -12,7 +12,7 @@ from importlib import import_module
 
 # 装饰器
 # from lesscode_utils.json_utils import JSONEncoder
-from flask import copy_current_request_context
+from flask import copy_current_request_context, request
 
 from lesscode_flask.utils.helpers import app_config
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
@@ -128,6 +128,9 @@ def format_insert_key(signature, func_name, args, params):
         if k != "self":
             _args.append(json.dumps(params[k]))
     str_insert_key = "&".join([str(x) for x in _args])
+    headers = {key: value for key, value in request.headers if key in ["App-Key", "Data-Source-Id"]}
+    for h in headers:
+        str_insert_key = str_insert_key + "&" + str(headers[h])
     str_insert_key = app_config.get("ROUTE_PREFIX") + "#" + func_name + "#" + str_insert_key
     return str_insert_key
 

{lesscode_flask-0.1.62 → lesscode-flask-0.1.64}/lesscode_flask/utils/task/task_helper.py

@@ -1,5 +1,8 @@
 import importlib
 
+from flask import request
+from requests import post
+
 from lesscode_flask.app import current_app
 
 
@@ -8,7 +11,7 @@ class TaskHelper:
     def add_job(func, trigger=None, args=None, kwargs=None, id=None, name=None,
                 misfire_grace_time=None, coalesce=None, max_instances=None,
                 next_run_time=None, jobstore='default', executor='default',
-                replace_existing=False, **trigger_args):
+                replace_existing=False, is_add_ctx=False, **trigger_args):
         try:
             util = importlib.import_module("apscheduler.util")
         except ImportError:
@@ -22,11 +25,24 @@ class TaskHelper:
         if next_run_time is None:
             next_run_time = util.undefined
         scheduler = getattr(current_app, 'apscheduler')
-        job = scheduler.add_job(func=func, trigger=trigger, args=args, kwargs=kwargs, id=id, name=name,
-                                misfire_grace_time=misfire_grace_time, coalesce=coalesce,
-                                max_instances=max_instances,
-                                next_run_time=next_run_time, jobstore=jobstore, executor=executor,
-                                replace_existing=replace_existing, **trigger_args)
+        if is_add_ctx:
+            _func = post
+            _kwargs = {
+                "url": f"http://127.0.0.1:{current_app.config.get('PORT')}{current_app.config.get('ROUTE_PREFIX')}/task_run",
+                "json": {"func_key": f"{func.__module__}:{func.__qualname__}",
+                         "task_params": kwargs, },
+                "headers": dict(request.headers)}
+            job = scheduler.add_job(func=_func, trigger=trigger, args=args, kwargs=_kwargs, id=id, name=name,
+                                    misfire_grace_time=misfire_grace_time, coalesce=coalesce,
+                                    max_instances=max_instances,
+                                    next_run_time=next_run_time, jobstore=jobstore, executor=executor,
+                                    replace_existing=replace_existing, **trigger_args)
+        else:
+            job = scheduler.add_job(func=func, trigger=trigger, args=args, kwargs=kwargs, id=id, name=name,
+                                    misfire_grace_time=misfire_grace_time, coalesce=coalesce,
+                                    max_instances=max_instances,
+                                    next_run_time=next_run_time, jobstore=jobstore, executor=executor,
+                                    replace_existing=replace_existing, **trigger_args)
         return job
 
     @staticmethod

{lesscode_flask-0.1.62 → lesscode-flask-0.1.64}/lesscode_flask.egg-info/PKG-INFO

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