From f8d8a9399068a8f11582d528e1eb54d36125fb76 Mon Sep 17 00:00:00 2001
From: Arash Kadkhodaei <arash77.kad@gmail.com>
Date: Fri, 22 Nov 2024 14:33:31 +0100
Subject: [PATCH] Fix package requirements for Flux tool (#1550)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Change pytorch-cuda to pytorch-gpu to fix the not exist package
Update package requirements for Flux tool

* Update protobuf version requirement from 21.2 to 5.28.3

* Refactor flux.xml to use Docker container

* Update flux.xml to use python3 for script execution

* Update flux.xml

---------

Co-authored-by: Björn Grüning <bjoern@gruenings.eu>
---
 tools/flux/flux.xml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/tools/flux/flux.xml b/tools/flux/flux.xml
index da0a6c909a..7c0dc6006b 100644
--- a/tools/flux/flux.xml
+++ b/tools/flux/flux.xml
@@ -2,22 +2,13 @@
     <description>text-to-image model</description>
     <macros>
         <token name="@TOOL_VERSION@">2024</token>
-        <token name="@VERSION_SUFFIX@">2</token>
+        <token name="@VERSION_SUFFIX@">3</token>
     </macros>
     <requirements>
-        <requirement type="package" version="3.12">python</requirement>
-        <requirement type="package" version="2.4.1">pytorch</requirement>
-        <requirement type="package" version="0.19.1">torchvision</requirement>
-        <requirement type="package" version="12.4">pytorch-cuda</requirement>
-        <requirement type="package" version="0.30.2">diffusers</requirement>
-        <requirement type="package" version="4.44.2">transformers</requirement>
-        <requirement type="package" version="0.34.0">accelerate</requirement>
-        <requirement type="package" version="0.2.0">sentencepiece</requirement>
-        <requirement type="package" version="4.25.3">protobuf</requirement>
-        <requirement type="package" version="0.24.6">huggingface_hub</requirement>
+        <container type="docker">quay.io/galaxy/black_forest_labs_flux:2024-0</container>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
-python '$__tool_directory__/flux.py'
+python3 '$__tool_directory__/flux.py'
 '$flux_models.fields.path'
 '$input_type_selector'
 '$prompt'
@@ -25,7 +16,7 @@ python '$__tool_directory__/flux.py'
     <configfiles>
     </configfiles>
     <inputs>
-        <param name="flux_models" label="Model data" type="select" help="contact the administrator of this Galaxy instance if you miss model data">
+        <param name="flux_models" label="Model data" type="select" help="Contact the administrator of our Galaxy instance if you miss model data">
             <options from_data_table="huggingface">
                 <filter type="static_value" column="4" value="flux"/>
                 <filter type="static_value" column="5" value="1"/>