nebu 0.1.52__tar.gz → 0.1.55__tar.gz

{nebu-0.1.52/src/nebu.egg-info → nebu-0.1.55}/PKG-INFO

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

{nebu-0.1.52 → nebu-0.1.55}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nebu"
-version = "0.1.52"
+version = "0.1.55"
 description = "A globally distributed container runtime"
 readme = "README.md"
 requires-python = ">=3.10.14"

{nebu-0.1.52 → nebu-0.1.55}/src/nebu/config.py

@@ -52,12 +52,17 @@ class GlobalConfig:
             config = cls()  # default
 
         # Collect environment variables (no fallback defaults here)
-        env_api_key = os.environ.get("NEBU_API_KEY") or os.environ.get(
-            "AGENTSEA_API_KEY"
+        env_api_key = (
+            os.environ.get("NEBU_API_KEY")
+            or os.environ.get("AGENTSEA_API_KEY")
+            or os.environ.get("ORIGN_API_KEY")
         )
-        env_server = os.environ.get("NEBU_SERVER") or os.environ.get("AGENTSEA_SERVER")
-        env_auth_server = os.environ.get("NEBU_AUTH_SERVER") or os.environ.get(
-            "AGENTSEA_AUTH_SERVER"
+        env_server = os.environ.get("NEBU_SERVER")
+        env_auth_server = (
+            os.environ.get("NEBU_AUTH_SERVER")
+            or os.environ.get("AGENTSEA_AUTH_SERVER")
+            or os.environ.get("ORIGN_AUTH_SERVER")
+            or os.environ.get("AGENTSEA_AUTH_URL")
         )
 
         # Only proceed if all three environment variables are present
@@ -158,7 +163,9 @@ class ContainerConfig:
         Load configuration from environment variables.
         """
         return cls(
-            api_key=os.environ.get("NEBU_API_KEY"),
+            api_key=os.environ.get("NEBU_API_KEY")
+            or os.environ.get("AGENTSEA_API_KEY")
+            or os.environ.get("ORIGN_API_KEY"),
             server=os.environ.get("NEBU_SERVER"),
             namespace=os.environ.get("NEBU_NAMESPACE"),
             name=os.environ.get("NEBU_NAME"),

{nebu-0.1.52 → nebu-0.1.55}/src/nebu/processors/decorate.py

@@ -1,6 +1,7 @@
 import ast  # For parsing notebook code
 import inspect
 import os
+import re  # Added import
 import textwrap
 from typing import (
     Any,
@@ -75,9 +76,10 @@ def is_jupyter_notebook():
 
         if importlib.util.find_spec("IPython") is None:
             return False
-        import IPython  # Now safe to import
+        # Fix: Import get_ipython directly
+        from IPython.core.getipython import get_ipython  # Now safe to import
 
-        ip = IPython.get_ipython()
+        ip = get_ipython()  # Use the imported function
         if ip is None:  # type: ignore
             # print("[DEBUG Helper] is_jupyter_notebook: No IPython instance found.")
             return False
@@ -102,9 +104,10 @@ def get_notebook_executed_code():
     """
     print("[DEBUG Helper] Attempting to get notebook execution history...")
     try:
-        import IPython
+        # Fix: Import get_ipython directly
+        from IPython.core.getipython import get_ipython
 
-        ip = IPython.get_ipython()
+        ip = get_ipython()  # Use the imported function
         if ip is None or not hasattr(ip, "history_manager"):
             print(
                 "[DEBUG Helper] get_notebook_executed_code: No IPython instance or history_manager."
@@ -187,12 +190,14 @@ def extract_definition_source_from_string(
                         start_lineno = getattr(node, "lineno", 1) - 1
                         end_lineno = getattr(node, "end_lineno", start_lineno + 1)
 
-                        if hasattr(node, "decorator_list") and node.decorator_list:
+                        if hasattr(node, "decorator_list") and node.decorator_list:  # type: ignore
                             # Ensure it's a node type that *can* have decorators
                             # FunctionDef and ClassDef have decorator_list
                             first_decorator_start_line = (
                                 getattr(
-                                    node.decorator_list[0], "lineno", start_lineno + 1
+                                    node.decorator_list[0],  # type: ignore
+                                    "lineno",
+                                    start_lineno + 1,
                                 )
                                 - 1
                             )  # type: ignore
@@ -391,13 +396,13 @@ def processor(
 ):
     def decorator(
         func: Callable[[Any], Any],
-    ) -> Processor | Callable[[Any], Any]:
+    ) -> Processor:
         # --- Prevent Recursion Guard ---
         if os.environ.get(_NEBU_INSIDE_CONSUMER_ENV_VAR) == "1":
             print(
                 f"[DEBUG Decorator] Guard triggered for '{func.__name__}'. Returning original function."
             )
-            return func
+            return func  # type: ignore
         # --- End Guard ---
 
         print(
@@ -599,7 +604,7 @@ def processor(
                     included_sources[obj] = obj_source
                     # Decide how to pass included source - keep using Env Vars for now
                     env_key_base = f"INCLUDED_OBJECT_{i}"
-                    if isinstance(obj_source, str):
+                    if isinstance(obj_source, str):  # type: ignore[arg-type]
                         all_env.append(
                             V1EnvVar(key=f"{env_key_base}_SOURCE", value=obj_source)
                         )
@@ -609,7 +614,7 @@ def processor(
                         # Ensure obj_source is indeed a tuple before unpacking
                         if len(obj_source) == 2:
                             # Now safe to unpack
-                            origin_src, arg_srcs = obj_source
+                            origin_src, arg_srcs = obj_source  # type: ignore[misc] # Suppress persistent tuple unpacking error
                             # type: ignore[misc] # Suppress persistent tuple unpacking error
                             if origin_src and isinstance(origin_src, str):
                                 all_env.append(
@@ -708,6 +713,7 @@ def processor(
         print(f"[DEBUG Decorator] get_origin result: {origin}, get_args result: {args}")
         is_stream_message = False
         content_type = None
+        content_type_name_from_regex = None  # Store regex result here
 
         # Use Message class directly for comparison
         message_cls = Message  # Get the class object
@@ -727,18 +733,63 @@ def processor(
                 )
             else:
                 print(
-                    "[DEBUG Decorator] Message detected, but no generic arguments found via get_args."
+                    "[DEBUG Decorator] Message detected, but no generic arguments found via get_args. Attempting regex fallback on string repr."
                 )
+                # --- Regex Fallback Start ---
+                match = re.search(r"Message\[([\w\.]+)\]", param_type_str_repr)
+                if match:
+                    content_type_name_from_regex = match.group(1)
+                    print(
+                        f"[DEBUG Decorator] Extracted content type name via regex: {content_type_name_from_regex}"
+                    )
+                else:
+                    print(
+                        "[DEBUG Decorator] Regex fallback failed to extract content type name."
+                    )
+                # --- Regex Fallback End ---
+        # Check 2a: Regex fallback if get_origin failed but string matches pattern
+        elif origin is None and param_type is not None:
+            print(
+                "[DEBUG Decorator] get_origin failed. Attempting regex fallback on string representation."
+            )
+            match = re.search(r"Message\[([\w\.]+)\]", param_type_str_repr)
+            if match:
+                print(
+                    "[DEBUG Decorator] Regex fallback successful after get_origin failed."
+                )
+                is_stream_message = True
+                content_type_name_from_regex = match.group(1)
+                # We don't have the actual content_type object here, only the name
+                content_type = None
+                print(
+                    f"[DEBUG Decorator] Extracted content type name via regex: {content_type_name_from_regex}"
+                )
+            else:
+                print(
+                    "[DEBUG Decorator] Regex fallback also failed. Treating as non-Message type."
+                )
+                is_stream_message = False
+                content_type = None
         # Check 2: Direct type check (Handles cases where get_origin might fail but type is correct)
         elif isinstance(param_type, type) and param_type is message_cls:
-            print("[DEBUG Decorator] Input type identified as direct Message type.")
+            # This case likely won't have generic args accessible easily if get_origin failed
+            print(
+                "[DEBUG Decorator] Input type identified as direct Message type. Attempting regex fallback."
+            )
             is_stream_message = True
-        # Check 3: Regex fallback might be less reliable now, but keep as last resort?
-        elif (
-            origin is None and param_type is not None
-        ):  # Only if origin failed and type exists
-            # ... (existing regex fallback logic using param_type_str_repr) ...
-            pass  # Keep existing regex logic here if desired
+            # --- Regex Fallback Start ---
+            match = re.search(r"Message\[([\w\.]+)\]", param_type_str_repr)
+            if match:
+                content_type_name_from_regex = match.group(1)
+                print(
+                    f"[DEBUG Decorator] Extracted content type name via regex: {content_type_name_from_regex}"
+                )
+            else:
+                print(
+                    "[DEBUG Decorator] Regex fallback failed to extract content type name."
+                )
+            # --- Regex Fallback End ---
+        # Check 3: Removed old placeholder elif branch
 
         else:  # Handle cases where param_type might be None or origin is something else
             print(
@@ -929,19 +980,31 @@ def processor(
 
         all_env.append(V1EnvVar(key="RETURN_TYPE_STR", value=return_type_str_repr))
         all_env.append(V1EnvVar(key="IS_STREAM_MESSAGE", value=str(is_stream_message)))
-        if content_type and hasattr(content_type, "__name__"):
-            content_type_name = None
-            # Check if content_type is a class before accessing __name__
-            if isinstance(content_type, type):
-                content_type_name = content_type.__name__
-                all_env.append(
-                    V1EnvVar(key="CONTENT_TYPE_NAME", value=content_type_name)
-                )
-            else:
-                # Handle unresolved types / typevars if needed
+
+        # Determine and set CONTENT_TYPE_NAME using object or regex fallback
+        content_type_name_to_set = None
+        if content_type and isinstance(content_type, type):
+            content_type_name_to_set = content_type.__name__
+            print(
+                f"[DEBUG Decorator] Using content type name from resolved type object: {content_type_name_to_set}"
+            )
+        elif content_type_name_from_regex:
+            content_type_name_to_set = content_type_name_from_regex
+            print(
+                f"[DEBUG Decorator] Using content type name from regex fallback: {content_type_name_to_set}"
+            )
+        else:
+            # Only warn if it was supposed to be a Message type
+            if is_stream_message:
                 print(
-                    f"Warning: Content type '{content_type}' is not a class, cannot get name."
+                    f"Warning: Could not determine CONTENT_TYPE_NAME for Message parameter {param_name} ({param_type_str_repr}). Consumer might use raw content."
                 )
+
+        if content_type_name_to_set:
+            all_env.append(
+                V1EnvVar(key="CONTENT_TYPE_NAME", value=content_type_name_to_set)
+            )
+
         # Use the calculated module_path for MODULE_NAME
         all_env.append(
             V1EnvVar(
@@ -1083,7 +1146,7 @@ def processor(
         # setattr(processor_instance, 'original_func', func) # Use setattr if not in model
         try:
             # This will fail if Processor hasn't been updated to include this field
-            processor_instance.original_func = func
+            processor_instance.original_func = func  # type: ignore
         except AttributeError:
             print(
                 "Warning: Could not assign original_func to Processor instance. Update Processor model or remove assignment."

{nebu-0.1.52 → nebu-0.1.55}/src/nebu/processors/processor.py

@@ -1,6 +1,6 @@
 import json
 import threading
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Generic, List, Optional, TypeVar
 
 import requests
 from pydantic import BaseModel
@@ -19,6 +19,8 @@ from nebu.processors.models import (
     V1UpdateProcessor,
 )
 
+InputType = TypeVar("InputType", bound=BaseModel)
+
 
 def _fetch_and_print_logs(log_url: str, api_key: str, processor_name: str):
     """Helper function to fetch logs in a separate thread."""
@@ -78,7 +80,7 @@ def _fetch_and_print_logs(log_url: str, api_key: str, processor_name: str):
         )
 
 
-class Processor:
+class Processor(Generic[InputType]):
     """
     A class for managing Processor instances.
     """
@@ -203,14 +205,14 @@ class Processor:
             patch_response.raise_for_status()
             print(f"Updated Processor {self.processor.metadata.name}")
 
-    def __call__(self, data: BaseModel, wait: bool = False) -> Dict[str, Any]:
+    def __call__(self, data: InputType, wait: bool = False) -> Dict[str, Any]:
         """
         Allows the Processor instance to be called like a function, sending data.
         """
         return self.send(data=data, wait=wait)
 
     def send(
-        self, data: BaseModel, wait: bool = False, logs: bool = False
+        self, data: InputType, wait: bool = False, logs: bool = False
     ) -> Dict[str, Any]:
         """
         Send data to the processor and optionally stream logs in the background.

{nebu-0.1.52 → nebu-0.1.55/src/nebu.egg-info}/PKG-INFO

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