nebu 0.1.35__py3-none-any.whl → 0.1.36__py3-none-any.whl

nebu/chatx/openai.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from typing import Dict, List, Literal, Optional, Union
 
-from pydantic import AnyUrl, BaseModel, ConfigDict, Field, RootModel
+from pydantic import BaseModel, ConfigDict, Field, RootModel
 
 
 class FunctionDefinition(BaseModel):
@@ -151,7 +151,7 @@ class ChatCompletionRequestMessageContentPartFile(BaseModel):
 
 
 class ImageUrl(BaseModel):
-    url: AnyUrl = Field(
+    url: str = Field(
         ..., description="Either a URL of the image or the base64 encoded image data."
     )
     detail: str | None = Field(

nebu/processors/consumer.py

@@ -28,6 +28,10 @@ try:
     return_type_name = os.environ.get("RETURN_TYPE_NAME")
     content_type_name = os.environ.get("CONTENT_TYPE_NAME")
 
+    # Get before_func source if provided
+    before_func_source = os.environ.get("BEFORE_FUNC_SOURCE")
+    before_func_name = os.environ.get("BEFORE_FUNC_NAME")
+
     # Check for generic type arguments
     input_model_args = []
     output_model_args = []
@@ -211,6 +215,21 @@ try:
         traceback.print_exc()
         sys.exit(1)
 
+    # Execute before_func if provided
+    if before_func_source and before_func_name:
+        print(f"Executing before_func: {before_func_name}...")
+        try:
+            exec(before_func_source, local_namespace)
+            before_function = local_namespace[before_func_name]
+            before_function()  # Call the function
+            print(f"Successfully executed before_func: {before_func_name}")
+        except Exception as e:
+            print(f"Error executing before_func '{before_func_name}': {e}")
+            traceback.print_exc()
+            # Decide if failure is critical. For now, let's exit.
+            print("Exiting due to before_func failure.")
+            sys.exit(1)
+
 except Exception as e:
     print(f"Error setting up function: {e}")
     traceback.print_exc()

nebu/processors/decorate.py

@@ -352,6 +352,7 @@ def processor(
     python_cmd: str = "python",
     no_delete: bool = False,
     include: Optional[List[Any]] = None,
+    before_func: Optional[Callable[[], None]] = None,
 ):
     def decorator(
         func: Callable[[Any], Any],
@@ -538,7 +539,7 @@ def processor(
             "[DEBUG Decorator] Validating parameter and return types are BaseModel subclasses..."
         )
 
-        def check_basemodel(type_to_check, desc):
+        def check_basemodel(type_to_check: Optional[Any], desc: str):
             print(
                 f"[DEBUG Decorator] check_basemodel: Checking {desc} - Type: {type_to_check}"
             )
@@ -634,6 +635,74 @@ def processor(
 {function_source[:250]}...\n-------")
         # --- End Function Source ---
 
+        # --- Get Before Function Source (if provided) ---
+        before_func_source = None
+        before_func_name = None
+        if before_func:
+            print(f"[DEBUG Decorator] Processing before_func: {before_func.__name__}")
+            before_func_name = before_func.__name__
+            # Validate signature (must take no arguments)
+            before_sig = inspect.signature(before_func)
+            if len(before_sig.parameters) != 0:
+                raise TypeError(
+                    f"before_func '{before_func_name}' must take zero parameters"
+                )
+
+            # Try to get source using similar logic as the main function
+            before_explicit_source = getattr(
+                before_func, _NEBU_EXPLICIT_SOURCE_ATTR, None
+            )
+            if before_explicit_source:
+                print(
+                    f"[DEBUG Decorator] Using explicit source (@include) for before_func {before_func_name}"
+                )
+                before_func_source = before_explicit_source
+            elif in_jupyter and notebook_code:
+                print(
+                    f"[DEBUG Decorator] Attempting notebook history extraction for before_func '{before_func_name}'..."
+                )
+                before_func_source = extract_definition_source_from_string(
+                    notebook_code, before_func_name, ast.FunctionDef
+                )
+                if before_func_source:
+                    print(
+                        f"[DEBUG Decorator] Found before_func '{before_func_name}' source in notebook history."
+                    )
+                else:
+                    print(
+                        f"[DEBUG Decorator] Failed to find before_func '{before_func_name}' in notebook history, falling back to dill."
+                    )
+
+            if before_func_source is None:
+                print(
+                    f"[DEBUG Decorator] Using dill fallback for before_func '{before_func_name}'..."
+                )
+                try:
+                    raw_before_func_source = dill.source.getsource(before_func)
+                    before_func_source = textwrap.dedent(raw_before_func_source)
+                    print(
+                        f"[DEBUG Decorator] Successfully got source via dill for '{before_func_name}'."
+                    )
+                except (IOError, TypeError, OSError) as e:
+                    print(
+                        f"[DEBUG Decorator] Dill fallback failed for '{before_func_name}': {e}"
+                    )
+                    # Raise error if we couldn't get the source by any means
+                    raise ValueError(
+                        f"Could not retrieve source for before_func '{before_func_name}': {e}"
+                    ) from e
+
+            if before_func_source is None:  # Final check
+                raise ValueError(
+                    f"Failed to obtain source code for before_func '{before_func_name}' using any method."
+                )
+            print(
+                f"[DEBUG Decorator] Final before_func source obtained for '{before_func_name}'."
+            )
+        else:
+            print("[DEBUG Decorator] No before_func provided.")
+        # --- End Before Function Source ---
+
         # --- Get Model Sources ---
         print("[DEBUG Decorator] Getting model sources...")
         input_model_source = None
@@ -746,6 +815,14 @@ def processor(
         add_source_to_env("CONTENT_TYPE", content_type_source)
         add_source_to_env("STREAM_MESSAGE", stream_message_source)
 
+        # Add before_func source if available
+        if before_func_source and before_func_name:
+            print(
+                f"[DEBUG Decorator] Adding BEFORE_FUNC env vars for {before_func_name}"
+            )
+            all_env.append(V1EnvVar(key="BEFORE_FUNC_SOURCE", value=before_func_source))
+            all_env.append(V1EnvVar(key="BEFORE_FUNC_NAME", value=before_func_name))
+
         print("[DEBUG Decorator] Adding type info env vars...")
         all_env.append(V1EnvVar(key="PARAM_TYPE_STR", value=param_type_str_repr))
         all_env.append(V1EnvVar(key="RETURN_TYPE_STR", value=str(return_type)))

nebu/processors/processor.py

@@ -157,7 +157,7 @@ class Processor:
 
         response = requests.post(
             url,
-            json=stream_data.model_dump(exclude_none=True),
+            json=stream_data.model_dump(mode="json", exclude_none=True),
             headers={"Authorization": f"Bearer {self.api_key}"},
         )
         response.raise_for_status()

{nebu-0.1.35.dist-info → nebu-0.1.36.dist-info}/METADATA

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

{nebu-0.1.35.dist-info → nebu-0.1.36.dist-info}/RECORD

@@ -6,21 +6,21 @@ nebu/config.py,sha256=aZzQltkobtOLHFCGcIkpKoE3ITn3Z11Dp0E72w84TA0,5769
 nebu/data.py,sha256=kIH9-JJ1-iO7P2t28bku6Gn0Y5tgQszGeTW_rpmO03A,38725
 nebu/meta.py,sha256=CzFHMND9seuewzq9zNNx9WTr6JvrCBExe7BLqDSr7lM,745
 nebu/chatx/convert.py,sha256=jIOuGXPfLkYf_cRqh739gsKKg7cBB2zEYm3Jpmf6Xvo,12535
-nebu/chatx/openai.py,sha256=LLSPvVGnauUViAXY7OifwoWlkUGZWfgxEjxR4mjSqZg,44961
+nebu/chatx/openai.py,sha256=VsJvV2MbYeJj2Ita9Q9X3qj5r5F3P-aPDhpSFr-Q-dw,44950
 nebu/containers/container.py,sha256=yb7KaPTVXnEEAlrpdlUi4HNqF6P7z9bmwAILGlq6iqU,13502
 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=TODyEfYZvvM5mK0pdKO7eL2wF4KWPbieUv_puO5QR1k,19835
-nebu/processors/decorate.py,sha256=9mf25RawOX6_6WyQcRLBIHQC3oCDtofQZijJ13aQM9E,34576
+nebu/processors/consumer.py,sha256=GxU-IM-U7B9Tq6eTwW2lBVe7jm-JfK0ux4ZR2HN3sfU,20693
+nebu/processors/decorate.py,sha256=Jn7rJfhJFDlbFGxLDNJzL_GOthX_MWDl1rtktl1kYFM,38286
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
 nebu/processors/models.py,sha256=y40HoW-MEzDWB2dm_tsYlUy3Nf3s6eiLC0iGO9BoNog,3956
-nebu/processors/processor.py,sha256=EQ3-dBf432fSAQE2A_9ATX-cG5LkJ4fjVaOtlxCoXvc,9719
+nebu/processors/processor.py,sha256=068hLQKapWabNlhb_DtzqAJ7N7MGdr5UcjfZrb_MkFo,9732
 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.35.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.35.dist-info/METADATA,sha256=STueCtZhQoWhv8cfD7g8pDTtTBmj9eBvOWWJAtou4IY,1786
-nebu-0.1.35.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nebu-0.1.35.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.35.dist-info/RECORD,,
+nebu-0.1.36.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.36.dist-info/METADATA,sha256=ZS2pswd9_T1ElnlDNUSBzRxH7udOM8f3Nh-6N_VsKtk,1786
+nebu-0.1.36.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nebu-0.1.36.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.36.dist-info/RECORD,,