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

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'
+__version_tuple__ = version_tuple = (3, 3)

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
 
 
@@ -812,7 +820,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/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_compatible-3.2.5.dist-info → typed_ffmpeg_compatible-3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typed-ffmpeg-compatible
-Version: 3.2.5
+Version: 3.3
 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.dist-info}/RECORD

@@ -1,5 +1,5 @@
 typed_ffmpeg/__init__.py,sha256=n1SZfENc9xhZ0eA3ZzkBNPuIY-Pt3-rOwB8-uUj5olU,1592
-typed_ffmpeg/_version.py,sha256=VJzOHz1iq5b2MvgVxeYYraqogSncMB5aG1qIW2TvKks,511
+typed_ffmpeg/_version.py,sha256=lgTPmPhRGLqWrHHDFV9z5QiSuA5Dn5Dch5YbYnpAWj4,506
 typed_ffmpeg/base.py,sha256=C5Tqbx2I0c-09D7aXKZoGkspu-lAAeAhuOns5zr3PXQ,6304
 typed_ffmpeg/exceptions.py,sha256=D4SID6WOwkjVV8O8mAjrEDHWn-8BRDnK_jteaDof1SY,2474
 typed_ffmpeg/filters.py,sha256=_lBpGZgPHK3KgGVrw-TCdQEsBRuEXVIgwggYNGd80MU,110076
@@ -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=Xuz4gAp4kqeywOxBNgPXH_Ie8lrmwfEdAl-HxMGo9kI,32892
 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
@@ -37,7 +37,7 @@ typed_ffmpeg/ffprobe/schema.py,sha256=PBgBWYGO8wKnI0Lae9oCJ1Nprhv2ciPkdLrumzPVll
 typed_ffmpeg/ffprobe/xml2json.py,sha256=1TSuxR7SYc-M_-JmE-1khHGbXCapgW0Oap9kzL0nwNg,2455
 typed_ffmpeg/streams/__init__.py,sha256=Nt9uWpcVI1sQLl5Qt_kBCBcWOGZA1vczCQ0qvFbSko0,141
 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
@@ -51,9 +51,9 @@ typed_ffmpeg/utils/view.py,sha256=QCSlQoQkRBI-T0sWjiywGgM9DlKd8Te3CB2ZYX-pEVU,34
 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.dist-info/licenses/LICENSE,sha256=8Aaya5i_09Cou2i3QMxTwz6uHGzi_fGA4uhkco07-A4,1066
+typed_ffmpeg_compatible-3.3.dist-info/METADATA,sha256=FtrDI-yit60_yKnw5CfgYotZX9MLBIMiNtqCXBnDPmA,8383
+typed_ffmpeg_compatible-3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+typed_ffmpeg_compatible-3.3.dist-info/entry_points.txt,sha256=kUQvZ27paV-07qtkIFV-emKsYtjFOTw9kknBRSXPs04,45
+typed_ffmpeg_compatible-3.3.dist-info/top_level.txt,sha256=vuASJGVRQiNmhWY1pt0RXESWSNkknWXqWLIRAU7H_L4,13
+typed_ffmpeg_compatible-3.3.dist-info/RECORD,,