indexify 0.4.28__tar.gz → 0.4.29__tar.gz

{indexify-0.4.28 → indexify-0.4.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: indexify
-Version: 0.4.28
+Version: 0.4.29
 Summary: Open Source Indexify components and helper tools
 Home-page: https://github.com/tensorlakeai/indexify
 License: Apache 2.0

{indexify-0.4.28 → indexify-0.4.29}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "indexify"
 # Incremented if any of the components provided in this packages are updated.
-version = "0.4.28"
+version = "0.4.29"
 description = "Open Source Indexify components and helper tools"
 authors = ["Tensorlake Inc. <support@tensorlake.ai>"]
 license = "Apache 2.0"

{indexify-0.4.28 → indexify-0.4.29}/src/indexify/executor/executor.py

@@ -23,9 +23,11 @@ from .metrics.executor import (
     metric_executor_info,
     metric_executor_state,
 )
+from .monitoring.desired_state_handler import DesiredStateHandler
 from .monitoring.health_check_handler import HealthCheckHandler
 from .monitoring.health_checker.health_checker import HealthChecker
 from .monitoring.prometheus_metrics_handler import PrometheusMetricsHandler
+from .monitoring.reported_state_handler import ReportedStateHandler
 from .monitoring.server import MonitoringServer
 from .monitoring.startup_probe_handler import StartupProbeHandler
 from .state_reconciler import ExecutorStateReconciler
@@ -59,13 +61,6 @@ class Executor:
             protocol = "https"
 
         self._startup_probe_handler = StartupProbeHandler()
-        self._monitoring_server = MonitoringServer(
-            host=monitoring_server_host,
-            port=monitoring_server_port,
-            startup_probe_handler=self._startup_probe_handler,
-            health_probe_handler=HealthCheckHandler(health_checker),
-            metrics_handler=PrometheusMetricsHandler(),
-        )
         self._channel_manager = ChannelManager(
             server_address=grpc_server_addr,
             config_path=config_path,
@@ -96,6 +91,15 @@ class Executor:
             state_reporter=self._state_reporter,
             logger=self._logger,
         )
+        self._monitoring_server = MonitoringServer(
+            host=monitoring_server_host,
+            port=monitoring_server_port,
+            startup_probe_handler=self._startup_probe_handler,
+            health_probe_handler=HealthCheckHandler(health_checker),
+            metrics_handler=PrometheusMetricsHandler(),
+            reported_state_handler=ReportedStateHandler(self._state_reporter),
+            desired_state_handler=DesiredStateHandler(self._state_reconciler),
+        )
         self._run_aio_task: Optional[asyncio.Task] = None
         self._shutdown_aio_task: Optional[asyncio.Task] = None
 

indexify-0.4.29/src/indexify/executor/monitoring/desired_state_handler.py

@@ -0,0 +1,24 @@
+from aiohttp import web
+
+from indexify.proto.executor_api_pb2 import (
+    DesiredExecutorState,
+)
+
+from ..state_reconciler import ExecutorStateReconciler
+from .handler import Handler
+
+
+class DesiredStateHandler(Handler):
+    def __init__(self, state_reconciler: ExecutorStateReconciler):
+        self._state_reconciler = state_reconciler
+
+    async def handle(self, request: web.Request) -> web.Response:
+        desired_state: DesiredExecutorState | None = (
+            self._state_reconciler.get_desired_state()
+        )
+        if desired_state is None:
+            return web.Response(
+                status=200, text="No desired state received from Server yet"
+            )
+        else:
+            return web.Response(text=str(desired_state))

indexify-0.4.29/src/indexify/executor/monitoring/reported_state_handler.py

@@ -0,0 +1,22 @@
+from aiohttp import web
+
+from indexify.proto.executor_api_pb2 import (
+    ReportExecutorStateRequest,
+)
+
+from ..state_reporter import ExecutorStateReporter
+from .handler import Handler
+
+
+class ReportedStateHandler(Handler):
+    def __init__(self, state_reporter: ExecutorStateReporter):
+        self._state_reporter = state_reporter
+
+    async def handle(self, request: web.Request) -> web.Response:
+        request: ReportExecutorStateRequest | None = (
+            self._state_reporter.last_state_report_request()
+        )
+        if request is None:
+            return web.Response(status=200, text="No state reported so far")
+        else:
+            return web.Response(text=str(request))

{indexify-0.4.28 → indexify-0.4.29}/src/indexify/executor/monitoring/server.py

@@ -11,6 +11,8 @@ class MonitoringServer:
         startup_probe_handler: Handler,
         health_probe_handler: Handler,
         metrics_handler: Handler,
+        reported_state_handler: Handler,
+        desired_state_handler: Handler,
     ):
         self._host = host
         self._port = port
@@ -20,6 +22,8 @@ class MonitoringServer:
                 web.get("/monitoring/startup", startup_probe_handler.handle),
                 web.get("/monitoring/health", health_probe_handler.handle),
                 web.get("/monitoring/metrics", metrics_handler.handle),
+                web.get("/state/reported", reported_state_handler.handle),
+                web.get("/state/desired", desired_state_handler.handle),
             ]
         )
         self._app_runner: web.AppRunner = web.AppRunner(self._app)

{indexify-0.4.28 → indexify-0.4.29}/src/indexify/executor/state_reconciler.py

@@ -88,6 +88,9 @@ class ExecutorStateReconciler:
         )
         self._last_desired_state: Optional[DesiredExecutorState] = None
 
+    def get_desired_state(self) -> Optional[DesiredExecutorState]:
+        return self._last_desired_state
+
     def run(self):
         """Runs the state reconciler.
 

{indexify-0.4.28 → indexify-0.4.29}/src/indexify/executor/state_reporter.py

@@ -89,6 +89,10 @@ class ExecutorStateReporter:
         self._pending_task_results: List[TaskResult] = []
         self._pending_fe_updates: List[FunctionExecutorUpdate] = []
         self._function_executor_states: Dict[str, FunctionExecutorState] = {}
+        self._last_state_report_request: Optional[ReportExecutorStateRequest] = None
+
+    def last_state_report_request(self) -> Optional[ReportExecutorStateRequest]:
+        return self._last_state_report_request
 
     def update_executor_status(self, value: ExecutorStatus) -> None:
         self._executor_status = value
@@ -203,7 +207,11 @@ class ExecutorStateReporter:
                 try:
                     state: ExecutorState = self._current_executor_state()
                     update: ExecutorUpdate = self._remove_pending_update()
+                    request: ReportExecutorStateRequest = ReportExecutorStateRequest(
+                        executor_state=state, executor_update=update
+                    )
                     _log_reported_executor_update(update, self._logger)
+                    self._last_state_report_request = request
 
                     with (
                         metric_state_report_rpc_errors.count_exceptions(),
@@ -211,10 +219,7 @@ class ExecutorStateReporter:
                     ):
                         metric_state_report_rpcs.inc()
                         await stub.report_executor_state(
-                            ReportExecutorStateRequest(
-                                executor_state=state, executor_update=update
-                            ),
-                            timeout=_REPORT_RPC_TIMEOUT_SEC,
+                            request, timeout=_REPORT_RPC_TIMEOUT_SEC
                         )
                     self._state_reported_event.set()
                     self._health_checker.server_connection_state_changed(