mpt-extension-sdk 5.2.0__tar.gz → 5.2.2__tar.gz

{mpt_extension_sdk-5.2.0 → mpt_extension_sdk-5.2.2}/PKG-INFO

@@ -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 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.2/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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-5.2.0 → mpt_extension_sdk-5.2.2}/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 → mpt_extension_sdk-5.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mpt-extension-sdk"
-version = "5.2.0"
+version = "5.2.2"
 description = "Extensions SDK for SoftwareONE Marketplace Platform"
 authors = [{ name = "SoftwareOne AG" }]
 requires-python = ">=3.12,<4"
@@ -68,6 +68,11 @@ dev = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.hatch.build]
+include = [
+  "mpt_extension_sdk/**"
+]
+
 [tool.pytest.ini_options]
 testpaths = "tests"
 pythonpath = "."
@@ -85,8 +90,6 @@ relative_files = true
 omit = [
   "security.py",
   "django.py",
-  "run.py",
-  "default.py",
   "swoext.py",
   "__init__.py",
 ]

mpt_extension_sdk-5.2.0/.env.sample

@@ -1,6 +0,0 @@
-OTEL_SERVICE_NAME=Swo.Extensions.MptExtensionsSDK
-MPT_PRODUCTS_IDS=PRD-1111-1111
-MPT_PORTAL_BASE_URL=http://devmock:8000
-MPT_API_BASE_URL=http://devmock:8000
-MPT_API_TOKEN=<vendor-api-token>
-MPT_ORDERS_API_POLLING_INTERVAL_SECS=120

mpt_extension_sdk-5.2.0/.flake8

@@ -1,6 +0,0 @@
-[flake8]
-exclude = .idea,.vscode,.git,venv,env,swo
-show-source = True
-max-line-length = 100
-max-cognitive-complexity = 15
-extend-ignore = PT004, E203, B008

mpt_extension_sdk-5.2.0/.github/CODEOWNERS

@@ -1 +0,0 @@
-* @softwareone-platform/sirius

mpt_extension_sdk-5.2.0/.github/workflows/on-release.yml

@@ -1,45 +0,0 @@
-name: Release
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  id-token: write  # for OIDC
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.12'
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install poetry
-
-    - name: 'Get the version'
-      id: get_version
-      run: echo  "VERSION=${GITHUB_REF/refs\/tags\//}" >> "$GITHUB_OUTPUT"
-
-    - name: 'Build'
-      run: |
-        poetry version ${{ steps.get_version.outputs.VERSION }}
-        poetry build
-
-    - name: Publish to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        repository-url: https://upload.pypi.org/legacy/

mpt_extension_sdk-5.2.0/.github/workflows/pr-build-merge.yml

@@ -1,47 +0,0 @@
-
-name: PR build and merge
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-  push:
-    branches:
-      - main
-      - "release/**"
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: 'Build test containers'
-      run: docker compose build app_test
-
-    - name: 'Run validation & test'
-      run: docker compose run --service-ports app_test
-
-    - name: 'Run SonarCloud Scan'
-      uses: SonarSource/sonarcloud-github-action@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
-    - name: 'Run SonarQube Quality Gate check'
-      uses: sonarsource/sonarqube-quality-gate-action@master
-      timeout-minutes: 5
-      env:
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
-    - name: 'Stop containers'
-      if: always()
-      run: docker compose down

mpt_extension_sdk-5.2.0/dev.Dockerfile

@@ -1,13 +0,0 @@
-FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
-
-COPY . /extension_sdk
-WORKDIR /extension_sdk
-
-RUN uv venv /opt/venv
-
-ENV VIRTUAL_ENV=/opt/venv
-ENV PATH=/opt/venv/bin:$PATH
-
-RUN uv sync --frozen --no-cache --all-groups --active
-
-CMD ["swoext", "run", "--no-color"]

mpt_extension_sdk-5.2.0/docker-compose.yml

@@ -1,34 +0,0 @@
-services:
-  bash:
-    container_name: mpt_extension_sdk_bash
-    build:
-      context: .
-      dockerfile: dev.Dockerfile
-    working_dir: /extension_sdk
-    command: bash
-    stdin_open: true
-    tty: true
-    volumes:
-      - .:/extension_sdk
-
-  app_test:
-    container_name: mpt_extension_sdk_test
-    build:
-      context: .
-      dockerfile: dev.Dockerfile
-    working_dir: /extension_sdk
-    command: bash -c "ruff check . && pytest"
-    volumes:
-      - .:/extension_sdk
-    environment:
-      - PROCESS_CHECK_INTERVAL_SECS=0
-
-  format:
-    container_name: mpt_extension_sdk_format
-    build:
-      context: .
-      dockerfile: dev.Dockerfile
-    working_dir: /extension_sdk
-    command: bash -c "ruff check . --select I --fix && ruff format ."
-    volumes:
-      - .:/extension_sdk

mpt_extension_sdk-5.2.0/prod.Dockerfile

@@ -1,13 +0,0 @@
-FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
-
-COPY . /extension_sdk
-WORKDIR /extension_sdk
-
-RUN uv venv /opt/venv
-
-ENV VIRTUAL_ENV=/opt/venv
-ENV PATH=/opt/venv/bin:$PATH
-
-RUN uv sync --frozen --no-cache --all-groups --active
-
-CMD ["swoext"]

mpt_extension_sdk-5.2.0/sonar-project.properties

@@ -1,13 +0,0 @@
-sonar.projectKey=softwareone-platform_mpt-extension-sdk
-sonar.organization=softwareone-mpt-github
-
-sonar.language=py
-
-sonar.sources=mpt_extension_sdk
-sonar.tests=tests
-sonar.inclusions=mpt_extension_sdk/**
-sonar.exclusions=tests/**
-
-sonar.python.coverage.reportPaths=coverage.xml
-sonar.python.xunit.reportPath=coverage.xml
-sonar.python.version=3