nexaai 1.0.19rc3__cp310-cp310-macosx_14_0_universal2.whl → 1.0.19rc5__cp310-cp310-macosx_14_0_universal2.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.19-rc3" 
+__version__ = "1.0.19-rc5" 

nexaai/utils/manifest_utils.py

@@ -332,8 +332,133 @@ def create_mlx_manifest(repo_id: str, files: List[str], directory_path: str, old
     return manifest
 
 
-def detect_model_type(files: List[str]) -> str:
-    """Detect if this is a GGUF or MLX model based on file extensions."""
+def create_npu_manifest(repo_id: str, files: List[str], directory_path: str, old_metadata: Dict[str, Any], is_mmproj: bool = False, file_name: Optional[Union[str, List[str]]] = None, **kwargs) -> Dict[str, Any]:
+    """Create NPU format manifest."""
+    
+    # Load existing manifest to merge NPU files if it exists
+    existing_manifest = load_nexa_manifest(directory_path)
+    
+    # Check if there's a downloaded nexa.manifest from the repo
+    downloaded_manifest = old_metadata.get('downloaded_manifest', {})
+    
+    model_files = {}
+    extra_files = []
+    
+    # Initialize MMProjFile
+    mmproj_file = {
+        "Name": "",
+        "Downloaded": False,
+        "Size": 0
+    }
+    
+    for current_file_name in files:
+        file_path = os.path.join(directory_path, current_file_name)
+        file_size = 0
+        if os.path.exists(file_path):
+            try:
+                file_size = os.path.getsize(file_path)
+            except (OSError, IOError):
+                pass
+        
+        # Check if this file is an mmproj file
+        is_current_mmproj = 'mmproj' in current_file_name.lower()
+        
+        # If we're downloading specific files and this is marked as mmproj, respect that
+        if is_mmproj and file_name is not None:
+            filenames_to_check = file_name if isinstance(file_name, list) else [file_name]
+            is_current_mmproj = current_file_name in filenames_to_check
+        
+        if is_current_mmproj:
+            # This is an mmproj file, put it in MMProjFile
+            mmproj_file = {
+                "Name": current_file_name,
+                "Downloaded": True,
+                "Size": file_size
+            }
+        else:
+            # For NPU, all non-mmproj files go to extra_files
+            extra_files.append({
+                "Name": current_file_name,
+                "Downloaded": True,
+                "Size": file_size
+            })
+    
+    # Pick the first file from extra_files and add it to ModelFile with key "N/A"
+    if extra_files:
+        first_file = extra_files[0]
+        model_files["N/A"] = {
+            "Name": first_file["Name"],
+            "Downloaded": first_file["Downloaded"],
+            "Size": first_file["Size"]
+        }
+    
+    # Determine PluginId with priority: kwargs > downloaded_manifest > model_file_type > default
+    plugin_id = kwargs.get('plugin_id')
+    if not plugin_id:
+        model_file_type = old_metadata.get('model_file_type')
+        if downloaded_manifest.get('PluginId'):
+            plugin_id = downloaded_manifest.get('PluginId')
+        elif model_file_type:
+            plugin_id = _get_plugin_id_from_model_file_type(model_file_type)
+        else:
+            plugin_id = "npu"
+    
+    # Determine ModelType with priority: kwargs > downloaded_manifest > pipeline_tag mapping
+    model_type = kwargs.get('model_type')
+    if not model_type:
+        if downloaded_manifest.get('ModelType'):
+            model_type = downloaded_manifest.get('ModelType')
+        else:
+            model_type = PIPELINE_TO_MODEL_TYPE.get(old_metadata.get('pipeline_tag'), "other")
+    
+    # Determine ModelName with priority: kwargs > downloaded_manifest > empty string
+    model_name = kwargs.get('model_name')
+    if not model_name:
+        model_name = downloaded_manifest.get('ModelName', '')
+    
+    # Get DeviceId and MinSDKVersion from kwargs or default to empty string
+    device_id = kwargs.get('device_id', '')
+    min_sdk_version = kwargs.get('min_sdk_version', '')
+    
+    manifest = {
+        "Name": repo_id,
+        "ModelName": model_name,
+        "ModelType": model_type,
+        "PluginId": plugin_id,
+        "DeviceId": device_id,
+        "MinSDKVersion": min_sdk_version,
+        "ModelFile": model_files,
+        "MMProjFile": mmproj_file,
+        "TokenizerFile": {
+            "Name": "",
+            "Downloaded": False,
+            "Size": 0
+        },
+        "ExtraFiles": extra_files if extra_files else None,
+        # Preserve old metadata fields
+        "pipeline_tag": old_metadata.get('pipeline_tag') if old_metadata.get('pipeline_tag') else existing_manifest.get('pipeline_tag'),
+        "download_time": old_metadata.get('download_time') if old_metadata.get('download_time') else existing_manifest.get('download_time'),
+        "avatar_url": old_metadata.get('avatar_url') if old_metadata.get('avatar_url') else existing_manifest.get('avatar_url')
+    }
+    
+    return manifest
+
+
+def detect_model_type(files: List[str], old_metadata: Dict[str, Any] = None) -> str:
+    """Detect if this is a GGUF, MLX, or NPU model based on file extensions and metadata.
+    
+    Args:
+        files: List of files in the model directory
+        old_metadata: Metadata dict that may contain 'model_file_type'
+        
+    Returns:
+        Model type string: 'gguf', 'mlx', or 'npu'
+    """
+    # Check if model_file_type is explicitly set to NPU
+    if old_metadata and old_metadata.get('model_file_type') == 'npu':
+        return "npu"
+    
+    # Otherwise, detect based on file extensions
     has_gguf = any(f.endswith('.gguf') for f in files)
     has_safetensors = any(f.endswith('.safetensors') or 'safetensors' in f for f in files)
     
@@ -354,7 +479,7 @@ def create_manifest_from_files(repo_id: str, files: List[str], directory_path: s
         repo_id: Repository ID
         files: List of files in the model directory
         directory_path: Path to the model directory
-        old_metadata: Existing metadata (pipeline_tag, download_time, avatar_url)
+        old_metadata: Existing metadata (pipeline_tag, download_time, avatar_url, model_file_type)
         is_mmproj: Whether the downloaded file is an mmproj file
         file_name: The specific file(s) that were downloaded (None if entire repo was downloaded)
         **kwargs: Additional metadata including plugin_id, model_name, model_type, device_id, min_sdk_version
@@ -362,10 +487,12 @@ def create_manifest_from_files(repo_id: str, files: List[str], directory_path: s
     Returns:
         Dict containing the appropriate manifest format
     """
-    model_type = detect_model_type(files)
+    model_type = detect_model_type(files, old_metadata)
     
     if model_type == "gguf":
         return create_gguf_manifest(repo_id, files, directory_path, old_metadata, is_mmproj, file_name, **kwargs)
+    elif model_type == "npu":
+        return create_npu_manifest(repo_id, files, directory_path, old_metadata, is_mmproj, file_name, **kwargs)
     else:  # mlx or other
         return create_mlx_manifest(repo_id, files, directory_path, old_metadata, is_mmproj, file_name, **kwargs)
 

nexaai/utils/model_types.py

@@ -13,7 +13,7 @@ class ModelTypeMapping(Enum):
     """Enum for mapping HuggingFace pipeline_tag to our ModelType."""
     TEXT_GENERATION = ("text-generation", "llm")
     IMAGE_TEXT_TO_TEXT = ("image-text-to-text", "vlm")
-    ANY_TO_ANY = ("any-to-any", "a2a")
+    ANY_TO_ANY = ("any-to-any", "ata")
     AUTOMATIC_SPEECH_RECOGNITION = ("automatic-speech-recognition", "asr")
     
     def __init__(self, pipeline_tag: str, model_type: str):

{nexaai-1.0.19rc3.dist-info → nexaai-1.0.19rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nexaai
-Version: 1.0.19rc3
+Version: 1.0.19rc5
 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.19rc3.dist-info → nexaai-1.0.19rc5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 nexaai/__init__.py,sha256=L8oB7GFZZMGnUpCg0PecDbI_ycKuQak-ZEJ4Y12_QIw,2184
-nexaai/_stub.cpython-310-darwin.so,sha256=gU1-7T8bFDL1yl7mKFSMwcriX0RN_h9P4UptbbbIOKQ,66768
-nexaai/_version.py,sha256=biSqFffhgVgZ7_N05gIols4ugoQJvVDrVGL8JTj6o5c,143
+nexaai/_stub.cpython-310-darwin.so,sha256=jf63NdYbs7Wv6p53PWKrd7y4gtNRomirR2pdY2sXu8M,66768
+nexaai/_version.py,sha256=LMA557zx5P3hvpk0d7lsVKacPlWeQ9AVuVRclTomHtk,143
 nexaai/asr.py,sha256=NljMXDErwPNMOPaRkJZMEDka9Nk8xyur7L8i924TStY,2054
 nexaai/base.py,sha256=N8PRgDFA-XPku2vWnQIofQ7ipz3pPlO6f8YZGnuhquE,982
 nexaai/common.py,sha256=Y0NJNLTi4Nq4x1WL6PQsSvGUto0eGmWhjpsC6jcekfA,3444
@@ -19,7 +19,7 @@ nexaai/asr_impl/pybind_asr_impl.py,sha256=pE9Hb_hMi5yAc4MF83bLVOb8zDtreCkB3_u7XE
 nexaai/binds/__init__.py,sha256=eYuay_8DDXeOUWz2_R9HFSabohxs6hvZn391t2L0Po0,104
 nexaai/binds/common_bind.cpython-310-darwin.so,sha256=zxJuD0nSV--VZKxBfWZUavU7_bHj_JTi0FhkjvG4VJw,235264
 nexaai/binds/embedder_bind.cpython-310-darwin.so,sha256=tPa0c0Dv_GiW66fgmAGWGCHXRGNApznqoQS0eQx9GFM,202064
-nexaai/binds/libnexa_bridge.dylib,sha256=xJ72KZaM0M1fd9-GgkzrgShsdViSDqfThDZ_nujw-Sw,251192
+nexaai/binds/libnexa_bridge.dylib,sha256=SMwmGIzFMbPVaqGiNFMAywQONO5mU78SaS7eUy8xBQA,251192
 nexaai/binds/llm_bind.cpython-310-darwin.so,sha256=TAWfa1Hzq00TjtC1xVsiAeLp6hv2LrL5afDz4omUghc,182784
 nexaai/binds/vlm_bind.cpython-310-darwin.so,sha256=nd6eG_m2EiPthzkSZ97hlXWUOZQir4cQfFJZ4p6eR2U,182704
 nexaai/binds/nexa_llama_cpp/libggml-base.dylib,sha256=JM4oOkie1su0ES5hMdtILeQHlRukRzH1vTleTupUXhg,650736
@@ -547,15 +547,15 @@ nexaai/tts_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexaai/tts_impl/mlx_tts_impl.py,sha256=i_uNPdvlXYtL3e01oKjDlP9jgkWCRt1bBHsExaaiJi8,3101
 nexaai/tts_impl/pybind_tts_impl.py,sha256=mpn44r6pfYLIl-NrEy2dXHjGtWtNCmM7HRyxiANxUI4,1444
 nexaai/utils/decode.py,sha256=61n4Zf6c5QLyqGoctEitlI9BX3tPlP2a5aaKNHbw3T4,404
-nexaai/utils/manifest_utils.py,sha256=Teji_i_ZG0IkiKWNKKwCq1j_a2k406db7bnd_MC4nu0,16195
+nexaai/utils/manifest_utils.py,sha256=SCcFN09xNI0DiTA1U7DZwWiQsRH0CInWSny_9q0BwNM,21273
 nexaai/utils/model_manager.py,sha256=NnbPv1iuwo6T523gLsWjnff-gGvPGUjez-rFg8-ffpE,59568
-nexaai/utils/model_types.py,sha256=9Q95icWn22jIUoY2eIEdIiXBBGJSGZlXXSbox0xXWNQ,1483
+nexaai/utils/model_types.py,sha256=ONWjjo8CFPdhxki6qo7MXnSZaEzjBcxa_Kkf_y5NXus,1483
 nexaai/utils/progress_tracker.py,sha256=jdUqtmPqyhwC9uSKvQcJEYETwSt-OhP4oitdJ94614o,15394
 nexaai/utils/quantization_utils.py,sha256=FYcNSAKGlBqFDUTx3jSKOr2lnq4nyiyC0ZG8oSxFwiU,7825
 nexaai/vlm_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexaai/vlm_impl/mlx_vlm_impl.py,sha256=pLtWm_ckz8a0U-AtAOMVseFDO4OVPvHyYO2KlfBaGYk,10833
 nexaai/vlm_impl/pybind_vlm_impl.py,sha256=FAbhpRJzHgI78r0mUvKybO97R1szvNhH0aTn_I52oT4,8597
-nexaai-1.0.19rc3.dist-info/METADATA,sha256=mK5fFMBrvvErJcvUuUkSXWqJ8kBemVHKYKzYDGZVhfs,1201
-nexaai-1.0.19rc3.dist-info/WHEEL,sha256=T2p57lol9__xkoU6aJTyN1Pm43ZpRU3q6km7mIbrAMs,114
-nexaai-1.0.19rc3.dist-info/top_level.txt,sha256=LRE2YERlrZk2vfuygnSzsEeqSknnZbz3Z1MHyNmBU4w,7
-nexaai-1.0.19rc3.dist-info/RECORD,,
+nexaai-1.0.19rc5.dist-info/METADATA,sha256=uxc1JkJYwh1ZVFYNk7W7_95zmk6PAUvXBEnIGH700sU,1201
+nexaai-1.0.19rc5.dist-info/WHEEL,sha256=T2p57lol9__xkoU6aJTyN1Pm43ZpRU3q6km7mIbrAMs,114
+nexaai-1.0.19rc5.dist-info/top_level.txt,sha256=LRE2YERlrZk2vfuygnSzsEeqSknnZbz3Z1MHyNmBU4w,7
+nexaai-1.0.19rc5.dist-info/RECORD,,