typed-ffmpeg-compatible 3.2.5__py3-none-any.whl → 3.3.1__py3-none-any.whl

typed_ffmpeg/__init__.py

@@ -28,7 +28,7 @@ from .dag import Stream
 from .exceptions import FFMpegExecuteError, FFMpegTypeError, FFMpegValueError
 from .ffprobe.probe import probe, probe_obj
 from .info import get_codecs, get_decoders, get_encoders
-from .streams import AudioStream, AVStream, VideoStream
+from .streams import AudioStream, AVStream, SubtitleStream, VideoStream
 
 __all__ = [
     "sources",
@@ -46,6 +46,7 @@ __all__ = [
     "AudioStream",
     "VideoStream",
     "AVStream",
+    "SubtitleStream",
     "vfilter",
     "afilter",
     "filter_multi_output",

typed_ffmpeg/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.2.5'
-__version_tuple__ = version_tuple = (3, 2, 5)
+__version__ = version = '3.3.1'
+__version_tuple__ = version_tuple = (3, 3, 1)

typed_ffmpeg/base.py

@@ -137,7 +137,7 @@ def filter_multi_output(
     *streams: FilterableStream,
     name: str,
     input_typings: tuple[StreamType, ...] = (),
-    output_tyings: tuple[StreamType, ...] = (),
+    output_typings: tuple[StreamType, ...] = (),
     **kwargs: Any,
 ) -> FilterNode:
     """
@@ -151,7 +151,7 @@ def filter_multi_output(
         *streams: One or more input streams to apply the filter to
         name: The FFmpeg filter name (e.g., 'split', 'channelsplit', etc.)
         input_typings: The expected types of the input streams
-        output_tyings: The expected types of each output stream
+        output_typings: The expected types of each output stream
         **kwargs: Filter-specific parameters as keyword arguments
 
     Returns:
@@ -162,7 +162,7 @@ def filter_multi_output(
         ```python
         # Split a video into two identical streams
         split_node = ffmpeg.filter_multi_output(
-            stream, name="split", output_tyings=(StreamType.video, StreamType.video)
+            stream, name="split", output_typings=(StreamType.video, StreamType.video)
         )
         stream1 = split_node.video(0)
         stream2 = split_node.video(1)
@@ -172,12 +172,13 @@ def filter_multi_output(
         This function is for custom filters not implemented in typed-ffmpeg.
         Use the built-in filters from the filters module when available.
     """
+
     return FilterNode(
         name=name,
         kwargs=FrozenDict(kwargs),
         inputs=streams,
         input_typings=input_typings,
-        output_typings=output_tyings,
+        output_typings=output_typings,
     )
 
 

typed_ffmpeg/compile/compile_cli.py

@@ -20,6 +20,7 @@ import re
 import shlex
 from collections import defaultdict
 from collections.abc import Mapping
+from dataclasses import replace
 
 from ..base import input, merge_outputs, output
 from ..common.cache import load
@@ -141,6 +142,12 @@ def parse_stream_selector(
     stream = mapping[stream_label]
 
     if isinstance(stream, AVStream):
+        if "?" in selector:
+            optional = True
+            selector = selector.strip("?")
+        else:
+            optional = False
+
         if ":" in selector:
             if selector.count(":") == 1:
                 stream_label, stream_type = selector.split(":", 1)
@@ -151,13 +158,14 @@ def parse_stream_selector(
 
             match stream_type:
                 case "v":
-                    return stream.video_stream(stream_index)
+                    return stream.video_stream(stream_index, optional)
                 case "a":
-                    return stream.audio_stream(stream_index)
+                    return stream.audio_stream(stream_index, optional)
                 case "s":
-                    return stream.subtitle_stream(stream_index)
+                    return stream.subtitle_stream(stream_index, optional)
                 case _:
                     raise FFMpegValueError(f"Unknown stream type: {stream_type}")
+        return replace(stream, optional=optional)
     return stream
 
 
@@ -674,6 +682,8 @@ def get_stream_label(stream: Stream, context: DAGContext | None = None) -> str:
             if len(stream.node.output_typings) > 1:
                 return f"{get_node_label(stream.node, context)}#{stream.index}"
             return f"{get_node_label(stream.node, context)}"
+        case OutputNode():
+            return f"{get_node_label(stream.node, context)}"
         case _:
             raise FFMpegValueError(
                 f"Unknown node type: {stream.node.__class__.__name__}"
@@ -812,7 +822,10 @@ def get_args_output_node(node: OutputNode, context: DAGContext) -> list[str]:
                     and len(node.inputs) == 1
                 ):
                     continue
-                commands += ["-map", get_stream_label(input, context)]
+                if not input.optional:
+                    commands += ["-map", get_stream_label(input, context)]
+                else:
+                    commands += ["-map", f"{get_stream_label(input, context)}?"]
             else:
                 commands += ["-map", f"[{get_stream_label(input, context)}]"]
 

typed_ffmpeg/compile/compile_python.py

@@ -77,10 +77,7 @@ def get_input_var_name(
         case VideoStream():
             match stream.node:
                 case InputNode():
-                    if stream.index is not None:
-                        return f"{get_output_var_name(stream.node, context)}.video_stream({stream.index})"
-                    else:
-                        return f"{get_output_var_name(stream.node, context)}.video"
+                    return f"{get_output_var_name(stream.node, context)}.video_stream({stream.index}, optional={stream.optional})"
                 case FilterNode():
                     if filter_data_dict[stream.node.name].is_dynamic_output:
                         return f"{get_output_var_name(stream.node, context)}.video({filter_stream_typed_index(stream, context)})"
@@ -94,10 +91,7 @@ def get_input_var_name(
         case AudioStream():
             match stream.node:
                 case InputNode():
-                    if stream.index is not None:
-                        return f"{get_output_var_name(stream.node, context)}.audio_stream({stream.index})"
-                    else:
-                        return f"{get_output_var_name(stream.node, context)}.audio"
+                    return f"{get_output_var_name(stream.node, context)}.audio_stream({stream.index}, optional={stream.optional})"
                 case FilterNode():
                     if filter_data_dict[stream.node.name].is_dynamic_output:
                         return f"{get_output_var_name(stream.node, context)}.audio({filter_stream_typed_index(stream, context)})"
@@ -111,10 +105,7 @@ def get_input_var_name(
         case SubtitleStream():
             match stream.node:
                 case InputNode():
-                    if stream.index is not None:
-                        return f"{get_output_var_name(stream.node, context)}.subtitle_stream({stream.index})"
-                    else:
-                        return f"{get_output_var_name(stream.node, context)}.subtitle"
+                    return f"{get_output_var_name(stream.node, context)}.subtitle_stream({stream.index}, optional={stream.optional})"
         case OutputStream():
             return f"{get_output_var_name(stream.node, context)}"
         case GlobalStream():

typed_ffmpeg/dag/schema.py

@@ -49,6 +49,14 @@ class Stream(HashableBaseModel):
         See Also: [Stream specifiers](https://ffmpeg.org/ffmpeg.html#Stream-specifiers-1) `stream_index`
     """
 
+    optional: bool = False
+    """
+    Represents whether the stream is optional.
+
+    Note:
+        See Also: [Advanced options](https://ffmpeg.org/ffmpeg.html#Advanced-options)
+    """
+
     def view(self, format: Literal["png", "svg", "dot"] = "png") -> str:
         """
         Visualize the stream.

typed_ffmpeg/streams/__init__.py

@@ -1,5 +1,6 @@
 from .audio import AudioStream
 from .av import AVStream
+from .subtitle import SubtitleStream
 from .video import VideoStream
 
-__all__ = ["AudioStream", "VideoStream", "AVStream"]
+__all__ = ["AudioStream", "VideoStream", "AVStream", "SubtitleStream"]

typed_ffmpeg/streams/av.py

@@ -41,38 +41,47 @@ class AVStream(AudioStream, VideoStream):
         """
         return SubtitleStream(node=self.node, index=self.index)
 
-    def video_stream(self, index: int | None = None) -> VideoStream:
+    def video_stream(
+        self, index: int | None = None, optional: bool = False
+    ) -> VideoStream:
         """
         Get the video stream from the input node with a specified index.
 
         Args:
             index: The index of the video stream.
+            optional: Whether the video stream is optional.
 
         Returns:
             VideoStream: The video stream from the input node.
         """
-        return VideoStream(node=self.node, index=index)
+        return VideoStream(node=self.node, index=index, optional=optional)
 
-    def audio_stream(self, index: int | None = None) -> AudioStream:
+    def audio_stream(
+        self, index: int | None = None, optional: bool = False
+    ) -> AudioStream:
         """
         Get the audio stream from the input node with a specified index.
 
         Args:
             index: The index of the audio stream.
+            optional: Whether the audio stream is optional.
 
         Returns:
             AudioStream: The audio stream from the input node.
         """
-        return AudioStream(node=self.node, index=index)
+        return AudioStream(node=self.node, index=index, optional=optional)
 
-    def subtitle_stream(self, index: int | None = None) -> SubtitleStream:
+    def subtitle_stream(
+        self, index: int | None = None, optional: bool = False
+    ) -> SubtitleStream:
         """
         Get the subtitle stream from the input node with a specified index.
 
         Args:
             index: The index of the subtitle stream.
+            optional: Whether the subtitle stream is optional.
 
         Returns:
             SubtitleStream: The subtitle stream from the input node.
         """
-        return SubtitleStream(node=self.node, index=index)
+        return SubtitleStream(node=self.node, index=index, optional=optional)

typed_ffmpeg/utils/snapshot.py

@@ -21,7 +21,7 @@ from syrupy.types import (
 from ..dag.schema import Stream
 
 
-class DAGSnapshotExtenstion(JSONSnapshotExtension):
+class DAGSnapshotExtension(JSONSnapshotExtension):
     """
     A snapshot extension for serializing and testing FFmpeg DAG structures.
 

typed_ffmpeg/utils/view.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..compile.compile_cli import get_args, get_stream_label
 from ..compile.context import DAGContext
 from ..dag.nodes import FilterNode, InputNode, OutputNode
 from ..dag.schema import Node
@@ -92,7 +93,7 @@ def view(node: Node, format: Literal["png", "svg", "dot"]) -> str:
         color = _get_node_color(node)
         graph.node(
             name=node.hex,
-            label=node.repr(),
+            label=" ".join(get_args(node, context)),
             shape="box",
             style="filled",
             fillcolor=color,
@@ -105,7 +106,7 @@ def view(node: Node, format: Literal["png", "svg", "dot"]) -> str:
             graph.edge(
                 stream.node.hex,
                 node.hex,
-                label=f"{'*' if stream.index is None else stream.index} => {idx}",
+                label=f"{get_stream_label(stream, context)} -> {idx}",
             )
 
     return graph.render(engine="dot")

{typed_ffmpeg_compatible-3.2.5.dist-info → typed_ffmpeg_compatible-3.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typed-ffmpeg-compatible
-Version: 3.2.5
+Version: 3.3.1
 Summary: Modern Python FFmpeg wrappers offer comprehensive support for complex filters, complete with detailed typing and documentation.
 Author-email: lucemia <lucemia@gmail.com>
 License-Expression: MIT

{typed_ffmpeg_compatible-3.2.5.dist-info → typed_ffmpeg_compatible-3.3.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-typed_ffmpeg/__init__.py,sha256=n1SZfENc9xhZ0eA3ZzkBNPuIY-Pt3-rOwB8-uUj5olU,1592
-typed_ffmpeg/_version.py,sha256=VJzOHz1iq5b2MvgVxeYYraqogSncMB5aG1qIW2TvKks,511
-typed_ffmpeg/base.py,sha256=C5Tqbx2I0c-09D7aXKZoGkspu-lAAeAhuOns5zr3PXQ,6304
+typed_ffmpeg/__init__.py,sha256=yixdEj2DRDUwCVipkVMaPGNo-DjIA_6ZSZrYQTxkUQY,1630
+typed_ffmpeg/_version.py,sha256=DGQPU6_vrM6PfHseD1DbTrLzSemTnUX5siYWgZbIrdI,511
+typed_ffmpeg/base.py,sha256=oNL_ZCYiweYoKOm2Kh-OePvIfVOlpQ4cDF8_aLNTz98,6309
 typed_ffmpeg/exceptions.py,sha256=D4SID6WOwkjVV8O8mAjrEDHWn-8BRDnK_jteaDof1SY,2474
 typed_ffmpeg/filters.py,sha256=_lBpGZgPHK3KgGVrw-TCdQEsBRuEXVIgwggYNGd80MU,110076
 typed_ffmpeg/info.py,sha256=0KCzf8hJaI6ObPRT0uftLa96RlYvaQmoEq1sqFJSc24,9521
@@ -13,15 +13,15 @@ typed_ffmpeg/common/cache.py,sha256=j0JvfX7jewLpdJWxgo7Pwze0BkUJdYGHX2uGR8BZ-9M,
 typed_ffmpeg/common/schema.py,sha256=qM8yfMX9UU3EAQSNsTrr-SAmyqKx8eQCXTtu3RJWkEk,19673
 typed_ffmpeg/common/serialize.py,sha256=dLim0DBP5CdJ1JiMV9xEmmh1XMSIhBOWs61EopAL15s,7719
 typed_ffmpeg/compile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typed_ffmpeg/compile/compile_cli.py,sha256=4XCkBC2WGP-P03XWVI3tgoBs--oQLvhuqyocSk8HhMw,32491
+typed_ffmpeg/compile/compile_cli.py,sha256=FyFcFN2qgpi57M3fERzXlSdEs4Z7XwD0zKicXbl7_4M,32980
 typed_ffmpeg/compile/compile_json.py,sha256=YCiTyfAnUVSbFr7BiQpmJYs13K5sa-xo77Iih33mb6I,992
-typed_ffmpeg/compile/compile_python.py,sha256=zxaG9DC0r8lO_cOV9HBN6cnxy3-wCZyvo3-4M47F84E,11914
+typed_ffmpeg/compile/compile_python.py,sha256=YnnRRHE8TEUiqFF9DsqkYOwIcA2ejCYw12k-O5n825A,11506
 typed_ffmpeg/compile/context.py,sha256=macQ3HhEJ73j_WbWYtU9GCQCzcB_KQGAPimcuU-WOac,10946
 typed_ffmpeg/compile/validate.py,sha256=QsWksdvlRwWw6hnatFo-ABakms1qDXRbEmvMQGRLrD8,9579
 typed_ffmpeg/dag/__init__.py,sha256=qAApSNqjbZ1DtUaV5bSku9RwG7MpMPa1HJO764cSBt4,849
 typed_ffmpeg/dag/factory.py,sha256=2IMVKP_2UaTrlGXBg8YDx5KXBqhpScJiJQ87PRrppzY,3147
 typed_ffmpeg/dag/nodes.py,sha256=lfHChT8JqRs3UUDWtgrWnnXn845HXSD5S1QmHpIUT4U,20526
-typed_ffmpeg/dag/schema.py,sha256=dSq0o8e9qFazyd55k2yXcxbjoKZJEtqeROd91w1O3Wo,5728
+typed_ffmpeg/dag/schema.py,sha256=xsVT46XgT3Usgb4N9OWdjP74MG9dBrXgZGbjsYhsUEM,5916
 typed_ffmpeg/dag/utils.py,sha256=hydh7_kjpOCw8WEGhXMxIXR4Ek-3DeoOt6esInuK2Xw,1941
 typed_ffmpeg/dag/global_runnable/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typed_ffmpeg/dag/global_runnable/global_args.py,sha256=ehLtx4v-XxqkmODhpE_gik0r79hs4Sa8TJnRsH9Fj1o,8043
@@ -35,9 +35,9 @@ typed_ffmpeg/ffprobe/parse.py,sha256=fq1cGFkUpUdvyVi3S-TAQ7qn-tXUdae6ADhymZt7-t4
 typed_ffmpeg/ffprobe/probe.py,sha256=D_opsKp3OgT2HSBzhxgY1b9SIqXpDhz3xh_k9HUGux0,10367
 typed_ffmpeg/ffprobe/schema.py,sha256=PBgBWYGO8wKnI0Lae9oCJ1Nprhv2ciPkdLrumzPVllY,13631
 typed_ffmpeg/ffprobe/xml2json.py,sha256=1TSuxR7SYc-M_-JmE-1khHGbXCapgW0Oap9kzL0nwNg,2455
-typed_ffmpeg/streams/__init__.py,sha256=Nt9uWpcVI1sQLl5Qt_kBCBcWOGZA1vczCQ0qvFbSko0,141
+typed_ffmpeg/streams/__init__.py,sha256=32kiqBVigKH2EqS3cA6EfXCW8KpVdQNWSStAmQ0MktM,196
 typed_ffmpeg/streams/audio.py,sha256=2oNRhb5UetWtlPG3NW73AjUZoFPl303yMv-6W1sGWt0,259054
-typed_ffmpeg/streams/av.py,sha256=q7zqNyr44vBT7tiR2nKUGTf3g93HtNVA_WSwCiysmgI,2240
+typed_ffmpeg/streams/av.py,sha256=qrsO692BG6OVMWVwIeuCKPntBGTR685lc2ULbGPTSkQ,2594
 typed_ffmpeg/streams/channel_layout.py,sha256=hGagaoc1tnWS8K1yiITp4f_92qq5e7C_zB15bHOL0DI,1162
 typed_ffmpeg/streams/subtitle.py,sha256=zhbRKUYH0C972Hurm4hK_dqLvT4Y6v_VNZFzQrkCm9A,141
 typed_ffmpeg/streams/video.py,sha256=cQwHfew75YO_dbZjmpUYd-nXt1JHN0M7suFKKe5UH5s,453576
@@ -45,15 +45,15 @@ typed_ffmpeg/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 typed_ffmpeg/utils/escaping.py,sha256=m6CTEBwWZTFdtZHTHW-3pQCgkpdZb9f9ynoO-gsD7uM,2937
 typed_ffmpeg/utils/forzendict.py,sha256=9QWdPQA2AbSfiC9-mrq1YeZFl1qN--zw8WlsqQ2ulCk,3114
 typed_ffmpeg/utils/run.py,sha256=mSoAdcvD-InldqkRgWNc8iXKgJJoEMAOE4PL2gVmtqw,2178
-typed_ffmpeg/utils/snapshot.py,sha256=mKILRm6qiQV2egaD-70MSUEl-DFoLD5w_v9GZIequI4,2181
+typed_ffmpeg/utils/snapshot.py,sha256=SHdfM1OXxR0cReNs4snDdAASjW45unz2KjF_6jMwq7c,2180
 typed_ffmpeg/utils/typing.py,sha256=DBQn_gCF8C_DTwsfMHeCgfnNUROwAjlIcHrQ7lNDOoE,1187
-typed_ffmpeg/utils/view.py,sha256=QCSlQoQkRBI-T0sWjiywGgM9DlKd8Te3CB2ZYX-pEVU,3413
+typed_ffmpeg/utils/view.py,sha256=jiCKJnx-KVJh-uvhkADBQNlWH1uHPqyYgmSZ_iSEj0c,3484
 typed_ffmpeg/utils/lazy_eval/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typed_ffmpeg/utils/lazy_eval/operator.py,sha256=QWybd-UH3VdDa8kgWkqAMi3WV0b0WF1d1JixQr6is2E,4136
 typed_ffmpeg/utils/lazy_eval/schema.py,sha256=WSg-E3MS3itN1AT6Dq4Z9btnRHEReuN3o6zruXou7h4,9623
-typed_ffmpeg_compatible-3.2.5.dist-info/licenses/LICENSE,sha256=8Aaya5i_09Cou2i3QMxTwz6uHGzi_fGA4uhkco07-A4,1066
-typed_ffmpeg_compatible-3.2.5.dist-info/METADATA,sha256=GSSr2eBSGWwgMrZZBx4wgAcRx6bas71nQjLxF8GVJPA,8385
-typed_ffmpeg_compatible-3.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-typed_ffmpeg_compatible-3.2.5.dist-info/entry_points.txt,sha256=kUQvZ27paV-07qtkIFV-emKsYtjFOTw9kknBRSXPs04,45
-typed_ffmpeg_compatible-3.2.5.dist-info/top_level.txt,sha256=vuASJGVRQiNmhWY1pt0RXESWSNkknWXqWLIRAU7H_L4,13
-typed_ffmpeg_compatible-3.2.5.dist-info/RECORD,,
+typed_ffmpeg_compatible-3.3.1.dist-info/licenses/LICENSE,sha256=8Aaya5i_09Cou2i3QMxTwz6uHGzi_fGA4uhkco07-A4,1066
+typed_ffmpeg_compatible-3.3.1.dist-info/METADATA,sha256=5ZtyLl8XCPa1W-B6XCCjyosTQMJotk5LWqy1WiixwYg,8385
+typed_ffmpeg_compatible-3.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+typed_ffmpeg_compatible-3.3.1.dist-info/entry_points.txt,sha256=kUQvZ27paV-07qtkIFV-emKsYtjFOTw9kknBRSXPs04,45
+typed_ffmpeg_compatible-3.3.1.dist-info/top_level.txt,sha256=vuASJGVRQiNmhWY1pt0RXESWSNkknWXqWLIRAU7H_L4,13
+typed_ffmpeg_compatible-3.3.1.dist-info/RECORD,,