lesscode-flask 0.1.46__tar.gz → 0.1.49__tar.gz

{lesscode-flask-0.1.46 → lesscode_flask-0.1.49}/PKG-INFO

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

{lesscode-flask-0.1.46 → lesscode_flask-0.1.49}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.46'
+__version__ = '0.1.49'
 
 import functools
 import logging

{lesscode-flask-0.1.46 → lesscode_flask-0.1.49}/lesscode_flask/model/user.py

@@ -222,6 +222,9 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
             permissions_url = []
             for key, value in app_dict.items():
                 permissions_url.append(key)
+                # 3.15 添加，如果value是字符串就转成dict
+                if isinstance(value, str):
+                    value = json.loads(value)
                 permissions.append(value.get("symbol", ""))
             user.permissions_url = permissions_url
             user.permissions = permissions

{lesscode-flask-0.1.46 → lesscode_flask-0.1.49}/lesscode_flask/setup/__init__.py

@@ -398,7 +398,7 @@ def setup_resource_register(app):
 #         """
 #         return send_from_directory('static', filename)
 
-
+t
 def setup_data_download(app):
     @app.route(f"{current_app.config.get('ROUTE_PREFIX')}/download/data_download", methods=['POST'])
     def data_download(download_key, data_len, params=None, column_list=None, page_size=10, file_name=""):

lesscode_flask-0.1.49/lesscode_flask/utils/task/task_helper.py

@@ -0,0 +1,142 @@
+import importlib
+
+from lesscode_flask.app import current_app
+
+
+class TaskHelper:
+    @staticmethod
+    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):
+        try:
+            util = importlib.import_module("apscheduler.util")
+        except ImportError:
+            raise Exception(f"flask_apscheduler is not exist,run:pip install flask_apscheduler==1.13.1")
+        if misfire_grace_time is None:
+            misfire_grace_time = util.undefined
+        if coalesce is None:
+            coalesce = util.undefined
+        if max_instances is None:
+            max_instances = util.undefined
+        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)
+        return job
+
+    @staticmethod
+    def scheduled_job(trigger, 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',
+                      **trigger_args):
+        try:
+            util = importlib.import_module("apscheduler.util")
+        except ImportError:
+            raise Exception(f"flask_apscheduler is not exist,run:pip install flask_apscheduler==1.13.1")
+        if misfire_grace_time is None:
+            misfire_grace_time = util.undefined
+        if coalesce is None:
+            coalesce = util.undefined
+        if max_instances is None:
+            max_instances = util.undefined
+        if next_run_time is None:
+            next_run_time = util.undefined
+        scheduler = getattr(current_app, 'apscheduler')
+        inner = scheduler.scheduled_job(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,
+                                        **trigger_args)
+        return inner
+
+    @staticmethod
+    def modify_job(job_id, jobstore=None, **changes):
+        scheduler = getattr(current_app, 'apscheduler')
+        job = scheduler.modify_job(job_id, jobstore=jobstore, **changes)
+        return job
+
+    @staticmethod
+    def reschedule_job(job_id, jobstore=None, trigger=None, **trigger_args):
+        scheduler = getattr(current_app, 'apscheduler')
+        job = scheduler.reschedule_job(job_id, jobstore=jobstore, trigger=trigger, **trigger_args)
+        return job
+
+    @staticmethod
+    def pause_job(job_id, jobstore=None):
+        scheduler = getattr(current_app, 'apscheduler')
+        job = scheduler.pause_job(job_id, jobstore=jobstore)
+        return job
+
+    @staticmethod
+    def resume_job(job_id, jobstore=None):
+        scheduler = getattr(current_app, 'apscheduler')
+        job = scheduler.resume_job(job_id, jobstore=jobstore)
+        return job
+
+    @staticmethod
+    def get_jobs(jobstore=None, pending=None):
+        scheduler = getattr(current_app, 'apscheduler')
+        jobs = scheduler.get_jobs(jobstore=jobstore, pending=pending)
+        return jobs
+
+    @staticmethod
+    def get_job(job_id, jobstore=None):
+        scheduler = getattr(current_app, 'apscheduler')
+        job = scheduler.get_job(job_id, jobstore=jobstore)
+        return job
+
+    @staticmethod
+    def remove_job(job_id, jobstore=None):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.remove_job(job_id, jobstore=jobstore)
+
+    @staticmethod
+    def remove_all_jobs(jobstore=None):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.remove_all_jobs(jobstore=jobstore)
+
+    @staticmethod
+    def print_jobs(jobstore=None, out=None):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.print_jobs(jobstore=jobstore, out=out)
+
+    @staticmethod
+    def add_executor(executor, alias='default', **executor_opts):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.add_executor(executor, alias=alias, **executor_opts)
+
+    @staticmethod
+    def remove_executor(alias, shutdown=True):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.remove_executor(alias=alias, shutdown=shutdown)
+
+    @staticmethod
+    def add_jobstore(jobstore, alias='default', **jobstore_opts):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.add_jobstore(jobstore, alias=alias, **jobstore_opts)
+
+    @staticmethod
+    def remove_jobstore(alias, shutdown=True):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.remove_jobstore(alias=alias, shutdown=shutdown)
+
+    @staticmethod
+    def add_listener(callback, mask=None):
+        try:
+            events = importlib.import_module("apscheduler.events")
+        except ImportError as e:
+            raise Exception(f"flask_apscheduler is not exist,run:pip install flask_apscheduler==1.13.1")
+        if mask is None:
+            mask = events.EVENT_ALL
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.add_listener(callback, mask=mask)
+
+    @staticmethod
+    def remove_listener(callback):
+        scheduler = getattr(current_app, 'apscheduler')
+        scheduler.remove_listener(callback)

{lesscode-flask-0.1.46 → lesscode_flask-0.1.49}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode-flask-0.1.46 → lesscode_flask-0.1.49}/lesscode_flask.egg-info/SOURCES.txt

@@ -41,6 +41,8 @@ lesscode_flask/utils/redis/redis_helper.py
 lesscode_flask/utils/request/request.py
 lesscode_flask/utils/swagger/swagger_template.py
 lesscode_flask/utils/swagger/swagger_util.py
+lesscode_flask/utils/task/__init__.py
+lesscode_flask/utils/task/task_helper.py
 lesscode_flask/utils/thread/thread_utils.py
 redash/query_runner/__init__.py
 redash/query_runner/clickhouse.py