mrok 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

mrok/controller/app.py

@@ -51,9 +51,15 @@ def setup_app():
 
     # TODO: Add healthcheck
     app.include_router(
-        extensions_router, prefix="/extensions", dependencies=[Depends(authenticate)]
+        extensions_router,
+        prefix="/extensions",
+        dependencies=[Depends(authenticate)],
+    )
+    app.include_router(
+        instances_router,
+        prefix="/instances",
+        dependencies=[Depends(authenticate)],
     )
-    app.include_router(instances_router, prefix="/instances", dependencies=[Depends(authenticate)])
 
     settings = get_settings()
 

mrok/controller/routes/extensions.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Annotated
+from typing import Annotated, Literal
 
 from fastapi import APIRouter, Body, HTTPException, status
 
@@ -116,8 +116,26 @@ async def create_extension(
 async def get_extension_by_id_or_extension_id(
     mgmt_api: ZitiManagementAPI,
     id_or_extension_id: str,
+    with_instances: Literal["none", "online", "offline"] = "none",
 ):
-    return ExtensionRead(**(await fetch_extension_or_404(mgmt_api, id_or_extension_id)))
+    extension = await fetch_extension_or_404(mgmt_api, id_or_extension_id)
+
+    if with_instances == "none":
+        return ExtensionRead(**extension)
+
+    instances = list(
+        filter(
+            lambda ir: ir.status == with_instances,
+            [
+                InstanceRead(**identity)
+                async for identity in mgmt_api.identities(
+                    {"filter": f'tags.{MROK_SERVICE_TAG_NAME} = "{extension["name"]}"'}
+                )
+            ],
+        )
+    )
+
+    return ExtensionRead(**extension, instances=instances)
 
 
 @router.delete(
@@ -272,11 +290,7 @@ async def get_instance_by_id_or_instance_id(
     id_or_instance_id: str,
 ):
     identity = await fetch_instance_or_404(mgmt_api, id_or_extension_id, id_or_instance_id)
-    return InstanceRead(
-        id=identity["id"],
-        name=identity["name"],
-        tags=identity["tags"],
-    )
+    return InstanceRead(**identity)
 
 
 @router.delete(

mrok/controller/routes/instances.py

@@ -6,6 +6,7 @@ from mrok.controller.dependencies import ZitiManagementAPI
 from mrok.controller.openapi import examples
 from mrok.controller.pagination import LimitOffsetPage, paginate
 from mrok.controller.schemas import InstanceRead
+from mrok.ziti.constants import MROK_IDENTITY_TYPE_TAG_NAME, MROK_IDENTITY_TYPE_TAG_VALUE_INSTANCE
 
 logger = logging.getLogger("mrok.controller")
 
@@ -68,4 +69,7 @@ async def get_instance_by_id_or_instance_id(
 async def get_instances(
     mgmt_api: ZitiManagementAPI,
 ):
-    return await paginate(mgmt_api, "/identities", InstanceRead)
+    params = {
+        "filter": f'tags.{MROK_IDENTITY_TYPE_TAG_NAME}="{MROK_IDENTITY_TYPE_TAG_VALUE_INSTANCE}"'
+    }
+    return await paginate(mgmt_api, "/identities", InstanceRead, extra_params=params)

mrok/controller/schemas.py

@@ -1,4 +1,6 @@
-from typing import Annotated, Any
+from __future__ import annotations
+
+from typing import Annotated, Any, Literal
 
 from pydantic import (
     BaseModel,
@@ -34,6 +36,7 @@ class ExtensionBase(BaseSchema):
 
 class ExtensionRead(BaseSchema, IdSchema):
     name: str
+    instances: list[InstanceRead] | None = None
 
     @computed_field
     def extension(self) -> dict:
@@ -51,6 +54,11 @@ class InstanceBase(BaseSchema):
 class InstanceRead(BaseSchema, IdSchema):
     name: str
     identity: dict[str, Any] | None = None
+    has_edge_router_connection: bool | None = Field(
+        False,
+        alias="hasEdgeRouterConnection",
+        exclude=True,
+    )
 
     @computed_field
     def instance(self) -> dict:
@@ -62,6 +70,10 @@ class InstanceRead(BaseSchema, IdSchema):
         _, extension_id = self.name.split(".", 1)
         return {"id": extension_id.upper()}
 
+    @computed_field
+    def status(self) -> Literal["online", "offline"]:
+        return "online" if bool(self.has_edge_router_connection) else "offline"
+
 
 class InstanceCreate(InstanceBase):
     pass

mrok/http/master.py

@@ -2,6 +2,7 @@ import logging
 import os
 import signal
 import threading
+import time
 from collections.abc import Callable
 from pathlib import Path
 
@@ -11,6 +12,10 @@ from watchfiles.run import CombinedProcess, start_process
 
 logger = logging.getLogger("mrok.agent")
 
+MONITOR_THREAD_JOIN_TIMEOUT = 5
+MONITOR_THREAD_CHECK_DELAY = 1
+MONITOR_THREAD_ERROR_DELAY = 3
+
 
 def print_path(path):
     try:
@@ -29,7 +34,7 @@ class Master:
         self.start_fn = start_fn
         self.workers = workers
         self.reload = reload
-        self.worker_processes: list[CombinedProcess] = []
+        self.worker_processes: dict[int, CombinedProcess] = {}
         self.stop_event = threading.Event()
         self.watch_filter = PythonFilter(ignore_paths=None)
         self.watcher = watch(
@@ -39,6 +44,7 @@ class Master:
             yield_on_timeout=True,
         )
         self.setup_signals_handler()
+        self.monitor_thread = None
 
     def setup_signals_handler(self):
         for sig in (signal.SIGINT, signal.SIGTERM):
@@ -47,26 +53,50 @@ class Master:
     def handle_signal(self, *args, **kwargs):
         self.stop_event.set()
 
+    def start_worker(self, worker_id: int):
+        """Start a single worker process"""
+        p = start_process(
+            self.start_fn,
+            "function",
+            (),
+            None,
+        )
+        logger.info(f"Worker {worker_id} [{p.pid}] started")
+        return p
+
     def start(self):
-        for _ in range(self.workers):
-            p = start_process(
-                self.start_fn,
-                "function",
-                (),
-                None,
-            )
-            logger.info(f"Worker [{p.pid}] started")
-            self.worker_processes.append(p)
+        for i in range(self.workers):
+            p = self.start_worker(i)
+            self.worker_processes[i] = p
 
     def stop(self):
-        for process in self.worker_processes:
+        for process in self.worker_processes.values():
             process.stop(sigint_timeout=5, sigkill_timeout=1)
-        self.worker_processes = []
+        self.worker_processes.clear()
 
     def restart(self):
         self.stop()
         self.start()
 
+    def monitor_workers(self):
+        while not self.stop_event.is_set():
+            try:
+                for worker_id, process in self.worker_processes.items():
+                    if not process.is_alive():
+                        logger.warning(f"Worker {worker_id} [{process.pid}] died unexpectedly")
+                        process.stop(sigint_timeout=1, sigkill_timeout=1)
+                        new_process = self.start_worker(worker_id)
+                        self.worker_processes[worker_id] = new_process
+                        logger.info(
+                            f"Restarted worker {worker_id} [{process.pid}] -> [{new_process.pid}]"
+                        )
+
+                time.sleep(MONITOR_THREAD_CHECK_DELAY)
+
+            except Exception as e:
+                logger.error(f"Error in worker monitoring: {e}")
+                time.sleep(MONITOR_THREAD_ERROR_DELAY)
+
     def __iter__(self):
         return self
 
@@ -79,12 +109,24 @@ class Master:
     def run(self):
         self.start()
         logger.info(f"Master process started: {os.getpid()}")
-        if self.reload:
-            for files_changed in self:
-                if files_changed:
-                    logger.warning(
-                        f"{', '.join(map(print_path, files_changed))} changed, reloading...",
-                    )
-                    self.restart()
-        else:
-            self.stop_event.wait()
+
+        # Start worker monitoring thread
+        self.monitor_thread = threading.Thread(target=self.monitor_workers, daemon=True)
+        self.monitor_thread.start()
+        logger.debug("Worker monitoring thread started")
+
+        try:
+            if self.reload:
+                for files_changed in self:
+                    if files_changed:
+                        logger.warning(
+                            f"{', '.join(map(print_path, files_changed))} changed, reloading...",
+                        )
+                        self.restart()
+            else:
+                self.stop_event.wait()
+        finally:
+            if self.monitor_thread and self.monitor_thread.is_alive():  # pragma: no cover
+                logger.debug("Wait for monitor worker to exit")
+                self.monitor_thread.join(timeout=MONITOR_THREAD_JOIN_TIMEOUT)
+            self.stop()

mrok/ziti/api.py

@@ -397,7 +397,7 @@ class ZitiManagementAPI(BaseZitiAPI):
     async def search_config_type(self, id_or_name: str) -> dict[str, Any] | None:
         return await self.search_by_id_or_name("/config-types", id_or_name)
 
-    async def delete_config_type(self, config_type_id: str) -> dict[str, Any] | None:
+    async def delete_config_type(self, config_type_id: str) -> None:
         return await self.delete("/config-types", config_type_id)
 
     async def get_identity(self, identity_id: str) -> dict[str, Any]:

{mrok-0.2.1.dist-info → mrok-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mrok
-Version: 0.2.1
+Version: 0.2.3
 Summary: MPT Extensions OpenZiti Orchestrator
 Author: SoftwareOne AG
 License:                                  Apache License

{mrok-0.2.1.dist-info → mrok-0.2.3.dist-info}/RECORD

@@ -31,10 +31,10 @@ mrok/cli/commands/controller/__init__.py,sha256=2xw-YVN0akiLiuGUU3XbYyZZ0ugOjQ6X
 mrok/cli/commands/controller/openapi.py,sha256=QLjVao9UkB2vBaGkFi_q_jrlg4Np4ldMRwDIJsrJ7A8,1175
 mrok/cli/commands/controller/run.py,sha256=osyjssb81xNMYZLPb6dfPR4W_BQlCxKDfvl-BIhG_1A,2460
 mrok/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mrok/controller/app.py,sha256=_MzTu_wFRbD4kGbw4PdP5OYpl3KDlOCJFeNWxt-WM-c,1818
+mrok/controller/app.py,sha256=XxCIB7N1YE52vSYfvGW2UPgEEOZ9jxDMe2l9D2SfXi8,1866
 mrok/controller/auth.py,sha256=Kg94W8yNMs6TvUmLRYv1QeUjDy4qlGZ-_6OHa4KH1zg,2648
 mrok/controller/pagination.py,sha256=raYpYa34q8Ckl4BXBOEdpWlKkFj6z7e6QLWr2HT7dzI,2187
-mrok/controller/schemas.py,sha256=zk91PIJ0zncpBgs4bhU-n-76EWlRKo87r3VVx15JxPc,1320
+mrok/controller/schemas.py,sha256=AaF8_bEwZTHM02apVEBAzlUb2t71zoxYaG-VHtPNeMk,1705
 mrok/controller/dependencies/__init__.py,sha256=voewk6gjkA0OarL6HFmfT_RLqBns0Fpl-VIqK5xVAEI,202
 mrok/controller/dependencies/conf.py,sha256=2Pa8fxJHkZ29q6UL-w6hUP_wr7WnNELfw5LlzWg1Tec,162
 mrok/controller/dependencies/ziti.py,sha256=fYoxeJb4s6p2_3gxbExbFSRabjpvp_gZMBb3ocXZV3Y,702
@@ -42,25 +42,25 @@ mrok/controller/openapi/__init__.py,sha256=U1dw45w76CcoQagyqg_FXdMuJF3qJZZM6wG8T
 mrok/controller/openapi/examples.py,sha256=ZI0BP7L6sI0z7Mq1I3uc2UrweGpzpPeGSIuf1bUKkgg,1419
 mrok/controller/openapi/utils.py,sha256=Kn55ISAWlMJNwrJTum7iFrBvJvr81To76pCK8W-s79Q,1114
 mrok/controller/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mrok/controller/routes/extensions.py,sha256=j-dLO4yLkUj-rdjnGhO2suvmR690-UdaNvokDZ7ZpF0,8670
-mrok/controller/routes/instances.py,sha256=rcpbKfLsYsokOo7aZamzQks-c9AYoU-8KKK9pDYpoOY,1963
+mrok/controller/routes/extensions.py,sha256=jd3OGsJ_ESLQbOJ1mkzU8F44QgPe3R23dIapkNjmYDY,9126
+mrok/controller/routes/instances.py,sha256=v-fn_F6JHbDZ4YUNCIZzClgHp6aC1Eu5HB7k7qBG5pk,2202
 mrok/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mrok/http/config.py,sha256=k8mjvD3ninJn-v1t-co-GSa3upm4b70bWyk3fwdcOh8,2161
 mrok/http/forwarder.py,sha256=mo-Z8B8Zg6kdDX-lWEiptRv-9kJU9cEdmg6gt6eF0cc,11374
 mrok/http/lifespan.py,sha256=9qevhD_5Y0f8fGTh2axdfWx7v1K4vnWtiUNyJLesOHE,262
-mrok/http/master.py,sha256=o_0Sxe2XuTgVAwvBbWkYcO3HkCcfvYP4rgxcuIDPwXo,2426
+mrok/http/master.py,sha256=TwU78yE_GQecogBs_PDpl3gY7_jWYNIRNaAXRzi0rvY,4152
 mrok/http/protocol.py,sha256=ap8jbLUvgbAH81ZJZCBkQiYR7mkV_eL3rpfwEkoE8sU,392
 mrok/http/server.py,sha256=Mj7C85fc-DXp-WTBWaOd7ag808oliLmFBH5bf-G2FHg,370
 mrok/ziti/__init__.py,sha256=20OWMiexRhOovZOX19zlX87-V78QyWnEnSZfyAftUdE,263
-mrok/ziti/api.py,sha256=onVOSgcqALTeC3EBX-RPJvkqQ3OhhzvJ91HPsGaIJC4,16171
+mrok/ziti/api.py,sha256=KvGiT9d4oSgC3JbFWLDQyuHcLX2HuZJoJ8nHmWtCDkY,16154
 mrok/ziti/bootstrap.py,sha256=QIDhlkIxPW2QRuumFq2D1WDbD003P5f3z24pAUsyeBI,2696
 mrok/ziti/constants.py,sha256=Urq1X3bCBQZfw8NbnEa1pqmY4oq1wmzkwPfzam3kbTw,339
 mrok/ziti/errors.py,sha256=yYCbVDwktnR0AYduqtynIjo73K3HOhIrwA_vQimvEd4,368
 mrok/ziti/identities.py,sha256=oE_3j6Y4xCr6uKNdprW55bxGsyKnmJt-MrxrylB2Ey4,5388
 mrok/ziti/pki.py,sha256=o2tySqHC8-7bvFuI2Tqxg9vX6H6ZSxWxfP_9x29e19M,1954
 mrok/ziti/services.py,sha256=JnznLTHNZjgbFwnBtv7y2XIp4NiQxLVawwP9EfWdVuM,3208
-mrok-0.2.1.dist-info/METADATA,sha256=6pEGhIuJ0KJNyG3QXfLouC71PaFpywYGg2AEWrrQFLg,15546
-mrok-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mrok-0.2.1.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
-mrok-0.2.1.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
-mrok-0.2.1.dist-info/RECORD,,
+mrok-0.2.3.dist-info/METADATA,sha256=HCW-FucwR1yddkxR12eUY63wEXxTiaeNlEIMKpORVUo,15546
+mrok-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mrok-0.2.3.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
+mrok-0.2.3.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
+mrok-0.2.3.dist-info/RECORD,,