nebu 0.1.27__py3-none-any.whl → 0.1.30__py3-none-any.whl

nebu/__init__.py

@@ -3,10 +3,14 @@
 # ruff: noqa: F401
 # ruff: noqa: F403
 
+from .adapter import *
+from .auth import is_allowed
+from .cache import Cache, OwnedValue
+from .chatx.convert import *
+from .chatx.openai import *
 from .config import *
 from .containers.container import Container
 from .containers.models import *
-from .convert import convert_to_unsloth
 from .data import *
 from .meta import *
 from .processors.decorate import *

nebu/adapter.py

@@ -0,0 +1,11 @@
+import time
+
+from pydantic import BaseModel, Field
+
+
+class Adapter(BaseModel):
+    created_at: int = Field(default_factory=lambda: int(time.time()))
+    name: str
+    uri: str
+    base_model: str
+    owner: str

nebu/auth.py

@@ -33,3 +33,18 @@ def get_user_profile(api_key: str) -> V1UserProfile:
     response.raise_for_status()
 
     return V1UserProfile.model_validate(response.json())
+
+
+def is_allowed(
+    resource_owner: str,
+    user_id: Optional[str] = None,
+    orgs: Optional[Dict[str, Dict[str, str]]] = None,
+) -> bool:
+    if orgs is None:
+        orgs = {}
+    owners = []
+    for org_id, _ in orgs.items():
+        owners.append(org_id)
+    if user_id:
+        owners.append(user_id)
+    return resource_owner in owners

nebu/cache.py

@@ -0,0 +1,103 @@
+import os
+import time
+from typing import Any, Optional, cast
+
+import redis
+from pydantic import BaseModel, Field
+
+
+class OwnedValue(BaseModel):
+    created_at: int = Field(default_factory=lambda: int(time.time()))
+    value: str
+    user_id: Optional[str] = None
+    orgs: Optional[Any] = None
+    handle: Optional[str] = None
+    owner: Optional[str] = None
+
+
+class Cache:
+    """
+    A simple cache class that connects to Redis.
+    """
+
+    def __init__(self, host: str = "localhost", port: int = 6379, db: int = 0):
+        """
+        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_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:
+            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 using {connection_info}")
+
+            self.prefix = f"cache:{namespace}"
+        except Exception as e:
+            print(f"Error connecting to Redis: {e}")
+            # Ensure client is None if connection fails at any point
+            self.redis_client = None
+
+    def get(self, key: str) -> str | None:
+        """
+        Gets the value associated with a key from Redis.
+        Returns None if the key does not exist or connection failed.
+        """
+        if not self.redis_client:
+            print("Redis client not connected.")
+            return None
+        try:
+            key = f"{self.prefix}:{key}"
+            # Cast the result to str | None as expected
+            result = self.redis_client.get(key)
+            return cast(str | None, result)
+        except Exception as e:
+            print(f"Error getting key '{key}' from Redis: {e}")
+            return None
+
+    def set(self, key: str, value: str, expiry_seconds: int | None = None) -> bool:
+        """
+        Sets a key-value pair in Redis.
+        Optionally sets an expiry time for the key in seconds.
+        Returns True if successful, False otherwise (e.g., connection failed).
+        """
+        if not self.redis_client:
+            print("Redis client not connected.")
+            return False
+        try:
+            key = f"{self.prefix}:{key}"
+            if expiry_seconds:
+                # Cast the result to bool
+                result = self.redis_client.setex(key, expiry_seconds, value)
+                return cast(bool, result)
+            else:
+                # Cast the result to bool
+                result = self.redis_client.set(key, value)
+                return cast(bool, result)
+        except Exception as e:
+            print(f"Error setting key '{key}' in Redis: {e}")
+            return False

nebu/{convert.py → chatx/convert.py}

@@ -1,34 +1,115 @@
 import base64
 import binascii
 import io
-from typing import Any, Dict, List
+from io import BytesIO
+from typing import Any, Dict, List, Tuple
 
 import requests
 from PIL import Image, UnidentifiedImageError
 
 
-def convert_to_unsloth(
-    messages_input: List[Dict[str, Any]],
-) -> Dict[str, List[Dict[str, Any]]]:
+def convert_to_unsloth_inference(
+    old_schema: Dict[str, Any],
+) -> Tuple[List[Dict[str, Any]], List[Image.Image]]:
     """
-    Converts a list of messages from an OpenAI-like chat format to the Nebulous conversation format.
-    Images specified by URLs or base64 strings are loaded into PIL.Image objects.
-
-    Input format example:
+    Convert from an old OpenAI message format that may look like:
     [
         {
             "role": "user",
             "content": [
-                {"type": "input_text", "text": "Describe the image."},
-                {"type": "input_image", "image_url": "http://... or base64 string"},
-            ]
-        },
+                {"type": "text", "text": "some text"},
+                {"type": "image_url", "image_url": {"url": "https://..."}},
+                ...
+            ],
+        }
+    ]
+
+    to a new format:
+    [
         {
-            "role": "assistant",
-            "content": [{"type": "text", "text": "This is an image of..."}] # Or potentially just a string
+            "role": "user",
+            "content": [
+                {"type": "image"},
+                {"type": "text", "text": "merged user text"}
+            ],
         }
     ]
 
+    Along with the new format, return a list of downloaded PIL Image objects.
+    """
+
+    new_schema = []
+    all_images = []  # Will store PIL images as we convert them
+
+    for message in old_schema:
+        role = message.get("role", "user")
+
+        # Collect all text pieces and all image URLs
+        text_chunks = []
+        image_urls = []
+
+        for content_item in message.get("content", []):
+            content_type = content_item.get("type")
+            if content_type == "text":
+                text_chunks.append(content_item.get("text", ""))
+            elif content_type == "image_url":
+                image_url = content_item.get("image_url", {}).get("url")
+                if image_url:
+                    image_urls.append(image_url)
+
+        # Merge text chunks into one
+        merged_text = " ".join(text_chunks).strip()
+
+        # Convert each URL into a PIL image
+        for url in image_urls:
+            # Download the image
+            response = requests.get(url)
+            response.raise_for_status()
+            image_data = BytesIO(response.content)
+            pil_img = Image.open(image_data).convert("RGB")
+            all_images.append(pil_img)
+
+        # Construct new message format
+        # For simplicity, this example only places one {"type": "image"} placeholder
+        # regardless of how many images were found, and merges all text into one block.
+        new_content = []
+        if 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})
+
+    return new_schema, all_images
+
+
+def oai_to_unsloth(
+    messages_input: Dict[
+        str, Any
+    ],  # Assume input is always dict like {'messages': [...]}
+) -> Dict[str, List[Dict[str, Any]]]:
+    """
+    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 (as dict from JSON line):
+    {
+        "messages": [
+            {
+                "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
+            }
+        ]
+    }
+
     Output format example:
     {
         "messages": [
@@ -46,8 +127,23 @@ def convert_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