nebu 0.1.82__py3-none-any.whl → 0.1.84__py3-none-any.whl

nebu/processors/consumer.py

@@ -783,27 +783,53 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
         # Execute the function
         print("Executing function...")
         result = target_function(input_obj)
-        print(f"Result: {result}")  # Reduce verbosity
+        # print(f"Raw Result: {result}") # Debugging
 
-        # Convert result to dict if it's a Pydantic model
-        if hasattr(result, "model_dump"):  # Use model_dump for Pydantic v2+
-            result_content = result.model_dump(mode="json")  # Serialize properly
-        elif hasattr(result, "dict"):  # Fallback for older Pydantic
-            result_content = result.dict()
-        else:
-            result_content = result  # Assume JSON-serializable
+        result_content = None  # Default to None
+        if result is not None:  # Only process if there's a result
+            try:
+                if hasattr(result, "model_dump"):
+                    print("[Consumer] Result has model_dump, using it.")
+                    # Use 'json' mode to ensure serializability where possible
+                    result_content = result.model_dump(mode="json")
+                    # print(f"[Consumer] Result after model_dump: {result_content}") # Debugging
+                else:
+                    # Try standard json.dumps as a fallback to check serializability
+                    print(
+                        "[Consumer] Result has no model_dump, attempting json.dumps check."
+                    )
+                    try:
+                        # Test if it's serializable
+                        json.dumps(result)
+                        # If the above line doesn't raise TypeError, assign the original result
+                        result_content = result
+                        # print(f"[Consumer] Result assigned directly after json.dumps check passed: {result_content}") # Debugging
+                    except TypeError as e:
+                        print(
+                            f"[Consumer] Warning: Result is not JSON serializable: {e}. Discarding result."
+                        )
+                        result_content = None  # Explicitly set to None on failure
+
+            except (
+                Exception
+            ) as e:  # Catch other potential model_dump errors or unexpected issues
+                print(
+                    f"[Consumer] Warning: Unexpected error during result processing/serialization: {e}. Discarding result."
+                )
+                traceback.print_exc()
+                result_content = None
 
-        # Prepare the response
+        # Prepare the response (ensure 'content' key exists even if None)
         response = {
             "kind": "StreamResponseMessage",
             "id": message_id,
-            "content": result_content,
+            "content": result_content,  # Use the potentially None result_content
             "status": "success",
-            "created_at": datetime.now().isoformat(),
+            "created_at": datetime.now(timezone.utc).isoformat(),  # Use UTC
             "user_id": user_id,  # Pass user_id back
         }
 
-        # print(f"Response: {response}") # Reduce verbosity
+        # print(f"Final Response Content: {response['content']}") # Debugging
 
         # Send the result to the return stream
         if return_stream:
@@ -890,7 +916,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)
@@ -942,8 +974,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)
@@ -1001,7 +1039,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
@@ -1019,6 +1057,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
@@ -1030,17 +1072,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
 
@@ -1059,27 +1110,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/processors/decorate.py

@@ -726,8 +726,6 @@ def processor(
             f"[DEBUG Decorator] Parameter '{param_name}' type hint: {param_type_str_repr}"
         )
 
-        if "return" not in type_hints:
-            raise TypeError(f"{processor_name} must have a return type hint")
         return_type = type_hints.get("return")
         return_type_str_repr = str(return_type)
         print(f"[DEBUG Decorator] Return type hint: {return_type_str_repr}")

{nebu-0.1.82.dist-info → nebu-0.1.84.dist-info}/METADATA

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

{nebu-0.1.82.dist-info → nebu-0.1.84.dist-info}/RECORD

@@ -14,17 +14,17 @@ 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=WMWZs0qkEy9b8G7AM1oE1JBOOgsR9Ia-Y9kaXJC3aw4,48546
+nebu/processors/consumer.py,sha256=DznWT6_51JPi3lA2KKalnZMlYJc11bpzdfeNmGe5bIQ,52039
 nebu/processors/consumer_process_worker.py,sha256=tF5KU3Rnmzfc3Y0cM8J5nwGg1cJMe-ry0FmMSgGvXrY,31765
-nebu/processors/decorate.py,sha256=U-NjFszyfKD6ACEyPJogFCbOPsfRYJUgGobLzfaHwD8,54766
+nebu/processors/decorate.py,sha256=jMh7OMamPdxGn7cMxQsOl5CEEmhZ1TXkMz8nCzBpVaU,54649
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
 nebu/processors/models.py,sha256=FnBJFxtaJkp-uIOs90qkJUBvOR80l2cdGnfmOIWIvVA,4058
 nebu/processors/processor.py,sha256=OgEK8Fz0ehSe_VFiNsxweVKZIckhgVvQQ11NNffYZqA,15848
 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.82.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.82.dist-info/METADATA,sha256=rGGm0UyV1uisVjnbQQZ54zeVl_5JgDsLQC_zAhWsI3Y,1731
-nebu-0.1.82.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-nebu-0.1.82.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.82.dist-info/RECORD,,
+nebu-0.1.84.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.84.dist-info/METADATA,sha256=5OLXVQZv3g7yNQGh8_gVsJ6hsjO_LzDpN6S9hqUjNdo,1731
+nebu-0.1.84.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+nebu-0.1.84.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.84.dist-info/RECORD,,