From 8e962c0c59980a7382d9282d2a863ed05e148b1c Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 13 Dec 2021 08:03:19 +0100 Subject: [PATCH 01/50] add mixin to consum a single API --- .../plugin/builtin/integration/mixins.py | 72 +++++++++++++++++++ InvenTree/plugin/mixins/__init__.py | 4 +- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 3a6b558db7..70345172ce 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -1,4 +1,7 @@ """default mixins for IntegrationMixins""" +import json +import requests + from django.conf.urls import url, include from plugin.urls import PLUGIN_BASE @@ -167,3 +170,72 @@ class AppMixin: this plugin is always an app with this plugin """ return True + + +class APICallMixin: + """Mixin that enables easier API calls for a plugin + + 1. Add this mixin + 2. Add two global settings for the required url and token/passowrd (use `GlobalSettingsMixin`) + 3. Save the references to `API_URL_SETTING` and `API_PASSWORD_SETTING` + 4. Set `API_TOKEN` to the name required for the token / password by the external API + 5. (Optional) Override the `api_url` property method if some part of the APIs url is static + 6. (Optional) Override `api_headers` to add extra headers (by default the token/password and Content-Type are contained) + 6. Access the API in you plugin code via `api_call` + """ + API_METHOD = 'https' + API_URL_SETTING = None + API_PASSWORD_SETTING = None + + API_TOKEN = 'Bearer' + + class MixinMeta: + """meta options for this mixin""" + MIXIN_NAME = 'external API usage' + + def __init__(self): + super().__init__() + self.add_mixin('api_call', 'has_api_call', __class__) + + @property + def has_api_call(self): + """Is the mixin ready to call external APIs?""" + # TODO check if settings are set + return True + + @property + def api_url(self): + return f'{self.API_METHOD}://{self.get_globalsetting(self.API_URL_SETTING)}' + + @property + def api_headers(self): + return {self.API_TOKEN: self.get_globalsetting(self.API_PASSWORD_SETTING), 'Content-Type': 'application/json'} + + def api_build_url_args(self, arguments): + groups = [] + for key, val in arguments.items(): + groups.append(f'{key}={",".join([str(a) for a in val])}') + return f'?{"&".join(groups)}' + + def api_call(self, endpoint, method: str='GET', url_args=None, data=None, headers=None, simple_response: bool = True): + if url_args: + endpoint += self.api_build_url_args(url_args) + + if headers is None: + headers = self.api_headers + + # build kwargs for call + kwargs = { + 'url': f'{self.api_url}/{endpoint}', + 'headers': headers, + } + if data: + kwargs['data'] = json.dumps(data) + + # run command + response = requests.request(method, **kwargs) + + # return + if simple_response: + return response.json() + return response diff --git a/InvenTree/plugin/mixins/__init__.py b/InvenTree/plugin/mixins/__init__.py index feb6bc3466..d63bae097b 100644 --- a/InvenTree/plugin/mixins/__init__.py +++ b/InvenTree/plugin/mixins/__init__.py @@ -1,6 +1,6 @@ """utility class to enable simpler imports""" -from ..builtin.integration.mixins import AppMixin, GlobalSettingsMixin, UrlsMixin, NavigationMixin +from ..builtin.integration.mixins import AppMixin, GlobalSettingsMixin, UrlsMixin, NavigationMixin, APICallMixin __all__ = [ - 'AppMixin', 'GlobalSettingsMixin', 'UrlsMixin', 'NavigationMixin', + 'AppMixin', 'GlobalSettingsMixin', 'UrlsMixin', 'NavigationMixin', 'APICallMixin', ] From 251fdeb69e161d1c03fb7751fcdab61c49319471 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 13 Dec 2021 18:01:20 +0100 Subject: [PATCH 02/50] PEP fixes --- InvenTree/plugin/builtin/integration/mixins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 70345172ce..932588c281 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -174,7 +174,7 @@ class AppMixin: class APICallMixin: """Mixin that enables easier API calls for a plugin - + 1. Add this mixin 2. Add two global settings for the required url and token/passowrd (use `GlobalSettingsMixin`) 3. Save the references to `API_URL_SETTING` and `API_PASSWORD_SETTING` @@ -217,7 +217,7 @@ class APICallMixin: groups.append(f'{key}={",".join([str(a) for a in val])}') return f'?{"&".join(groups)}' - def api_call(self, endpoint, method: str='GET', url_args=None, data=None, headers=None, simple_response: bool = True): + def api_call(self, endpoint, method: str = 'GET', url_args=None, data=None, headers=None, simple_response: bool = True): if url_args: endpoint += self.api_build_url_args(url_args) From a2871ccb45beebf61d54ed30df91722646fa600d Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 13 Dec 2021 18:40:24 +0100 Subject: [PATCH 03/50] update database images before running --- .github/workflows/qc_checks.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qc_checks.yaml b/.github/workflows/qc_checks.yaml index 929a299e93..4491ba7815 100644 --- a/.github/workflows/qc_checks.yaml +++ b/.github/workflows/qc_checks.yaml @@ -282,6 +282,7 @@ jobs: cache: 'pip' - name: Install Dependencies run: | + sudo apt-get update sudo apt-get install mysql-server libmysqlclient-dev pip3 install invoke pip3 install mysqlclient From 1e5ecb13f04213f05bd0805ce6d169c5e7187cfa Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 7 Jan 2022 21:48:17 +1100 Subject: [PATCH 04/50] Add code for triggering and responding to events --- InvenTree/InvenTree/events.py | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 InvenTree/InvenTree/events.py diff --git a/InvenTree/InvenTree/events.py b/InvenTree/InvenTree/events.py new file mode 100644 index 0000000000..75b04adb00 --- /dev/null +++ b/InvenTree/InvenTree/events.py @@ -0,0 +1,42 @@ +""" +Functions for triggering and responding to server side events +""" + +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +import logging + +from InvenTree.tasks import offload_task + + +logger = logging.getLogger('inventree') + + +def trigger_event(event, *args, **kwargs): + """ + Trigger an even with optional arguments. + + This event will be stored in the database, + and the worker will respond to it later on. + """ + + logger.debug(f"Event triggered: '{event}'") + + offload_task( + 'InvenTree.events.process_event', + event, + *args, + **kwargs, + ) + +def process_event(event, *args, **kwargs): + """ + Respond to a triggered event. + + This function is run by the background worker process. + """ + + logger.info(f"Processing event '{event}'") + + # Determine if there are any plugins which are interested in responding From 8ff3bf1ad19cb35ed12975a916b5fbb768c52b1b Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 7 Jan 2022 21:53:42 +1100 Subject: [PATCH 05/50] Adds a new setting to enable event responses --- InvenTree/InvenTree/events.py | 6 ++++++ InvenTree/common/models.py | 11 ++++++++++- InvenTree/templates/InvenTree/settings/plugin.html | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/events.py b/InvenTree/InvenTree/events.py index 75b04adb00..2286f57d7b 100644 --- a/InvenTree/InvenTree/events.py +++ b/InvenTree/InvenTree/events.py @@ -7,6 +7,10 @@ from __future__ import unicode_literals import logging +from django.conf import settings + +from common.models import InvenTreeSetting + from InvenTree.tasks import offload_task @@ -40,3 +44,5 @@ def process_event(event, *args, **kwargs): logger.info(f"Processing event '{event}'") # Determine if there are any plugins which are interested in responding + if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_EVENTS'): + pass diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index dee0eb2e8b..d361cb5bb1 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -957,6 +957,8 @@ class InvenTreeSetting(BaseInvenTreeSetting): 'default': False, 'validator': bool, }, + + # Settings for plugin mixin features 'ENABLE_PLUGINS_URL': { 'name': _('Enable URL integration'), 'description': _('Enable plugins to add URL routes'), @@ -984,7 +986,14 @@ class InvenTreeSetting(BaseInvenTreeSetting): 'default': False, 'validator': bool, 'requires_restart': True, - } + }, + 'ENABLE_PLUGINS_EVENTS': { + 'name': _('Enable event integration'), + 'description': _('Enable plugins to respond to internal events'), + 'default': False, + 'validator': bool, + 'requires_restart': True, + }, } class Meta: diff --git a/InvenTree/templates/InvenTree/settings/plugin.html b/InvenTree/templates/InvenTree/settings/plugin.html index 858d0f3ab9..7b428e161f 100644 --- a/InvenTree/templates/InvenTree/settings/plugin.html +++ b/InvenTree/templates/InvenTree/settings/plugin.html @@ -20,6 +20,7 @@ {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_SCHEDULE" icon="fa-calendar-alt" %} + {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_EVENTS" icon="fa-reply-all" %} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_URL" icon="fa-link" %} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_NAVIGATION" icon="fa-sitemap" %} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_APP" icon="fa-rocket" %} From 63eb49777a5ce289c3910ea87929702e88990b39 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 7 Jan 2022 22:22:59 +1100 Subject: [PATCH 06/50] Add mixin class to respond to internal events --- .../plugin/builtin/integration/mixins.py | 64 +++++++++++++++++++ InvenTree/plugin/mixins/__init__.py | 3 +- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index c6198ed7a1..68288121e2 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -80,6 +80,7 @@ class ScheduleMixin: ALLOWABLE_SCHEDULE_TYPES = ['I', 'H', 'D', 'W', 'M', 'Q', 'Y'] + # Override this in subclass model SCHEDULED_TASKS = {} class MixinMeta: @@ -180,6 +181,69 @@ class ScheduleMixin: logger.warning("unregister_tasks failed, database not ready") +class EventMixin: + """ + Mixin that provides support for responding to triggered events. + + Implementing classes must provide a list of tuples, + which provide pairs of 'event':'function' + + Notes: + + Events are called by name, and based on the django signal nomenclature, + e.g. 'part.pre_save' + + Receiving functions must be prototyped to match the 'event' they receive. + + Example: + + EVENTS = [ + ('part.pre_save', 'myplugin.functions.do_stuff'), + ('build.complete', 'myplugin.functions.process_completed_build'), + ] + """ + + # Override this in subclass model + EVENTS = [] + + class MixinMeta: + MIXIN_NAME = 'Events' + + def __init__(self): + super().__init__() + self.add_mixin('events', 'has_events', __class__) + self.events = getattr(self, 'EVENTS', []) + + self.validate_events() + + @property + def has_events(self): + return bool(self.events) and len(self.events) > 0 + + def validate_events(self): + """ + Check that the provided event callbacks are valid + """ + + if not self.has_events: + raise ValueError('EVENTS not defined') + + for pair in self.events: + valid = True + + if len(pair) == 2: + event = pair[0].strip() + func = pair[1].strip() + + if len(event) == 0 or len(func) == 0: + valid = False + else: + valid = False + + if not valid: + raise ValueError("Invalid event callback: " + str(pair)) + + class UrlsMixin: """ Mixin that enables custom URLs for the plugin diff --git a/InvenTree/plugin/mixins/__init__.py b/InvenTree/plugin/mixins/__init__.py index e9c910bb9e..3df552df75 100644 --- a/InvenTree/plugin/mixins/__init__.py +++ b/InvenTree/plugin/mixins/__init__.py @@ -2,10 +2,11 @@ Utility class to enable simpler imports """ -from ..builtin.integration.mixins import AppMixin, SettingsMixin, ScheduleMixin, UrlsMixin, NavigationMixin +from ..builtin.integration.mixins import AppMixin, SettingsMixin, EventMixin, ScheduleMixin, UrlsMixin, NavigationMixin __all__ = [ 'AppMixin', + 'EventMixin', 'NavigationMixin', 'ScheduleMixin', 'SettingsMixin', From a604d85f0f83afa413061bb5cb0f14c0ab6805b2 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 7 Jan 2022 22:31:10 +1100 Subject: [PATCH 07/50] Move events.py to the plugin app --- InvenTree/{InvenTree => plugin}/events.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename InvenTree/{InvenTree => plugin}/events.py (91%) diff --git a/InvenTree/InvenTree/events.py b/InvenTree/plugin/events.py similarity index 91% rename from InvenTree/InvenTree/events.py rename to InvenTree/plugin/events.py index 2286f57d7b..703fe71d9c 100644 --- a/InvenTree/InvenTree/events.py +++ b/InvenTree/plugin/events.py @@ -19,7 +19,7 @@ logger = logging.getLogger('inventree') def trigger_event(event, *args, **kwargs): """ - Trigger an even with optional arguments. + Trigger an event with optional arguments. This event will be stored in the database, and the worker will respond to it later on. @@ -28,12 +28,13 @@ def trigger_event(event, *args, **kwargs): logger.debug(f"Event triggered: '{event}'") offload_task( - 'InvenTree.events.process_event', + 'plugin.events.process_event', event, *args, **kwargs, ) + def process_event(event, *args, **kwargs): """ Respond to a triggered event. From 04d25a60b0653304ee541192920a2c737a73ac7d Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 8 Jan 2022 09:07:27 +1100 Subject: [PATCH 08/50] Adds sample plugin which responds to triggered events - Adds some example trigger events for the "Part" model --- InvenTree/part/models.py | 12 ++++-- .../plugin/builtin/integration/mixins.py | 4 +- InvenTree/plugin/events.py | 25 +++++++++++- InvenTree/plugin/plugin.py | 12 ++++++ InvenTree/plugin/registry.py | 39 +++++++++++++++++++ .../samples/integration/event_sample.py | 29 ++++++++++++++ .../samples/integration/scheduled_task.py | 2 +- .../InvenTree/settings/plugin_settings.html | 2 +- 8 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 InvenTree/plugin/samples/integration/event_sample.py diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index ec76846a08..99d7cd02f5 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -60,6 +60,8 @@ import common.models import part.settings as part_settings +from plugin.events import trigger_event + logger = logging.getLogger("inventree") @@ -1980,10 +1982,10 @@ class Part(MPTTModel): @property def attachment_count(self): - """ Count the number of attachments for this part. + """ + Count the number of attachments for this part. If the part is a variant of a template part, include the number of attachments for the template part. - """ return self.part_attachments.count() @@ -2181,7 +2183,11 @@ def after_save_part(sender, instance: Part, created, **kwargs): Function to be executed after a Part is saved """ - if not created: + trigger_event('part.saved', part_id=instance.pk) + + if created: + trigger_event('part.created', part_id=instance.pk) + else: # Check part stock only if we are *updating* the part (not creating it) # Run this check in the background diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 68288121e2..dff749af53 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -189,10 +189,10 @@ class EventMixin: which provide pairs of 'event':'function' Notes: - + Events are called by name, and based on the django signal nomenclature, e.g. 'part.pre_save' - + Receiving functions must be prototyped to match the 'event' they receive. Example: diff --git a/InvenTree/plugin/events.py b/InvenTree/plugin/events.py index 703fe71d9c..bd3bf7c06c 100644 --- a/InvenTree/plugin/events.py +++ b/InvenTree/plugin/events.py @@ -8,11 +8,14 @@ from __future__ import unicode_literals import logging from django.conf import settings +from django.db import transaction from common.models import InvenTreeSetting from InvenTree.tasks import offload_task +from plugin.registry import plugin_registry + logger = logging.getLogger('inventree') @@ -38,12 +41,30 @@ def trigger_event(event, *args, **kwargs): def process_event(event, *args, **kwargs): """ Respond to a triggered event. - + This function is run by the background worker process. + + This function may queue multiple functions to be handled by the background worker. """ logger.info(f"Processing event '{event}'") # Determine if there are any plugins which are interested in responding if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_EVENTS'): - pass + + # Run atomically, to ensure that either *all* tasks are registered, or *none* + with transaction.atomic(): + for slug, callbacks in plugin_registry.mixins_events.items(): + # slug = plugin slug + # callbacks = list of (event, function) tuples + + for _event, _func in callbacks: + if _event == event: + + logger.info(f"Running task '{_func}' for plugin '{slug}'") + + offload_task( + _func, + *args, + **kwargs + ) diff --git a/InvenTree/plugin/plugin.py b/InvenTree/plugin/plugin.py index 35643b36c3..8842553ba7 100644 --- a/InvenTree/plugin/plugin.py +++ b/InvenTree/plugin/plugin.py @@ -63,3 +63,15 @@ class InvenTreePlugin(): raise error return cfg + + def is_active(self): + """ + Return True if this plugin is currently active + """ + + cfg = self.plugin_config() + + if cfg: + return cfg.active + else: + return False diff --git a/InvenTree/plugin/registry.py b/InvenTree/plugin/registry.py index b7e37d22ba..5e6016fc86 100644 --- a/InvenTree/plugin/registry.py +++ b/InvenTree/plugin/registry.py @@ -56,8 +56,10 @@ class PluginsRegistry: # integration specific self.installed_apps = [] # Holds all added plugin_paths + # mixins self.mixins_settings = {} + self.mixins_events = {} # region public plugin functions def load_plugins(self): @@ -265,6 +267,7 @@ class PluginsRegistry: logger.info(f'Found {len(plugins)} active plugins') self.activate_integration_settings(plugins) + self.activate_integration_events(plugins) self.activate_integration_schedule(plugins) self.activate_integration_app(plugins, force_reload=force_reload) @@ -275,6 +278,7 @@ class PluginsRegistry: self.deactivate_integration_app() self.deactivate_integration_schedule() + self.deactivate_integration_events() self.deactivate_integration_settings() def activate_integration_settings(self, plugins): @@ -299,6 +303,41 @@ class PluginsRegistry: # clear cache self.mixins_settings = {} + def activate_integration_events(self, plugins): + """ + Activate triggered events mixin for applicable plugins + """ + + logger.info('Activating plugin events') + + from common.models import InvenTreeSetting + + self.mixins_events = {} + + event_count = 0 + + if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_EVENTS'): + + for slug, plugin in plugins: + + if plugin.mixin_enabled('events'): + config = plugin.plugin_config() + + # Only activate events for plugins which are enabled + if config and config.active: + self.mixins_events[slug] = plugin.events + + event_count += len(plugin.events) + + if event_count > 0: + logger.info(f"Registered callbacks for {event_count} events") + + def deactivate_integration_events(self): + """ + Deactivate events for all plugins + """ + self.mixins_events = {} + def activate_integration_schedule(self, plugins): logger.info('Activating plugin tasks') diff --git a/InvenTree/plugin/samples/integration/event_sample.py b/InvenTree/plugin/samples/integration/event_sample.py new file mode 100644 index 0000000000..48516cfa3c --- /dev/null +++ b/InvenTree/plugin/samples/integration/event_sample.py @@ -0,0 +1,29 @@ +""" +Sample plugin which responds to events +""" + +from plugin import IntegrationPluginBase +from plugin.mixins import EventMixin + + +def on_part_saved(*args, **kwargs): + """ + Simple function which responds to a triggered event + """ + + part_id = kwargs['part_id'] + print(f"func on_part_saved() - part: {part_id}") + + +class EventPlugin(EventMixin, IntegrationPluginBase): + """ + A sample plugin which provides supports for triggered events + """ + + PLUGIN_NAME = "EventPlugin" + PLUGIN_SLUG = "event" + PLUGIN_TITLE = "Triggered Events" + + EVENTS = [ + ('part.saved', 'plugin.samples.integration.event_sample.on_part_saved'), + ] diff --git a/InvenTree/plugin/samples/integration/scheduled_task.py b/InvenTree/plugin/samples/integration/scheduled_task.py index 5a8f866cd7..7a08a21287 100644 --- a/InvenTree/plugin/samples/integration/scheduled_task.py +++ b/InvenTree/plugin/samples/integration/scheduled_task.py @@ -32,7 +32,7 @@ class ScheduledTaskPlugin(ScheduleMixin, IntegrationPluginBase): 'hello': { 'func': 'plugin.samples.integration.scheduled_task.print_hello', 'schedule': 'I', - 'minutes': 5, + 'minutes': 45, }, 'world': { 'func': 'plugin.samples.integration.scheduled_task.print_hello', diff --git a/InvenTree/templates/InvenTree/settings/plugin_settings.html b/InvenTree/templates/InvenTree/settings/plugin_settings.html index 59178300ac..a670d71c34 100644 --- a/InvenTree/templates/InvenTree/settings/plugin_settings.html +++ b/InvenTree/templates/InvenTree/settings/plugin_settings.html @@ -90,7 +90,7 @@ - + From 9e2250e9b80ea1216467db371e42ce37b6430365 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 8 Jan 2022 13:19:16 +1100 Subject: [PATCH 09/50] Bug fixes for settings --- InvenTree/common/models.py | 7 ------- InvenTree/templates/InvenTree/settings/report.html | 2 +- InvenTree/templates/InvenTree/settings/stock.html | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index d361cb5bb1..50c95966cc 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -872,13 +872,6 @@ class InvenTreeSetting(BaseInvenTreeSetting): 'validator': bool, }, - 'STOCK_GROUP_BY_PART': { - 'name': _('Group by Part'), - 'description': _('Group stock items by part reference in table views'), - 'default': True, - 'validator': bool, - }, - 'BUILDORDER_REFERENCE_PREFIX': { 'name': _('Build Order Reference Prefix'), 'description': _('Prefix value for build order reference'), diff --git a/InvenTree/templates/InvenTree/settings/report.html b/InvenTree/templates/InvenTree/settings/report.html index 54c7175508..a25ace23ce 100644 --- a/InvenTree/templates/InvenTree/settings/report.html +++ b/InvenTree/templates/InvenTree/settings/report.html @@ -12,7 +12,7 @@
{% trans "Installation path" %} {{ plugin.package_path }}
- {% include "InvenTree/settings/setting.html" with key="REPORT_ENABLE" icon="file-pdf" %} + {% include "InvenTree/settings/setting.html" with key="REPORT_ENABLE" icon="fa-file-pdf" %} {% include "InvenTree/settings/setting.html" with key="REPORT_DEFAULT_PAGE_SIZE" icon="fa-print" %} {% include "InvenTree/settings/setting.html" with key="REPORT_DEBUG_MODE" icon="fa-laptop-code" %} {% include "InvenTree/settings/setting.html" with key="REPORT_ENABLE_TEST_REPORT" icon="fa-vial" %} diff --git a/InvenTree/templates/InvenTree/settings/stock.html b/InvenTree/templates/InvenTree/settings/stock.html index d5455750d7..a3c0940c1f 100644 --- a/InvenTree/templates/InvenTree/settings/stock.html +++ b/InvenTree/templates/InvenTree/settings/stock.html @@ -11,7 +11,6 @@
- {% include "InvenTree/settings/setting.html" with key="STOCK_GROUP_BY_PART" icon="fa-layer-group" %} {% include "InvenTree/settings/setting.html" with key="STOCK_ENABLE_EXPIRY" icon="fa-stopwatch" %} {% include "InvenTree/settings/setting.html" with key="STOCK_STALE_DAYS" icon="fa-calendar" %} {% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_SALE" icon="fa-truck" %} From 137a668452e802f92f4f64797b28a6bf507f1ed1 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 8 Jan 2022 13:29:13 +1100 Subject: [PATCH 10/50] Remove duplicated settings display --- .../templates/InvenTree/settings/user.html | 82 ------------------- 1 file changed, 82 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index ae04568f53..9bd0dba26e 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -214,88 +214,6 @@ -
-
-

{% trans "Theme Settings" %}

-
- -
-
- {% csrf_token %} - - -
- -
- -
-
- -
-
- -
-
-

{% trans "Language Settings" %}

-
- -
-
- {% csrf_token %} - - -
- -
- -
-

{% trans "Some languages are not complete" %} - {% if ALL_LANG %} - . {% trans "Show only sufficent" %} - {% else %} - and hidden. {% trans "Show them too" %} - {% endif %} -

-
- -
-
-

{% trans "Help the translation efforts!" %}

-

{% blocktrans with link="https://crowdin.com/project/inventree" %}Native language translation of the - InvenTree web application is community contributed via crowdin. Contributions are - welcomed and encouraged.{% endblocktrans %}

-
-
-
From 77decc72edb2a074d5507d78d0ddbcf2de629cc8 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 8 Jan 2022 20:07:54 +1100 Subject: [PATCH 11/50] Extra bug fix for part variant form --- InvenTree/config_template.yaml | 9 +++++---- InvenTree/templates/js/translated/part.js | 8 +++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/InvenTree/config_template.yaml b/InvenTree/config_template.yaml index 3472a37d8e..d8f780bb36 100644 --- a/InvenTree/config_template.yaml +++ b/InvenTree/config_template.yaml @@ -14,18 +14,15 @@ database: # --- Available options: --- # ENGINE: Database engine. Selection from: - # - sqlite3 # - mysql # - postgresql + # - sqlite3 # NAME: Database name # USER: Database username (if required) # PASSWORD: Database password (if required) # HOST: Database host address (if required) # PORT: Database host port (if required) - # --- Example Configuration - sqlite3 --- - # ENGINE: sqlite3 - # NAME: '/home/inventree/database.sqlite3' # --- Example Configuration - MySQL --- #ENGINE: mysql @@ -42,6 +39,10 @@ database: #PASSWORD: inventree_password #HOST: 'localhost' #PORT: '5432' + + # --- Example Configuration - sqlite3 --- + # ENGINE: sqlite3 + # NAME: '/home/inventree/database.sqlite3' # Select default system language (default is 'en-us') language: en-us diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js index 3d70b97598..020c5d1a6c 100644 --- a/InvenTree/templates/js/translated/part.js +++ b/InvenTree/templates/js/translated/part.js @@ -345,6 +345,12 @@ function editPart(pk) { // Launch form to duplicate a part function duplicatePart(pk, options={}) { + var title = '{% trans "Duplicate Part" %}'; + + if (options.variant) { + title = '{% trans "Create Part Variant" %}'; + } + // First we need all the part information inventreeGet(`/api/part/${pk}/`, {}, { @@ -372,7 +378,7 @@ function duplicatePart(pk, options={}) { method: 'POST', fields: fields, groups: partGroups(), - title: '{% trans "Duplicate Part" %}', + title: title, data: data, onSuccess: function(data) { // Follow the new part From af18d16d98407146167bbce92205c1c2045a31af Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 8 Jan 2022 20:19:18 +1100 Subject: [PATCH 12/50] Tweak admin area icon --- InvenTree/templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 0ee6bb021e..551f1e99ed 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -108,7 +108,7 @@
    {% if user.is_authenticated %} {% if user.is_staff and not demo %} -
  • {% trans "Admin" %}
    • +
  • {% trans "Admin" %}
    • {% endif %}
  • {% trans "Logout" %}
    • {% else %} From ff7a75266b45b764feaa20fc089880a44485a7d4 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 8 Jan 2022 20:28:57 +1100 Subject: [PATCH 13/50] Fixes for stock location forms --- InvenTree/stock/serializers.py | 1 + InvenTree/templates/js/translated/stock.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/InvenTree/stock/serializers.py b/InvenTree/stock/serializers.py index 1c4c8844ff..cdc844095b 100644 --- a/InvenTree/stock/serializers.py +++ b/InvenTree/stock/serializers.py @@ -426,6 +426,7 @@ class LocationSerializer(InvenTree.serializers.InvenTreeModelSerializer): 'parent', 'pathstring', 'items', + 'owner', ] diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js index 988b93cad9..ded4c48883 100644 --- a/InvenTree/templates/js/translated/stock.js +++ b/InvenTree/templates/js/translated/stock.js @@ -111,12 +111,17 @@ function stockLocationFields(options={}) { }, name: {}, description: {}, + owner: {}, }; if (options.parent) { fields.parent.value = options.parent; } + if (!global_settings.STOCK_OWNERSHIP_CONTROL) { + delete fields['owner']; + } + return fields; } @@ -130,6 +135,8 @@ function editStockLocation(pk, options={}) { options.fields = stockLocationFields(options); + options.title = '{% trans "Edit Stock Location" %}'; + constructForm(url, options); } From 62394c4a826b06eaf37dfea8e90cc21021f507e8 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 8 Jan 2022 21:54:42 +0100 Subject: [PATCH 14/50] small reformat --- InvenTree/plugin/builtin/integration/mixins.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 457f86fb80..4f2d35268e 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -342,7 +342,10 @@ class APICallMixin: @property def api_headers(self): - return {self.API_TOKEN: self.get_globalsetting(self.API_PASSWORD_SETTING), 'Content-Type': 'application/json'} + return { + self.API_TOKEN: self.get_globalsetting(self.API_PASSWORD_SETTING), + 'Content-Type': 'application/json' + } def api_build_url_args(self, arguments): groups = [] From f59b59401fb66374a60555308b249411750b205e Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 8 Jan 2022 21:58:44 +0100 Subject: [PATCH 15/50] refactor setting --- InvenTree/plugin/builtin/integration/mixins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 4f2d35268e..590c7615d6 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -318,7 +318,7 @@ class APICallMixin: """ API_METHOD = 'https' API_URL_SETTING = None - API_PASSWORD_SETTING = None + API_TOKEN_SETTING = None API_TOKEN = 'Bearer' @@ -343,7 +343,7 @@ class APICallMixin: @property def api_headers(self): return { - self.API_TOKEN: self.get_globalsetting(self.API_PASSWORD_SETTING), + self.API_TOKEN: self.get_globalsetting(self.API_TOKEN_SETTING), 'Content-Type': 'application/json' } From 3aea1bb7ba1c44c813ba8cf099d2ac43b91c5f62 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 8 Jan 2022 21:59:02 +0100 Subject: [PATCH 16/50] made docstring clearer --- InvenTree/plugin/builtin/integration/mixins.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 590c7615d6..4001a100e3 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -306,14 +306,15 @@ class AppMixin: class APICallMixin: - """Mixin that enables easier API calls for a plugin + """ + Mixin that enables easier API calls for a plugin - 1. Add this mixin - 2. Add two global settings for the required url and token/passowrd (use `GlobalSettingsMixin`) - 3. Save the references to `API_URL_SETTING` and `API_PASSWORD_SETTING` - 4. Set `API_TOKEN` to the name required for the token / password by the external API - 5. (Optional) Override the `api_url` property method if some part of the APIs url is static - 6. (Optional) Override `api_headers` to add extra headers (by default the token/password and Content-Type are contained) + 1. Add this mixin before (left of) SettingsMixin and PluginBase + 2. Add two settings for the required url and token/passowrd (use `SettingsMixin`) + 3. Save the references to keys of the settings in `API_URL_SETTING` and `API_TOKEN_SETTING` + 4. (Optional) Set `API_TOKEN` to the name required for the token by the external API - Defaults to `Bearer` + 5. (Optional) Override the `api_url` property method if the setting needs to be extended + 6. (Optional) Override `api_headers` to add extra headers (by default the token and Content-Type are contained) 6. Access the API in you plugin code via `api_call` """ API_METHOD = 'https' From d939107d3633f623d76e83f140ff1a9852bee84b Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:01:31 +0100 Subject: [PATCH 17/50] add example --- .../plugin/builtin/integration/mixins.py | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 4001a100e3..84d99d1bce 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -315,7 +315,40 @@ class APICallMixin: 4. (Optional) Set `API_TOKEN` to the name required for the token by the external API - Defaults to `Bearer` 5. (Optional) Override the `api_url` property method if the setting needs to be extended 6. (Optional) Override `api_headers` to add extra headers (by default the token and Content-Type are contained) - 6. Access the API in you plugin code via `api_call` + 7. Access the API in you plugin code via `api_call` + + Example: + ``` + from plugin import IntegrationPluginBase + from plugin.mixins import APICallMixin, SettingsMixin + + + class SampleApiCallerPlugin(APICallMixin, SettingsMixin, IntegrationPluginBase): + ''' + A small api call sample + ''' + PLUGIN_NAME = "Sample API Caller" + + SETTINGS = { + 'API_TOKEN': { + 'name': 'API Token', + 'protected': True, + }, + 'API_URL': { + 'name': 'External URL', + 'description': 'Where is your API located?', + 'default': 'https://reqres.in', + }, + } + API_URL_SETTING = 'API_URL' + API_TOKEN_SETTING = 'API_TOKEN' + + def get_external_url(self): + ''' + returns data from the sample endpoint + ''' + return self.api_call('api/users/2') + ``` """ API_METHOD = 'https' API_URL_SETTING = None From 33ee7e53dbbd861d32221b31969fa80d61a93b9c Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:01:50 +0100 Subject: [PATCH 18/50] append docstring --- InvenTree/plugin/builtin/integration/mixins.py | 1 + 1 file changed, 1 insertion(+) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 84d99d1bce..d9f6bdc2d5 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -309,6 +309,7 @@ class APICallMixin: """ Mixin that enables easier API calls for a plugin + Steps to set up: 1. Add this mixin before (left of) SettingsMixin and PluginBase 2. Add two settings for the required url and token/passowrd (use `SettingsMixin`) 3. Save the references to keys of the settings in `API_URL_SETTING` and `API_TOKEN_SETTING` From 19f2c44c2a77e89bd508b99ceea45a2ce9233344 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:02:19 +0100 Subject: [PATCH 19/50] change mixin name --- InvenTree/plugin/builtin/integration/mixins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index d9f6bdc2d5..22ba6de27d 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -359,7 +359,7 @@ class APICallMixin: class MixinMeta: """meta options for this mixin""" - MIXIN_NAME = 'external API usage' + MIXIN_NAME = 'API calls' def __init__(self): super().__init__() From 61b21d1ec14e0be683f8da2b92b3ca2aa9fdcf59 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:03:05 +0100 Subject: [PATCH 20/50] add sample for api caller --- .../plugin/samples/integration/api_caller.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 InvenTree/plugin/samples/integration/api_caller.py diff --git a/InvenTree/plugin/samples/integration/api_caller.py b/InvenTree/plugin/samples/integration/api_caller.py new file mode 100644 index 0000000000..eaef93a4b6 --- /dev/null +++ b/InvenTree/plugin/samples/integration/api_caller.py @@ -0,0 +1,34 @@ +""" +Sample plugin for calling an external API +""" +from django.utils.translation import ugettext_lazy as _ + +from plugin import IntegrationPluginBase +from plugin.mixins import APICallMixin, SettingsMixin + + +class SampleApiCallerPlugin(APICallMixin, SettingsMixin, IntegrationPluginBase): + """ + A small api call sample + """ + PLUGIN_NAME = "Sample API Caller" + + SETTINGS = { + 'API_TOKEN': { + 'name': 'API Token', + 'protected': True, + }, + 'API_URL': { + 'name': 'External URL', + 'description': 'Where is your API located?', + 'default': 'https://reqres.in', + }, + } + API_URL_SETTING = 'API_URL' + API_TOKEN_SETTING = 'API_TOKEN' + + def get_external_url(self): + """ + returns data from the sample endpoint + """ + return self.api_call('api/users/2') From ed193e9e90304c04ed8047a2ffc41f8926808e0e Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:04:00 +0100 Subject: [PATCH 21/50] docstring for plugin base import class --- InvenTree/plugin/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/InvenTree/plugin/__init__.py b/InvenTree/plugin/__init__.py index b3dc3a2fd0..86f65919c4 100644 --- a/InvenTree/plugin/__init__.py +++ b/InvenTree/plugin/__init__.py @@ -1,3 +1,7 @@ +""" +Utility file to enable simper imports +""" + from .registry import plugin_registry from .plugin import InvenTreePlugin from .integration import IntegrationPluginBase From ea8fd21af09933526a5930cce7c70b7e2b69eda4 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:10:23 +0100 Subject: [PATCH 22/50] pip fix --- InvenTree/plugin/samples/integration/api_caller.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/InvenTree/plugin/samples/integration/api_caller.py b/InvenTree/plugin/samples/integration/api_caller.py index eaef93a4b6..7e5c883961 100644 --- a/InvenTree/plugin/samples/integration/api_caller.py +++ b/InvenTree/plugin/samples/integration/api_caller.py @@ -1,8 +1,6 @@ """ Sample plugin for calling an external API """ -from django.utils.translation import ugettext_lazy as _ - from plugin import IntegrationPluginBase from plugin.mixins import APICallMixin, SettingsMixin From b48e9bcac9cf8417cf51ba44f3f0577d2cc1fa89 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:33:47 +0100 Subject: [PATCH 23/50] fix settings call --- InvenTree/plugin/builtin/integration/mixins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 22ba6de27d..c8bb9f7f9e 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -373,12 +373,12 @@ class APICallMixin: @property def api_url(self): - return f'{self.API_METHOD}://{self.get_globalsetting(self.API_URL_SETTING)}' + return f'{self.API_METHOD}://{self.get_setting(self.API_URL_SETTING)}' @property def api_headers(self): return { - self.API_TOKEN: self.get_globalsetting(self.API_TOKEN_SETTING), + self.API_TOKEN: self.get_setting(self.API_TOKEN_SETTING), 'Content-Type': 'application/json' } From cc8948c708cdb00c28341e42c7b321f0ffa4d37b Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:34:08 +0100 Subject: [PATCH 24/50] fix sample url --- InvenTree/plugin/builtin/integration/mixins.py | 2 +- InvenTree/plugin/samples/integration/api_caller.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index c8bb9f7f9e..66676d0520 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -338,7 +338,7 @@ class APICallMixin: 'API_URL': { 'name': 'External URL', 'description': 'Where is your API located?', - 'default': 'https://reqres.in', + 'default': 'reqres.in', }, } API_URL_SETTING = 'API_URL' diff --git a/InvenTree/plugin/samples/integration/api_caller.py b/InvenTree/plugin/samples/integration/api_caller.py index 7e5c883961..36e1583ba0 100644 --- a/InvenTree/plugin/samples/integration/api_caller.py +++ b/InvenTree/plugin/samples/integration/api_caller.py @@ -19,7 +19,7 @@ class SampleApiCallerPlugin(APICallMixin, SettingsMixin, IntegrationPluginBase): 'API_URL': { 'name': 'External URL', 'description': 'Where is your API located?', - 'default': 'https://reqres.in', + 'default': 'reqres.in', }, } API_URL_SETTING = 'API_URL' From f9742ab41d6f75d44f853b7767b37f30fb289512 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:34:27 +0100 Subject: [PATCH 25/50] add integration test for plugin --- .../samples/integration/test_api_caller.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 InvenTree/plugin/samples/integration/test_api_caller.py diff --git a/InvenTree/plugin/samples/integration/test_api_caller.py b/InvenTree/plugin/samples/integration/test_api_caller.py new file mode 100644 index 0000000000..7db431c3ee --- /dev/null +++ b/InvenTree/plugin/samples/integration/test_api_caller.py @@ -0,0 +1,20 @@ +""" Unit tests for action caller sample""" + +from django.test import TestCase + +from plugin import plugin_registry + +class SampleApiCallerPluginTests(TestCase): + """ Tests for SampleApiCallerPluginTests """ + + def test_return(self): + """check if the external api call works""" + # The plugin should be defined + self.assertIn('sample-api-caller', plugin_registry.plugins) + plg = plugin_registry.plugins['sample-api-caller'] + self.assertTrue(plg) + + # do an api call + result = plg.get_external_url() + self.assertTrue(result) + self.assertIn('data', result,) From ad9a9da656f7686dde4bd23133e2ea7b4cf63c50 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 03:35:29 +0100 Subject: [PATCH 26/50] PEP fix --- InvenTree/plugin/samples/integration/test_api_caller.py | 1 + 1 file changed, 1 insertion(+) diff --git a/InvenTree/plugin/samples/integration/test_api_caller.py b/InvenTree/plugin/samples/integration/test_api_caller.py index 7db431c3ee..e15edfad94 100644 --- a/InvenTree/plugin/samples/integration/test_api_caller.py +++ b/InvenTree/plugin/samples/integration/test_api_caller.py @@ -4,6 +4,7 @@ from django.test import TestCase from plugin import plugin_registry + class SampleApiCallerPluginTests(TestCase): """ Tests for SampleApiCallerPluginTests """ From 3731d688c96cc642c5043928bd6e5af5060e9eb7 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 9 Jan 2022 22:52:28 +1100 Subject: [PATCH 27/50] Refactor behaviour of "event" mixin: - Trigger a new background task for each plugin - Call plugin.process_event - Plugin class can then decide what to do with the particular event --- .../plugin/builtin/integration/mixins.py | 56 ++----------------- InvenTree/plugin/events.py | 51 +++++++++-------- InvenTree/plugin/integration.py | 5 ++ InvenTree/plugin/registry.py | 38 ------------- .../samples/integration/event_sample.py | 20 +++---- .../samples/integration/scheduled_task.py | 8 --- 6 files changed, 43 insertions(+), 135 deletions(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index dff749af53..6354ca3973 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -185,63 +185,19 @@ class EventMixin: """ Mixin that provides support for responding to triggered events. - Implementing classes must provide a list of tuples, - which provide pairs of 'event':'function' - - Notes: - - Events are called by name, and based on the django signal nomenclature, - e.g. 'part.pre_save' - - Receiving functions must be prototyped to match the 'event' they receive. - - Example: - - EVENTS = [ - ('part.pre_save', 'myplugin.functions.do_stuff'), - ('build.complete', 'myplugin.functions.process_completed_build'), - ] + Implementing classes must provide a "process_event" function: """ - # Override this in subclass model - EVENTS = [] - + def process_event(self, event, *args, **kwargs): + # Default implementation does not do anything + raise NotImplementedError + class MixinMeta: MIXIN_NAME = 'Events' def __init__(self): super().__init__() - self.add_mixin('events', 'has_events', __class__) - self.events = getattr(self, 'EVENTS', []) - - self.validate_events() - - @property - def has_events(self): - return bool(self.events) and len(self.events) > 0 - - def validate_events(self): - """ - Check that the provided event callbacks are valid - """ - - if not self.has_events: - raise ValueError('EVENTS not defined') - - for pair in self.events: - valid = True - - if len(pair) == 2: - event = pair[0].strip() - func = pair[1].strip() - - if len(event) == 0 or len(func) == 0: - valid = False - else: - valid = False - - if not valid: - raise ValueError("Invalid event callback: " + str(pair)) + self.add_mixin('events', True, __class__) class UrlsMixin: diff --git a/InvenTree/plugin/events.py b/InvenTree/plugin/events.py index bd3bf7c06c..49f5a87c6f 100644 --- a/InvenTree/plugin/events.py +++ b/InvenTree/plugin/events.py @@ -30,15 +30,30 @@ def trigger_event(event, *args, **kwargs): logger.debug(f"Event triggered: '{event}'") - offload_task( - 'plugin.events.process_event', - event, - *args, - **kwargs, - ) + # Offload a separate task for each plugin + # Determine if there are any plugins which are interested in responding + if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_EVENTS'): + + for slug, plugin in plugin_registry.plugins.items(): + + if plugin.mixin_enabled('events'): + + config = plugin.plugin_config() + + if config and config.active: + + logger.debug(f"Registering callback for plugin '{slug}'") + + offload_task( + 'plugin.events.process_event', + slug, + event, + *args, + **kwargs + ) -def process_event(event, *args, **kwargs): +def process_event(plugin_slug, event, *args, **kwargs): """ Respond to a triggered event. @@ -47,24 +62,8 @@ def process_event(event, *args, **kwargs): This function may queue multiple functions to be handled by the background worker. """ - logger.info(f"Processing event '{event}'") + logger.info(f"Plugin '{plugin_slug}' is processing triggered event '{event}'") - # Determine if there are any plugins which are interested in responding - if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_EVENTS'): + plugin = plugin_registry.plugins[plugin_slug] - # Run atomically, to ensure that either *all* tasks are registered, or *none* - with transaction.atomic(): - for slug, callbacks in plugin_registry.mixins_events.items(): - # slug = plugin slug - # callbacks = list of (event, function) tuples - - for _event, _func in callbacks: - if _event == event: - - logger.info(f"Running task '{_func}' for plugin '{slug}'") - - offload_task( - _func, - *args, - **kwargs - ) + plugin.process_event(event, *args, **kwargs) diff --git a/InvenTree/plugin/integration.py b/InvenTree/plugin/integration.py index b7ae7d1fc4..c012336a7a 100644 --- a/InvenTree/plugin/integration.py +++ b/InvenTree/plugin/integration.py @@ -176,6 +176,11 @@ class IntegrationPluginBase(MixinBase, plugin.InvenTreePlugin): """check if mixin is enabled and ready""" if self.mixin(key): fnc_name = self._mixins.get(key) + + # Allow for simple case where the mixin is "always" ready + if fnc_name == True: + return True + return getattr(self, fnc_name, True) return False # endregion diff --git a/InvenTree/plugin/registry.py b/InvenTree/plugin/registry.py index 5e6016fc86..8d04620120 100644 --- a/InvenTree/plugin/registry.py +++ b/InvenTree/plugin/registry.py @@ -59,7 +59,6 @@ class PluginsRegistry: # mixins self.mixins_settings = {} - self.mixins_events = {} # region public plugin functions def load_plugins(self): @@ -267,7 +266,6 @@ class PluginsRegistry: logger.info(f'Found {len(plugins)} active plugins') self.activate_integration_settings(plugins) - self.activate_integration_events(plugins) self.activate_integration_schedule(plugins) self.activate_integration_app(plugins, force_reload=force_reload) @@ -278,7 +276,6 @@ class PluginsRegistry: self.deactivate_integration_app() self.deactivate_integration_schedule() - self.deactivate_integration_events() self.deactivate_integration_settings() def activate_integration_settings(self, plugins): @@ -303,41 +300,6 @@ class PluginsRegistry: # clear cache self.mixins_settings = {} - def activate_integration_events(self, plugins): - """ - Activate triggered events mixin for applicable plugins - """ - - logger.info('Activating plugin events') - - from common.models import InvenTreeSetting - - self.mixins_events = {} - - event_count = 0 - - if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_EVENTS'): - - for slug, plugin in plugins: - - if plugin.mixin_enabled('events'): - config = plugin.plugin_config() - - # Only activate events for plugins which are enabled - if config and config.active: - self.mixins_events[slug] = plugin.events - - event_count += len(plugin.events) - - if event_count > 0: - logger.info(f"Registered callbacks for {event_count} events") - - def deactivate_integration_events(self): - """ - Deactivate events for all plugins - """ - self.mixins_events = {} - def activate_integration_schedule(self, plugins): logger.info('Activating plugin tasks') diff --git a/InvenTree/plugin/samples/integration/event_sample.py b/InvenTree/plugin/samples/integration/event_sample.py index 48516cfa3c..dddb97da1d 100644 --- a/InvenTree/plugin/samples/integration/event_sample.py +++ b/InvenTree/plugin/samples/integration/event_sample.py @@ -6,16 +6,7 @@ from plugin import IntegrationPluginBase from plugin.mixins import EventMixin -def on_part_saved(*args, **kwargs): - """ - Simple function which responds to a triggered event - """ - - part_id = kwargs['part_id'] - print(f"func on_part_saved() - part: {part_id}") - - -class EventPlugin(EventMixin, IntegrationPluginBase): +class EventPluginSample(EventMixin, IntegrationPluginBase): """ A sample plugin which provides supports for triggered events """ @@ -24,6 +15,9 @@ class EventPlugin(EventMixin, IntegrationPluginBase): PLUGIN_SLUG = "event" PLUGIN_TITLE = "Triggered Events" - EVENTS = [ - ('part.saved', 'plugin.samples.integration.event_sample.on_part_saved'), - ] + def process_event(self, event, *args, **kwargs): + """ Custom event processing """ + + print(f"Processing triggered event: '{event}'") + print("args:", str(args)) + print("kwargs:", str(kwargs)) diff --git a/InvenTree/plugin/samples/integration/scheduled_task.py b/InvenTree/plugin/samples/integration/scheduled_task.py index 7a08a21287..825dab134f 100644 --- a/InvenTree/plugin/samples/integration/scheduled_task.py +++ b/InvenTree/plugin/samples/integration/scheduled_task.py @@ -15,10 +15,6 @@ def print_world(): print("World") -def fail_task(): - raise ValueError("This task should fail!") - - class ScheduledTaskPlugin(ScheduleMixin, IntegrationPluginBase): """ A sample plugin which provides support for scheduled tasks @@ -38,8 +34,4 @@ class ScheduledTaskPlugin(ScheduleMixin, IntegrationPluginBase): 'func': 'plugin.samples.integration.scheduled_task.print_hello', 'schedule': 'H', }, - 'failure': { - 'func': 'plugin.samples.integration.scheduled_task.fail_task', - 'schedule': 'D', - }, } From d765be8c73177214bca23cf63f843a2e494f1074 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 9 Jan 2022 22:58:59 +1100 Subject: [PATCH 28/50] Iterate through plugins in a separate background task --- InvenTree/build/models.py | 20 ++++++++ .../plugin/builtin/integration/mixins.py | 2 +- InvenTree/plugin/events.py | 46 +++++++++++++------ InvenTree/plugin/integration.py | 2 +- 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py index f03cb30c74..30f80d8aa1 100644 --- a/InvenTree/build/models.py +++ b/InvenTree/build/models.py @@ -36,6 +36,8 @@ import InvenTree.fields import InvenTree.helpers import InvenTree.tasks +from plugin.events import trigger_event + from part import models as PartModels from stock import models as StockModels from users import models as UserModels @@ -585,6 +587,13 @@ class Build(MPTTModel, ReferenceIndexingMixin): # which point to thie Build Order self.allocated_stock.all().delete() + # Register an event + trigger_event( + 'build.completed', + build_id=self.pk, + user_id=user.pk, + ) + @transaction.atomic def cancelBuild(self, user): """ Mark the Build as CANCELLED @@ -604,6 +613,12 @@ class Build(MPTTModel, ReferenceIndexingMixin): self.status = BuildStatus.CANCELLED self.save() + trigger_event( + 'build.cancelled', + build_id=self.pk, + user_id=user.pk, + ) + @transaction.atomic def unallocateStock(self, bom_item=None, output=None): """ @@ -1042,6 +1057,11 @@ def after_save_build(sender, instance: Build, created: bool, **kwargs): # Run checks on required parts InvenTree.tasks.offload_task('build.tasks.check_build_stock', instance) + trigger_event( + 'build.created', + build_id=instance.pk, + ) + class BuildOrderAttachment(InvenTreeAttachment): """ diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 6354ca3973..cf15acdef9 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -191,7 +191,7 @@ class EventMixin: def process_event(self, event, *args, **kwargs): # Default implementation does not do anything raise NotImplementedError - + class MixinMeta: MIXIN_NAME = 'Events' diff --git a/InvenTree/plugin/events.py b/InvenTree/plugin/events.py index 49f5a87c6f..6589a6f601 100644 --- a/InvenTree/plugin/events.py +++ b/InvenTree/plugin/events.py @@ -30,27 +30,47 @@ def trigger_event(event, *args, **kwargs): logger.debug(f"Event triggered: '{event}'") - # Offload a separate task for each plugin + offload_task( + 'plugin.event.register_event', + event, + *args, + **kwargs + ) + + +def register_event(event, *args, **kwargs): + """ + Register the event with any interested plugins. + + Note: This function is processed by the background worker, + as it performs multiple database access operations. + """ + + logger.debug(f"Registering triggered event: '{event}'") + # Determine if there are any plugins which are interested in responding if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_EVENTS'): - for slug, plugin in plugin_registry.plugins.items(): + with transaction.atomic(): - if plugin.mixin_enabled('events'): + for slug, plugin in plugin_registry.plugins.items(): - config = plugin.plugin_config() + if plugin.mixin_enabled('events'): - if config and config.active: + config = plugin.plugin_config() - logger.debug(f"Registering callback for plugin '{slug}'") + if config and config.active: - offload_task( - 'plugin.events.process_event', - slug, - event, - *args, - **kwargs - ) + logger.debug(f"Registering callback for plugin '{slug}'") + + # Offload a separate task for each plugin + offload_task( + 'plugin.events.process_event', + slug, + event, + *args, + **kwargs + ) def process_event(plugin_slug, event, *args, **kwargs): diff --git a/InvenTree/plugin/integration.py b/InvenTree/plugin/integration.py index c012336a7a..c00b81419d 100644 --- a/InvenTree/plugin/integration.py +++ b/InvenTree/plugin/integration.py @@ -178,7 +178,7 @@ class IntegrationPluginBase(MixinBase, plugin.InvenTreePlugin): fnc_name = self._mixins.get(key) # Allow for simple case where the mixin is "always" ready - if fnc_name == True: + if fnc_name is True: return True return getattr(self, fnc_name, True) From e891e0a2b906ce81bdac63f61d68a86807d0fec2 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 9 Jan 2022 23:02:24 +1100 Subject: [PATCH 29/50] typo fix --- InvenTree/plugin/events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/plugin/events.py b/InvenTree/plugin/events.py index 6589a6f601..1020c5ac4d 100644 --- a/InvenTree/plugin/events.py +++ b/InvenTree/plugin/events.py @@ -31,7 +31,7 @@ def trigger_event(event, *args, **kwargs): logger.debug(f"Event triggered: '{event}'") offload_task( - 'plugin.event.register_event', + 'plugin.events.register_event', event, *args, **kwargs From 936330d3d26da310a95fea92a6d02cfa2aae9dd9 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 9 Jan 2022 23:07:12 +1100 Subject: [PATCH 30/50] Add more triggered events --- InvenTree/part/models.py | 6 ++++-- InvenTree/stock/models.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py index 99d7cd02f5..76aa160804 100644 --- a/InvenTree/part/models.py +++ b/InvenTree/part/models.py @@ -280,6 +280,8 @@ def before_delete_part_category(sender, instance, using, **kwargs): child.parent = instance.parent child.save() + trigger_event('category.deleted') + def rename_part_image(instance, filename): """ Function for renaming a part image file @@ -2183,11 +2185,11 @@ def after_save_part(sender, instance: Part, created, **kwargs): Function to be executed after a Part is saved """ - trigger_event('part.saved', part_id=instance.pk) - if created: trigger_event('part.created', part_id=instance.pk) else: + trigger_event('part.saved', part_id=instance.pk) + # Check part stock only if we are *updating* the part (not creating it) # Run this check in the background diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index d302b1676c..c6dc7b899a 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -35,6 +35,8 @@ import common.models import report.models import label.models +from plugin.events import trigger_event + from InvenTree.status_codes import StockStatus, StockHistoryCode from InvenTree.models import InvenTreeTree, InvenTreeAttachment from InvenTree.fields import InvenTreeModelMoneyField, InvenTreeURLField @@ -133,6 +135,8 @@ def before_delete_stock_location(sender, instance, using, **kwargs): child.parent = instance.parent child.save() + trigger_event('location.deleted') + class StockItemManager(TreeManager): """ @@ -1774,6 +1778,8 @@ def before_delete_stock_item(sender, instance, using, **kwargs): child.parent = instance.parent child.save() + trigger_event('stockitem.deleted') + @receiver(post_delete, sender=StockItem, dispatch_uid='stock_item_post_delete_log') def after_delete_stock_item(sender, instance: StockItem, **kwargs): @@ -1786,11 +1792,16 @@ def after_delete_stock_item(sender, instance: StockItem, **kwargs): @receiver(post_save, sender=StockItem, dispatch_uid='stock_item_post_save_log') -def after_save_stock_item(sender, instance: StockItem, **kwargs): +def after_save_stock_item(sender, instance: StockItem, created, **kwargs): """ Hook function to be executed after StockItem object is saved/updated """ + if created: + trigger_event('stockitem.created', item_id=instance.pk) + else: + trigger_event('stockitem.saved', item_id=instance.pk) + # Run this check in the background InvenTree.tasks.offload_task('part.tasks.notify_low_stock_if_required', instance.part) From c699ced34ad263fdb0cdc6372d73fa2e5a7ac7a3 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 22:16:19 +0100 Subject: [PATCH 31/50] make general mixin tests multi mixin enabled --- InvenTree/plugin/test_integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/plugin/test_integration.py b/InvenTree/plugin/test_integration.py index 3d88fed4dd..abddc9ee59 100644 --- a/InvenTree/plugin/test_integration.py +++ b/InvenTree/plugin/test_integration.py @@ -15,9 +15,9 @@ from plugin.urls import PLUGIN_BASE class BaseMixinDefinition: def test_mixin_name(self): # mixin name - self.assertEqual(self.mixin.registered_mixins[0]['key'], self.MIXIN_NAME) + self.assertIn(self.MIXIN_NAME, [item['key'] for item in self.mixin.registered_mixins]) # human name - self.assertEqual(self.mixin.registered_mixins[0]['human_name'], self.MIXIN_HUMAN_NAME) + self.assertIn(self.MIXIN_HUMAN_NAME, [item['human_name'] for item in self.mixin.registered_mixins]) class SettingsMixinTest(BaseMixinDefinition, TestCase): From 31d587a9b190ef7eb0c7546fa6e4ed25e477da3c Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 22:19:01 +0100 Subject: [PATCH 32/50] unittests fdor ApiCallMixin --- InvenTree/plugin/test_integration.py | 46 +++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/InvenTree/plugin/test_integration.py b/InvenTree/plugin/test_integration.py index abddc9ee59..eb55f984d3 100644 --- a/InvenTree/plugin/test_integration.py +++ b/InvenTree/plugin/test_integration.py @@ -8,7 +8,7 @@ from django.contrib.auth import get_user_model from datetime import datetime from plugin import IntegrationPluginBase -from plugin.mixins import AppMixin, SettingsMixin, UrlsMixin, NavigationMixin +from plugin.mixins import AppMixin, SettingsMixin, UrlsMixin, NavigationMixin, APICallMixin from plugin.urls import PLUGIN_BASE @@ -142,6 +142,50 @@ class NavigationMixinTest(BaseMixinDefinition, TestCase): self.assertEqual(self.nothing_mixin.navigation_name, '') +class APICallMixinTest(BaseMixinDefinition, TestCase): + MIXIN_HUMAN_NAME = 'API calls' + MIXIN_NAME = 'api_call' + MIXIN_ENABLE_CHECK = 'has_api_call' + + def setUp(self): + class MixinCls(APICallMixin, SettingsMixin, IntegrationPluginBase): + PLUGIN_NAME = "Sample API Caller" + + SETTINGS = { + 'API_TOKEN': { + 'name': 'API Token', + 'protected': True, + }, + 'API_URL': { + 'name': 'External URL', + 'description': 'Where is your API located?', + 'default': 'reqres.in', + }, + } + API_URL_SETTING = 'API_URL' + API_TOKEN_SETTING = 'API_TOKEN' + + def get_external_url(self): + ''' + returns data from the sample endpoint + ''' + return self.api_call('api/users/2') + self.mixin = MixinCls() + def test_function(self): + # api_url + self.assertEqual('https://reqres.in', self.mixin.api_url) + + # api_headers + headers = self.mixin.api_headers + self.assertEqual(headers, {'Bearer': '', 'Content-Type': 'application/json'}) + + # api_build_url_args + # api_call + result = self.mixin.get_external_url() + self.assertTrue(result) + self.assertIn('data', result,) + + class IntegrationPluginBaseTests(TestCase): """ Tests for IntegrationPluginBase """ From e889f487f010be2b59a0961e051ce93e54db40de Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 22:27:50 +0100 Subject: [PATCH 33/50] added a check for the required constants --- InvenTree/plugin/builtin/integration/mixins.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/InvenTree/plugin/builtin/integration/mixins.py b/InvenTree/plugin/builtin/integration/mixins.py index 66676d0520..7d257dbee5 100644 --- a/InvenTree/plugin/builtin/integration/mixins.py +++ b/InvenTree/plugin/builtin/integration/mixins.py @@ -368,7 +368,10 @@ class APICallMixin: @property def has_api_call(self): """Is the mixin ready to call external APIs?""" - # TODO check if settings are set + if not bool(self.API_URL_SETTING): + raise ValueError("API_URL_SETTING must be defined") + if not bool(self.API_TOKEN_SETTING): + raise ValueError("API_TOKEN_SETTING must be defined") return True @property From c8599039a25cb17535f41149d588ff3acb4836af Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 22:33:14 +0100 Subject: [PATCH 34/50] added test for wrong config --- InvenTree/plugin/test_integration.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/InvenTree/plugin/test_integration.py b/InvenTree/plugin/test_integration.py index eb55f984d3..48533a70e2 100644 --- a/InvenTree/plugin/test_integration.py +++ b/InvenTree/plugin/test_integration.py @@ -171,6 +171,11 @@ class APICallMixinTest(BaseMixinDefinition, TestCase): ''' return self.api_call('api/users/2') self.mixin = MixinCls() + + class WrongCLS(APICallMixin, IntegrationPluginBase): + pass + self.mixin_nothing = WrongCLS() + def test_function(self): # api_url self.assertEqual('https://reqres.in', self.mixin.api_url) @@ -185,6 +190,10 @@ class APICallMixinTest(BaseMixinDefinition, TestCase): self.assertTrue(result) self.assertIn('data', result,) + # wrongly defined plugins should not load + with self.assertRaises(ValueError): + self.mixin_nothing.has_api_call() + class IntegrationPluginBaseTests(TestCase): """ Tests for IntegrationPluginBase """ From 2c05b858a4afa2542a20556b6a5f3b6c8ea6f9e0 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 9 Jan 2022 22:34:02 +0100 Subject: [PATCH 35/50] renmae var --- InvenTree/plugin/test_integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/plugin/test_integration.py b/InvenTree/plugin/test_integration.py index 48533a70e2..a65fc85708 100644 --- a/InvenTree/plugin/test_integration.py +++ b/InvenTree/plugin/test_integration.py @@ -174,7 +174,7 @@ class APICallMixinTest(BaseMixinDefinition, TestCase): class WrongCLS(APICallMixin, IntegrationPluginBase): pass - self.mixin_nothing = WrongCLS() + self.mixin_wrong = WrongCLS() def test_function(self): # api_url @@ -192,7 +192,7 @@ class APICallMixinTest(BaseMixinDefinition, TestCase): # wrongly defined plugins should not load with self.assertRaises(ValueError): - self.mixin_nothing.has_api_call() + self.mixin_wrong.has_api_call() class IntegrationPluginBaseTests(TestCase): From 0002edc32ce9ad37b60719586081a501123201b0 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 10 Jan 2022 08:50:50 +1100 Subject: [PATCH 36/50] Hide "restart required" message in demo mode --- InvenTree/templates/base.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index a71f4e67c9..fd3e496f80 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -6,6 +6,7 @@ {% settings_value 'REPORT_ENABLE_TEST_REPORT' as test_report_enabled %} {% settings_value "REPORT_ENABLE" as report_enabled %} {% settings_value "SERVER_RESTART_REQUIRED" as server_restart_required %} +{% inventree_demo_mode as demo_mode %} @@ -90,7 +91,7 @@ {% block alerts %}
    - {% if server_restart_required %} + {% if server_restart_required and not demo_mode %}