mrok 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

mrok/proxy/ziti.py

@@ -0,0 +1,173 @@
+"""Ziti-backed connection manager for the proxy.
+
+This manager owns creation of connections via an OpenZiti context, wraps
+streams to observe IO errors, evicts idle entries, and serializes creation
+per-key.
+"""
+
+import asyncio
+import logging
+import time
+from pathlib import Path
+
+# typing imports intentionally minimized
+import openziti
+
+from mrok.http.types import StreamReader, StreamWriter
+from mrok.proxy.dataclasses import CachedStreamEntry
+from mrok.proxy.streams import CachedStreamReader, CachedStreamWriter
+from mrok.proxy.types import CachedStream, ConnectionKey
+
+logger = logging.getLogger("mrok.proxy")
+
+
+class ZitiConnectionManager:
+    def __init__(
+        self,
+        identity_file: str | Path,
+        ziti_timeout_ms: int = 10000,
+        ttl_seconds: float = 60.0,
+        purge_interval: float = 10.0,
+    ):
+        self._identity_file = identity_file
+        self._ziti_ctx = None
+        self._ziti_timeout_ms = ziti_timeout_ms
+        self._ttl = float(ttl_seconds)
+        self._purge_interval = float(purge_interval)
+        self._cache: dict[ConnectionKey, CachedStreamEntry] = {}
+        self._lock = asyncio.Lock()
+        self._in_progress: dict[ConnectionKey, asyncio.Lock] = {}
+        self._purge_task: asyncio.Task | None = None
+
+    async def get(self, target: str) -> tuple[StreamReader, StreamWriter] | tuple[None, None]:
+        head, _, tail = target.partition(".")
+        terminator = target if head and tail else ""
+        service = tail if tail else head
+        r, w = await self._get_or_create_key((service, terminator))
+        return r, w
+
+    async def invalidate(self, key: ConnectionKey) -> None:
+        async with self._lock:
+            item = self._cache.pop(key, None)
+        if item is None:
+            return
+        await self._close_writer(item.writer)
+
+    async def start(self) -> None:
+        if self._ziti_ctx is None:
+            ctx, err = openziti.load(str(self._identity_file), timeout=self._ziti_timeout_ms)
+            if err != 0:
+                raise Exception(f"Cannot create a Ziti context from the identity file: {err}")
+            self._ziti_ctx = ctx
+        if self._purge_task is None:
+            self._purge_task = asyncio.create_task(self._purge_loop())
+            logger.info("Ziti connection manager started")
+
+    async def stop(self) -> None:
+        if self._purge_task is not None:
+            self._purge_task.cancel()
+            try:
+                await self._purge_task
+            except asyncio.CancelledError:
+                logger.debug("Purge task was cancelled")
+            except Exception as e:
+                logger.warning(f"An error occurred stopping the purge task: {e}")
+            self._purge_task = None
+            logger.info("Ziti connection manager stopped")
+
+        async with self._lock:
+            items = list(self._cache.items())
+            self._cache.clear()
+
+        for _, item in items:
+            await self._close_writer(item.writer)
+
+    async def _purge_loop(self) -> None:
+        try:
+            while True:
+                await asyncio.sleep(self._purge_interval)
+                await self._purge_once()
+        except asyncio.CancelledError:
+            return
+
+    async def _purge_once(self) -> None:
+        to_close: list[tuple[StreamReader, StreamWriter]] = []
+        async with self._lock:
+            now = time.time()
+            for key, item in list(self._cache.items()):
+                if now - item.last_access > self._ttl:
+                    to_close.append((item.reader, item.writer))
+                    del self._cache[key]
+
+        for _, writer in to_close:
+            writer.close()
+            await self._close_writer(writer)
+
+    def _is_writer_closed(self, writer: StreamWriter) -> bool:
+        return writer.transport.is_closing()
+
+    async def _close_writer(self, writer: StreamWriter) -> None:
+        writer.close()
+        try:
+            await writer.wait_closed()
+        except Exception as e:
+            logger.debug(f"Error closing writer: {e}")
+
+    async def _get_or_create_key(self, key: ConnectionKey) -> CachedStream:
+        """Internal: create or return a cached wrapped pair for the concrete key."""
+        await self._purge_once()
+        to_close = None
+        async with self._lock:
+            if key in self._cache:
+                now = time.time()
+                item = self._cache[key]
+                reader, writer = item.reader, item.writer
+                if not self._is_writer_closed(writer) and not reader.at_eof():
+                    self._cache[key] = CachedStreamEntry(reader, writer, now)
+                    return reader, writer
+                to_close = writer
+                del self._cache[key]
+
+            lock = self._in_progress.get(key)
+            if lock is None:
+                lock = asyncio.Lock()
+                self._in_progress[key] = lock
+
+        if to_close:
+            await self._close_writer(to_close)
+
+        async with lock:
+            try:
+                # # double-check cache after acquiring the per-key lock
+                # async with self._lock:
+                #     now = time.time()
+                #     if key in self._cache:
+                #         r, w, _ = self._cache[key]
+                #         if not self._is_writer_closed(w) and not r.at_eof():
+                #             self._cache[key] = (r, w, now)
+                #             return r, w
+
+                # perform creation via ziti context
+                extension, instance = key
+                logger.info(f"Create connection to {extension}: {instance}")
+                # loop = asyncio.get_running_loop()
+                # sock = await loop.run_in_executor(None, self._ziti_ctx.connect,
+                # extension, instance)
+                if instance:
+                    sock = self._ziti_ctx.connect(
+                        extension, terminator=instance
+                    )  # , terminator=instance)
+                else:
+                    sock = self._ziti_ctx.connect(extension)
+                orig_reader, orig_writer = await asyncio.open_connection(sock=sock)
+
+                reader = CachedStreamReader(orig_reader, key, self)
+                writer = CachedStreamWriter(orig_writer, key, self)
+
+                async with self._lock:
+                    self._cache[key] = CachedStreamEntry(reader, writer, time.time())
+
+                return reader, writer
+            finally:
+                async with self._lock:
+                    self._in_progress.pop(key, None)

{mrok-0.3.0.dist-info → mrok-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mrok
-Version: 0.3.0
+Version: 0.4.0
 Summary: MPT Extensions OpenZiti Orchestrator
 Author: SoftwareOne AG
 License:                                  Apache License
@@ -212,14 +212,20 @@ Requires-Dist: dynaconf<4.0.0,>=3.2.11
 Requires-Dist: fastapi-pagination<0.15.0,>=0.14.1
 Requires-Dist: fastapi[standard]<0.120.0,>=0.119.0
 Requires-Dist: gunicorn<24.0.0,>=23.0.0
+Requires-Dist: hdrhistogram<0.11.0,>=0.10.3
 Requires-Dist: httptools<0.8.0,>=0.7.1
 Requires-Dist: httpx<0.29.0,>=0.28.1
 Requires-Dist: openziti<2.0.0,>=1.3.1
+Requires-Dist: psutil<8.0.0,>=7.1.3
 Requires-Dist: pydantic<3.0.0,>=2.11.7
 Requires-Dist: pyfiglet<2.0.0,>=1.0.4
 Requires-Dist: pyjwt<3.0.0,>=2.10.1
+Requires-Dist: pytest-textual-snapshot<2.0.0,>=1.1.0
 Requires-Dist: pyyaml<7.0.0,>=6.0.2
+Requires-Dist: pyzmq<28.0.0,>=27.1.0
 Requires-Dist: rich<15.0.0,>=14.1.0
+Requires-Dist: textual-serve<2.0.0,>=1.1.3
+Requires-Dist: textual<7.0.0,>=6.5.0
 Requires-Dist: typer<0.20.0,>=0.19.2
 Requires-Dist: uvicorn-worker<0.5.0,>=0.4.0
 Description-Content-Type: text/markdown

{mrok-0.3.0.dist-info → mrok-0.4.0.dist-info}/RECORD

@@ -1,16 +1,26 @@
 mrok/__init__.py,sha256=D1PUs3KtMCqG4bFLceVNG62L3RN53NS95uSCNXpgvzs,181
-mrok/conf.py,sha256=iDMxJtorJWxK0mI-pGEi1TBd_064R-VLcWzHB4esUlE,661
+mrok/conf.py,sha256=_5Z-A5LyojQeY8J7W8C0QidsmrPl99r9qKYEoMf4kcI,840
+mrok/datastructures.py,sha256=gp8KF2JoNOxIRzYStVZLKL_XVDbcIVSIDnmpQo4FNt0,4067
 mrok/errors.py,sha256=ruNMDFr2_0ezCGXuCG1OswCEv-bHOIzMMd02J_0ABcs,37
-mrok/logging.py,sha256=4F5rviPK1-MWWMZuHfzNNQmGxg-emAPRdKz0PsWDSww,2261
+mrok/logging.py,sha256=ZMWn0w4fJ-F_g-L37H_GM14BSXAIF2mFF_ougX5S7mg,2856
+mrok/master.py,sha256=6_bUic39mXE37lt0PBf_BtY2D2mBR7KzPj65JP7HWPc,8287
+mrok/metrics.py,sha256=asweK_7xiV5MtkDkvbEm9Tktqrl2KHM8VflF0AkNGI0,4036
 mrok/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mrok/agent/ziticorn.py,sha256=sWtX7cyaIks8_Re3RmLlcgFPGOZ7-xBqdv6TZ50I1ac,765
+mrok/agent/ziticorn.py,sha256=marXGcr6CbDdiNi8V3CZJhg8YCUbKw6ySuO3-0-zf8g,900
+mrok/agent/devtools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mrok/agent/devtools/__main__.py,sha256=R8ezbW7hCik5r45U3w2TgiTubg9SlbVsWA-bapILJXU,781
+mrok/agent/devtools/inspector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mrok/agent/devtools/inspector/__main__.py,sha256=HeYcRf1bjXPji2LKMPCcTU61afrRH2P1RqnFmHClRTc,524
+mrok/agent/devtools/inspector/app.py,sha256=_pzxemMqIunE5EdMq5amjqpOGsMWIOw17GgiCtRAi6Q,16464
+mrok/agent/devtools/inspector/server.py,sha256=C4uD6_1psSHMjJLUDCMPGvKdQYKaEwYTw27NAbwuuA0,636
 mrok/agent/sidecar/__init__.py,sha256=DrjJGhqFyxsVODW06KI20Wpr6HsD2lD6qFCKUXc7GIE,59
-mrok/agent/sidecar/app.py,sha256=QEfPdeFwlerxDbjAqUNtMsnslVUu2h4nCoOVCBFVsy0,992
-mrok/agent/sidecar/main.py,sha256=6HVJRqtxNOKrCQ0XQhQdfWCfjzHJMgBn_zPqtLsIxWw,798
+mrok/agent/sidecar/app.py,sha256=1p6qWkXVq78zcJ2dhCYlw8CqfwPsgEtu07Lp5csK3Iw,874
+mrok/agent/sidecar/main.py,sha256=h31wynUCcFmRckvqLHtH97w1QgMv4fzcmYjhRPUobxY,1076
 mrok/cli/__init__.py,sha256=mtFEa8IeS1x6Gm4dUYoSnAxyEzNqbUVSmWxtuZUMR84,61
 mrok/cli/main.py,sha256=DFcYPwDskXi8SKAgEsuP4GMFzaniIf_6bZaSDWvYKDk,2724
 mrok/cli/rich.py,sha256=P3Dyu8EArUR9_0j7DPK7LRx85TWdYdZ1SaJzD_S1ZCE,511
-mrok/cli/commands/__init__.py,sha256=M6Sypb2vAh6qxQQJNIO9xop2DrD6zt6TEp8rbbD7LS0,114
+mrok/cli/utils.py,sha256=m_olScdIUGks5IoC6p2F9D6CQIucWZ7LHyrvwm2bkJw,106
+mrok/cli/commands/__init__.py,sha256=jihISOj3ZZQ_dn0rogXrJOx6b283KLRUfTw9USQgAhI,134
 mrok/cli/commands/admin/__init__.py,sha256=WU49jpMF9p18UONjYywWEFzjF57zLpLKJ0qAZvrzcR4,414
 mrok/cli/commands/admin/bootstrap.py,sha256=iOnHctYajgcHrG_Idjn5Y7VVSaWYRIhdgqKSw9TWq9I,1680
 mrok/cli/commands/admin/utils.py,sha256=wQ-qQJGFyhikMJY_CWT-G6sTEIZb-LUdj1AUZisLPBw,1363
@@ -23,16 +33,22 @@ mrok/cli/commands/admin/register/instances.py,sha256=XB6uAchc7Rm8uAu7o3-oHaN_rS8
 mrok/cli/commands/admin/unregister/__init__.py,sha256=-GjjCPX1pISbWmJK6GpKO3ijGsDQb21URjU1hNu99O4,215
 mrok/cli/commands/admin/unregister/extensions.py,sha256=GR3Iwzeksk_R0GkgmCSG7iHRcUrI7ABqDi25Gbes64Y,1016
 mrok/cli/commands/admin/unregister/instances.py,sha256=-28wL8pTXTWHVHtw93y8-dqi-Dlf0OZOnlBCKOyGo80,1138
-mrok/cli/commands/agent/__init__.py,sha256=Jr9RDSDdRPjbVJ7NhzgjRD-jtr5hD2vvKzDe7XsLnVo,140
+mrok/cli/commands/agent/__init__.py,sha256=ZAi7eTkKQtfwwV1c1mv3uvEEsyMMrhCQ_-id_0wksAQ,218
+mrok/cli/commands/agent/utils.py,sha256=m_olScdIUGks5IoC6p2F9D6CQIucWZ7LHyrvwm2bkJw,106
+mrok/cli/commands/agent/dev/__init__.py,sha256=ZfreyRuaLqO0AwPS8Ll1DIpsKacsu7_dTmbxV5QecOM,172
+mrok/cli/commands/agent/dev/console.py,sha256=rrKAGoKXVQQBOC75H0JSuX1sYyvc2QSrV-dfMPK49p4,673
+mrok/cli/commands/agent/dev/web.py,sha256=O9dYk-o1FV2E_sKLOezdEmLsnexwbJNDdsYL5pATZRQ,1028
 mrok/cli/commands/agent/run/__init__.py,sha256=E_IJCl3BfMffqFASe8gzJwhhQgt5bQfjhuyekVwdEBA,164
-mrok/cli/commands/agent/run/asgi.py,sha256=aqwu_h9WyCDI2Ts8D4zTvawCETNmcke7cX3zIUyRww4,1265
-mrok/cli/commands/agent/run/sidecar.py,sha256=VC6o1Xw6XXB25xh5F2PyPsDe5Sii0cWLVLDrpNIC5hU,1490
+mrok/cli/commands/agent/run/asgi.py,sha256=dCgzwJtTLv2eyEIP7v1tDfe_PrFBS02SfN5dSDw1Jzg,2054
+mrok/cli/commands/agent/run/sidecar.py,sha256=Tj5inAeSX1E3yCVs2q4P3sP3trvvwk2lYMSUtyFfxo8,2098
 mrok/cli/commands/controller/__init__.py,sha256=2xw-YVN0akiLiuGUU3XbYyZZ0ugOjQ6XhtTkzEKSmMA,161
 mrok/cli/commands/controller/openapi.py,sha256=QLjVao9UkB2vBaGkFi_q_jrlg4Np4ldMRwDIJsrJ7A8,1175
-mrok/cli/commands/controller/run.py,sha256=osyjssb81xNMYZLPb6dfPR4W_BQlCxKDfvl-BIhG_1A,2460
+mrok/cli/commands/controller/run.py,sha256=yl1p7oRHhQINWWjUKlRHtMIWUCV0KsxYdyVyazhX834,2406
+mrok/cli/commands/proxy/__init__.py,sha256=Y9oluemsuWSaykDniLVsI2cyTurcEO3_GJDHgf-7BdU,120
+mrok/cli/commands/proxy/run.py,sha256=QzKAjNCib-SS8IrGGHOxDjTtgTQxfeeeqmI3LaIkiLo,1293
 mrok/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mrok/controller/app.py,sha256=XxCIB7N1YE52vSYfvGW2UPgEEOZ9jxDMe2l9D2SfXi8,1866
-mrok/controller/auth.py,sha256=Kg94W8yNMs6TvUmLRYv1QeUjDy4qlGZ-_6OHa4KH1zg,2648
+mrok/controller/auth.py,sha256=hYa0OPJ5X0beGxRP6qbxwJOVXj5TmzHjmam2OjTBKn4,2704
 mrok/controller/pagination.py,sha256=raYpYa34q8Ckl4BXBOEdpWlKkFj6z7e6QLWr2HT7dzI,2187
 mrok/controller/schemas.py,sha256=AaF8_bEwZTHM02apVEBAzlUb2t71zoxYaG-VHtPNeMk,1705
 mrok/controller/dependencies/__init__.py,sha256=voewk6gjkA0OarL6HFmfT_RLqBns0Fpl-VIqK5xVAEI,202
@@ -45,12 +61,22 @@ mrok/controller/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 mrok/controller/routes/extensions.py,sha256=zoY4sNz_BIZcbly6WXM7Rbpn2jmB89njS_0xdJkoKfs,9192
 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=TwU78yE_GQecogBs_PDpl3gY7_jWYNIRNaAXRzi0rvY,4152
+mrok/http/config.py,sha256=k73-4hBo6jag1RpyZagJLtTCL6EQoebZaX8Vv-CMN_k,2050
+mrok/http/constants.py,sha256=ao5gI2HFBWmrdd2Yc6XFK_RGaHk-omxI4AqvfIiGes8,409
+mrok/http/forwarder.py,sha256=DakD9hrrCWAzB1B_4SgQaQaEHcDYLLI9WaYs5F0O36I,12977
+mrok/http/lifespan.py,sha256=UdbOqjWZsHzJJjX0CTd2hY96Jpk5QWtdHJEzPG6Z4hQ,1288
+mrok/http/middlewares.py,sha256=SGo4EwhTId2uJx1aMuqGbNy7MXgZlDEdZI0buzBYVv0,5011
 mrok/http/protocol.py,sha256=ap8jbLUvgbAH81ZJZCBkQiYR7mkV_eL3rpfwEkoE8sU,392
 mrok/http/server.py,sha256=Mj7C85fc-DXp-WTBWaOd7ag808oliLmFBH5bf-G2FHg,370
+mrok/http/types.py,sha256=XpNrvbfpANKvmjOBYtLF1FmDHoJF3z_MIMQHXoJlvmE,1302
+mrok/http/utils.py,sha256=sOixYu3R9-nNoMFYdifrreYvcFRIHYVtb6AAmtVzaLE,2125
+mrok/proxy/__init__.py,sha256=vWXyImroqM1Eq8e_oFPBup8VJ3reyp8SVjFTbLzRkI8,51
+mrok/proxy/app.py,sha256=MwJZ91MQ1oWkbmsX7-NooZSV9BkLVZPFmUKpNPC4HHQ,2490
+mrok/proxy/dataclasses.py,sha256=DtX-Yuma-uOECOPefJnoQJhZMEtT6Za_27cd-lJE9Iw,237
+mrok/proxy/main.py,sha256=ZXpticE6J4FABaslDB_8J5qklPsf3e7xIFSZmcPAAjQ,1588
+mrok/proxy/streams.py,sha256=6TMZwrQPbSyQqpqavsoTeyUmS2O026pJfiCnxLopPqg,3425
+mrok/proxy/types.py,sha256=dgWqAj6dFGVH_Q8-k8sU5h18yoUF_fTn-SRPIfEs_gA,308
+mrok/proxy/ziti.py,sha256=dKd6UzmEAFu9-gey871sPEDUZTkt4YVPyCYRzeA5mlA,6539
 mrok/ziti/__init__.py,sha256=20OWMiexRhOovZOX19zlX87-V78QyWnEnSZfyAftUdE,263
 mrok/ziti/api.py,sha256=KvGiT9d4oSgC3JbFWLDQyuHcLX2HuZJoJ8nHmWtCDkY,16154
 mrok/ziti/bootstrap.py,sha256=QIDhlkIxPW2QRuumFq2D1WDbD003P5f3z24pAUsyeBI,2696
@@ -59,8 +85,8 @@ mrok/ziti/errors.py,sha256=yYCbVDwktnR0AYduqtynIjo73K3HOhIrwA_vQimvEd4,368
 mrok/ziti/identities.py,sha256=1BcwfqAJHMBhc3vRaf0aLaIkoHskj5Xe2Lsq2lO9Vs8,6735
 mrok/ziti/pki.py,sha256=o2tySqHC8-7bvFuI2Tqxg9vX6H6ZSxWxfP_9x29e19M,1954
 mrok/ziti/services.py,sha256=zR1PEBYwXVou20iJK4euh0ZZFAo9UB8PZk8f6SDmiUE,3194
-mrok-0.3.0.dist-info/METADATA,sha256=5d5NEs5U_FXyVXXoZXhZgZUkdQl5N_EbFPjkDJ79whM,15546
-mrok-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mrok-0.3.0.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
-mrok-0.3.0.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
-mrok-0.3.0.dist-info/RECORD,,
+mrok-0.4.0.dist-info/METADATA,sha256=39Su41kvqC4oAsQl1_ZG7b5v1xRr6c2YK6x84XgURi8,15796
+mrok-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mrok-0.4.0.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
+mrok-0.4.0.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
+mrok-0.4.0.dist-info/RECORD,,

mrok/http/master.py

@@ -1,132 +0,0 @@
-import logging
-import os
-import signal
-import threading
-import time
-from collections.abc import Callable
-from pathlib import Path
-
-from watchfiles import watch
-from watchfiles.filters import PythonFilter
-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:
-        return f'"{path.relative_to(Path.cwd())}"'
-    except ValueError:
-        return f'"{path}"'
-
-
-class Master:
-    def __init__(
-        self,
-        start_fn: Callable,
-        workers: int,
-        reload: bool,
-    ):
-        self.start_fn = start_fn
-        self.workers = workers
-        self.reload = reload
-        self.worker_processes: dict[int, CombinedProcess] = {}
-        self.stop_event = threading.Event()
-        self.watch_filter = PythonFilter(ignore_paths=None)
-        self.watcher = watch(
-            Path.cwd(),
-            watch_filter=self.watch_filter,
-            stop_event=self.stop_event,
-            yield_on_timeout=True,
-        )
-        self.setup_signals_handler()
-        self.monitor_thread = None
-
-    def setup_signals_handler(self):
-        for sig in (signal.SIGINT, signal.SIGTERM):
-            signal.signal(sig, self.handle_signal)
-
-    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 i in range(self.workers):
-            p = self.start_worker(i)
-            self.worker_processes[i] = p
-
-    def stop(self):
-        for process in self.worker_processes.values():
-            process.stop(sigint_timeout=5, sigkill_timeout=1)
-        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
-
-    def __next__(self):
-        changes = next(self.watcher)
-        if changes:
-            return list({Path(change[1]) for change in changes})
-        return None
-
-    def run(self):
-        self.start()
-        logger.info(f"Master process started: {os.getpid()}")
-
-        # 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()