Support for Generic Inputs and Outputs

CMakeLists.txt

@@ -93,10 +93,12 @@ target_sources(${PROJECT_NAME}
         src/gui/HoverHandler.h
         src/gui/ControlComponent.h
         src/gui/ToggleWithLabel.h
+        src/gui/FileChooserWithLabel.h
 
         src/media/MediaDisplayComponent.cpp
         src/media/AudioDisplayComponent.cpp
         src/media/MidiDisplayComponent.cpp
+        src/media/FileDisplayComponent.cpp
         src/media/OutputLabelComponent.cpp
 
         src/media/pianoroll/KeyboardComponent.cpp

README.md

@@ -105,7 +105,7 @@ The currently available versions of HARP and pyharp are mutually compatible.
 <!-- website/content/contributing/add_model.md -->
 # Adding Models with pyharp
 
-[![ReadMe Card](https://github-readme-stats.vercel.app/api/pin/?username=TEAMuP-dev&repo=pyharp)](https://github.com/TEAMuP-dev/pyharp)
+[![PyHARP](https://gh-card.dev/repos/TEAMuP-dev/pyharp.svg)](https://github.com/TEAMuP-dev/pyharp)
 
 pyharp provides a lightweight API to build HARP-compatible [Gradio](https://www.gradio.app) apps. It allows researchers to easily create DAW-friendly interfaces for any audio processing code with minimal Python wrapping.
 

src/Model.h

@@ -259,6 +259,31 @@ class Model
             }
         }
 
+        std::map<Uuid, std::string> fileControlRemotePaths;
+
+        for (const auto& controlComponent : controlComponents)
+        {
+            if (auto* fileComponentInfo = dynamic_cast<FileComponentInfo*>(controlComponent.get()))
+            {
+                if (fileComponentInfo->path.empty())
+                    continue;
+
+                String remoteFilePath;
+
+                result =
+                    client->uploadFile(loadedPath, File(fileComponentInfo->path), remoteFilePath);
+
+                if (result.failed())
+                {
+                    setStatus(ModelStatus::FAILURE);
+
+                    return result;
+                }
+
+                fileControlRemotePaths[fileComponentInfo->id] = remoteFilePath.toStdString();
+            }
+        }
+
         /* Extract control values for JSON payload in order */
 
         Array<var> controlValues;
@@ -314,6 +339,25 @@ class Model
             {
                 controlValue = var(comboBoxComponentInfo->value);
             }
+            else if (auto fileComponentInfo = dynamic_cast<FileComponentInfo*>(componentInfo.get()))
+            {
+                auto it = fileControlRemotePaths.find(fileComponentInfo->id);
+
+                if (it == fileControlRemotePaths.end() || it->second.empty())
+                {
+                    controlValue = var();
+                }
+                else
+                {
+                    DynamicObject::Ptr fileObj = new DynamicObject();
+
+                    fileObj->setProperty("path", var(it->second));
+
+                    controlValue = var(fileObj);
+                }
+
+                wasFile = true;
+            }
             else
             {
                 // Unsupported control was added
@@ -440,6 +484,17 @@ class Model
                     DBG_AND_LOG("Model::extractInputs: MIDI track input \"" + midiTrack->label
                                 + "\" extracted.");
                 }
+                else if (type == "generic_file")
+                {
+                    std::shared_ptr<ModelComponentInfo> fileChooser =
+                        std::make_shared<FileComponentInfo>(controlsDict);
+
+                    newControls.push_back(fileChooser);
+                    tempComponentIDs.push_back(fileChooser->id);
+
+                    DBG_AND_LOG("Model::extractInputs: File chooser control \"" + fileChooser->label
+                                + "\" extracted.");
+                }
                 else if (type == "text_box")
                 {
                     std::shared_ptr<ModelComponentInfo> textControl =
@@ -563,6 +618,16 @@ class Model
                     DBG_AND_LOG("Model::extractOutputs: MIDI track output \"" + midiTrack->label
                                 + "\" extracted.");
                 }
+                else if (type == "generic_file")
+                {
+                    std::shared_ptr<ModelComponentInfo> fileOutput =
+                        std::make_shared<FileComponentInfo>(controlsDict);
+
+                    newOutputs.push_back(fileOutput);
+
+                    DBG_AND_LOG("Model::extractOutputs: File output \"" + fileOutput->label
+                                + "\" extracted.");
+                }
                 else if (type == "json")
                 {
                     // Labels are handled separately

src/ModelTab.h

@@ -487,6 +487,23 @@ class ModelTab : public Component, private ChangeListener, public ChangeBroadcas
             }
         }
 
+        for (const auto& controlInfo : model->getControls())
+        {
+            if (auto* fileInfo = dynamic_cast<FileComponentInfo*>(controlInfo.get()))
+            {
+                if (fileInfo->required && fileInfo->path.empty())
+                {
+                    AlertWindow::showMessageBoxAsync(
+                        AlertWindow::WarningIcon,
+                        "Error",
+                        "Required file input \"" + String(fileInfo->label)
+                            + "\" is empty. Please select a file before processing.");
+
+                    return;
+                }
+            }
+        }
+
         modelSelectionWidget.setDisabled();
         processCancelButton.setMode(cancelButtonInfo.displayLabel);
 
@@ -536,7 +553,9 @@ class ModelTab : public Component, private ChangeListener, public ChangeBroadcas
                         {
                             auto& outputMediaDisplays = outputTrackAreaWidget.getMediaDisplays();
 
-                            for (size_t i = 0; i < outputMediaDisplays.size(); ++i)
+                            for (size_t i = 0;
+                                 i < outputMediaDisplays.size() && i < outputFilesPtr->size();
+                                 ++i)
                             {
                                 outputMediaDisplays[i]->initializeDisplay(
                                     URL((*outputFilesPtr)[i]));

src/gui/ControlComponent.h

@@ -20,6 +20,11 @@ class ControlComponent : public Component
 public:
     virtual ~ControlComponent() = default;
 
+    /**
+     * Returns the preferred height for this control, or 0 to use the layout default.
+     */
+    virtual int getPreferredHeight() const { return 0; }
+
     /**
      * Returns the minimum width required to display this control properly.
      * This includes the label width plus any necessary padding.