nexaai 1.0.12rc1__cp310-cp310-macosx_13_0_x86_64.whl → 1.0.13rc1__cp310-cp310-macosx_13_0_x86_64.whl

nexaai/_version.py

@@ -1,4 +1,4 @@
 # This file is generated by CMake from _version.py.in
 # Do not modify this file manually - it will be overwritten
 
-__version__ = "1.0.12-rc1" 
+__version__ = "1.0.13-rc1" 

nexaai/binds/__init__.py

@@ -1,3 +1,4 @@
 from .common_bind import *
 from .llm_bind import *
 from .embedder_bind import *
+from .vlm_bind import *

nexaai/utils/model_manager.py

@@ -1124,15 +1124,64 @@ def download_from_huggingface(
 ##########################################################################
 
 
+def _download_model_if_needed(
+    model_path: str,
+    param_name: str,
+    progress_callback: Optional[Callable[[Dict[str, Any]], None]] = None,
+    token: Union[bool, str, None] = None
+) -> str:
+    """
+    Helper function to download a model from HuggingFace if it doesn't exist locally.
+    
+    Args:
+        model_path: The model path that may be local or remote
+        param_name: Name of the parameter (for error messages)
+        progress_callback: Callback function for download progress updates
+        token: HuggingFace authentication token for private repositories
+        
+    Returns:
+        str: Local path to the model (either existing or downloaded)
+        
+    Raises:
+        RuntimeError: If download fails
+    """
+    # Check if model_path exists locally (file or directory)
+    if os.path.exists(model_path):
+        # Local path exists, return as-is
+        return model_path
+    
+    # Model path doesn't exist locally, try to download from HuggingFace
+    try:
+        # Parse model_path to extract repo_id and filename
+        repo_id, file_name = _parse_model_path(model_path)
+        
+        # Download the model
+        downloaded_path = download_from_huggingface(
+            repo_id=repo_id,
+            file_name=file_name,
+            local_dir=None,  # Use default cache directory
+            enable_transfer=True,
+            progress_callback=progress_callback,
+            show_progress=True,
+            token=token
+        )
+        
+        return downloaded_path
+        
+    except Exception as e:
+        # Only handle download-related errors
+        raise RuntimeError(f"Could not load model from '{param_name}={model_path}': {e}")
+
+
 def auto_download_model(func: Callable) -> Callable:
     """
     Decorator that automatically downloads models from HuggingFace if they don't exist locally.
     
-    This decorator should be applied to __init__ methods that take a name_or_path parameter.
-    If name_or_path doesn't exist as a local file/directory, it will attempt to download
-    it from HuggingFace Hub using the download_from_huggingface function.
+    This decorator should be applied to __init__ methods that take a name_or_path parameter
+    and optionally an mmproj_path parameter. If these paths don't exist as local files/directories,
+    it will attempt to download them from HuggingFace Hub using the download_from_huggingface function.
     
-    The name_or_path can be in formats like:
+    The name_or_path and mmproj_path can be in formats like:
     - "microsoft/DialoGPT-small" (downloads entire repo)  
     - "microsoft/DialoGPT-small/pytorch_model.bin" (downloads specific file)
     - "Qwen/Qwen3-4B-GGUF/Qwen3-4B-Q4_K_M.gguf" (downloads specific file)
@@ -1149,21 +1198,6 @@ def auto_download_model(func: Callable) -> Callable:
     """
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
-        # Find name_or_path in arguments
-        # Assuming name_or_path is the first argument after self
-        if len(args) >= 2:
-            name_or_path = args[1]
-            args_list = list(args)
-            path_index = 1
-            is_positional = True
-        elif 'name_or_path' in kwargs:
-            name_or_path = kwargs['name_or_path']
-            path_index = None
-            is_positional = False
-        else:
-            # No name_or_path found, call original function
-            return func(*args, **kwargs)
-        
         # Extract progress_callback and token from arguments
         progress_callback = None
         if 'progress_callback' in kwargs:
@@ -1173,39 +1207,63 @@ def auto_download_model(func: Callable) -> Callable:
         if 'token' in kwargs:
             token = kwargs.pop('token')  # Remove from kwargs to avoid passing to original func
         
-        # Check if name_or_path exists locally (file or directory)
-        if os.path.exists(name_or_path):
-            # Local path exists, use as-is without downloading
+        # Handle name_or_path parameter
+        name_or_path = None
+        name_path_index = None
+        is_name_positional = False
+        
+        # Find name_or_path in arguments
+        # Assuming name_or_path is the first argument after self
+        if len(args) >= 2:
+            name_or_path = args[1]
+            args_list = list(args)
+            name_path_index = 1
+            is_name_positional = True
+        elif 'name_or_path' in kwargs:
+            name_or_path = kwargs['name_or_path']
+            is_name_positional = False
+        
+        # Handle mmproj_path parameter
+        mmproj_path = None
+        if 'mmproj_path' in kwargs:
+            mmproj_path = kwargs['mmproj_path']
+        
+        # If neither parameter is found, call original function
+        if name_or_path is None and mmproj_path is None:
             return func(*args, **kwargs)
         
-        # Model path doesn't exist locally, try to download from HuggingFace
-        try:
-            # Parse name_or_path to extract repo_id and filename
-            repo_id, file_name = _parse_model_path(name_or_path)
-            
-            # Download the model
-            downloaded_path = download_from_huggingface(
-                repo_id=repo_id,
-                file_name=file_name,
-                local_dir=None,  # Use default cache directory
-                enable_transfer=True,
-                progress_callback=progress_callback,  # Use the extracted callback
-                show_progress=True,
-                token=token  # Use the extracted token
-            )
-            
-            # Replace name_or_path with downloaded path
-            if is_positional:
-                args_list[path_index] = downloaded_path
-                args = tuple(args_list)
-            else:
-                kwargs['name_or_path'] = downloaded_path
-            
-        except Exception as e:
-            # Only handle download-related errors
-            raise RuntimeError(f"Could not load model from '{name_or_path}': {e}")
+        # Download name_or_path if needed
+        if name_or_path is not None:
+            try:
+                downloaded_name_path = _download_model_if_needed(
+                    name_or_path, 'name_or_path', progress_callback, token
+                )
+                
+                # Replace name_or_path with downloaded path
+                if is_name_positional:
+                    if name_path_index is not None:
+                        args_list[name_path_index] = downloaded_name_path
+                        args = tuple(args_list)
+                else:
+                    kwargs['name_or_path'] = downloaded_name_path
+                    
+            except Exception as e:
+                raise e  # Re-raise the error from _download_model_if_needed
+        
+        # Download mmproj_path if needed
+        if mmproj_path is not None:
+            try:
+                downloaded_mmproj_path = _download_model_if_needed(
+                    mmproj_path, 'mmproj_path', progress_callback, token
+                )
+                
+                # Replace mmproj_path with downloaded path
+                kwargs['mmproj_path'] = downloaded_mmproj_path
+                
+            except Exception as e:
+                raise e  # Re-raise the error from _download_model_if_needed
         
-        # Call original function with updated path (outside try-catch to let model creation errors bubble up)
+        # Call original function with updated paths (outside try-catch to let model creation errors bubble up)
         return func(*args, **kwargs)
     
     return wrapper

nexaai/vlm_impl/pybind_vlm_impl.py

@@ -1,7 +1,6 @@
 from typing import Generator, Optional, List, Dict, Any, Union
 import queue
 import threading
-import base64
 from pathlib import Path
 
 from nexaai.common import ModelConfig, GenerationConfig, MultiModalMessage, PluginID
@@ -102,26 +101,16 @@ class PyBindVLMImpl(VLM):
                 t = c["type"]
                 if t == "text":
                     blocks.append({"type": "text", "text": c.get("text","") or ""})
+                elif t == "image":
+                    # Pass through the original structure - let vlm-bind.cpp handle field extraction
+                    blocks.append(c)
                 else:
-                    # image/audio/video
-                    src = c.get("url") or c.get("path")
-                    if not src:
-                        raise ValueError(f"No url/path for {t}")
-                    # read local file or strip data URI
-                    if Path(src).exists():
-                        raw = Path(src).read_bytes()
-                        b64 = base64.b64encode(raw).decode("ascii")
-                        blocks.append({"type": t, "text": b64})
-                    elif src.startswith("data:"):
-                        b64 = src.split(",",1)[1]
-                        blocks.append({"type": t, "text": b64})
-                    else:
-                        # remote URL
-                        blocks.append({"type": t, "text": src})
+                    raise ValueError(f"Unsupported content type: {t}. Use 'text' or 'image' to match the golden reference in vlm.cpp")
 
             payload.append({"role": role, "content": blocks})
 
-        return vlm_bind.ml_vlm_apply_chat_template(self._handle, payload, tools)
+        result = vlm_bind.ml_vlm_apply_chat_template(self._handle, payload, tools)
+        return result
 
     def generate_stream(self, prompt: str, g_cfg: GenerationConfig = GenerationConfig()) -> Generator[str, None, None]:
         """Generate text with streaming."""

{nexaai-1.0.12rc1.dist-info → nexaai-1.0.13rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nexaai
-Version: 1.0.12rc1
+Version: 1.0.13rc1
 Summary: Python bindings for NexaSDK C-lib backend
 Author-email: "Nexa AI, Inc." <dev@nexa.ai>
 Project-URL: Homepage, https://github.com/NexaAI/nexasdk-bridge

{nexaai-1.0.12rc1.dist-info → nexaai-1.0.13rc1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 nexaai/__init__.py,sha256=jXdC4vv6DBK1fVewYTYSUhOOYfvf_Mk81UIeMGGIKUg,2029
-nexaai/_stub.cpython-310-darwin.so,sha256=9VzNDEo89QZB144PAC2Wn8s7I8iER3r0We0qTBJf1nE,49832
-nexaai/_version.py,sha256=szohTDI5dEmwOKD5OkFBXNf_BUsFGffIiuRLsNYkFes,143
+nexaai/_stub.cpython-310-darwin.so,sha256=R8fF_ouYUW419bQTnDSU8pu9M2bskkgYjx2DFG5qSsQ,49832
+nexaai/_version.py,sha256=akSnDABX0T874oWowjXB3MrX7aTHCZHWA6-X80hJ7bY,143
 nexaai/asr.py,sha256=NljMXDErwPNMOPaRkJZMEDka9Nk8xyur7L8i924TStY,2054
 nexaai/base.py,sha256=N8PRgDFA-XPku2vWnQIofQ7ipz3pPlO6f8YZGnuhquE,982
 nexaai/common.py,sha256=yBnIbqYaQYnfrl7IczOBh6MDibYZVxwaRJEglYcKgGs,3422
@@ -15,13 +15,14 @@ nexaai/vlm.py,sha256=3voXmAVnGlXnOiwA3wcX4p0Lvmp0X1VKkQVPObJdwBY,4649
 nexaai/asr_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexaai/asr_impl/mlx_asr_impl.py,sha256=eosd8-TIWAOwV0HltmoFrLwzXHcU4jyxtncvuZE9pgA,3257
 nexaai/asr_impl/pybind_asr_impl.py,sha256=pE9Hb_hMi5yAc4MF83bLVOb8zDtreCkB3_u7XED9YpA,1516
-nexaai/binds/__init__.py,sha256=T9Ua7SzHNglSeEqXlfH5ymYXRyXhNKkC9z_y_bWCNMo,80
+nexaai/binds/__init__.py,sha256=eYuay_8DDXeOUWz2_R9HFSabohxs6hvZn391t2L0Po0,104
 nexaai/binds/common_bind.cpython-310-darwin.so,sha256=7xH5yNkK6Ot-2f9vxmultr9NIeTemlmN5tHIYp8SZHs,233960
 nexaai/binds/embedder_bind.cpython-310-darwin.so,sha256=eQwf9m58Yrl_ZZzWlstBHfHD-s3UMFi0JNPty-Pc524,202032
 nexaai/binds/libcrypto.dylib,sha256=ysW8ydmDPnnNRy3AHESjJwMTFfmGDKU9eLIaiR37ca0,5091432
-nexaai/binds/libnexa_bridge.dylib,sha256=w0XiFs2v3uoojLBFLag9mSMAydDHmaJFrT-yFaRZRyA,250592
+nexaai/binds/libnexa_bridge.dylib,sha256=fAc-fbOkwd_5rPLHJ-c01dEG5YeFjM25iqRslIIeBIw,250592
 nexaai/binds/libssl.dylib,sha256=JHPTSbRFnImmoWDO9rFdiKb0lJMT3q78VEsx-5-S0sk,889520
 nexaai/binds/llm_bind.cpython-310-darwin.so,sha256=08DuSv91LIVCS5BSfSx3Nuz088h62lm3MV2yDTSIKt4,183008
+nexaai/binds/vlm_bind.cpython-310-darwin.so,sha256=x1hxuCx09P69swsVj46FXHKUH5Ln39ISBjBscyJWESM,183000
 nexaai/binds/nexa_llama_cpp/libggml-base.dylib,sha256=GyOkHOM-5uHp7NUZ4Sr9BWak6BYpcc9aqI9A-zPnQp4,629528
 nexaai/binds/nexa_llama_cpp/libggml-cpu.so,sha256=cnLUQ7WdX-5iiDaH8v45u1kX1NUmK8DanpzSMGCpXPE,1039800
 nexaai/binds/nexa_llama_cpp/libggml-metal.so,sha256=Xhhl_tLg1xmCIQVrKjqPFaLHAlx_2wUFiwDyUk0wJ-E,713680
@@ -359,14 +360,14 @@ nexaai/tts_impl/pybind_tts_impl.py,sha256=mpn44r6pfYLIl-NrEy2dXHjGtWtNCmM7HRyxiA
 nexaai/utils/avatar_fetcher.py,sha256=bWy8ujgbOiTHFCjFxTwkn3uXbZ84PgEGUkXkR3MH4bI,3821
 nexaai/utils/decode.py,sha256=61n4Zf6c5QLyqGoctEitlI9BX3tPlP2a5aaKNHbw3T4,404
 nexaai/utils/manifest_utils.py,sha256=2waOuQErodNHhoAETQqlQgXdVes-T5A4HMb8pUIN9hg,9765
-nexaai/utils/model_manager.py,sha256=T7I4HvjMhLqkWutydzWKFOZNFWrTxVT7-WHx-XKX3KM,50269
+nexaai/utils/model_manager.py,sha256=ELmF2gVw7c0f_oGbbx0ldXrmCuJVxTZ9X-xsW59zWks,52300
 nexaai/utils/model_types.py,sha256=-DER8L4lAUR_iLS99F0r57avwqWtuN21ug5pX2p24_E,1369
 nexaai/utils/progress_tracker.py,sha256=jdUqtmPqyhwC9uSKvQcJEYETwSt-OhP4oitdJ94614o,15394
 nexaai/utils/quantization_utils.py,sha256=4gvp6UQfSO9G1FYBwnFtQspTzH9sDbi1PBXw2t1N69M,7650
 nexaai/vlm_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexaai/vlm_impl/mlx_vlm_impl.py,sha256=od1R1mRoIgPG3NHC7JiDlcB_YJY8aklX8Em3ZkeHNpE,10734
-nexaai/vlm_impl/pybind_vlm_impl.py,sha256=5ZMFgDATthmMzjrd-vE5KX5ZAMoWPYbF_FTLz8DBKIk,8908
-nexaai-1.0.12rc1.dist-info/METADATA,sha256=kN9eRlmv408cw-PhvdNvM4lL_GYL9UyBM4P37fWbixI,1201
-nexaai-1.0.12rc1.dist-info/WHEEL,sha256=0KYp5feZ1CMUhsfFXKpSQTbSmQbXy4mv6yPPVBXg2EM,110
-nexaai-1.0.12rc1.dist-info/top_level.txt,sha256=LRE2YERlrZk2vfuygnSzsEeqSknnZbz3Z1MHyNmBU4w,7
-nexaai-1.0.12rc1.dist-info/RECORD,,
+nexaai/vlm_impl/pybind_vlm_impl.py,sha256=n4lBTeDA9i07Fz1sq4694XkA2XQtnJnR9RaaKK0CrcM,8458
+nexaai-1.0.13rc1.dist-info/METADATA,sha256=2ZDKnf6R77BIkVCNLzAdpGXwoXEoY-GL6R3oHUJPcns,1201
+nexaai-1.0.13rc1.dist-info/WHEEL,sha256=0KYp5feZ1CMUhsfFXKpSQTbSmQbXy4mv6yPPVBXg2EM,110
+nexaai-1.0.13rc1.dist-info/top_level.txt,sha256=LRE2YERlrZk2vfuygnSzsEeqSknnZbz3Z1MHyNmBU4w,7
+nexaai-1.0.13rc1.dist-info/RECORD,,