nebu 0.1.41__py3-none-any.whl → 0.1.43__py3-none-any.whl

nebu/adapter.py

@@ -17,3 +17,4 @@ class Adapter(BaseModel):
     lora_dropout: float = Field(default=0.1)
     lora_target_modules: List[str] = Field(default=[])
     learning_rate: float = Field(default=0.0001)
+    examples_trained: int = Field(default=0)

nebu/processors/decorate.py

@@ -878,15 +878,32 @@ def processor(
         metadata = V1ResourceMetaRequest(
             name=processor_name, namespace=namespace, labels=labels
         )
-        consumer_command = f"{python_cmd} -u -m nebu.processors.consumer"
-        setup_commands = [
-            f"{python_cmd} -m pip install dill pydantic redis nebu",  # Base deps
+        # Separate the final execution command from setup
+        consumer_module = "nebu.processors.consumer"
+        if "accelerate launch" in python_cmd:
+            # python_cmd is the launcher prefix (e.g., "accelerate launch")
+            # Append the module flag and the module name.
+            # Remove -u as accelerate likely handles buffering.
+            consumer_execution_command = f"{python_cmd.strip()} -m {consumer_module}"
+        else:
+            # Assume python_cmd is just the interpreter (e.g., "python")
+            consumer_execution_command = f"{python_cmd} -u -m {consumer_module}"
+
+        # Build setup commands list - run these with standard python/shell
+        setup_commands_list = [
+            "python -m pip install dill pydantic redis nebu",  # Base deps (use standard python)
         ]
         if setup_script:
-            print("[DEBUG Decorator] Adding setup script to command.")
-            setup_commands.append(f"\n{setup_script}\n")
-        setup_commands.append(consumer_command)
-        final_command = "\n".join(setup_commands)
+            print("[DEBUG Decorator] Adding setup script to setup commands.")
+            # Add setup script as raw commands
+            setup_commands_list.append(setup_script.strip())
+
+        # Combine setup commands and the final execution command
+        all_commands = setup_commands_list + [consumer_execution_command]
+        final_command = "\n\n".join(
+            all_commands
+        )  # Use double newline for clarity in logs
+
         print(
             f"[DEBUG Decorator] Final container command:\n-------\n{final_command}\n-------"
         )

nebu/processors/processor.py

@@ -1,3 +1,5 @@
+import json
+import threading
 from typing import Any, Dict, List, Optional
 
 import requests
@@ -18,6 +20,64 @@ from nebu.processors.models import (
 )
 
 
+def _fetch_and_print_logs(log_url: str, api_key: str, processor_name: str):
+    """Helper function to fetch logs in a separate thread."""
+    try:
+        headers = {"Authorization": f"Bearer {api_key}"}
+        print(f"--- Attempting to stream logs for {processor_name} from {log_url} ---")
+        # Use stream=True for potentially long-lived connections and timeout
+        with requests.get(log_url, headers=headers, stream=True, timeout=300) as r:
+            r.raise_for_status()
+            print(f"--- Streaming logs for {processor_name} ---")
+            for line in r.iter_lines():
+                if not line:
+                    continue
+                try:
+                    # Decode bytes to string
+                    decoded_line = line.decode("utf-8")
+                    # Parse the JSON line
+                    log_data = json.loads(decoded_line)
+
+                    # Check if the parsed data is a dictionary (expected format)
+                    if isinstance(log_data, dict):
+                        for container, log_content in log_data.items():
+                            # Ensure log_content is a string before printing
+                            if isinstance(log_content, str):
+                                print(f"[{processor_name}][{container}] {log_content}")
+                            else:
+                                # Handle cases where log_content might not be a string
+                                print(
+                                    f"[{processor_name}][{container}] Unexpected log format: {log_content}"
+                                )
+                    else:
+                        # If not a dict, print the raw line with a warning
+                        print(
+                            f"[{processor_name}] Unexpected log structure (not a dict): {decoded_line}"
+                        )
+
+                except json.JSONDecodeError:
+                    # If JSON parsing fails, print the original line as fallback
+                    print(f"[{processor_name}] {line.decode('utf-8')} (raw/non-JSON)")
+                except Exception as e:
+                    # Catch other potential errors during line processing
+                    print(f"Error processing log line for {processor_name}: {e}")
+
+        print(f"--- Log stream ended for {processor_name} ---")
+    except requests.exceptions.Timeout:
+        print(f"Log stream connection timed out for {processor_name}.")
+    except requests.exceptions.RequestException as e:
+        # Handle potential API errors gracefully
+        print(f"Error fetching logs for {processor_name} from {log_url}: {e}")
+        if e.response is not None:
+            print(
+                f"Response status: {e.response.status_code}, Response body: {e.response.text}"
+            )
+    except Exception as e:
+        print(
+            f"An unexpected error occurred while fetching logs for {processor_name}: {e}"
+        )
+
+
 class Processor:
     """
     A class for managing Processor instances.
@@ -56,6 +116,7 @@ class Processor:
         self.max_replicas = max_replicas
         self.scale_config = scale_config
         self.processors_url = f"{self.orign_host}/v1/processors"
+        self._log_thread: Optional[threading.Thread] = None
 
         # Fetch existing Processors
         response = requests.get(
@@ -148,27 +209,61 @@ class Processor:
         """
         return self.send(data=data, wait=wait)
 
-    def send(self, data: BaseModel, wait: bool = False) -> Dict[str, Any]:
+    def send(
+        self, data: BaseModel, wait: bool = False, logs: bool = False
+    ) -> Dict[str, Any]:
         """
-        Send data to the processor.
+        Send data to the processor and optionally stream logs in the background.
         """
-        if not self.processor or not self.processor.metadata.name:
-            raise ValueError("Processor not found")
-
-        url = f"{self.processors_url}/{self.processor.metadata.namespace}/{self.processor.metadata.name}/messages"
-
+        if (
+            not self.processor
+            or not self.processor.metadata.name
+            or not self.processor.metadata.namespace
+        ):
+            raise ValueError("Processor not found or missing metadata (name/namespace)")
+
+        processor_name = self.processor.metadata.name
+        processor_namespace = self.processor.metadata.namespace
+
+        # --- Send Data ---
+        messages_url = (
+            f"{self.processors_url}/{processor_namespace}/{processor_name}/messages"
+        )
         stream_data = V1StreamData(
             content=data,
             wait=wait,
         )
-
         response = requests.post(
-            url,
+            messages_url,
             json=stream_data.model_dump(mode="json", exclude_none=True),
             headers={"Authorization": f"Bearer {self.api_key}"},
         )
         response.raise_for_status()
-        return response.json()
+        send_response_json = response.json()
+
+        # --- Fetch Logs (if requested and not already running) ---
+        if logs:
+            if self._log_thread is None or not self._log_thread.is_alive():
+                log_url = (
+                    f"{self.processors_url}/{processor_namespace}/{processor_name}/logs"
+                )
+                self._log_thread = threading.Thread(
+                    target=_fetch_and_print_logs,
+                    args=(log_url, self.api_key, processor_name),  # Pass processor_name
+                    daemon=True,
+                )
+                try:
+                    self._log_thread.start()
+                    print(f"Started background log fetching for {processor_name}...")
+                except Exception as e:
+                    print(
+                        f"Failed to start log fetching thread for {processor_name}: {e}"
+                    )
+                    self._log_thread = None  # Reset if start fails
+            else:
+                print(f"Log fetching is already running for {processor_name}.")
+
+        return send_response_json
 
     def scale(self, replicas: int) -> Dict[str, Any]:
         """
@@ -284,3 +379,21 @@ class Processor:
         Get the resource ref for the processor.
         """
         return f"{self.name}.{self.namespace}.Processor"
+
+    def stop_logs(self):
+        """
+        Signals the intent to stop the background log stream.
+        Note: Interrupting a streaming requests.get cleanly can be complex.
+              This currently allows a new log stream to be started on the next call.
+        """
+        if self._log_thread and self._log_thread.is_alive():
+            # Attempting to stop a daemon thread directly isn't standard practice.
+            # Setting the reference to None allows a new thread to be created if needed.
+            # The OS will eventually clean up the daemon thread when the main process exits,
+            # or potentially sooner if the network request completes or errors out.
+            print(
+                f"Disassociating from active log stream for {self.name}. A new stream can be started."
+            )
+            self._log_thread = None
+        else:
+            print(f"No active log stream to stop for {self.name}.")

{nebu-0.1.41.dist-info → nebu-0.1.43.dist-info}/METADATA

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

{nebu-0.1.41.dist-info → nebu-0.1.43.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nebu/__init__.py,sha256=5sepbzdAdoA_8TIxws60S4ugFY1apQd_savzn20a4cY,465
-nebu/adapter.py,sha256=yELhnYDsb56vI4xb_fpgZehsr9GQwiNY1tcasO2IQQo,546
+nebu/adapter.py,sha256=lqpvfY_up-qVvWxxfYKLFXkYvlEilv-BrRNt554cixU,591
 nebu/auth.py,sha256=N_v6SPFD9HU_UoRDTaouH03g2Hmo9C-xxqInE1FweXE,1471
 nebu/cache.py,sha256=jmluqvWnE9N8uNq6nppXSxEJK7DKWaB79GicaGg9KmY,4718
 nebu/config.py,sha256=aZzQltkobtOLHFCGcIkpKoE3ITn3Z11Dp0E72w84TA0,5769
@@ -12,15 +12,15 @@ nebu/containers/decorator.py,sha256=uFtzlAXRHYZECJ-NPusY7oN9GXvdHrHDd_JNrIGr8aQ,
 nebu/containers/models.py,sha256=0j6NGy4yto-enRDh_4JH_ZTbHrLdSpuMOqNQPnIrwC4,6815
 nebu/containers/server.py,sha256=yFa2Y9PzBn59E1HftKiv0iapPonli2rbGAiU6r-wwe0,2513
 nebu/processors/consumer.py,sha256=qQleTn5BmaZvlH4YkrZqqEZNvMJDv5RpKRVRHX28Qs0,24496
-nebu/processors/decorate.py,sha256=ltYo2DMBsMJek2AZe4o0w9eFVo3qFCfGg7oRYlskRvU,40144
+nebu/processors/decorate.py,sha256=T-nnsu85eH5ui-66E0IJfMj5KG1fMDHeSmj4oT2scZA,40990
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
 nebu/processors/models.py,sha256=y40HoW-MEzDWB2dm_tsYlUy3Nf3s6eiLC0iGO9BoNog,3956
-nebu/processors/processor.py,sha256=lN1T665WV-d45gerGBgb8HxVVc2k52U3hxIBaAfe-Nk,9991
+nebu/processors/processor.py,sha256=cptZEN9ZGcaoFNreaw3BkwV0qKHvjP9b4nNxlQjFT3s,15405
 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.41.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.41.dist-info/METADATA,sha256=OohCbzIvc4-hH0OzVDsWQJpOfAsi7kH9WqHOIqGo_f4,1738
-nebu-0.1.41.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nebu-0.1.41.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.41.dist-info/RECORD,,
+nebu-0.1.43.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.43.dist-info/METADATA,sha256=6oxUDToyMBXQWgcNZd7LaYF3DIi-gCGU1b-bVLzesK0,1738
+nebu-0.1.43.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nebu-0.1.43.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.43.dist-info/RECORD,,