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

nebu/processors/consumer.py

@@ -138,9 +138,9 @@ try:
     if stream_message_source:
         try:
             exec(stream_message_source, local_namespace)
-            print("Successfully defined V1StreamMessage class")
+            print("Successfully defined Message class")
         except Exception as e:
-            print(f"Error defining V1StreamMessage: {e}")
+            print(f"Error defining Message: {e}")
             traceback.print_exc()
 
     # Define content type if available
@@ -340,14 +340,14 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
         print(f"Content: {content}")
 
         # For StreamMessage, construct the proper input object
-        if is_stream_message and "V1StreamMessage" in local_namespace:
+        if is_stream_message and "Message" in local_namespace:
             # If we have a content type, try to construct it
             if content_type_name and content_type_name in local_namespace:
                 # Try to create the content type model first
                 try:
                     content_model = local_namespace[content_type_name](**content)
                     print(f"Content model: {content_model}")
-                    input_obj = local_namespace["V1StreamMessage"](
+                    input_obj = local_namespace["Message"](
                         kind=kind,
                         id=msg_id,
                         content=content_model,
@@ -361,7 +361,7 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
                 except Exception as e:
                     print(f"Error creating content type model: {e}")
                     # Fallback to using raw content
-                    input_obj = local_namespace["V1StreamMessage"](
+                    input_obj = local_namespace["Message"](
                         kind=kind,
                         id=msg_id,
                         content=content,
@@ -375,7 +375,7 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
             else:
                 # Just use the raw content
                 print(f"Using raw content")
-                input_obj = local_namespace["V1StreamMessage"](
+                input_obj = local_namespace["Message"](
                     kind=kind,
                     id=msg_id,
                     content=content,
@@ -390,13 +390,14 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
             # Otherwise use the param type directly
             try:
                 if param_type_name in local_namespace:
-                    input_obj = local_namespace[param_type_name](**content)
+                    print(f"Validating content against {param_type_name}")
+                    input_obj = local_namespace[param_type_name].model_validate(content)
                 else:
                     # If we can't find the exact type, just pass the content directly
                     input_obj = content
             except Exception as e:
                 print(f"Error creating input model: {e}, using raw content")
-                input_obj = content
+                raise e
 
         print(f"Input object: {input_obj}")
 

nebu/processors/decorate.py

@@ -27,8 +27,8 @@ from nebu.containers.models import (
 )
 from nebu.meta import V1ResourceMetaRequest
 from nebu.processors.models import (
+    Message,
     V1Scale,
-    V1StreamMessage,
 )
 from nebu.processors.processor import Processor
 
@@ -455,14 +455,12 @@ def processor(
         content_type = None
 
         # Check 1: Standard introspection
-        if origin is V1StreamMessage or (
+        if origin is Message or (
             origin is not None
-            and origin.__name__ == V1StreamMessage.__name__
-            and origin.__module__ == V1StreamMessage.__module__
+            and origin.__name__ == Message.__name__
+            and origin.__module__ == Message.__module__
         ):
-            print(
-                "[DEBUG Decorator] Input type identified as V1StreamMessage via get_origin."
-            )
+            print("[DEBUG Decorator] Input type identified as Message via get_origin.")
             is_stream_message = True
             if args:
                 content_type = args[0]
@@ -471,13 +469,11 @@ def processor(
                 )
             else:
                 print(
-                    "[DEBUG Decorator] V1StreamMessage detected, but no generic arguments found via get_args."
+                    "[DEBUG Decorator] Message detected, but no generic arguments found via get_args."
                 )
         # Check 2: Direct type check
-        elif isinstance(param_type, type) and param_type is V1StreamMessage:
-            print(
-                "[DEBUG Decorator] Input type identified as direct V1StreamMessage type."
-            )
+        elif isinstance(param_type, type) and param_type is Message:
+            print("[DEBUG Decorator] Input type identified as direct Message type.")
             is_stream_message = True
         # Check 3: Regex fallback on string representation
         elif origin is None:
@@ -486,13 +482,11 @@ def processor(
             )
             # Use param_type_str_repr in match calls
             generic_match = re.match(
-                r"^<class '(?:[a-zA-Z0-9_.]+\.)?V1StreamMessage\[(.+?)\]'>$",
+                r"^<class '(?:[a-zA-Z0-9_.]+\.)?Message\[(.+?)\]'>$",
                 param_type_str_repr,
             )
             if generic_match:
-                print(
-                    "[DEBUG Decorator] Regex matched generic V1StreamMessage pattern!"
-                )
+                print("[DEBUG Decorator] Regex matched generic Message pattern!")
                 is_stream_message = True
                 content_type_name_str = generic_match.group(1).strip()
                 print(
@@ -517,21 +511,21 @@ def processor(
             else:
                 # Use param_type_str_repr in match calls
                 simple_match = re.match(
-                    r"^<class '(?:[a-zA-Z0-9_.]+\.)?V1StreamMessage'>$",
+                    r"^<class '(?:[a-zA-Z0-9_.]+\.)?Message'>$",
                     param_type_str_repr,
                 )
                 if simple_match:
                     print(
-                        "[DEBUG Decorator] Regex identified direct V1StreamMessage (no generic) from string."
+                        "[DEBUG Decorator] Regex identified direct Message (no generic) from string."
                     )
                     is_stream_message = True
                 else:
                     print(
-                        f"[DEBUG Decorator] Regex did not match V1StreamMessage pattern for string '{param_type_str_repr}'. Assuming not StreamMessage."
+                        f"[DEBUG Decorator] Regex did not match Message pattern for string '{param_type_str_repr}'. Assuming not StreamMessage."
                     )
         else:
             print(
-                f"[DEBUG Decorator] Input parameter '{param_name}' type ({param_type_str_repr}) identified as non-StreamMessage type (origin was not None and not V1StreamMessage)."
+                f"[DEBUG Decorator] Input parameter '{param_name}' type ({param_type_str_repr}) identified as non-StreamMessage type (origin was not None and not Message)."
             )
 
         print(
@@ -645,8 +639,8 @@ def processor(
         input_model_source = None
         output_model_source = None
         content_type_source = None
-        print("[DEBUG Decorator] Getting base V1StreamMessage source...")
-        stream_message_source = get_type_source(V1StreamMessage, notebook_code)
+        print("[DEBUG Decorator] Getting base Message source...")
+        stream_message_source = get_type_source(Message, notebook_code)
 
         if is_stream_message:
             print(

nebu/processors/models.py

@@ -94,6 +94,18 @@ class V1StreamData(BaseModel):
     wait: Optional[bool] = None
 
 
+class Message(BaseModel, Generic[T]):
+    kind: str = "Message"
+    id: str
+    content: Optional[T] = None
+    created_at: int
+    return_stream: Optional[str] = None
+    user_id: Optional[str] = None
+    orgs: Optional[Any] = None
+    handle: Optional[str] = None
+    adapter: Optional[str] = None
+
+
 class V1StreamMessage(BaseModel, Generic[T]):
     kind: str = "StreamMessage"
     id: str

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

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

{nebu-0.1.22.dist-info → nebu-0.1.24.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=qQQWNAZnY7A7Af6SNMYVXN3NOG_9dNK5iE_0us-o2Po,19659
-nebu/processors/decorate.py,sha256=AeG1c1n8JtcexxAEf2sF2L2eKwVDaNQ5gvPs6EpazKo,34789
+nebu/processors/consumer.py,sha256=ejGgYhOMn86aEvJxQorWp7ybHVcvmo4T3nyiv7gTnhM,19687
+nebu/processors/decorate.py,sha256=B2qK1B2Jm1SzO5IN9pWk32sS0z5WLqXPdJtP-y-iSO4,34563
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
-nebu/processors/models.py,sha256=GvnI8UJrQSjHo2snP07cPfisCH90cEGTY-PZV5_AtXI,3654
+nebu/processors/models.py,sha256=y40HoW-MEzDWB2dm_tsYlUy3Nf3s6eiLC0iGO9BoNog,3956
 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.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,,
+nebu-0.1.24.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.24.dist-info/METADATA,sha256=8O-NbvrAFRRuGr3QLz2DzM08CJnbpfXi3fAIABOSho4,1678
+nebu-0.1.24.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nebu-0.1.24.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.24.dist-info/RECORD,,