nebu 0.1.83__py3-none-any.whl → 0.1.85__py3-none-any.whl

nebu/processors/consumer.py

@@ -612,6 +612,7 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
         orgs = raw_payload.get("organizations")
         handle = raw_payload.get("handle")
         adapter = raw_payload.get("adapter")
+        api_key = raw_payload.get("api_key")  # Extract api_key
 
         # --- Health Check Logic (Keep as is) ---
         if kind == "HealthCheck":
@@ -703,6 +704,7 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
                             orgs=orgs,
                             handle=handle,
                             adapter=adapter,
+                            api_key=api_key,  # Add api_key
                         )
                     except Exception as e:
                         print(
@@ -719,6 +721,7 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
                             orgs=orgs,
                             handle=handle,
                             adapter=adapter,
+                            api_key=api_key,  # Add api_key
                         )
                 else:
                     # No content type name or class found, use raw content
@@ -732,6 +735,7 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
                         orgs=orgs,
                         handle=handle,
                         adapter=adapter,
+                        api_key=api_key,  # Add api_key
                     )
             else:  # Not a stream message, use the function's parameter type
                 param_type_name = (
@@ -916,7 +920,13 @@ CLAIM_COUNT = 10  # Max messages to claim at once
 
 try:
     while True:
+        print(
+            f"[{datetime.now(timezone.utc).isoformat()}] --- Top of main loop ---"
+        )  # Added log
         # --- Check for Code Updates ---
+        print(
+            f"[{datetime.now(timezone.utc).isoformat()}] Checking for code updates..."
+        )  # Added log
         if entrypoint_abs_path:  # Should always be set after init
             try:
                 current_mtime = os.path.getmtime(entrypoint_abs_path)
@@ -968,8 +978,14 @@ try:
             print(
                 "[Consumer] Warning: Entrypoint absolute path not set, cannot check for code updates."
             )
+        print(
+            f"[{datetime.now(timezone.utc).isoformat()}] Finished checking for code updates."
+        )  # Added log
 
         # --- Claim Old Pending Messages ---
+        print(
+            f"[{datetime.now(timezone.utc).isoformat()}] Checking for pending messages to claim..."
+        )  # Added log
         try:
             if target_function is not None:  # Only claim if we can process
                 assert isinstance(REDIS_STREAM, str)
@@ -1027,7 +1043,7 @@ try:
 
                 if claimed_messages:
                     print(
-                        f"[Consumer] Claimed {len(claimed_messages[0][1])} pending message(s). Processing..."
+                        f"[{datetime.now(timezone.utc).isoformat()}] Claimed {claimed_messages} pending message(s). Processing..."
                     )
                     # Process claimed messages immediately
                     # Cast messages to expected type to satisfy type checker
@@ -1045,6 +1061,10 @@ try:
                     # After processing claimed messages, loop back to check for more potentially
                     # This avoids immediately blocking on XREADGROUP if there were claimed messages
                     continue
+                else:  # Added log
+                    print(
+                        f"[{datetime.now(timezone.utc).isoformat()}] No pending messages claimed."
+                    )  # Added log
 
         except ResponseError as e_claim:
             # Handle specific errors like NOGROUP gracefully if needed
@@ -1056,17 +1076,26 @@ try:
             else:
                 print(f"[Consumer] Error during XAUTOCLAIM: {e_claim}")
                 # Decide if this is fatal or recoverable
+                print(
+                    f"[{datetime.now(timezone.utc).isoformat()}] Error during XAUTOCLAIM: {e_claim}"
+                )  # Added log
                 time.sleep(5)  # Wait before retrying claim
         except ConnectionError as e_claim_conn:
             print(
                 f"Redis connection error during XAUTOCLAIM: {e_claim_conn}. Will attempt reconnect in main loop."
             )
             # Let the main ConnectionError handler below deal with reconnection
+            print(
+                f"[{datetime.now(timezone.utc).isoformat()}] Redis connection error during XAUTOCLAIM: {e_claim_conn}. Will attempt reconnect."
+            )  # Added log
             time.sleep(5)  # Avoid tight loop on connection errors during claim
         except Exception as e_claim_other:
             print(
                 f"[Consumer] Unexpected error during XAUTOCLAIM/processing claimed messages: {e_claim_other}"
             )
+            print(
+                f"[{datetime.now(timezone.utc).isoformat()}] Unexpected error during XAUTOCLAIM/processing claimed: {e_claim_other}"
+            )  # Added log
             traceback.print_exc()
             time.sleep(5)  # Wait before retrying
 
@@ -1085,27 +1114,42 @@ try:
         streams_arg: Dict[str, str] = {REDIS_STREAM: ">"}
 
         # With decode_responses=True, redis-py expects str types here
+        print(
+            f"[{datetime.now(timezone.utc).isoformat()}] Calling xreadgroup (block=5000ms)..."
+        )  # Added log
         messages = r.xreadgroup(
             REDIS_CONSUMER_GROUP,
             consumer_name,
-            streams_arg,  # type: ignore[arg-type]
+            streams_arg,  # type: ignore[arg-type] # Suppress linter warning
             count=1,
             block=5000,  # Use milliseconds for block
         )
 
         if not messages:
+            print(
+                f"[{datetime.now(timezone.utc).isoformat()}] xreadgroup timed out (no new messages)."
+            )  # Added log
             # print("[Consumer] No new messages.") # Reduce verbosity
             continue
+        # Removed the else block here
 
+        # If we reached here, messages is not empty.
         # Assert messages is not None to help type checker (already implied by `if not messages`)
         assert messages is not None
 
-        # Cast messages to expected type to satisfy type checker
+        # Cast messages to expected type to satisfy type checker (do it once)
         typed_messages = cast(
             List[Tuple[str, List[Tuple[str, Dict[str, str]]]]], messages
         )
         stream_name_str, stream_messages = typed_messages[0]
+        num_msgs = len(stream_messages)
+
+        # Log reception and count before processing
+        print(
+            f"[{datetime.now(timezone.utc).isoformat()}] xreadgroup returned {num_msgs} message(s). Processing..."
+        )  # Moved and combined log
 
+        # Process the received messages
         # for msg_id_bytes, msg_data_bytes_dict in stream_messages: # Original structure
         for (
             message_id_str,

{nebu-0.1.83.dist-info → nebu-0.1.85.dist-info}/METADATA

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

{nebu-0.1.83.dist-info → nebu-0.1.85.dist-info}/RECORD

@@ -14,7 +14,7 @@ nebu/containers/models.py,sha256=0j6NGy4yto-enRDh_4JH_ZTbHrLdSpuMOqNQPnIrwC4,681
 nebu/containers/server.py,sha256=yFa2Y9PzBn59E1HftKiv0iapPonli2rbGAiU6r-wwe0,2513
 nebu/namespaces/models.py,sha256=EqUOpzhVBhvJw2P92ONDUbIgC31M9jMmcaG5vyOrsWg,497
 nebu/namespaces/namespace.py,sha256=Q_EDH7BgQrTkaDh_l4tbo22qpq-uARfIk8ZPBLjITGY,4967
-nebu/processors/consumer.py,sha256=kbfX6KMzBPvCvM2dy0wQA578FE0lNl-6VrAtYsmZops,50072
+nebu/processors/consumer.py,sha256=kLCERYgJXiLIHzDiWrHNCma0DkmuFSJ9luj4MERJ268,52279
 nebu/processors/consumer_process_worker.py,sha256=tF5KU3Rnmzfc3Y0cM8J5nwGg1cJMe-ry0FmMSgGvXrY,31765
 nebu/processors/decorate.py,sha256=jMh7OMamPdxGn7cMxQsOl5CEEmhZ1TXkMz8nCzBpVaU,54649
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
@@ -23,8 +23,8 @@ nebu/processors/processor.py,sha256=OgEK8Fz0ehSe_VFiNsxweVKZIckhgVvQQ11NNffYZqA,
 nebu/processors/remote.py,sha256=TeAIPGEMqnDIb7H1iett26IEZrBlcbPB_-DSm6jcH1E,1285
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.83.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.83.dist-info/METADATA,sha256=isv9vhNtjv8_gr99FdtFSrnqn5EOIYYhHtMSO53MZlY,1731
-nebu-0.1.83.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-nebu-0.1.83.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.83.dist-info/RECORD,,
+nebu-0.1.85.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.85.dist-info/METADATA,sha256=au2f_3l53q7qL-xNvMv98tfOFmYqNP3gaKSgOSGqQeU,1731
+nebu-0.1.85.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+nebu-0.1.85.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.85.dist-info/RECORD,,