nebu 0.1.20__py3-none-any.whl → 0.1.22__py3-none-any.whl

nebu/processors/consumer.py

@@ -6,7 +6,7 @@ import sys
 import time
 import traceback
 from datetime import datetime
-from typing import Any, Dict, TypeVar, cast
+from typing import Dict, TypeVar
 
 import redis
 import socks
@@ -246,6 +246,9 @@ except Exception as e:
 
 # Create consumer group if it doesn't exist
 try:
+    # Assert types before use
+    assert isinstance(REDIS_STREAM, str)
+    assert isinstance(REDIS_CONSUMER_GROUP, str)
     r.xgroup_create(REDIS_STREAM, REDIS_CONSUMER_GROUP, id="0", mkstream=True)
     print(f"Created consumer group {REDIS_CONSUMER_GROUP} for stream {REDIS_STREAM}")
 except ResponseError as e:
@@ -257,19 +260,34 @@ except ResponseError as e:
 
 
 # Function to process messages
-def process_message(message_id: bytes, message_data: Dict[bytes, bytes]) -> None:
+def process_message(message_id: str, message_data: Dict[str, str]) -> None:
     # Initialize variables that need to be accessible in the except block
     return_stream = None
     user_id = None
 
+    print(f"Message data inner: {message_data}")
+
     try:
-        # Assign message_data directly to raw_payload.
-        # Cast to Dict[str, Any] to inform type checker of the expected type due to decode_responses=True.
-        raw_payload = cast(Dict[str, Any], message_data)
+        # Extract the JSON string payload from the 'data' field
+        payload_str = message_data.get("data")
+
+        # decode_responses=True should mean payload_str is a string if found.
+        if not payload_str:
+            raise ValueError(
+                f"Missing or invalid 'data' field (expected string): {message_data}"
+            )
 
-        # Validate that raw_payload is a dictionary as expected - Removed, cast handles this for type checker
-        # if not isinstance(raw_payload, dict):
-        #     raise TypeError(f"Expected message_data to be a dictionary, but got {type(raw_payload)}")
+        # Parse the JSON string into a dictionary
+        try:
+            raw_payload = json.loads(payload_str)
+        except json.JSONDecodeError as json_err:
+            raise ValueError(f"Failed to parse JSON payload: {json_err}") from json_err
+
+        # Validate that raw_payload is a dictionary as expected
+        if not isinstance(raw_payload, dict):
+            raise TypeError(
+                f"Expected parsed payload to be a dictionary, but got {type(raw_payload)}"
+            )
 
         print(f"Raw payload: {raw_payload}")
 
@@ -287,10 +305,10 @@ def process_message(message_id: bytes, message_data: Dict[bytes, bytes]) -> None
 
         # --- Health Check Logic based on kind ---
         if kind == "HealthCheck":
-            print(f"Received HealthCheck message {message_id.decode('utf-8')}")
+            print(f"Received HealthCheck message {message_id}")
             health_response = {
                 "kind": "StreamResponseMessage",  # Respond with a standard message kind
-                "id": message_id.decode("utf-8"),
+                "id": message_id,
                 "content": {"status": "healthy", "checked_message_id": msg_id},
                 "status": "success",
                 "created_at": datetime.now().isoformat(),
@@ -306,7 +324,7 @@ def process_message(message_id: bytes, message_data: Dict[bytes, bytes]) -> None
             assert isinstance(REDIS_STREAM, str)
             assert isinstance(REDIS_CONSUMER_GROUP, str)
             r.xack(REDIS_STREAM, REDIS_CONSUMER_GROUP, message_id)
-            print(f"Acknowledged HealthCheck message {message_id.decode('utf-8')}")
+            print(f"Acknowledged HealthCheck message {message_id}")
             return  # Exit early for health checks
         # --- End Health Check Logic ---
 
@@ -392,7 +410,7 @@ def process_message(message_id: bytes, message_data: Dict[bytes, bytes]) -> None
         # Prepare the response
         response = {
             "kind": "StreamResponseMessage",
-            "id": message_id.decode("utf-8"),
+            "id": message_id,
             "content": result,
             "status": "success",
             "created_at": datetime.now().isoformat(),
@@ -406,9 +424,7 @@ def process_message(message_id: bytes, message_data: Dict[bytes, bytes]) -> None
             # Assert type again closer to usage for type checker clarity
             assert isinstance(return_stream, str)
             r.xadd(return_stream, {"data": json.dumps(response)})
-            print(
-                f"Processed message {message_id.decode('utf-8')}, result sent to {return_stream}"
-            )
+            print(f"Processed message {message_id}, result sent to {return_stream}")
 
         # Acknowledge the message
         # Assert types again closer to usage for type checker clarity
@@ -417,13 +433,13 @@ def process_message(message_id: bytes, message_data: Dict[bytes, bytes]) -> None
         r.xack(REDIS_STREAM, REDIS_CONSUMER_GROUP, message_id)
 
     except Exception as e:
-        print(f"Error processing message {message_id.decode('utf-8')}: {e}")
+        print(f"Error processing message {message_id}: {e}")
         traceback.print_exc()
 
         # Prepare the error response
         error_response = {
             "kind": "StreamResponseMessage",
-            "id": message_id.decode("utf-8"),
+            "id": message_id,
             "content": {
                 "error": str(e),
                 "traceback": traceback.format_exc(),
@@ -462,6 +478,7 @@ while True:
 
         # Read from stream with blocking
         streams = {REDIS_STREAM: ">"}  # '>' means read only new messages
+        # The type checker still struggles here, but the runtime types are asserted.
         messages = r.xreadgroup(  # type: ignore[arg-type]
             REDIS_CONSUMER_GROUP, consumer_name, streams, count=1, block=5000
         )

{nebu-0.1.20.dist-info → nebu-0.1.22.dist-info}/METADATA

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

{nebu-0.1.20.dist-info → nebu-0.1.22.dist-info}/RECORD

@@ -6,15 +6,15 @@ nebu/containers/container.py,sha256=yb7KaPTVXnEEAlrpdlUi4HNqF6P7z9bmwAILGlq6iqU,
 nebu/containers/decorator.py,sha256=uFtzlAXRHYZECJ-NPusY7oN9GXvdHrHDd_JNrIGr8aQ,3244
 nebu/containers/models.py,sha256=0j6NGy4yto-enRDh_4JH_ZTbHrLdSpuMOqNQPnIrwC4,6815
 nebu/containers/server.py,sha256=yFa2Y9PzBn59E1HftKiv0iapPonli2rbGAiU6r-wwe0,2513
-nebu/processors/consumer.py,sha256=kX4UT8Z5c_LWU3MOcM5qXSzHEA0CYjUZ4dRJfhUKP-M,19202
+nebu/processors/consumer.py,sha256=qQQWNAZnY7A7Af6SNMYVXN3NOG_9dNK5iE_0us-o2Po,19659
 nebu/processors/decorate.py,sha256=AeG1c1n8JtcexxAEf2sF2L2eKwVDaNQ5gvPs6EpazKo,34789
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
 nebu/processors/models.py,sha256=GvnI8UJrQSjHo2snP07cPfisCH90cEGTY-PZV5_AtXI,3654
 nebu/processors/processor.py,sha256=oy2YdI-cy6qQWxrZhpZahJV46oWZlu_Im-jm811R_oo,9667
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.20.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.20.dist-info/METADATA,sha256=mmrQRfaJ6jXFMa02a7rp4ghX1wKW8m3TLHeBCsmk64g,1678
-nebu-0.1.20.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nebu-0.1.20.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.20.dist-info/RECORD,,
+nebu-0.1.22.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.22.dist-info/METADATA,sha256=5knaeQTz1sBQEH2za1s6-499HYkNfNxLZgxvpRUEO6Y,1678
+nebu-0.1.22.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nebu-0.1.22.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.22.dist-info/RECORD,,