Upload 2 files

scripts/ComfyUI/Install-ComfyUI.ps1

@@ -217,50 +217,46 @@ Write-Log "  - Installing ComfyUI requirements..."
 Invoke-AndLog "$venvPython" "-m pip install -r `"$comfyPath\requirements.txt`""
 
 # --- Étape 5: Installation des Custom Nodes ---
-Write-Log "`nStep 5: Installing custom nodes..." -Color Yellow
-$customNodesPath = Join-Path $InstallPath "custom_nodes" # Définit le chemin pour les noeuds
-# ... (La liste des noeuds est inchangée)
-$customNodes = @(
-    @{Name="ComfyUI-Manager"; Repo="https://github.com/ltdrdata/ComfyUI-Manager.git"; HasRequirements=$false},
-    @{Name="ComfyUI-Impact-Pack"; Repo="https://github.com/ltdrdata/ComfyUI-Impact-Pack"; HasRequirements=$true},
-    @{Name="ComfyUI-Impact-Subpack"; Repo="https://github.com/ltdrdata/ComfyUI-Impact-Subpack"; Subfolder="ComfyUI-Impact-Pack/impact_subpack"; HasRequirements=$true},
-    @{Name="ComfyUI-GGUF"; Repo="https://github.com/city96/ComfyUI-GGUF"; HasRequirements=$true},
-    @{Name="ComfyUI-mxToolkit"; Repo="https://github.com/Smirnov75/ComfyUI-mxToolkit"; HasRequirements=$false},
-    @{Name="ComfyUI-Custom-Scripts"; Repo="https://github.com/pythongosssss/ComfyUI-Custom-Scripts"; HasRequirements=$false},
-    @{Name="ComfyUI-KJNodes"; Repo="https://github.com/kijai/ComfyUI-KJNodes"; HasRequirements=$true},
-    @{Name="ComfyUI-WanVideoWrapper"; Repo="https://github.com/kijai/ComfyUI-WanVideoWrapper"; HasRequirements=$true},
-    @{Name="ComfyUI-VideoHelperSuite"; Repo="https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite"; HasRequirements=$true},
-    @{Name="ComfyUI-Frame-Interpolation"; Repo="https://github.com/Fannovel16/ComfyUI-Frame-Interpolation"; RequirementsFile="requirements-with-cupy.txt"; HasRequirements=$true},
-    @{Name="rgthree-comfy"; Repo="https://github.com/rgthree/rgthree-comfy"; HasRequirements=$true},
-    @{Name="ComfyUI-Easy-Use"; Repo="https://github.com/yolain/ComfyUI-Easy-Use"; HasRequirements=$true},
-    @{Name="ComfyUI_PuLID_Flux_ll"; Repo="https://github.com/lldacing/ComfyUI_PuLID_Flux_ll"; HasRequirements=$true},
-    @{Name="ComfyUI-HunyuanVideoMultiLora"; Repo="https://github.com/facok/ComfyUI-HunyuanVideoMultiLora"; HasRequirements=$false},
-    @{Name="was-node-suite-comfyui"; Repo="https://github.com/WASasquatch/was-node-suite-comfyui"; HasRequirements=$true},
-    @{Name="ComfyUI-Florence2"; Repo="https://github.com/kijai/ComfyUI-Florence2"; HasRequirements=$true},
-    @{Name="ComfyUI-MultiGPU"; Repo="https://github.com/pollockjj/ComfyUI-MultiGPU"; HasRequirements=$false},
-    @{Name="ComfyUI-WanStartEndFramesNative"; Repo="https://github.com/Flow-two/ComfyUI-WanStartEndFramesNative"; HasRequirements=$false},
-    @{Name="ComfyUI-Image-Saver"; Repo="https://github.com/alexopus/ComfyUI-Image-Saver"; HasRequirements=$true},
-    @{Name="ComfyUI_UltimateSDUpscale"; Repo="https://github.com/ssitu/ComfyUI_UltimateSDUpscale"; HasRequirements=$false},
-    @{Name="comfyui_controlnet_aux"; Repo="https://github.com/Fannovel16/comfyui_controlnet_aux"; HasRequirements=$true},
-    @{Name="x-flux-comfyui"; Repo="https://github.com/XLabs-AI/x-flux-comfyui"; HasRequirements=$true},
-    @{Name="ComfyUI-RMBG"; Repo="https://github.com/1038lab/ComfyUI-RMBG"; HasRequirements=$true},
-    @{Name="ComfyUI-Detail-Daemon"; Repo="https://github.com/Jonseed/ComfyUI-Detail-Daemon"; HasRequirements=$true},
-    @{Name="ComfyUI-TeaCache"; Repo="https://github.com/welltop-cn/ComfyUI-TeaCache"; HasRequirements=$true},
-    @{Name="ComfyUI-Crystools"; Repo="https://github.com/crystian/ComfyUI-Crystools"; HasRequirements=$true}
-)
-foreach ($node in $customNodes) {
-    $nodePath = if ($node.Subfolder) { Join-Path $customNodesPath $node.Subfolder } else { Join-Path $customNodesPath $node.Name }
-    if (-not (Test-Path $nodePath)) {
-        Write-Log "  - Installing $($node.Name)..."
-        $cloneTargetPath = if ($node.Subfolder) { (Split-Path $nodePath -Parent) } else { $nodePath }
-        if ($node.Name -eq 'ComfyUI-Impact-Subpack') { $clonePath = Join-Path $cloneTargetPath "impact_subpack" } else { $clonePath = $cloneTargetPath }
-        Invoke-AndLog "git" "clone $($node.Repo) `"$clonePath`""
-        if ($node.HasRequirements) {
-            $requirementsFile = if ($node.RequirementsFile) { $node.RequirementsFile } else { "requirements.txt" }
-            $reqPath = Join-Path $nodePath $requirementsFile
-            if (Test-Path $reqPath) { Invoke-AndLog "$venvPython" "-m pip install -r `"$reqPath`"" }
+Write-Log "`nStep 5: Installing custom nodes from CSV list..." -Color Yellow
+
+$csvUrl = "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/scripts/Nodes_installer/custom_nodes.csv"
+$scriptsFolder = Join-Path $InstallPath "scripts"
+$csvPath = Join-Path $scriptsFolder "custom_nodes.csv"
+
+# Télécharge la dernière liste de custom nodes
+Download-File -Uri $csvUrl -OutFile $csvPath
+
+if (-not (Test-Path $csvPath)) {
+    Write-Log "  - ERREUR: Impossible de télécharger la liste des custom nodes. Étape ignorée." -Color Red
+} else {
+    $customNodes = Import-Csv -Path $csvPath
+    $customNodesPath = Join-Path $comfyPath "custom_nodes"
+
+    foreach ($node in $customNodes) {
+        $nodeName = $node.Name
+        $repoUrl = $node.RepoUrl
+        
+        # Détermine le chemin d'installation final
+        $nodePath = if ($node.Subfolder) { Join-Path $customNodesPath $node.Subfolder } else { Join-Path $customNodesPath $nodeName }
+        
+        if (-not (Test-Path $nodePath)) {
+            Write-Log "  - Installing $nodeName..."
+            
+            # Gère le cas spécial du subpack
+            $cloneTargetPath = if ($node.Subfolder) { (Split-Path $nodePath -Parent) } else { $nodePath }
+            if ($nodeName -eq 'ComfyUI-Impact-Subpack') { $clonePath = Join-Path $cloneTargetPath "impact_subpack" } else { $clonePath = $cloneTargetPath }
+            
+            Invoke-AndLog "git" "clone $repoUrl `"$clonePath`""
+            
+            # Installe les dépendances si un fichier est spécifié
+            if ($node.RequirementsFile) {
+                $reqPath = Join-Path $nodePath $node.RequirementsFile
+                if (Test-Path $reqPath) { Invoke-AndLog "$venvPython" "-m pip install -r `"$reqPath`"" }
+            }
+        } else {
+            Write-Log "  - $nodeName (already exists, skipping)" -Color Green
         }
-    } else { Write-Log "  - $($node.Name) (already exists, skipping)" -Color Green }
+    }
 }
 
 # --- Étape 6: Installation des modules Python supplémentaires ---
@@ -270,19 +266,6 @@ Write-Log "`nStep 6: Installing supplementary modules..." -Color Yellow
 Write-Log "  - Installing Visual Studio Build Tools..."
 winget install --id Microsoft.VisualStudio.2022.BuildTools -e --source winget --override "--quiet --wait --norestart --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.20348"
 
-# Python include/libs
-Write-Log "  - Installing Python include/libs for compatibility..."
-$pyLibsUrl = "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/others/python_3.12.9_include_libs.zip"
-$zipPath = Join-Path $InstallPath "python_libs.tmp.zip"
-$extractPath = Join-Path $comfyPath "venv" # On extrait dans le venv
-Download-File -Uri $pyLibsUrl -OutFile $zipPath
-if (Test-Path $zipPath) {
-    try {
-        Expand-Archive -Path $zipPath -DestinationPath $extractPath -Force
-        Write-Log "    - Python libs extracted successfully." -Color Green
-    } catch { Write-Log "    - FAILED to extract python libs. Error: $($_.Exception.Message)" -Color Red } finally { Remove-Item -Path $zipPath -Force }
-}
-
 # Triton
 Write-Log "  - Installing Triton..."
 $tritonWheel = Join-Path $InstallPath "triton-3.3.0-py3-none-any.whl"

scripts/ComfyUI/Update-ComfyUI.ps1

@@ -78,16 +78,54 @@ Write-Log "=====================================================================
 Write-Log "`n[1/4] Updating ComfyUI Core..." -Color Green
 Invoke-Git-Pull -DirectoryPath $comfyPath
 
-# --- 2. Update Custom Nodes ---
-Write-Log "`n[2/4] Updating Custom Nodes..." -Color Green
-if (Test-Path $customNodesPath) {
-    $nodeDirs = Get-ChildItem -Path $customNodesPath -Directory
-    foreach ($dir in $nodeDirs) {
-        Write-Log "  - Checking node: $($dir.Name)"
-        Invoke-Git-Pull -DirectoryPath $dir.FullName
+# --- 2. Update and Install Custom Nodes ---
+Write-Log "`n[2/4] Updating and Installing Custom Nodes..." -Color Green
+
+$csvUrl = "https://huggingface.co/UmeAiRT/ComfyUI-Auto_installer/resolve/main/scripts/Nodes_installer/custom_nodes.csv"
+$scriptsFolder = Join-Path $InstallPath "scripts"
+$csvPath = Join-Path $scriptsFolder "custom_nodes.csv"
+
+# Télécharge la dernière liste de custom nodes
+try {
+    Invoke-WebRequest -Uri $csvUrl -OutFile $csvPath
+} catch {
+    Write-Log "  - ERREUR: Impossible de télécharger la liste des custom nodes. Mise à jour des nodes ignorée." -Color Red
+    return
+}
+
+$customNodesList = Import-Csv -Path $csvPath
+$existingNodeDirs = Get-ChildItem -Path $customNodesPath -Directory
+
+# D'abord, on met à jour les nodes existants
+Write-Log "  - Updating existing nodes..."
+foreach ($dir in $existingNodeDirs) {
+    Write-Log "    - Checking node: $($dir.Name)"
+    Invoke-Git-Pull -DirectoryPath $dir.FullName
+}
+
+# Ensuite, on vérifie s'il y a de nouveaux nodes à installer
+Write-Log "  - Checking for new nodes to install..."
+foreach ($node in $customNodesList) {
+    $nodeName = $node.Name
+    $nodePath = if ($node.Subfolder) { Join-Path $customNodesPath $node.Subfolder } else { Join-Path $customNodesPath $nodeName }
+
+    if (-not (Test-Path $nodePath)) {
+        Write-Log "    - New node found: $nodeName. Installing..." -Color Yellow
+        
+        $repoUrl = $node.RepoUrl
+        $cloneTargetPath = if ($node.Subfolder) { (Split-Path $nodePath -Parent) } else { $nodePath }
+        if ($nodeName -eq 'ComfyUI-Impact-Subpack') { $clonePath = Join-Path $cloneTargetPath "impact_subpack" } else { $clonePath = $cloneTargetPath }
+        
+        $tempLogFile = Join-Path $env:TEMP ([System.Guid]::NewGuid().ToString() + ".tmp")
+        try {
+            $commandToRun = "git clone $repoUrl `"$clonePath`""
+            $cmdArguments = "/C `"$commandToRun > `"`"$tempLogFile`"`" 2>&1`""
+            Start-Process -FilePath "cmd.exe" -ArgumentList $cmdArguments -Wait -WindowStyle Hidden
+            if (Test-Path $tempLogFile) { Add-Content -Path $logFile -Value (Get-Content $tempLogFile) }
+        } finally {
+            if (Test-Path $tempLogFile) { Remove-Item $tempLogFile }
+        }
     }
-} else {
-    Write-Log "  - Custom nodes directory not found, skipping."
 }