nebu 0.1.121__py3-none-any.whl → 0.1.123__py3-none-any.whl

nebu/processors/consumer.py

@@ -471,10 +471,10 @@ def check_health_subprocess() -> bool:
     """Check if the health subprocess is still running and restart if needed."""
     global health_subprocess
 
-    print(f"[DEBUG] check_health_subprocess called")
+    # print(f"[DEBUG] check_health_subprocess called")
 
     if health_subprocess is None:
-        print(f"[DEBUG] health_subprocess is None")
+        # print(f"[DEBUG] health_subprocess is None")
         return False
 
     # Cat the health subprocess log file
@@ -503,7 +503,7 @@ def check_health_subprocess() -> bool:
 
     # Check if process is still running
     poll_result = health_subprocess.poll()
-    print(f"[DEBUG] health_subprocess.poll() returned: {poll_result}")
+    # print(f"[DEBUG] health_subprocess.poll() returned: {poll_result}")
 
     if poll_result is None:
         print(f"[DEBUG] Health subprocess still running (PID {health_subprocess.pid})")
@@ -511,29 +511,29 @@ def check_health_subprocess() -> bool:
 
     # Process has exited
     exit_code = health_subprocess.returncode
-    print(f"[DEBUG] Health subprocess exited with code {exit_code}")
+    # print(f"[DEBUG] Health subprocess exited with code {exit_code}")
     logger.warning(
         f"[Consumer] Health subprocess exited with code {exit_code}. Restarting..."
     )
 
     # Start a new health subprocess
-    print(f"[DEBUG] Attempting to restart health subprocess...")
+    # print(f"[DEBUG] Attempting to restart health subprocess...")
     health_subprocess = start_health_check_subprocess()
 
     if health_subprocess:
-        print(f"[DEBUG] Health subprocess restarted successfully")
+        # print(f"[DEBUG] Health subprocess restarted successfully")
         # Start monitoring thread for the new subprocess
         monitor_thread = threading.Thread(
             target=monitor_health_subprocess, args=(health_subprocess,), daemon=True
         )
         monitor_thread.start()
-        print(f"[DEBUG] Monitor thread started for health subprocess")
+        # print(f"[DEBUG] Monitor thread started for health subprocess")
         logger.info(
             "[Consumer] Health subprocess restarted and monitoring thread started."
         )
         return True
     else:
-        print(f"[DEBUG] Failed to restart health subprocess")
+        # print(f"[DEBUG] Failed to restart health subprocess")
         logger.error("[Consumer] Failed to restart health subprocess.")
         return False
 

nebu/processors/consumer_health_worker.py

@@ -31,9 +31,7 @@ def setup_health_logging():
         format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
         handlers=[
             logging.FileHandler(log_file),
-            logging.StreamHandler(
-                sys.stdout
-            ),  # Also log to stdout for subprocess monitoring
+            # Removed StreamHandler to prevent health logs from appearing in main logs
         ],
     )
 
@@ -51,11 +49,11 @@ def process_health_check_message(
     health_group: str,
 ) -> None:
     """Processes a single health check message."""
-    print(f"[HEALTH DEBUG] === PROCESSING HEALTH CHECK MESSAGE ===")
-    print(f"[HEALTH DEBUG] Message ID: {message_id}")
-    print(f"[HEALTH DEBUG] Message data: {message_data}")
-    print(f"[HEALTH DEBUG] Health stream: {health_stream}")
-    print(f"[HEALTH DEBUG] Health group: {health_group}")
+    # print(f"[HEALTH DEBUG] === PROCESSING HEALTH CHECK MESSAGE ===")
+    # print(f"[HEALTH DEBUG] Message ID: {message_id}")
+    # print(f"[HEALTH DEBUG] Message data: {message_data}")
+    # print(f"[HEALTH DEBUG] Health stream: {health_stream}")
+    # print(f"[HEALTH DEBUG] Health group: {health_group}")
 
     logger.info(f"Processing health check message {message_id}: {message_data}")
 
@@ -64,33 +62,33 @@ def process_health_check_message(
     details: Optional[Dict[str, Any]] = None
     return_stream: Optional[str] = None
     original_message_id: Optional[str] = None
-    user_id: Optional[str] = None
+    # user_id: Optional[str] = None
 
     try:
         if "data" in message_data:
-            print(f"[HEALTH DEBUG] Found 'data' field in message")
+            # print(f"[HEALTH DEBUG] Found 'data' field in message")
             data_str = message_data["data"]
             print(f"[HEALTH DEBUG] Raw data string: {data_str}")
 
             data = json.loads(data_str)
-            print(f"[HEALTH DEBUG] Parsed data: {json.dumps(data, indent=2)}")
+            # print(f"[HEALTH DEBUG] Parsed data: {json.dumps(data, indent=2)}")
             logger.info(f"Health check data: {data}")
 
             # Extract important fields from the forwarded message
             return_stream = data.get("return_stream")
             original_message_id = data.get("original_message_id")
-            user_id = data.get("user_id")
-            inner_kind = data.get("kind")
+            # user_id = data.get("user_id")
+            # inner_kind = data.get("kind")
             inner_id = data.get("id")
             content = data.get("content")
 
-            print(f"[HEALTH DEBUG] Extracted fields:")
-            print(f"[HEALTH DEBUG]   return_stream: {return_stream}")
-            print(f"[HEALTH DEBUG]   original_message_id: {original_message_id}")
-            print(f"[HEALTH DEBUG]   user_id: {user_id}")
-            print(f"[HEALTH DEBUG]   inner_kind: {inner_kind}")
-            print(f"[HEALTH DEBUG]   inner_id: {inner_id}")
-            print(f"[HEALTH DEBUG]   content: {content}")
+            # print(f"[HEALTH DEBUG] Extracted fields:")
+            # print(f"[HEALTH DEBUG]   return_stream: {return_stream}")
+            # print(f"[HEALTH DEBUG]   original_message_id: {original_message_id}")
+            # print(f"[HEALTH DEBUG]   user_id: {user_id}")
+            # print(f"[HEALTH DEBUG]   inner_kind: {inner_kind}")
+            # print(f"[HEALTH DEBUG]   inner_id: {inner_id}")
+            # print(f"[HEALTH DEBUG]   content: {content}")
 
             # Update details with health check info
             details = {
@@ -101,12 +99,13 @@ def process_health_check_message(
 
             if content and isinstance(content, dict):
                 details.update({"check_content": content})
-                print(f"[HEALTH DEBUG] Added check_content to details")
+                # print(f"[HEALTH DEBUG] Added check_content to details")
         else:
-            print(f"[HEALTH DEBUG] No 'data' field found in message_data")
+            # print(f"[HEALTH DEBUG] No 'data' field found in message_data")
+            pass
 
     except (json.JSONDecodeError, KeyError) as e:
-        print(f"[HEALTH DEBUG] ERROR parsing message data: {e}")
+        # print(f"[HEALTH DEBUG] ERROR parsing message data: {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}"
@@ -126,16 +125,16 @@ def process_health_check_message(
 
     # Send the response to the return stream in the format expected by the system
     if return_stream:
-        print(
-            f"[HEALTH DEBUG] Sending V1ProcessorHealthResponse to return_stream: {return_stream}"
-        )
+        # print(
+        #     f"[HEALTH DEBUG] Sending V1ProcessorHealthResponse to return_stream: {return_stream}"
+        # )
         try:
             # Send the V1ProcessorHealthResponse directly (not wrapped in StreamResponseMessage)
             response_data = health_response.model_dump()
 
-            print(
-                f"[HEALTH DEBUG] Sending V1ProcessorHealthResponse directly: {json.dumps(response_data, indent=2)}"
-            )
+            # print(
+            #     f"[HEALTH DEBUG] Sending V1ProcessorHealthResponse directly: {json.dumps(response_data, indent=2)}"
+            # )
 
             # Send to return stream
             redis_conn.xadd(
@@ -144,38 +143,39 @@ def process_health_check_message(
                 maxlen=1000,
                 approximate=True,
             )
-            print(
-                f"[HEALTH DEBUG] V1ProcessorHealthResponse sent successfully to {return_stream}"
-            )
+            # print(
+            #     f"[HEALTH DEBUG] V1ProcessorHealthResponse sent successfully to {return_stream}"
+            # )
             logger.info(
                 f"Sent health response for {message_id} to stream: {return_stream}"
             )
         except Exception as e_resp_send:
-            print(f"[HEALTH DEBUG] ERROR sending response: {e_resp_send}")
+            # print(f"[HEALTH DEBUG] ERROR sending response: {e_resp_send}")
             logger.error(
                 f"Failed to send health response for {message_id} to stream {return_stream}: {e_resp_send}"
             )
     else:
-        print(f"[HEALTH DEBUG] No return_stream specified, not sending response")
+        # print(f"[HEALTH DEBUG] No return_stream specified, not sending response")
+        pass
 
     # Acknowledge the health check message
-    print(f"[HEALTH DEBUG] Acknowledging message {message_id}")
+    # print(f"[HEALTH DEBUG] Acknowledging message {message_id}")
     try:
         redis_conn.xack(health_stream, health_group, message_id)
-        print(f"[HEALTH DEBUG] Message {message_id} acknowledged successfully")
+        # print(f"[HEALTH DEBUG] Message {message_id} acknowledged successfully")
         logger.info(f"Acknowledged health check message {message_id}")
     except Exception as e_ack:
-        print(f"[HEALTH DEBUG] ERROR acknowledging message: {e_ack}")
+        # print(f"[HEALTH DEBUG] ERROR acknowledging message: {e_ack}")
         logger.error(
             f"Failed to acknowledge health check message {message_id}: {e_ack}"
         )
 
-    print(f"[HEALTH DEBUG] === FINISHED PROCESSING HEALTH CHECK MESSAGE ===")
+    # print(f"[HEALTH DEBUG] === FINISHED PROCESSING HEALTH CHECK MESSAGE ===")
 
 
 def main():
     """Main function for the health check consumer subprocess."""
-    print(f"[HEALTH DEBUG] === HEALTH WORKER STARTING ===")
+    # print(f"[HEALTH DEBUG] === HEALTH WORKER STARTING ===")
     logger = setup_health_logging()
 
     # Get environment variables
@@ -183,10 +183,10 @@ def main():
     health_stream = os.environ.get("REDIS_HEALTH_STREAM")
     health_group = os.environ.get("REDIS_HEALTH_CONSUMER_GROUP")
 
-    print(f"[HEALTH DEBUG] Environment variables:")
-    print(f"[HEALTH DEBUG]   REDIS_URL: {redis_url}")
-    print(f"[HEALTH DEBUG]   REDIS_HEALTH_STREAM: {health_stream}")
-    print(f"[HEALTH DEBUG]   REDIS_HEALTH_CONSUMER_GROUP: {health_group}")
+    # print(f"[HEALTH DEBUG] Environment variables:")
+    # print(f"[HEALTH DEBUG]   REDIS_URL: {redis_url}")
+    # print(f"[HEALTH DEBUG]   REDIS_HEALTH_STREAM: {health_stream}")
+    # print(f"[HEALTH DEBUG]   REDIS_HEALTH_CONSUMER_GROUP: {health_group}")
 
     if not all([redis_url, health_stream, health_group]):
         print(f"[HEALTH DEBUG] ERROR: Missing required environment variables")
@@ -208,56 +208,58 @@ def main():
     )
 
     # Configure SOCKS proxy
-    print(f"[HEALTH DEBUG] Configuring SOCKS proxy...")
+    # print(f"[HEALTH DEBUG] Configuring SOCKS proxy...")
     socks.set_default_proxy(socks.SOCKS5, "localhost", 1055)
     socket.socket = socks.socksocket
     logger.info("Configured SOCKS5 proxy for socket connections via localhost:1055")
 
     health_redis_conn: Optional[redis.Redis] = None
     health_consumer_name = f"health-consumer-{os.getpid()}-{socket.gethostname()}"
-    print(f"[HEALTH DEBUG] Health consumer name: {health_consumer_name}")
+    # print(f"[HEALTH DEBUG] Health consumer name: {health_consumer_name}")
 
-    print(f"[HEALTH DEBUG] === ENTERING MAIN LOOP ===")
+    # print(f"[HEALTH DEBUG] === ENTERING MAIN LOOP ===")
     while True:
         try:
             if health_redis_conn is None:
-                print(f"[HEALTH DEBUG] Connecting to Redis for health stream...")
+                # print(f"[HEALTH DEBUG] Connecting to Redis for health stream...")
                 logger.info("Connecting to Redis for health stream...")
+
                 health_redis_conn = redis.from_url(redis_url, decode_responses=True)
                 health_redis_conn.ping()
-                print(f"[HEALTH DEBUG] Connected to Redis successfully")
+                # print(f"[HEALTH DEBUG] Connected to Redis successfully")
                 logger.info("Connected to Redis for health stream.")
 
                 # Create health consumer group if it doesn't exist
-                print(f"[HEALTH DEBUG] Creating/checking consumer group...")
+                # print(f"[HEALTH DEBUG] Creating/checking consumer group...")
+                logger.info("Creating/checking consumer group...")
                 try:
                     health_redis_conn.xgroup_create(
                         health_stream, health_group, id="0", mkstream=True
                     )
-                    print(
-                        f"[HEALTH DEBUG] Created consumer group {health_group} for stream {health_stream}"
-                    )
+                    # print(
+                    #     f"[HEALTH DEBUG] Created consumer group {health_group} for stream {health_stream}"
+                    # )
                     logger.info(
                         f"Created consumer group {health_group} for stream {health_stream}"
                     )
                 except ResponseError as e_group:
                     if "BUSYGROUP" in str(e_group):
-                        print(
-                            f"[HEALTH DEBUG] Consumer group {health_group} already exists"
-                        )
+                        # print(
+                        #     f"[HEALTH DEBUG] Consumer group {health_group} already exists"
+                        # )
                         logger.info(f"Consumer group {health_group} already exists.")
                     else:
-                        print(
-                            f"[HEALTH DEBUG] ERROR creating health consumer group: {e_group}"
-                        )
+                        # print(
+                        #     f"[HEALTH DEBUG] ERROR creating health consumer group: {e_group}"
+                        # )
                         logger.error(f"Error creating health consumer group: {e_group}")
                         time.sleep(5)
                         health_redis_conn = None
                         continue
                 except Exception as e_group_other:
-                    print(
-                        f"[HEALTH DEBUG] UNEXPECTED ERROR creating health consumer group: {e_group_other}"
-                    )
+                    # print(
+                    #     f"[HEALTH DEBUG] UNEXPECTED ERROR creating health consumer group: {e_group_other}"
+                    # )
                     logger.error(
                         f"Unexpected error creating health consumer group: {e_group_other}"
                     )
@@ -268,7 +270,8 @@ def main():
             # Read from health stream
             assert health_redis_conn is not None
 
-            print(f"[HEALTH DEBUG] Reading from health stream {health_stream}...")
+            # print(f"[HEALTH DEBUG] Reading from health stream {health_stream}...")
+            logger.info(f"Reading from health stream {health_stream}...")
             health_streams_arg: Dict[str, object] = {health_stream: ">"}
             raw_messages = health_redis_conn.xreadgroup(
                 health_group,
@@ -278,21 +281,26 @@ def main():
                 block=5000,  # Block for 5 seconds
             )
 
-            print(f"[HEALTH DEBUG] xreadgroup returned: {raw_messages}")
-            print(f"[HEALTH DEBUG] Messages type: {type(raw_messages)}")
+            # print(f"[HEALTH DEBUG] xreadgroup returned: {raw_messages}")
+            # print(f"[HEALTH DEBUG] Messages type: {type(raw_messages)}")
 
             if raw_messages:
-                print(f"[HEALTH DEBUG] Found messages to process")
+                # print(f"[HEALTH DEBUG] Found messages to process")
+                logger.info("Found messages to process")
                 # Cast to expected type for decode_responses=True
                 messages = cast(
                     List[Tuple[str, List[Tuple[str, Dict[str, str]]]]], raw_messages
                 )
                 for stream_name, stream_messages in messages:
-                    print(
-                        f"[HEALTH DEBUG] Processing stream: {stream_name} with {len(stream_messages)} message(s)"
+                    # print(
+                    #     f"[HEALTH DEBUG] Processing stream: {stream_name} with {len(stream_messages)} message(s)"
+                    # )
+                    logger.info(
+                        f"Processing stream: {stream_name} with {len(stream_messages)} message(s)"
                     )
                     for message_id, message_data in stream_messages:
-                        print(f"[HEALTH DEBUG] Processing message {message_id}")
+                        # print(f"[HEALTH DEBUG] Processing message {message_id}")
+                        logger.info(f"Processing message {message_id}")
                         process_health_check_message(
                             message_id,
                             message_data,
@@ -302,7 +310,8 @@ def main():
                             health_group,
                         )
             else:
-                print(f"[HEALTH DEBUG] No messages received (timeout)")
+                # print(f"[HEALTH DEBUG] No messages received (timeout)")
+                logger.info("No messages received (timeout)")
 
         except (ConnectionError, RedisTimeoutError, TimeoutError) as e_conn:
             logger.error(f"Redis connection error: {e_conn}. Reconnecting in 5s...")

{nebu-0.1.121.dist-info → nebu-0.1.123.dist-info}/METADATA

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

{nebu-0.1.121.dist-info → nebu-0.1.123.dist-info}/RECORD

@@ -13,8 +13,8 @@ nebu/containers/container.py,sha256=Mrh_gvMsTvDkj3CwpqIPzJ72IMw0gQIg64y548vq0yg,
 nebu/containers/models.py,sha256=0j6NGy4yto-enRDh_4JH_ZTbHrLdSpuMOqNQPnIrwC4,6815
 nebu/namespaces/models.py,sha256=EqUOpzhVBhvJw2P92ONDUbIgC31M9jMmcaG5vyOrsWg,497
 nebu/namespaces/namespace.py,sha256=oeZyGqsIGIrppyjif1ZONsdTmqRgd9oSLFE1BChXTTE,5247
-nebu/processors/consumer.py,sha256=zD9lCwPhwnYRIpisucvs7kymsN1eLDWSE_mAKSJqfTE,78525
-nebu/processors/consumer_health_worker.py,sha256=7qT3Iu3aUoPqg0Doy-MWN7RMpoS1yXljLMaF3QikF2M,14483
+nebu/processors/consumer.py,sha256=RoQqpE8ee7-dV68dYLZTX3c7W373txNs7qsJF-NK8Oo,78541
+nebu/processors/consumer_health_worker.py,sha256=XJaLNNBxkHmkBap_XeQrxFV9JKcXp21ATudV25r3l7g,15096
 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
@@ -22,8 +22,8 @@ nebu/processors/models.py,sha256=8-TmKha2_QAnPlXcZxYjrCSPDCX7FFcMDMcHK77jK0U,422
 nebu/processors/processor.py,sha256=wos5BkNZUVaY5ifT7yeDLbJkdfeloJ7hRuK9P18LU7U,26155
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.121.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.121.dist-info/METADATA,sha256=yKsxf5jq5kAs-24UQRcIgLFlpCupGkWmTXr9SHIVotU,1798
-nebu-0.1.121.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nebu-0.1.121.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.121.dist-info/RECORD,,
+nebu-0.1.123.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.123.dist-info/METADATA,sha256=8L9L8vNoFhK8A4U-iWvXP9DIgeVXOW0MV324qcOhsV0,1798
+nebu-0.1.123.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nebu-0.1.123.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.123.dist-info/RECORD,,