From ea354ce621e9af45f9f8defa864229ee3518b713 Mon Sep 17 00:00:00 2001
From: Faisal Amir <urmauur@gmail.com>
Date: Tue, 16 Sep 2025 15:44:58 +0700
Subject: [PATCH] fix/validate-mmproj-from-general-basename

---
 .../dialogs/ImportVisionModelDialog.tsx       | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/web-app/src/containers/dialogs/ImportVisionModelDialog.tsx b/web-app/src/containers/dialogs/ImportVisionModelDialog.tsx
index f1eb77b22..47851963d 100644
--- a/web-app/src/containers/dialogs/ImportVisionModelDialog.tsx
+++ b/web-app/src/containers/dialogs/ImportVisionModelDialog.tsx
@@ -57,8 +57,6 @@ export const ImportVisionModelDialog = ({
     }
 
     try {
-      console.log(`Reading GGUF metadata for ${fileType}:`, filePath)
-
       // Handle validation differently for model files vs mmproj files
       if (fileType === 'model') {
         // For model files, use the standard validateGgufFile method
@@ -66,16 +64,16 @@ export const ImportVisionModelDialog = ({
           const result = await serviceHub.models().validateGgufFile(filePath)
 
           if (result.metadata) {
-            // Log full metadata for debugging
-            console.log(
-              `Full GGUF metadata for ${fileType}:`,
-              JSON.stringify(result.metadata, null, 2)
-            )
-
             // Check architecture from metadata
             const architecture =
               result.metadata.metadata?.['general.architecture']
-            console.log(`${fileType} architecture:`, architecture)
+
+            // Extract baseName and use it as model name if available
+            const baseName = result.metadata.metadata?.['general.basename']
+
+            if (baseName) {
+              setModelName(baseName)
+            }
 
             // Model files should NOT be clip
             if (architecture === 'clip') {
@@ -86,11 +84,6 @@ export const ImportVisionModelDialog = ({
                 'CLIP architecture detected in model file:',
                 architecture
               )
-            } else {
-              console.log(
-                'Model validation passed. Architecture:',
-                architecture
-              )
             }
           }
 
@@ -109,16 +102,15 @@ export const ImportVisionModelDialog = ({
             path: filePath,
           })
 
-          console.log(
-            `Full GGUF metadata for ${fileType}:`,
-            JSON.stringify(metadata, null, 2)
-          )
 
           // Check if architecture matches expected type
           const architecture = (
             metadata as { metadata?: Record<string, string> }
           ).metadata?.['general.architecture']
-          console.log(`${fileType} architecture:`, architecture)
+
+          // Get general.baseName from metadata
+          const baseName = (metadata as { metadata?: Record<string, string> })
+            .metadata?.['general.basename']
 
           // MMProj files MUST be clip
           if (architecture !== 'clip') {
@@ -128,11 +120,19 @@ export const ImportVisionModelDialog = ({
               'Non-CLIP architecture detected in mmproj file:',
               architecture
             )
-          } else {
-            console.log(
-              'MMProj validation passed. Architecture:',
-              architecture
-            )
+          } else if (
+            baseName &&
+            modelName &&
+            !modelName.toLowerCase().includes(baseName.toLowerCase()) &&
+            !baseName.toLowerCase().includes(modelName.toLowerCase())
+          ) {
+            // Validate that baseName and model name are compatible (one should contain the other)
+            const errorMessage = `MMProj file baseName "${baseName}" does not match model name "${modelName}". The MMProj file should be compatible with the selected model.`
+            setMmprojValidationError(errorMessage)
+            console.error('BaseName mismatch in mmproj file:', {
+              baseName,
+              modelName,
+            })
           }
         } catch (directError) {
           console.error('Failed to validate mmproj file directly:', directError)
@@ -179,14 +179,14 @@ export const ImportVisionModelDialog = ({
 
       if (type === 'model') {
         setModelFile(selectedFile)
-        // Auto-generate model name from GGUF file
+        // Set temporary model name from filename (will be overridden by baseName from metadata if available)
         const sanitizedName = fileName
           .replace(/\s/g, '-')
           .replace(/\.(gguf|GGUF)$/, '')
           .replace(/[^a-zA-Z0-9/_.-]/g, '') // Remove any characters not allowed in model IDs
         setModelName(sanitizedName)
 
-        // Validate the selected model file
+        // Validate the selected model file (this will update model name with baseName from metadata)
         await validateModelFile(selectedFile)
       } else {
         setMmProjFile(selectedFile)