nebu 0.1.29__py3-none-any.whl → 0.1.31__py3-none-any.whl

nebu/cache.py

@@ -25,29 +25,42 @@ class Cache:
         Initializes the Redis connection.
         Pulls connection details from environment variables REDIS_HOST,
         REDIS_PORT, and REDIS_DB if available, otherwise uses defaults.
+        Also checks for REDIS_URL and prefers that if set.
         """
-        redis_host = os.environ.get("REDIS_HOST", host)
-        redis_port = int(os.environ.get("REDIS_PORT", port))
-        redis_db = int(os.environ.get("REDIS_DB", db))
+        redis_url = os.environ.get("REDIS_URL")
         namespace = os.environ.get("NEBU_NAMESPACE")
         if not namespace:
             raise ValueError("NEBU_NAMESPACE environment variable is not set")
 
+        self.redis_client = None
+        connection_info = ""
+
         try:
-            # decode_responses=True ensures keys and values are returned as strings
-            self.redis_client = redis.StrictRedis(
-                host=redis_host, port=redis_port, db=redis_db, decode_responses=True
-            )
+            if redis_url:
+                # Use REDIS_URL if available
+                self.redis_client = redis.StrictRedis.from_url(
+                    redis_url, decode_responses=True
+                )
+                connection_info = f"URL {redis_url}"
+            else:
+                # Fallback to individual host, port, db
+                redis_host = os.environ.get("REDIS_HOST", host)
+                redis_port = int(os.environ.get("REDIS_PORT", port))
+                redis_db = int(os.environ.get("REDIS_DB", db))
+                self.redis_client = redis.StrictRedis(
+                    host=redis_host, port=redis_port, db=redis_db, decode_responses=True
+                )
+                connection_info = f"{redis_host}:{redis_port}/{redis_db}"
+
             # Ping the server to ensure connection is established
             self.redis_client.ping()
-            print(
-                f"Successfully connected to Redis at {redis_host}:{redis_port}/{redis_db}"
-            )
+            print(f"Successfully connected to Redis using {connection_info}")
 
             self.prefix = f"cache:{namespace}"
         except Exception as e:
             print(f"Error connecting to Redis: {e}")
-            self.redis_client = None  # Set client to None if connection fails
+            # Ensure client is None if connection fails at any point
+            self.redis_client = None
 
     def get(self, key: str) -> str | None:
         """

nebu/chatx/convert.py

@@ -74,36 +74,49 @@ def convert_to_unsloth_inference(
         # regardless of how many images were found, and merges all text into one block.
         new_content = []
         if image_urls:
-            new_content.append({"type": "image"})
+            # Add image placeholders for each image found
+            for _ in image_urls:
+                new_content.append({"type": "image"})
         if merged_text:
             new_content.append({"type": "text", "text": merged_text})
 
-        new_schema.append({"role": role, "content": new_content})
+        # Check if there's any content to add
+        if new_content:
+            new_schema.append({"role": role, "content": new_content})
+        # else: Optionally handle cases where a message might become empty
 
     return new_schema, all_images
 
 
 def oai_to_unsloth(
-    messages_input: List[Dict[str, Any]],
+    messages_input: Dict[
+        str, Any
+    ],  # Assume input is always dict like {'messages': [...]}
 ) -> Dict[str, List[Dict[str, Any]]]:
     """
-    Converts a list of messages from an OpenAI-like chat format to the Nebulous conversation format.
+    Converts messages from a JSON object containing a 'messages' key
+    (typical in JSON Lines format) to the Nebulous conversation format.
     Images specified by URLs or base64 strings are loaded into PIL.Image objects.
 
-    Input format example:
-    [
-        {
-            "role": "user",
-            "content": [
-                {"type": "input_text", "text": "Describe the image."},
-                {"type": "input_image", "image_url": "http://... or base64 string"},
-            ]
-        },
-        {
-            "role": "assistant",
-            "content": [{"type": "text", "text": "This is an image of..."}] # Or potentially just a string
-        }
-    ]
+    {
+        "messages": [
+            {
+                "role": "user",
+                "content": [
+                    {
+                        "type": "text",
+                        "text": "Who is this an image of?"
+                    },
+                    {
+                        "type": "image_url",
+                        "image_url": {
+                            "url": "https://upload.wikimedia.org/wikipedia/commons/5/57/Abraham_Lincoln_1863_Portrait_%283x4_cropped%29.jpg"
+                        }
+                    }
+                ]
+            }
+        ]
+    }
 
     Output format example:
     {
@@ -122,10 +135,26 @@ def oai_to_unsloth(
         ]
     }
     """
+    # Directly extract the list of messages, assuming input structure
+    messages_to_process = messages_input.get("messages", [])
+
+    # Validate that 'messages' key contained a list
+    if not isinstance(messages_to_process, list):
+        print(
+            f"Warning: Input dict provided, but 'messages' key does not contain a list: {type(messages_to_process)}. Returning empty."
+        )
+        return {"messages": []}
+
     nebu_conversation = []
-    for message in messages_input:
+    for message in messages_to_process:  # Use the extracted list
+        # Add check here for robustness against malformed items *within* the list
+        if not isinstance(message, dict):
+            print(f"Warning: Skipping non-dictionary item in message list: {message!r}")
+            continue
+
         role = message.get("role")
         input_content = message.get("content")  # Can be list or string
+        image_url_top_level = message.get("image_url")  # Check for top-level image_url
 
         processed_content = []
 
@@ -143,41 +172,59 @@ def oai_to_unsloth(
                     "image",
                 ):  # Accept 'image' as source key too
                     # Use "image_url" first, then fallback to "image" if needed
-                    image_source = item.get("image_url", item.get("image"))
-                    if image_source:
+                    image_source_value = item.get("image_url", item.get("image"))
+                    image_url_to_load = None
+                    pil_image_to_load = None
+
+                    if item_type == "image_url" and isinstance(
+                        image_source_value, dict
+                    ):
+                        # Handle nested {"url": "..."}
+                        image_url_to_load = image_source_value.get("url")
+                    elif isinstance(image_source_value, str):
+                        # Handle direct URL string or base64 string
+                        image_url_to_load = image_source_value  # Could be URL or base64
+                    elif isinstance(image_source_value, Image.Image):
+                        # Handle direct PIL image
+                        pil_image_to_load = image_source_value
+
+                    if pil_image_to_load:  # If we already have a PIL image
+                        processed_content.append(
+                            {"type": "image", "image": pil_image_to_load}
+                        )
+                    elif (
+                        image_url_to_load
+                    ):  # If we have a URL or base64 string to process
                         pil_image = None
                         try:
-                            if isinstance(
-                                image_source, str
-                            ) and image_source.startswith(("http://", "https://")):
+                            if image_url_to_load.startswith(("http://", "https://")):
                                 # Handle URL
-                                response = requests.get(image_source, stream=True)
+                                response = requests.get(image_url_to_load, stream=True)
                                 response.raise_for_status()  # Raise an exception for bad status codes
                                 pil_image = Image.open(response.raw)
-                            elif isinstance(image_source, str):
+                            else:  # Assume base64
                                 # Handle base64 string
                                 # Remove potential data URI prefix (e.g., "data:image/png;base64,")
-                                if "," in image_source:
-                                    image_source = image_source.split(",", 1)[1]
-                                image_bytes = base64.b64decode(image_source)
+                                if "," in image_url_to_load:
+                                    image_url_to_load = image_url_to_load.split(",", 1)[
+                                        1
+                                    ]
+                                image_bytes = base64.b64decode(image_url_to_load)
                                 pil_image = Image.open(io.BytesIO(image_bytes))
 
-                            elif isinstance(image_source, Image.Image):
-                                # Handle direct PIL.Image input
-                                pil_image = image_source
-
                             if pil_image:
                                 processed_content.append(
                                     {"type": "image", "image": pil_image}
                                 )
                             else:
+                                # This condition might be less likely now with the separated logic
                                 print(
-                                    f"Warning: Could not load image from source: {type(image_source)}"
+                                    f"Warning: Could not load image from source: {type(image_url_to_load)}"
                                 )
 
                         except requests.exceptions.RequestException as e:
                             print(
-                                f"Warning: Failed to fetch image from URL {image_source}: {e}"
+                                f"Warning: Failed to fetch image from URL {image_url_to_load}: {e}"
                             )
                         except (binascii.Error, ValueError) as e:
                             print(f"Warning: Failed to decode base64 image string: {e}")
@@ -190,7 +237,7 @@ def oai_to_unsloth(
 
                     else:
                         print(
-                            "Warning: Image item provided but 'image_url' or 'image' key is missing or empty."
+                            "Warning: Image item provided but could not resolve image source (URL, base64, or PIL Image)."
                         )
 
                 # Add handling for other potential input types if necessary
@@ -199,6 +246,43 @@ def oai_to_unsloth(
             processed_content.append({"type": "text", "text": input_content})
         # else: Handle unexpected content format (e.g., log warning, skip message)
 
+        # Handle potential top-level image_url (after processing content)
+        if image_url_top_level and isinstance(image_url_top_level, str):
+            pil_image = None
+            try:
+                if image_url_top_level.startswith(("http://", "https://")):
+                    # Handle URL
+                    response = requests.get(image_url_top_level, stream=True)
+                    response.raise_for_status()  # Raise an exception for bad status codes
+                    pil_image = Image.open(response.raw)
+                else:
+                    # Assume base64 string if not URL (could refine this check)
+                    # Remove potential data URI prefix
+                    if "," in image_url_top_level:
+                        image_url_top_level = image_url_top_level.split(",", 1)[1]
+                    image_bytes = base64.b64decode(image_url_top_level)
+                    pil_image = Image.open(io.BytesIO(image_bytes))
+
+                if pil_image:
+                    processed_content.append({"type": "image", "image": pil_image})
+                else:
+                    print(
+                        f"Warning: Could not load image from top-level source: {type(image_url_top_level)}"
+                    )
+
+            except requests.exceptions.RequestException as e:
+                print(
+                    f"Warning: Failed to fetch top-level image from URL {image_url_top_level}: {e}"
+                )
+            except (binascii.Error, ValueError) as e:
+                print(f"Warning: Failed to decode top-level base64 image string: {e}")
+            except (IOError, UnidentifiedImageError) as e:
+                print(f"Warning: Failed to open top-level image: {e}")
+            except Exception as e:
+                print(
+                    f"Warning: An unexpected error occurred while processing top-level image: {e}"
+                )
+
         if role and processed_content:
             nebu_conversation.append({"role": role, "content": processed_content})
         # else: Handle missing role or empty content if needed

nebu/processors/consumer.py

@@ -342,7 +342,9 @@ def process_message(message_id: str, message_data: Dict[str, str]) -> None:
             if content_type_name and content_type_name in local_namespace:
                 # Try to create the content type model first
                 try:
-                    content_model = local_namespace[content_type_name](**content)
+                    content_model = local_namespace[content_type_name].model_validate(
+                        content
+                    )
                     print(f"Content model: {content_model}")
                     input_obj = local_namespace["Message"](
                         kind=kind,

nebu/processors/processor.py

@@ -12,6 +12,7 @@ from nebu.processors.models import (
     V1Processors,
     V1ProcessorScaleRequest,
     V1Scale,
+    V1StreamData,
     V1UpdateProcessor,
 )
 
@@ -140,7 +141,7 @@ class Processor:
             patch_response.raise_for_status()
             print(f"Updated Processor {self.processor.metadata.name}")
 
-    def send(self, data: Dict[str, Any]) -> Dict[str, Any]:
+    def send(self, data: Dict[str, Any], wait: bool = False) -> Dict[str, Any]:
         """
         Send data to the processor.
         """
@@ -149,9 +150,14 @@ class Processor:
 
         url = f"{self.processors_url}/{self.processor.metadata.namespace}/{self.processor.metadata.name}/messages"
 
+        stream_data = V1StreamData(
+            content=data,
+            wait=wait,
+        )
+
         response = requests.post(
             url,
-            json=data,
+            json=stream_data.model_dump(exclude_none=True),
             headers={"Authorization": f"Bearer {self.api_key}"},
         )
         response.raise_for_status()

{nebu-0.1.29.dist-info → nebu-0.1.31.dist-info}/METADATA

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

{nebu-0.1.29.dist-info → nebu-0.1.31.dist-info}/RECORD

@@ -1,26 +1,26 @@
 nebu/__init__.py,sha256=5sepbzdAdoA_8TIxws60S4ugFY1apQd_savzn20a4cY,465
 nebu/adapter.py,sha256=yWQCpAn2lJxXPSyQacmFpfVzAL3RrKtKgrSMws0BoT8,211
 nebu/auth.py,sha256=N_v6SPFD9HU_UoRDTaouH03g2Hmo9C-xxqInE1FweXE,1471
-nebu/cache.py,sha256=ngfotHgmT7cvu16kI1Y43pPBBdQt0kUMOk2s3ssNHC4,3292
+nebu/cache.py,sha256=1aY1plIXWOPmUY6GGq_s_QDXzIi5UMuG34XYBA8PpW8,3803
 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=t-8ATcIKEv0oYCMFcYzZIdOZcjDHcvdBazQZOLH7A0k,7906
+nebu/chatx/convert.py,sha256=S_0Q7OTZEeGQZTfqCmshp0UaXJbAR_w9dIBTcyqnlBo,12107
 nebu/chatx/openai.py,sha256=LLSPvVGnauUViAXY7OifwoWlkUGZWfgxEjxR4mjSqZg,44961
 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=Nd5s3C5aYCJvnj5VqhwYekIX9Gkafy1eJtWFTbVQJrM,19635
+nebu/processors/consumer.py,sha256=becQxjQoerlaDdr2_wxzIux3wl8SVmo2LA93RZn0Jk8,19694
 nebu/processors/decorate.py,sha256=9mf25RawOX6_6WyQcRLBIHQC3oCDtofQZijJ13aQM9E,34576
 nebu/processors/default.py,sha256=W4slJenG59rvyTlJ7gRp58eFfXcNOTT2Hfi6zzJAobI,365
 nebu/processors/models.py,sha256=y40HoW-MEzDWB2dm_tsYlUy3Nf3s6eiLC0iGO9BoNog,3956
-nebu/processors/processor.py,sha256=STyzq2CiKD2KCnijVuNebguakNtFQHFf8ef-UTJeyBk,9548
+nebu/processors/processor.py,sha256=EQ3-dBf432fSAQE2A_9ATX-cG5LkJ4fjVaOtlxCoXvc,9719
 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.29.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nebu-0.1.29.dist-info/METADATA,sha256=3Wi5lrW1j5AsloJEypjpCl0RlEKOjvFQugRovKNHvyA,1786
-nebu-0.1.29.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nebu-0.1.29.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
-nebu-0.1.29.dist-info/RECORD,,
+nebu-0.1.31.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nebu-0.1.31.dist-info/METADATA,sha256=gXoUbLOIX6fDnn90IDvX3-fnFhBWRZrVxbJr0ZNbEf0,1786
+nebu-0.1.31.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nebu-0.1.31.dist-info/top_level.txt,sha256=uLIbEKJeGSHWOAJN5S0i5XBGwybALlF9bYoB1UhdEgQ,5
+nebu-0.1.31.dist-info/RECORD,,