fix #349 auto input variable (#368)

* fix #349 auto input variable

* add list-all utils in cache

* fix concat filter

* add test case for auto

* fix concat's schema

* update test case

* update test case

* remove not used code

src/ffmpeg/common/schema.py

@@ -79,8 +79,8 @@ class FFMpegIOType:
 class FFMpegFilterDef:
     name: str
 
-    typings_input: str | tuple[Literal["video", "audio"], ...]
-    typings_output: str | tuple[Literal["video", "audio"], ...]
+    typings_input: str | tuple[Literal["video", "audio"], ...] = ()
+    typings_output: str | tuple[Literal["video", "audio"], ...] = ()
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -107,8 +107,13 @@ class FFMpegFilter:
     formula_typings_input: str | None = None
     formula_typings_output: str | None = None
 
+    pre: tuple[tuple[str, str], ...] = ()
     options: tuple[FFMpegFilterOption, ...] = ()
 
+    @property
+    def pre_dict(self) -> dict[str, str]:
+        return dict(self.pre)
+
     @property
     def to_def(self) -> FFMpegFilterDef:
         return FFMpegFilterDef(

src/ffmpeg/common/tests/__snapshots__/test_serialize.ambr

@@ -82,7 +82,12 @@
                       "__class__": "ffmpeg.streams.video.VideoStream",
                       "node": {
                         "__class__": "ffmpeg.dag.nodes.FilterNode",
-                        "kwargs": [],
+                        "kwargs": [
+                          [
+                            "n",
+                            2
+                          ]
+                        ],
                         "inputs": [
                           {
                             "__class__": "ffmpeg.streams.video.VideoStream",

src/ffmpeg/dag/factory.py

@@ -2,11 +2,15 @@
 from typing import Any
 
 from ..common.schema import FFMpegFilterDef, StreamType
+from ..schema import Auto
 from ..utils.run import _to_tuple
 from .nodes import FilterableStream, FilterNode
 
 
 def filter_node_factory(filter: FFMpegFilterDef, *inputs: FilterableStream, **kwargs: Any) -> FilterNode:
+    for k, v in kwargs.items():
+        if isinstance(v, Auto):
+            kwargs[k] = eval(v, {"StreamType": StreamType, "re": re, **kwargs, "streams": inputs})
 
     if isinstance(filter.typings_input, str):
         input_typings = tuple(eval(filter.typings_input, {"StreamType": StreamType, "re": re, **kwargs}))

src/ffmpeg/dag/tests/__snapshots__/test_factory.ambr

@@ -0,0 +1,10 @@
+# serializer version: 1
+# name: test_filter_node_factory
+  FilterNode(kwargs=(('n', 0),), inputs=(), name='foo', input_typings=(), output_typings=())
+# ---
+# name: test_filter_node_factory.1
+  FilterNode(kwargs=(('n', 1),), inputs=(VideoStream(node=InputNode(kwargs=(), inputs=(), filename='foo.mp4'), index=None),), name='foo', input_typings=(<StreamType.video: 'video'>,), output_typings=())
+# ---
+# name: test_filter_node_factory.2
+  FilterNode(kwargs=(('n', 2),), inputs=(VideoStream(node=InputNode(kwargs=(), inputs=(), filename='foo.mp4'), index=None), VideoStream(node=InputNode(kwargs=(), inputs=(), filename='foo.mp4'), index=None)), name='foo', input_typings=(<StreamType.video: 'video'>, <StreamType.video: 'video'>), output_typings=())
+# ---

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_filter_node_with_outputs.json

@@ -1,5 +1,6 @@
 [
   "[0:v][1:v]",
-  "concat",
+  "concat=",
+  "n=2",
   "[s0]"
 ]

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not config][compile with overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not config][compile without overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not config][compile-line].json

@@ -1 +1 @@
-"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat[s0]' -map '[s0]' output.mp4"
+"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat=n=2[s0]' -map '[s0]' output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not config][compile].json

@@ -5,7 +5,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not set with global args][compile with overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not set with global args][compile without overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not set with global args][compile-line].json

@@ -1 +1 @@
-"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat[s0]' -map '[s0]' output.mp4"
+"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat=n=2[s0]' -map '[s0]' output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[not set with global args][compile].json

@@ -5,7 +5,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is False with global args][compile with overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is False with global args][compile without overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is False with global args][compile-line].json

@@ -1 +1 @@
-"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat[s0]' -map '[s0]' output.mp4"
+"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat=n=2[s0]' -map '[s0]' output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is False with global args][compile].json

@@ -5,7 +5,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is True with global args][compile with overwrite].json

@@ -7,7 +7,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is True with global args][compile without overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is True with global args][compile-line].json

@@ -1 +1 @@
-"ffmpeg -n -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat[s0]' -map '[s0]' output.mp4"
+"ffmpeg -n -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat=n=2[s0]' -map '[s0]' output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set n is True with global args][compile].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args0][compile with overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args0][compile without overwrite].json

@@ -7,7 +7,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args0][compile-line].json

@@ -1 +1 @@
-"ffmpeg -y -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat[s0]' -map '[s0]' output.mp4"
+"ffmpeg -y -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat=n=2[s0]' -map '[s0]' output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args0][compile].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args1][compile with overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args1][compile without overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args1][compile-line].json

@@ -1 +1 @@
-"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat[s0]' -map '[s0]' output.mp4"
+"ffmpeg -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat=n=2[s0]' -map '[s0]' output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y is True with global args1][compile].json

@@ -5,7 +5,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y with overwrite_output][compile with overwrite].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y with overwrite_output][compile without overwrite].json

@@ -7,7 +7,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y with overwrite_output][compile-line].json

@@ -1 +1 @@
-"ffmpeg -y -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat[s0]' -map '[s0]' output.mp4"
+"ffmpeg -y -i tmp1.mp4 -i tmp2.mp4 -filter_complex '[0:v][1:v]concat=n=2[s0]' -map '[s0]' output.mp4"

src/ffmpeg/dag/tests/__snapshots__/test_nodes/test_global_node_with_args_overwrite[set y with overwrite_output][compile].json

@@ -6,7 +6,7 @@
   "-i",
   "tmp2.mp4",
   "-filter_complex",
-  "[0:v][1:v]concat[s0]",
+  "[0:v][1:v]concat=n=2[s0]",
   "-map",
   "[s0]",
   "output.mp4"