nebu 0.1.127__py3-none-any.whl → 0.1.129__py3-none-any.whl

nebu/processors/processor.py

@@ -363,19 +363,31 @@ class Processor(Generic[InputType, OutputType]):
         # Poll only if poll=True AND the initial request was configured not to wait (wait=False).
         if poll and not stream_data_wait_param:
             message_id = raw_response_json.get("message_id")
+            return_stream = raw_response_json.get("return_stream")
+
             if not message_id or not isinstance(message_id, str):
                 logger.error(
-                    f"Processor {processor_name}: Polling requested but 'message_id' (string) not found in initial response. Response: {raw_response_json}"
+                    f"Processor {processor_name}: Polling requested but 'message_id' (string) not found or invalid in initial response. Response: {raw_response_json}"
                 )
                 raise ValueError(
                     "Polling failed: 'message_id' (string) missing or invalid in initial server response."
                 )
+            if not return_stream or not isinstance(return_stream, str):
+                logger.error(
+                    f"Processor {processor_name}: Polling requested but 'return_stream' (string) not found or invalid in initial response. Response: {raw_response_json}"
+                )
+                raise ValueError(
+                    "Polling failed: 'return_stream' (string) missing or invalid in initial server response for polling."
+                )
 
             # Polling URL using self.orign_host for consistency
             polling_url = f"{self.orign_host}/v1/processors/{processor_namespace}/{processor_name}/return/{message_id}"
 
+            # Prepare polling payload
+            poll_payload = {"consumer_group": return_stream}
+
             logger.info(
-                f"Processor {processor_name}: Polling for message_id {message_id} at {polling_url}. Overall timeout: {timeout}s, Interval: {poll_interval_seconds}s."
+                f"Processor {processor_name}: Polling for message_id {message_id} at {polling_url} with payload {poll_payload}. Overall timeout: {timeout}s, Interval: {poll_interval_seconds}s."
             )
             polling_start_time = time.time()
 
@@ -401,7 +413,7 @@ class Processor(Generic[InputType, OutputType]):
                         polling_url,
                         headers={"Authorization": f"Bearer {current_op_api_key}"},
                         timeout=individual_poll_timeout,
-                        json={},  # Send an empty JSON body for POST
+                        json=poll_payload,
                     )
 
                     if poll_response.status_code == 200:
@@ -409,14 +421,28 @@ class Processor(Generic[InputType, OutputType]):
                             f"Processor {processor_name}: Successfully retrieved message {message_id} via polling. Status: 200."
                         )
                         try:
-                            polled_data = poll_response.json()
-                            if isinstance(polled_data, (dict, list, str)):
-                                raw_content = polled_data
+                            polled_data_full = poll_response.json()
+                            if (
+                                isinstance(polled_data_full, dict)
+                                and "content" in polled_data_full
+                            ):
+                                # Extract the nested content for Pydantic validation
+                                raw_content = polled_data_full.get("content")
+                                logger.debug(
+                                    f"Processor {processor_name}: Extracted nested 'content' from polled data for {message_id}. Nested content: {str(raw_content)[:200]}..."
+                                )
+                            elif isinstance(polled_data_full, (dict, list, str)):
+                                # Fallback: use the full polled data if 'content' key is not present in a dict, or if it's not a dict itself.
+                                raw_content = polled_data_full
+                                logger.warning(
+                                    f"Processor {processor_name}: Polled data for {message_id} did not contain a 'content' key as expected, or was not a dict. Using full polled data. Type: {type(polled_data_full)}. Data: {str(polled_data_full)[:200]}..."
+                                )
                             else:
+                                # Unexpected type for polled_data_full
+                                raw_content = polled_data_full
                                 logger.warning(
-                                    f"Processor {processor_name}: Polled data for {message_id} is of unexpected type: {type(polled_data)}. Content: {polled_data}"
+                                    f"Processor {processor_name}: Polled data for {message_id} is of an unexpected type: {type(polled_data_full)}. Content: {str(polled_data_full)[:200]}..."
                                 )
-                                raw_content = polled_data
                         except json.JSONDecodeError:
                             logger.error(
                                 f"Processor {processor_name}: Failed to decode JSON from polling response for {message_id}. Response text: {poll_response.text[:200]}..."
@@ -427,11 +453,11 @@ class Processor(Generic[InputType, OutputType]):
                         break  # Exit polling loop
 
                     elif poll_response.status_code == 404:
-                        print(
+                        logger.debug(
                             f"Processor {processor_name}: Message {message_id} not yet ready (404). Retrying in {poll_interval_seconds}s..."
                         )
                     elif poll_response.status_code == 202:
-                        print(
+                        logger.debug(
                             f"Processor {processor_name}: Message {message_id} processing (202). Retrying in {poll_interval_seconds}s..."
                         )
                     else:

{nebu-0.1.127.dist-info → nebu-0.1.129.dist-info}/METADATA

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

{nebu-0.1.127.dist-info → nebu-0.1.129.dist-info}/RECORD

@@ -19,11 +19,11 @@ nebu/processors/consumer_process_worker.py,sha256=h--eNFKaLbUayxn88mB8oGGdrU2liE
 nebu/processors/decorate.py,sha256=5p9pQrk_H8-Fj0UjsgSVCYx7Jk7KFuhMZtNhkKvpmkQ,61306
 nebu/processors/default.py,sha256=cy4ETMdbdRGkrvbYec1o60h7mGDlGN5JsuUph0ENtDU,364
 nebu/processors/models.py,sha256=8-TmKha2_QAnPlXcZxYjrCSPDCX7FFcMDMcHK77jK0U,4223
-nebu/processors/processor.py,sha256=_JZIc5BXAfCTqsoqAJp_6_tD2D_WBlE4QeJIKMZjoc8,35388
+nebu/processors/processor.py,sha256=hHb5e2LfQhrLXIS-BJP183takGgEN6Z46VqzhepWM7U,37259
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.127.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.127.dist-info/METADATA,sha256=Cvad84eLNPdvWcqP-H25DgDjS7PZNcaz8QxK6Qjt1z0,1798
-nebu-0.1.127.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nebu-0.1.127.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.127.dist-info/RECORD,,
+nebu-0.1.129.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.129.dist-info/METADATA,sha256=GOVWO0OfeW9hbJrKsA_zSXathJyI5lsYJw1vi3Ksf94,1798
+nebu-0.1.129.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nebu-0.1.129.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.129.dist-info/RECORD,,