nebu 0.1.107__py3-none-any.whl → 0.1.108__py3-none-any.whl

nebu/data.py

@@ -59,7 +59,7 @@ def rclone_copy(
         source_dir,
         destination,
         f"--transfers={transfers}",
-        "--progress",
+        # "--progress",
     ]
 
     if dry_run:
@@ -1171,7 +1171,7 @@ class RcloneBucket(StorageBucket):
             "--modify-window=2s",
             "--log-level=DEBUG" if self.verbose else "--log-level=INFO",
             "--log-format=date,time,level,message",
-            "--progress",  # Add progress display
+            # "--progress",  # Add progress display
         ]
         if dry_run:
             rc_args.append("--dry-run")
@@ -1286,7 +1286,7 @@ class RcloneBucket(StorageBucket):
         rc_args = [
             "--log-level=DEBUG" if self.verbose else "--log-level=INFO",
             "--log-format=date,time,level,message",
-            "--progress",  # Add progress display
+            # "--progress",  # Add progress display
         ]
 
         # Set environment variables for AWS credentials if they exist

nebu/processors/processor.py

@@ -2,7 +2,7 @@ import json
 import threading
 import time
 import uuid
-from typing import Any, Dict, Generic, List, Optional, TypeVar
+from typing import Any, Dict, Generic, List, Optional, TypeVar, cast, get_args
 
 import requests
 from pydantic import BaseModel
@@ -132,6 +132,30 @@ class Processor(Generic[InputType, OutputType]):
         self.processors_url = f"{self.orign_host}/v1/processors"
         self._log_thread: Optional[threading.Thread] = None
 
+        # Attempt to infer OutputType if schema_ is not provided
+        if self.schema_ is None and hasattr(self, "__orig_class__"):
+            type_args = get_args(self.__orig_class__)  # type: ignore
+            if len(type_args) == 2:
+                output_type_candidate = type_args[1]
+                # Check if it looks like a Pydantic model class
+                if isinstance(output_type_candidate, type) and issubclass(
+                    output_type_candidate, BaseModel
+                ):
+                    logger.debug(
+                        f"Inferred OutputType {output_type_candidate.__name__} from generic arguments."
+                    )
+                    self.schema_ = output_type_candidate
+                else:
+                    logger.debug(
+                        f"Second generic argument {output_type_candidate} is not a Pydantic BaseModel. "
+                        "Cannot infer OutputType."
+                    )
+            else:
+                logger.debug(
+                    "Could not infer OutputType from generic arguments: wrong number of type args found "
+                    f"(expected 2, got {len(type_args) if type_args else 0})."
+                )
+
         # Fetch existing Processors
         response = requests.get(
             self.processors_url, headers={"Authorization": f"Bearer {self.api_key}"}
@@ -222,12 +246,18 @@ class Processor(Generic[InputType, OutputType]):
         logs: bool = False,
         api_key: Optional[str] = None,
         user_key: Optional[str] = None,
+        timeout: Optional[float] = 600.0,
     ) -> OutputType | Dict[str, Any] | None:
         """
         Allows the Processor instance to be called like a function, sending data.
         """
         return self.send(
-            data=data, wait=wait, logs=logs, api_key=api_key, user_key=user_key
+            data=data,
+            wait=wait,
+            logs=logs,
+            api_key=api_key,
+            user_key=user_key,
+            timeout=timeout,
         )
 
     def send(
@@ -271,7 +301,9 @@ class Processor(Generic[InputType, OutputType]):
             timeout=timeout,
         )
         response.raise_for_status()
-        send_response_json = response.json()
+        raw_response_json = response.json()
+        raw_content = raw_response_json.get("content")
+        logger.debug(f">>> Raw content: {raw_content}")
 
         # --- Fetch Logs (if requested and not already running) ---
         if logs:
@@ -297,7 +329,33 @@ class Processor(Generic[InputType, OutputType]):
             else:
                 logger.info(f"Log fetching is already running for {processor_name}.")
 
-        return send_response_json
+        # Attempt to parse into OutputType if conditions are met
+        if (
+            wait
+            and self.schema_
+            and isinstance(self.schema_, type)
+            and issubclass(self.schema_, BaseModel)  # type: ignore
+            and isinstance(raw_content, dict)
+        ):  # Check if raw_content is a dict
+            try:
+                # self.schema_ is assumed to be the Pydantic model class for OutputType
+                # Parse raw_content instead of the full response
+                parsed_model = self.schema_.model_validate(raw_content)
+                # Cast to OutputType to satisfy the linter with generics
+                parsed_output: OutputType = cast(OutputType, parsed_model)
+                return parsed_output
+            except (
+                Exception
+            ) as e:  # Consider pydantic.ValidationError for more specific handling
+                schema_name = getattr(self.schema_, "__name__", str(self.schema_))
+                logger.error(
+                    f"Processor {processor_name}: Failed to parse 'content' field into output type {schema_name}. "
+                    f"Error: {e}. Returning raw JSON response."
+                )
+                # Fallback to returning the raw JSON response
+                return raw_content
+
+        return raw_content
 
     def scale(self, replicas: int) -> Dict[str, Any]:
         """

{nebu-0.1.107.dist-info → nebu-0.1.108.dist-info}/METADATA

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

{nebu-0.1.107.dist-info → nebu-0.1.108.dist-info}/RECORD

@@ -2,7 +2,7 @@ nebu/__init__.py,sha256=xNtWiN29MJZK_WBEUP-9hDmlkfLxoASVI-f4tNTXO58,454
 nebu/auth.py,sha256=N_v6SPFD9HU_UoRDTaouH03g2Hmo9C-xxqInE1FweXE,1471
 nebu/cache.py,sha256=JqRb4FdZrRrO4ePlwvsKdxRC8dNEFMxfTWag0aJz8Gw,4893
 nebu/config.py,sha256=C5Jt9Bd0i0HrgzBSVNJ-Ml3KwX_gaYbYYZEtNL2gvJg,7031
-nebu/data.py,sha256=4fEvO_xNCeTNW4RFr1u6iZ7j92S-5zWwxmFdXopxae8,63502
+nebu/data.py,sha256=v29F1Dwfa3cw6HzG2C6bxAfAJIu16k5PwZCC_niLwCU,63508
 nebu/errors.py,sha256=bBnK5YQ6qZg4OMY81AN2k03ppefg89FUwF_SHEMlqCA,170
 nebu/logging.py,sha256=VzpjCEoXm3c4i0sKJL5GTsPIhTQ6Y4BPUTzPmwhve7o,950
 nebu/meta.py,sha256=CzFHMND9seuewzq9zNNx9WTr6JvrCBExe7BLqDSr7lM,745
@@ -18,11 +18,11 @@ nebu/processors/consumer_process_worker.py,sha256=h--eNFKaLbUayxn88mB8oGGdrU2liE
 nebu/processors/decorate.py,sha256=AfHVCoNbW7RymccF5ewleEL-GlMiqVH1-t9bCmD60rk,58654
 nebu/processors/default.py,sha256=cy4ETMdbdRGkrvbYec1o60h7mGDlGN5JsuUph0ENtDU,364
 nebu/processors/models.py,sha256=g4B1t6Rgoy-NUEHBLeQc0EENzHXLDlWSio8Muv7cTDU,4093
-nebu/processors/processor.py,sha256=vbafqawdZhh5VRoBE5C5wRR_32iSyzoDTqK7qsNQvaM,19242
+nebu/processors/processor.py,sha256=PeJvxBPfjQ8uFqLcrGNk28yqBmqZC2VW4ssCsanZxYY,21985
 nebu/redis/models.py,sha256=coPovAcVXnOU1Xh_fpJL4PO3QctgK9nBe5QYoqEcnxg,1230
 nebu/services/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nebu-0.1.107.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.107.dist-info/METADATA,sha256=yd6ycmsMZA8RM6dDaH4EPdoiRyUyG-S6x4j-0FSb168,1798
-nebu-0.1.107.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-nebu-0.1.107.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.107.dist-info/RECORD,,
+nebu-0.1.108.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.108.dist-info/METADATA,sha256=drUdR1bXazQ1Yqlns8I1KPOt1qnoO6OhNQMAlDwaK9o,1798
+nebu-0.1.108.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+nebu-0.1.108.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.108.dist-info/RECORD,,