nebu 0.1.117__py3-none-any.whl → 0.1.118__py3-none-any.whl

nebu/processors/consumer_health_worker.py

@@ -5,13 +5,16 @@ import os
 import socket
 import sys
 import time
-from typing import Dict, List, Optional, Tuple, cast
+from typing import Any, Dict, List, Optional, Tuple, cast
 
 import redis
 import socks
 from redis import ConnectionError, ResponseError
 from redis.exceptions import TimeoutError as RedisTimeoutError
 
+# Assuming these are imported from other modules
+from nebu.processors.models import V1ProcessorHealthResponse
+
 
 def setup_health_logging():
     """Set up logging for the health check worker to write to a dedicated file."""
@@ -50,16 +53,53 @@ def process_health_check_message(
     """Processes a single health check message."""
     logger.info(f"Processing health check message {message_id}: {message_data}")
 
-    # Parse the message if it contains JSON data
+    health_status = "ok"
+    health_message: Optional[str] = "Health check processed successfully."
+    details: Optional[Dict[str, Any]] = None
+    return_stream: Optional[str] = None
+
     try:
         if "data" in message_data:
             data = json.loads(message_data["data"])
             logger.info(f"Health check data: {data}")
+            # Example: Extract return_stream if present in the health check data
+            return_stream = data.get("return_stream")
+            # Example: Update details if provided
+            if "check_details" in data:
+                details = {"processed_details": data["check_details"]}
+
     except (json.JSONDecodeError, KeyError) as e:
         logger.warning(f"Could not parse health check message data: {e}")
+        health_status = "error"
+        health_message = f"Failed to parse health check message data: {e}"
+        details = {"error": str(e)}
+
+    # Construct the health response
+    health_response = V1ProcessorHealthResponse(
+        status=health_status, message=health_message, details=details
+    )
+
+    logger.info(
+        f"Health response for message {message_id}: {health_response.model_dump_json()}"
+    )
 
-    # You could add more logic here, e.g., update an internal health status,
-    # send a response, perform actual health checks, etc.
+    # If a return_stream is specified, send the response there
+    if return_stream:
+        try:
+            # It's good practice to set a maxlen for the return stream to prevent it from growing indefinitely
+            redis_conn.xadd(
+                return_stream,
+                health_response.model_dump(),  # type: ignore[arg-type]
+                maxlen=1000,
+                approximate=True,
+            )
+            logger.info(
+                f"Sent health response for {message_id} to stream: {return_stream}"
+            )
+        except Exception as e_resp_send:
+            logger.error(
+                f"Failed to send health response for {message_id} to stream {return_stream}: {e_resp_send}"
+            )
 
     # Acknowledge the health check message
     try:

nebu/processors/models.py

@@ -149,3 +149,9 @@ class V1OpenAIStreamResponse(BaseModel):
     content: Any  # Using Any for ChatCompletionResponse
     created_at: int
     user_id: Optional[str] = None
+
+
+class V1ProcessorHealthResponse(BaseModel):
+    status: str
+    message: Optional[str] = None
+    details: Optional[Any] = None

nebu/processors/processor.py

@@ -1,7 +1,8 @@
 import json
 import threading
 import time
-import uuid
+
+# import uuid # Removed unused import
 from typing import (
     Any,
     Dict,
@@ -23,6 +24,7 @@ from nebu.meta import V1ResourceMetaRequest, V1ResourceReference
 from nebu.processors.models import (
     V1ContainerRequest,
     V1Processor,
+    V1ProcessorHealthResponse,
     V1ProcessorRequest,
     V1Processors,
     V1ProcessorScaleRequest,
@@ -246,7 +248,7 @@ class Processor(Generic[InputType, OutputType]):
 
         # --- Wait for health check if requested ---
         if wait_for_healthy:
-            self.wait_for_health_check()
+            self.wait_for_healthy()
 
     def __call__(
         self,
@@ -559,11 +561,11 @@ class Processor(Generic[InputType, OutputType]):
         else:
             logger.info(f"No active log stream to stop for {self.name}.")
 
-    def wait_for_health_check(
+    def wait_for_healthy(
         self, timeout: float = 3600.0, retry_interval: float = 5.0
     ) -> None:
         """
-        Wait for the processor to respond to health checks.
+        Wait for the processor to respond to health checks using the health endpoint.
 
         Args:
             timeout: Maximum time to wait for health check in seconds
@@ -573,40 +575,25 @@ class Processor(Generic[InputType, OutputType]):
             raise ValueError("Processor not found, cannot perform health check")
 
         logger.info(
-            f"Waiting for processor {self.processor.metadata.name} to be healthy..."
+            f"Waiting for processor {self.processor.metadata.name} to be healthy via health endpoint..."
         )
 
         start_time = time.time()
         while time.time() - start_time < timeout:
             try:
-                # Create a health check message
-                health_check_data = {
-                    "kind": "HealthCheck",
-                    "id": str(uuid.uuid4()),
-                    "content": {},
-                    "created_at": time.time(),
-                }
-
-                # Send health check and wait for response
-                response = self.send(
-                    data=health_check_data,  # type: ignore[arg-type]
-                    wait=True,
-                    timeout=30.0,  # Short timeout for individual health check
+                health_response = self.health()  # Use the new health() method
+                logger.info(
+                    f">>> Health check response: {health_response.model_dump_json()}"
                 )
-                logger.info(f">>> Health check response: {response}")
 
                 # Check if the response indicates health
-                if response and isinstance(response, dict):
-                    status = response.get("status")
-                    if status == "healthy":
-                        logger.info(
-                            f"Processor {self.processor.metadata.name} is healthy!"
-                        )
-                        return
-
-                logger.info(
-                    f"Health check attempt failed, retrying in {retry_interval}s..."
-                )
+                if health_response.status == "ok":  # Check for "ok" status
+                    logger.info(f"Processor {self.processor.metadata.name} is healthy!")
+                    return
+                else:
+                    logger.info(
+                        f"Processor {self.processor.metadata.name} reported status: {health_response.status}. Retrying in {retry_interval}s..."
+                    )
 
             except Exception as e:
                 logger.info(
@@ -619,3 +606,39 @@ class Processor(Generic[InputType, OutputType]):
         raise TimeoutError(
             f"Processor {self.processor.metadata.name} failed to become healthy within {timeout} seconds"
         )
+
+    def health(self) -> V1ProcessorHealthResponse:
+        """
+        Performs a health check on the processor by calling the health endpoint.
+        """
+        if (
+            not self.processor
+            or not self.processor.metadata.name
+            or not self.processor.metadata.namespace
+        ):
+            raise ValueError(
+                "Processor not found or missing metadata (name/namespace), cannot perform health check."
+            )
+
+        health_url = f"{self.orign_host}/v1/processors/{self.processor.metadata.namespace}/{self.processor.metadata.name}/health"
+        logger.debug(f"Calling health check endpoint: {health_url}")
+
+        try:
+            response = requests.get(
+                health_url,
+                headers={"Authorization": f"Bearer {self.api_key}"},
+                timeout=30.0,  # Standard timeout for a health check
+            )
+            response.raise_for_status()  # Raise an exception for HTTP errors
+            health_response_data = response.json()
+            return V1ProcessorHealthResponse.model_validate(health_response_data)
+        except requests.exceptions.RequestException as e:
+            logger.error(f"Health check request to {health_url} failed: {e}")
+            # Optionally, return a V1ProcessorHealthResponse indicating an error
+            # For now, re-raising the exception or a custom one might be better
+            raise RuntimeError(f"Failed to get health status: {e}") from e
+        except Exception as e:
+            logger.error(f"An unexpected error occurred during health check: {e}")
+            raise RuntimeError(
+                f"Unexpected error during health status retrieval: {e}"
+            ) from e

{nebu-0.1.117.dist-info → nebu-0.1.118.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nebu
-Version: 0.1.117
+Version: 0.1.118
 Summary: A globally distributed container runtime
 Requires-Python: >=3.10.14
 Description-Content-Type: text/markdown

{nebu-0.1.117.dist-info → nebu-0.1.118.dist-info}/RECORD

@@ -14,16 +14,16 @@ nebu/containers/models.py,sha256=0j6NGy4yto-enRDh_4JH_ZTbHrLdSpuMOqNQPnIrwC4,681
 nebu/namespaces/models.py,sha256=EqUOpzhVBhvJw2P92ONDUbIgC31M9jMmcaG5vyOrsWg,497
 nebu/namespaces/namespace.py,sha256=oeZyGqsIGIrppyjif1ZONsdTmqRgd9oSLFE1BChXTTE,5247
 nebu/processors/consumer.py,sha256=18p3QKa9AgVdTv-HH3Iu7cwXTw1pjCy5pKuYqYt0Ndc,68524
-nebu/processors/consumer_health_worker.py,sha256=4tS2vyd71tXMCy93Ae_TQi_ESaZVLPO16f9Gf4Eavcg,7946
+nebu/processors/consumer_health_worker.py,sha256=e6-WX8zrK5hprBvpU9al7CpiydYPdJp6wqjA33TyUvw,9509
 nebu/processors/consumer_process_worker.py,sha256=h--eNFKaLbUayxn88mB8oGGdrU2liE1dnwm_TPlewX8,36960
 nebu/processors/decorate.py,sha256=5p9pQrk_H8-Fj0UjsgSVCYx7Jk7KFuhMZtNhkKvpmkQ,61306
 nebu/processors/default.py,sha256=cy4ETMdbdRGkrvbYec1o60h7mGDlGN5JsuUph0ENtDU,364
-nebu/processors/models.py,sha256=g4B1t6Rgoy-NUEHBLeQc0EENzHXLDlWSio8Muv7cTDU,4093
-nebu/processors/processor.py,sha256=oi9QdpvZV91UzVHz63pBFQw9-BeY7xvtJkJblFF_xew,24753
+nebu/processors/models.py,sha256=8-TmKha2_QAnPlXcZxYjrCSPDCX7FFcMDMcHK77jK0U,4223
+nebu/processors/processor.py,sha256=APzvh4wB97pazl0SJewJEfi8sjQzQAMXZjtONNjaF_0,26081
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.117.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.117.dist-info/METADATA,sha256=T-j8N4SlzlgRjOk8QvUCc6sCUGvdSBllPd45bEghRUw,1798
-nebu-0.1.117.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-nebu-0.1.117.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.117.dist-info/RECORD,,
+nebu-0.1.118.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.118.dist-info/METADATA,sha256=6zVkM6OCzcti9On0yu4aPCzWtWSgL7xPIv8y4jo_Q2U,1798
+nebu-0.1.118.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+nebu-0.1.118.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.118.dist-info/RECORD,,