mpt-extension-sdk 5.2.0__py3-none-any.whl → 5.2.2__py3-none-any.whl

mpt_extension_sdk/constants.py

@@ -2,6 +2,6 @@ EVENT_TYPES = "orders"
 SECURITY_ALGORITHM = "HS256"
 USER_AGENT = "swo-extensions/1.0"
 CONSUME_EVENTS_HELP_TEXT = "Consume events from the MPT platform"
-DEFAULT_APP_CONFIG_GROUP = "swo.mpt.sdk"
+DEFAULT_APP_CONFIG_GROUP = "swo.mpt.ext"
 DEFAULT_APP_CONFIG_NAME = "app_config"
 DJANGO_SETTINGS_MODULE = "mpt_extension_sdk.runtime.djapp.conf.default"

mpt_extension_sdk/mpt_http/mpt.py

@@ -1,6 +1,5 @@
 import logging
 from datetime import date
-from enum import Enum
 from functools import cache
 from itertools import batched
 
@@ -11,8 +10,6 @@ from mpt_extension_sdk.mpt_http.wrap_http_error import wrap_mpt_http_error
 
 logger = logging.getLogger(__name__)
 
-NotifyCategories = Enum("NotifyCategories", settings.MPT_NOTIFY_CATEGORIES)
-
 
 def _has_more_pages(page):
     if not page:
@@ -209,22 +206,6 @@ def get_agreements_by_next_sync(mpt_client, next_sync_parameter):
     return get_agreements_by_query(mpt_client, rql_query)
 
 
-def get_agreements_by_3yc_enroll_status(
-    mpt_client: MPTClient, enroll_statuses: tuple[str], status: str = "Active"
-):
-    param_condition = (
-        f"any(parameters.fulfillment,"
-        f"and(eq(externalId,3YCEnrollStatus),in(displayValue,({",".join(enroll_statuses)}))))"
-    )
-    status_condition = f"eq(status,{status})"
-
-    rql_query = (
-        f"and({status_condition},{param_condition})"
-        "&select=lines,parameters,subscriptions,product,listing"
-    )
-    return get_agreements_by_query(mpt_client, rql_query)
-
-
 @wrap_mpt_http_error
 def update_agreement_subscription(mpt_client, subscription_id, **kwargs):
     response = mpt_client.put(

mpt_extension_sdk/runtime/commands/django.py

@@ -1,21 +1,33 @@
 from contextlib import nullcontext
 
 import click
+from django.core.management import execute_from_command_line
 from opentelemetry import trace
 
+from mpt_extension_sdk.constants import (
+    DEFAULT_APP_CONFIG_GROUP,
+    DEFAULT_APP_CONFIG_NAME,
+    DJANGO_SETTINGS_MODULE,
+)
+from mpt_extension_sdk.runtime.initializer import initialize
+
 
 @click.command(
     add_help_option=False, context_settings=dict(ignore_unknown_options=True)
 )
 @click.argument("management_args", nargs=-1, type=click.UNPROCESSED)
 @click.pass_context
-def django(ctx, management_args):
+def django(ctx, management_args):  # pragma: no cover
     "Execute Django subcommands."
-    from mpt_extension_sdk.runtime.initializer import initialize
-
-    initialize({})
     from django.conf import settings
-    from django.core.management import execute_from_command_line
+
+    initialize(
+        {
+            "group": DEFAULT_APP_CONFIG_GROUP,
+            "name": DEFAULT_APP_CONFIG_NAME,
+            "django_settings_module": DJANGO_SETTINGS_MODULE,
+        }
+    )
 
     if settings.USE_APPLICATIONINSIGHTS:
         tracer = trace.get_tracer(__name__)

mpt_extension_sdk/runtime/commands/run.py

@@ -1,4 +1,6 @@
 import click
+import debugpy
+from django.conf import settings
 
 from mpt_extension_sdk.runtime.master import Master
 
@@ -25,10 +27,8 @@ def run(component, color, debug, reload, debug_py):
     """
 
     if debug_py:
-        import debugpy
-
         host, port = debug_py.split(":")
-        debugpy.listen((host, int(port)))
+        debugpy.listen((host, int(port)))  # pragma: no cover
 
     master = Master(
         {
@@ -37,5 +37,6 @@ def run(component, color, debug, reload, debug_py):
             "reload": reload,
             "component": component,
         },
+        settings=settings,
     )
-    master.run()
+    master.run()  # pragma: no cover

mpt_extension_sdk/runtime/djapp/conf/default.py

@@ -10,7 +10,6 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.2/ref/settings/
 """
 
-import json
 import os
 from pathlib import Path
 
@@ -26,6 +25,12 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = os.getenv(
+    "MPT_DJANGO_SECRET_KEY",
+    "",
+)
+
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
@@ -128,7 +133,7 @@ APPLICATIONINSIGHTS_CONNECTION_STRING = os.getenv(
 USE_APPLICATIONINSIGHTS = APPLICATIONINSIGHTS_CONNECTION_STRING != ""
 
 
-if USE_APPLICATIONINSIGHTS:
+if USE_APPLICATIONINSIGHTS:  # pragma: no cover
     logger_provider = LoggerProvider()
     set_logger_provider(logger_provider)
     exporter = AzureMonitorLogExporter(
@@ -208,11 +213,7 @@ MPT_ORDERS_API_POLLING_INTERVAL_SECS = int(
     os.getenv("MPT_ORDERS_API_POLLING_INTERVAL_SECS", "120")
 )
 
-# TODO: Should be synced with the initializer.py::initialize function
-MPT_NOTIFY_CATEGORIES = json.loads(
-    os.getenv("MPT_NOTIFY_CATEGORIES", '{"ORDERS": "NTC-0000-0006"}')
-)
-
 EXTENSION_CONFIG = {
     "DUE_DATE_DAYS": "30",
+    "ORDER_CREATION_WINDOW_HOURS": os.getenv("EXT_ORDER_CREATION_WINDOW_HOURS", "24"),
 }

mpt_extension_sdk/runtime/djapp/conf/urls.py

@@ -0,0 +1,10 @@
+
+from mpt_extension_sdk.constants import (
+    DEFAULT_APP_CONFIG_GROUP,
+    DEFAULT_APP_CONFIG_NAME,
+)
+from mpt_extension_sdk.runtime.utils import get_extension, get_urlpatterns
+
+extension = get_extension(name=DEFAULT_APP_CONFIG_NAME, group=DEFAULT_APP_CONFIG_GROUP)
+
+urlpatterns = get_urlpatterns(extension)

mpt_extension_sdk/runtime/djapp/management/commands/consume_events.py

@@ -1,11 +1,13 @@
-import signal
-from threading import Event
+import signal  # pragma: no cover
+from threading import Event  # pragma: no cover
 
-from django.core.management.base import BaseCommand
+from django.core.management.base import BaseCommand  # pragma: no cover
 
-from mpt_extension_sdk.constants import CONSUME_EVENTS_HELP_TEXT
-from mpt_extension_sdk.runtime.events.dispatcher import Dispatcher
-from mpt_extension_sdk.runtime.events.producers import OrderEventProducer
+from mpt_extension_sdk.constants import CONSUME_EVENTS_HELP_TEXT  # pragma: no cover
+from mpt_extension_sdk.runtime.events.dispatcher import Dispatcher  # pragma: no cover
+from mpt_extension_sdk.runtime.events.producers import (
+    OrderEventProducer,  # pragma: no cover
+)
 
 
 class Command(BaseCommand):  # pragma: no cover

mpt_extension_sdk/runtime/events/dispatcher.py

@@ -5,6 +5,10 @@ import time
 from collections import deque
 from concurrent.futures import ThreadPoolExecutor
 
+from mpt_extension_sdk.constants import (
+    DEFAULT_APP_CONFIG_GROUP,
+    DEFAULT_APP_CONFIG_NAME,
+)
 from mpt_extension_sdk.core.events.dataclasses import Event
 from mpt_extension_sdk.core.events.registry import EventsRegistry
 from mpt_extension_sdk.core.utils import setup_client
@@ -24,8 +28,8 @@ def done_callback(futures, key, future):  # pragma: no cover
 
 
 class Dispatcher:
-    def __init__(self):
-        self.registry: EventsRegistry = get_events_registry()
+    def __init__(self, group=DEFAULT_APP_CONFIG_GROUP, name=DEFAULT_APP_CONFIG_NAME):
+        self.registry: EventsRegistry = get_events_registry(group=group, name=name)
         self.queue = deque()
         self.futures = {}
         self.executor = ThreadPoolExecutor()
@@ -45,7 +49,7 @@ class Dispatcher:
     def running(self):
         return self.running_event.is_set()
 
-    def dispatch_event(self, event: Event):
+    def dispatch_event(self, event: Event):  # pragma: no cover
         if self.registry.is_event_supported(event.type):
             logger.info(f"event of type {event.type} with id {event.id} accepted")
             self.queue.appendleft((event.type, event))

mpt_extension_sdk/runtime/initializer.py

@@ -24,10 +24,8 @@ JSON_EXT_VARIABLES = {
 }
 
 
-def initialize(options):
+def initialize(options, group=DEFAULT_APP_CONFIG_GROUP, name=DEFAULT_APP_CONFIG_NAME):
     rich.reconfigure(theme=Theme({"repr.mpt_id": "bold light_salmon3"}))
-    group = options.get("app_config_group", DEFAULT_APP_CONFIG_GROUP)
-    name = options.get("app_config_name", DEFAULT_APP_CONFIG_NAME)
     django_settings_module = options.get(
         "django_settings_module", DJANGO_SETTINGS_MODULE
     )

mpt_extension_sdk/runtime/master.py

@@ -18,17 +18,18 @@ HANDLED_SIGNALS = (signal.SIGINT, signal.SIGTERM)
 PROCESS_CHECK_INTERVAL_SECS = int(os.environ.get("PROCESS_CHECK_INTERVAL_SECS", 5))
 
 
-def _display_path(path):
+def _display_path(path):  # pragma: no cover
     try:
         return f'"{path.relative_to(Path.cwd())}"'
-    except ValueError:  # pragma: no cover
+    except ValueError:
         return f'"{path}"'
 
 
 class Master:
-    def __init__(self, options):
+    def __init__(self, options, settings):
         self.workers = {}
         self.options = options
+        self.settings = settings
         self.stop_event = threading.Event()
         self.monitor_event = threading.Event()
         self.watch_filter = PythonFilter(ignore_paths=None)

mpt_extension_sdk/runtime/utils.py

@@ -4,6 +4,8 @@ import sys
 from importlib.metadata import entry_points
 
 from django.apps import apps
+from django.contrib import admin
+from django.urls import path
 from pyfiglet import Figlet
 from rich.console import Console
 from rich.text import Text
@@ -105,3 +107,23 @@ def get_extension_variables(json_ext_variables):
 
         variables[var[0][4:]] = value
     return variables
+
+
+def get_api_url(extension):
+    if extension:
+        api_url = extension.api.urls
+        return api_url
+    return None
+
+
+def get_urlpatterns(extension):
+    urlpatterns = [
+        path("admin/", admin.site.urls),
+    ]
+
+    api_url = get_api_url(extension)
+
+    if api_url:
+        urlpatterns.append(path("api/", api_url))
+
+    return urlpatterns

mpt_extension_sdk/runtime/workers.py

@@ -2,6 +2,10 @@ from django.core.management import call_command
 from django.core.wsgi import get_wsgi_application
 from gunicorn.app.base import BaseApplication
 
+from mpt_extension_sdk.constants import (
+    DEFAULT_APP_CONFIG_GROUP,
+    DEFAULT_APP_CONFIG_NAME,
+)
 from mpt_extension_sdk.runtime.initializer import initialize
 
 
@@ -29,15 +33,18 @@ def start_event_consumer(options):
     call_command("consume_events")
 
 
-def start_gunicorn(options):
-    initialize(options)
+def start_gunicorn(
+    options, group=DEFAULT_APP_CONFIG_GROUP, name=DEFAULT_APP_CONFIG_NAME
+):
+    initialize(options, group=group, name=name)
 
     logging_config = {
         "version": 1,
         "disable_existing_loggers": False,
         "formatters": {
             "verbose": {
-                "format": "{asctime} {name} {levelname} (pid: {process}) {message}",
+                "format":
+                    "{asctime} {name} {levelname} (pid: {process}, thread: {thread}) {message}",
                 "style": "{",
             },
             "rich": {

{mpt_extension_sdk-5.2.0.dist-info → mpt_extension_sdk-5.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpt-extension-sdk
-Version: 5.2.0
+Version: 5.2.2
 Summary: Extensions SDK for SoftwareONE Marketplace Platform
 Author: SoftwareOne AG
 License: Apache-2.0 license

{mpt_extension_sdk-5.2.0.dist-info → mpt_extension_sdk-5.2.2.dist-info}/RECORD

@@ -1,5 +1,6 @@
 mpt_extension_sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mpt_extension_sdk/constants.py,sha256=4LyR-sUD9-V226jG4cRXKqXKeqjwAj1euL4XRURSfQw,304
+mpt_extension_sdk/constants.py,sha256=lMXalL_Ac67GroFd6xNS93O9wGze368QZ4EFHxFQKTs,304
+mpt_extension_sdk/airtable/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpt_extension_sdk/airtable/wrap_http_error.py,sha256=Shiy4uwpdpgkevooLjhpe1grhgJRj7cV6lUMMCQKogc,1263
 mpt_extension_sdk/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpt_extension_sdk/core/extension.py,sha256=s0QE2s99RMywfKQRZrYqOdWxELQvlFFVZMwm0xo2hhw,266
@@ -15,33 +16,34 @@ mpt_extension_sdk/key_vault/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 mpt_extension_sdk/key_vault/base.py,sha256=RVG_Wiq-MrPyngJ4gfUd8oxoh1LUop1SvtCM2xdlx8M,3361
 mpt_extension_sdk/mpt_http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpt_extension_sdk/mpt_http/base.py,sha256=3qgo9BW-uTRAbex26urMvLZU0fwnYnBprDRIJCHvTOk,1284
-mpt_extension_sdk/mpt_http/mpt.py,sha256=1RXaqYmcopK2mLKNndDflH6eGkYhRYjcM1IyU32KRd0,13451
+mpt_extension_sdk/mpt_http/mpt.py,sha256=zIojPyOLBp1QJB8DXz2fx4P1c0yqfIuknyBOsKppcBg,12816
 mpt_extension_sdk/mpt_http/utils.py,sha256=3wJTT84CXYGjZw6FksNDX8tIHijkL3Wcmld9r6Iz0xc,95
 mpt_extension_sdk/mpt_http/wrap_http_error.py,sha256=j8K6Ddx7NiM-FPRMQi25vuULAW8LXxzZ4EwuIJufxis,1801
 mpt_extension_sdk/runtime/__init__.py,sha256=PQSAz9qvXHbxrn4KvuXSHB8y-A4Jpgbm6ZV-wPiNPyw,194
-mpt_extension_sdk/runtime/initializer.py,sha256=3gX9OAeTp2lsgsP0h3HVzkEUvCTa9fBIsBGVo7E6JFY,2229
+mpt_extension_sdk/runtime/initializer.py,sha256=V8fubCULUJlvCBkYhJM52GUNoHNWVI-siaecmZv3kzk,2154
 mpt_extension_sdk/runtime/logging.py,sha256=wJ6KyvnuvMZELI1Hd0fYbuHr7YiP3GIXFBvvSdmd7nQ,885
-mpt_extension_sdk/runtime/master.py,sha256=1p_tYbhtGls0uO78fqs8CqZghxsBvCvXb7DhsO0r4LU,4532
+mpt_extension_sdk/runtime/master.py,sha256=slwZor9IhIVzQBxbUrLNKmHDmnfl9JVA4FMY1nqm0w8,4575
 mpt_extension_sdk/runtime/swoext.py,sha256=LS0YZXwQsHDaYjalDGfYQi5cAL3aKQhphf3chrNmNBk,1665
-mpt_extension_sdk/runtime/utils.py,sha256=ZnRWIBwYzOerx30KFmBXLUe19qzwE4JFNkNMGVqjuyk,3365
-mpt_extension_sdk/runtime/workers.py,sha256=k25jFlh-NdHVqeMV2AgoC6IHIlbRHcDoRB5xqWwMPFg,2411
+mpt_extension_sdk/runtime/utils.py,sha256=I4nhj89LDwGG5ukX5K66RqvKv6lo1drUaa3VbaJtZtA,3781
+mpt_extension_sdk/runtime/workers.py,sha256=qlsFSuAgKotGwdFiU0Tq0HDD3PCIBq66h2_JF17s02c,2644
 mpt_extension_sdk/runtime/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mpt_extension_sdk/runtime/commands/django.py,sha256=VHszc3KctzSkhewAqbQMkRBG7cuMPWxzn7dHrRGm8y8,892
-mpt_extension_sdk/runtime/commands/run.py,sha256=1Qrqr2Hq1J8JvXtmEdgUNU9u3JLd_92-NR9MKrZOFxo,1052
+mpt_extension_sdk/runtime/commands/django.py,sha256=o3oxOuO1klx1ra9BCkhqHmekMnOAUFah7dPmlcJmLA8,1213
+mpt_extension_sdk/runtime/commands/run.py,sha256=U_tVtMZQn2kstz3b4ANvs45hqDKs-PfLq3-vaukh5kw,1143
 mpt_extension_sdk/runtime/djapp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpt_extension_sdk/runtime/djapp/apps.py,sha256=YA1G5HaRqFBS-0DfYQuFpMgzUCYpu5T8x5LEC6MwI_M,1398
 mpt_extension_sdk/runtime/djapp/middleware.py,sha256=oAA5khXW6xeUjnOV63pNCF4D7QFVD6PayIa_489KRmg,555
 mpt_extension_sdk/runtime/djapp/conf/__init__.py,sha256=_sHo76rGeXSTH8bW3pacyGFfNYSln8oLRwOSstYOmco,350
-mpt_extension_sdk/runtime/djapp/conf/default.py,sha256=vOtxAZkIJ78D1p1mua3Ls6BwmNybW7NZl2G7F3jb33k,6120
+mpt_extension_sdk/runtime/djapp/conf/default.py,sha256=Io-dz0ylmVY_3tpZm0_K5JcxZXHlgeW1RFwAXMchCro,6167
+mpt_extension_sdk/runtime/djapp/conf/urls.py,sha256=x-LDNfqckwvnEqHVFk8DttDZpYWjoF_JbJgu_itJSZE,310
 mpt_extension_sdk/runtime/djapp/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpt_extension_sdk/runtime/djapp/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mpt_extension_sdk/runtime/djapp/management/commands/consume_events.py,sha256=1rfldJpnKgpgAhW15wkJ_TLb_TKimkC5hryn1TPEfuk,1100
+mpt_extension_sdk/runtime/djapp/management/commands/consume_events.py,sha256=BVb4sgKI2Ep759bDcOH5Qm1xJEewc5-bNt_snspV2ck,1229
 mpt_extension_sdk/runtime/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mpt_extension_sdk/runtime/events/dispatcher.py,sha256=GYICBuA9bO38TgDk0FKS_Z9D-8YB-tmNf4O_pUxuomc,2801
+mpt_extension_sdk/runtime/events/dispatcher.py,sha256=ZMswk50vGGfUgKeQ2Cc3k9wtrm63z0OH7EtlKCkWQYM,3008
 mpt_extension_sdk/runtime/events/producers.py,sha256=dv-PWN9hKOBxT6nyLWezjZxUq6NpPz8Jq-cOiVEcDUY,3604
 mpt_extension_sdk/runtime/events/utils.py,sha256=bxFo-iQUqEJDqcIotC88Ty3Xt0K2FyYjA9UMWFEyMKI,2663
-mpt_extension_sdk-5.2.0.dist-info/METADATA,sha256=W-8wrxSWN6L94bREMEhGYGGRC5UVXYqlTRIoFuAzEGw,1386
-mpt_extension_sdk-5.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mpt_extension_sdk-5.2.0.dist-info/entry_points.txt,sha256=N8T9gBssEOm_UeBf9ABbGqtlnethrumfMoL4hNYWVFA,146
-mpt_extension_sdk-5.2.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mpt_extension_sdk-5.2.0.dist-info/RECORD,,
+mpt_extension_sdk-5.2.2.dist-info/METADATA,sha256=BKkSIxFuVCmJaaHIZtwjJbpxajx8RmjlFV4PjIK2BHw,1386
+mpt_extension_sdk-5.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mpt_extension_sdk-5.2.2.dist-info/entry_points.txt,sha256=N8T9gBssEOm_UeBf9ABbGqtlnethrumfMoL4hNYWVFA,146
+mpt_extension_sdk-5.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mpt_extension_sdk-5.2.2.dist-info/RECORD,,