Refactor media output components and setup listeners

app.py

@@ -122,12 +122,15 @@ with gr.Blocks(
                         audio_button = gr.Button("Audio")
                         file_button = gr.Button("File")
                     media_output_audio = gr.Audio(
-                        type="filepath", label="Output", visible=True, interactive=False
+                        type="filepath",
+                        label="Audio",
+                        visible=False,
+                        interactive=False,
                     )
                     media_output_video = gr.Video(
-                        label="Output", visible=False, height=300
+                        label="Video", visible=True, height=300
                     )
-                    media_output_file = gr.File(label="Output", visible=False)
+                    media_output_file = gr.File(label="File", visible=False)
                     with gr.Row() as command_output:
                         output_textbox = gr.Code(
                             value="$ echo 'Hello, World!'",
@@ -250,9 +253,9 @@ with gr.Blocks(
     ffmpeg_commands = CommandBuilder(
         inputs_clip, video_inputs, audio_inputs, filter_inputs, filter_inputs_1
     )
-    ffmpeg_commands.do()
+    ffmpeg_commands.setup_listener()
     # pprint(ffmpeg_commands.commands)
     ffmpeg_commands.update(output_textbox)
 
 if __name__ == "__main__":
-    demo.launch(show_error=True)
+    demo.launch(show_error=True, max_threads=300)

functions.py

@@ -58,25 +58,6 @@ class CommandBuilder:
     a function to each component in the context
     to build an array of ffmpeg commands"""
 
-    def __call__(self, *args, **kwds):
-        return [i.value for i in self._component]
-
-    def do(self, *inputs, **kwds):
-        for comp in self._component:
-            if comp.label is not None:
-                # self.changefunc(comp, comp.value)
-                # print(
-                #     comp.label,
-                #     comp,
-                # )
-                state = gr.State(value=comp.label)
-                comp.change(fn=self.changefunc, inputs=[state, comp], outputs=[])
-
-    def reset(self):
-        self.output_dict = {"vf": {}, "af": {}}
-        self.commands = ""
-        self.vf, self.af, self.extra = ([] for _ in range(3))
-
     def __init__(self, *inputs: gr.Row | gr.Column) -> None:
         """
         Parameters:
@@ -85,8 +66,6 @@ class CommandBuilder:
 
         self.output_dict = {"vf": {}, "af": {}}
         self.formatoutputdict = {"vf": {}, "af": {}}
-        # state=gr.Variable()
-        # state2=gr.Variable()
 
         self._component: List[Component] = []
         self.vf, self.af, self.extra = ([] for _ in range(3))
@@ -95,8 +74,6 @@ class CommandBuilder:
             return None
         for i in inputs:
             self._component += self._get_component_instance(i)
-        # print(self._component, "component")
-        # print(len(self._component), "length")
         # for comp in self._component:
         #     state = gr.State()
         #     if comp.label is not None:
@@ -105,6 +82,29 @@ class CommandBuilder:
         # self.changefunc(state.value, comp.value)
         # comp.change(fn=self.changefunc, inputs=[state, comp], outputs=[])
 
+    def __call__(self, *args, **kwds):
+        return [i.value for i in self._component]
+
+    def setup_listener(self, *inputs, **kwds):
+        """
+        Sets up listeners for component updates in the current instance.
+
+        """
+        for comp in self._component:
+            if comp.label is not None:
+                # self.changefunc(comp, comp.value)
+                # print(
+                #     comp.label,
+                #     comp,
+                # )
+                state = gr.State(value=comp.label)
+                comp.change(fn=self.changefunc, inputs=[state, comp], outputs=[])
+
+    def reset(self):
+        self.output_dict = {"vf": {}, "af": {}}
+        self.commands = ""
+        self.vf, self.af, self.extra = ([] for _ in range(3))
+
     def changefunc(self, component_label: str | None, new_value=""):
         label, *_ = (
             component_label.strip(": \n").lower().split()
@@ -224,16 +224,11 @@ class CommandBuilder:
             if not hasattr(i, "children"):
                 # res.append(gr.components.get_component_instance(i,render=True))
                 # if isinstance(i, gr.components.Component):
-                # print(gr.components.get_component_instance(i, render=True))
-                res += [gr.components.get_component_instance(i, render=True)]
-            # print(res)
-            # elif hasattr(i, "children"):
+                res += [gr.components.get_component_instance(i)]
             else:
-                # if isinstance(i, gr.Blocks):
                 res += self._get_component_instance(i)
         # print(res)
         return res
-        # return [gr.components.get_component_instance(i, render=True) for i in inputs.children if not hasattr(i, "children")]
 
     def set_video_filters(self, options):
         value = self.output_dict.get(options, "-")
@@ -339,34 +334,6 @@ class CommandBuilder:
         self.build()
 
 
-# def somefunc(input: gr.components.IOComponent, c_label=""):
-#     label = ""
-#     output = {}
-#     print(input, c_label)
-#     label, *_ = input.label.strip(": ").lower().split(
-#     ) if type(input.label) != list else "".join(input.label).strip(": ").lower().split()
-#     label += "".join(_).title()
-#     print(newoutputMap.get(label), label, c_label)
-#     if c_label not in [None, "Source", "Auto", ""]:
-#         print(input.value)
-#         output.update({label: c_label})
-#     else:
-#         output.pop(label, "No Key Exists")
-#     pprint(output)
-
-# def mediaChange(option):
-#     no_=gr.update(visible=False)
-#     if option in video_containers:
-#         output=gr.update(visible=True)
-#         return [no_,output]
-#     elif option in audio_containers:
-#         output=gr.update(visible=True)
-#         return [output,no_]
-#     else:
-#         output=gr.update(visible=False)
-#         return [no_,no_]
-
-
 def media_change(option: str, state) -> List[Component]:
     """
         Allows playing the media in various options,
@@ -389,20 +356,6 @@ def media_change(option: str, state) -> List[Component]:
     return [chosen(ops), chosen(ops2), chosen(ops3)]
 
 
-# def videoChange(value):
-#     print(value.name)
-
-# if option in video_containers:
-#     output=gr.update(visible=True)
-#     return [no_,output]
-# elif option in audio_containers:
-#     output=gr.update(visible=True)
-#     return [output,no_]
-# else:
-#     output=gr.update(visible=False)
-#     return [no_,no_]
-
-
 """Helper Functions for Processing """
 
 
@@ -492,8 +445,6 @@ def change_clipbox(choice: str) -> List[Component]:
     print(choice, " now choice")
     if choice == "Enabled":
         return [
-            # gr.update(visible=True, value="00:00"),
-            # gr.update(visible=True, value="00:10"),
             gr.Textbox(
                 label="Start Time:", placeholder="00:00", visible=True, value="00:00"
             ),
@@ -514,29 +465,9 @@ def change_clipbox(choice: str) -> List[Component]:
 #         return gr.update(value=file.name)
 
 
-def get_component_instance(inputs: gr.Blocks) -> List[Component]:
-    """returns only components
-
-    Args:
-        inputs: layout elements
-
-    Returns:
-        List[Component]: components
-    """
-    return [
-        gr.components.get_component_instance(i, render=True) for i in inputs.children
-    ]
-
-
 class Clear(CommandBuilder):
     """Class for clearing components in layouts"""
 
-    def __call__(self, *args, **kwds):
-        return self._component
-
-    def __str__(self):
-        return f"{self._component} __clear__ class"
-
     def __init__(self, *input_component: gr.Row | gr.Column) -> None:
         """
         Parameters:
@@ -549,24 +480,25 @@ class Clear(CommandBuilder):
                 # self._component += super()._get_component_instance(i)
                 self._component += self.__get_component_instance(i)
 
+    def __call__(self, *args, **kwds):
+        return self._component
+
+    def __str__(self):
+        return f"{self._component} __clear__ class"
+
     def __get_component_instance(self, inputs: gr.Row | gr.Column) -> list:
-        # print(inputs, " class instance")
         res = []
-        # print(*inputs.children)
         for i in inputs.children:
             # print(i,hasattr(i,"children"))
             if not hasattr(i, "children"):
                 # res.append(gr.components.get_component_instance(i,render=True))
-                res += [gr.components.get_component_instance(i, render=True)]
+                res += [gr.components.get_component_instance(i)]
                 # print(i)
-            elif hasattr(i, "children"):
-                # print(*i.children)
+            else:
                 res += self.__get_component_instance(i)
                 # res=[gr.components.get_component_instance(i, render=True) for i in inputs.children if not hasattr(i, "children")]
-                # print(res,"__ result")
         # print(res)
         return res
-        # return [gr.components.get_component_instance(i, render=True) for i in inputs.children if not hasattr(i, "children")]
 
     def add(self, *args):
         print(args, type(args))