nebu 0.1.14__tar.gz → 0.1.17__tar.gz

{nebu-0.1.14/src/nebu.egg-info → nebu-0.1.17}/PKG-INFO

@@ -1,13 +1,16 @@
 Metadata-Version: 2.4
 Name: nebu
-Version: 0.1.14
+Version: 0.1.17
 Summary: A globally distributed container runtime
 Requires-Python: >=3.10.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: dill>=0.3.8
 Requires-Dist: openai>=1.68.2
 Requires-Dist: pydantic>=2.10.6
+Requires-Dist: pysocks>=1.7.1
 Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: redis[socks]>=5.0
 Requires-Dist: requests>=2.32.3
 Dynamic: license-file
 

{nebu-0.1.14 → nebu-0.1.17}/pyproject.toml

@@ -1,19 +1,24 @@
 [project]
 name = "nebu"
-version = "0.1.14"
+version = "0.1.17"
 description = "A globally distributed container runtime"
 readme = "README.md"
 requires-python = ">=3.10.14"
 dependencies = [
+    "dill>=0.3.8",
     "openai>=1.68.2",
     "pydantic>=2.10.6",
+    "pysocks>=1.7.1",
     "pyyaml>=6.0.2",
+    "redis[socks]>=5.0",
     "requests>=2.32.3",
 ]
 
 [dependency-groups]
 dev = [
     "ipykernel>=6.29.5",
+    "nbformat>=5.10.4",
+    "notebook>=7.3.3",
     "pytest>=8.3.5",
     "trl>=0.16.1",
 ]

{nebu-0.1.14 → nebu-0.1.17}/src/nebu/containers/decorator.py

@@ -1,9 +1,9 @@
 import base64
-import inspect
 import pickle
 import time
 from typing import Any, Callable, List, Optional
 
+import dill  # Import dill
 import requests
 
 from nebu.containers.container import Container
@@ -47,8 +47,16 @@ def container(
                 )
                 time.sleep(1)
 
-            # Get function source code
-            func_code = inspect.getsource(func)
+            # Get function source code using dill
+            try:
+                func_code = dill.source.getsource(func)
+            except (OSError, TypeError) as e:
+                raise RuntimeError(
+                    f"Failed to retrieve source code for function '{func.__name__}'. "
+                    "This can happen with functions defined dynamically or interactively "
+                    "(e.g., in a Jupyter notebook or REPL). Ensure the function is defined "
+                    f"in a standard Python module if possible. Original error: {e}"
+                )
 
             # Serialize arguments using pickle for complex objects
             serialized_args = base64.b64encode(pickle.dumps(args)).decode("utf-8")

{nebu-0.1.14 → nebu-0.1.17}/src/nebu/processors/consumer.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import json
 import os
+import socket
 import sys
 import time
 import traceback
@@ -8,6 +9,7 @@ from datetime import datetime
 from typing import Dict, TypeVar
 
 import redis
+import socks
 
 # Define TypeVar for generic models
 T = TypeVar("T")
@@ -97,6 +99,26 @@ try:
     exec("from nebu.processors.models import *", local_namespace)
     exec("from nebu.processors.processor import *", local_namespace)
 
+    # Execute included object sources FIRST, as they might define types needed by others
+    print("[Consumer] Executing included object sources...")
+    for i, (obj_source, args_sources) in enumerate(included_object_sources):
+        try:
+            exec(obj_source, local_namespace)
+            print(f"[Consumer] Successfully executed included object {i} base source")
+            for j, arg_source in enumerate(args_sources):
+                try:
+                    exec(arg_source, local_namespace)
+                    print(
+                        f"[Consumer] Successfully executed included object {i} arg {j} source"
+                    )
+                except Exception as e:
+                    print(f"Error executing included object {i} arg {j} source: {e}")
+                    traceback.print_exc()
+        except Exception as e:
+            print(f"Error executing included object {i} base source: {e}")
+            traceback.print_exc()
+    print("[Consumer] Finished executing included object sources.")
+
     # First try to import the module to get any needed dependencies
     # This is a fallback in case the module is available
     module_name = os.environ.get("MODULE_NAME")
@@ -176,22 +198,6 @@ try:
             print(f"Error defining output model: {e}")
             traceback.print_exc()
 
-    # Execute included object sources
-    for i, (obj_source, args_sources) in enumerate(included_object_sources):
-        try:
-            exec(obj_source, local_namespace)
-            print(f"Successfully executed included object {i} base source")
-            for j, arg_source in enumerate(args_sources):
-                try:
-                    exec(arg_source, local_namespace)
-                    print(f"Successfully executed included object {i} arg {j} source")
-                except Exception as e:
-                    print(f"Error executing included object {i} arg {j} source: {e}")
-                    traceback.print_exc()
-        except Exception as e:
-            print(f"Error executing included object {i} base source: {e}")
-            traceback.print_exc()
-
     # Finally, execute the function code
     try:
         exec(function_source, local_namespace)
@@ -216,13 +222,24 @@ if not all([REDIS_URL, REDIS_CONSUMER_GROUP, REDIS_STREAM]):
     print("Missing required Redis environment variables")
     sys.exit(1)
 
+# Configure SOCKS proxy before connecting to Redis
+# Use the proxy settings provided by tailscaled
+socks.set_default_proxy(socks.SOCKS5, "localhost", 1055)
+socket.socket = socks.socksocket
+print("Configured SOCKS5 proxy for socket connections via localhost:1055")
+
 # Connect to Redis
 try:
-    r = redis.from_url(REDIS_URL)
+    # Parse the Redis URL to handle potential credentials or specific DBs if needed
+    # Although from_url should work now with the patched socket
+    r = redis.from_url(
+        REDIS_URL, decode_responses=True
+    )  # Added decode_responses for convenience
+    r.ping()  # Test connection
     redis_info = REDIS_URL.split("@")[-1] if "@" in REDIS_URL else REDIS_URL
-    print(f"Connected to Redis at {redis_info}")
+    print(f"Connected to Redis via SOCKS proxy at {redis_info}")
 except Exception as e:
-    print(f"Failed to connect to Redis: {e}")
+    print(f"Failed to connect to Redis via SOCKS proxy: {e}")
     traceback.print_exc()
     sys.exit(1)