moved type defs around

tikuma-lsuhsc · hokiedsp · commit 1613fb5e78e4 · 2025-06-01T10:26:39.000-04:00
diff --git a/src/ffmpegio/_typing.py b/src/ffmpegio/_typing.py
@@ -33,20 +33,7 @@
 """
 
 
-
-
 MediaType = Literal["audio", "video"]
 
 FFmpegUrlType = Union[str, Path, ParseResult]
-FFmpegInputType = Literal["url", "filtergraph", "buffer", "fileobj"]
-FFmpegOutputType = Literal["url", "fileobj"]
-
-
-
-class InputSourceDict(TypedDict):
-    """input source info"""
 
-    src_type: FFmpegInputType  # True if file path/url
-    bytes: NotRequired[bytes]  # index of the source index
-    fileobj: NotRequired[IO]  # file object
-    pipe: NotRequired[NPopen]  # pipe
diff --git a/src/ffmpegio/configure.py b/src/ffmpegio/configure.py
@@ -1,6 +1,16 @@
 from __future__ import annotations
 
-from .typing import Literal, Any, FFmpegArgs, FFmpegUrlType
+from ._typing import (
+    Literal,
+    Any,
+    MediaType,
+    FFmpegUrlType,
+    Union,
+    NotRequired,
+    TypedDict,
+    IO,
+    Buffer,
+)
 from collections.abc import Sequence
 
 from fractions import Fraction
@@ -16,6 +26,33 @@
 from ._utils import as_multi_option, is_non_str_sequence
 
 UrlType = Literal["input", "output"]
+FFmpegInputType = Literal["url", "filtergraph", "buffer", "fileobj"]
+FFmpegOutputType = Literal["url", "fileobj"]
+
+FFmpegInputUrlComposite = Union[FFmpegUrlType, FilterGraphObject, IO, Buffer]
+FFmpegOutputUrlComposite = Union[FFmpegUrlType, IO]
+
+
+class FFmpegArgs(TypedDict):
+    """FFmpeg arguments"""
+
+    inputs: list[
+        tuple[FFmpegUrlType | FilterGraphObject | FFConcat, dict | None]
+    ]  # list of input definitions (pairs of url and options)
+    outputs: list[
+        tuple[FFmpegUrlType, dict | None]
+    ]  # list of output definitions (pairs of url and options)
+    global_options: NotRequired[dict | None]  # FFmpeg global options
+
+
+class InputSourceDict(TypedDict):
+    """input source info"""
+
+    src_type: FFmpegInputType  # True if file path/url
+    bytes: NotRequired[bytes]  # index of the source index
+    fileobj: NotRequired[IO]  # file object
+    pipe: NotRequired[NPopen]  # pipe
+
 
 
 def array_to_video_input(
diff --git a/src/ffmpegio/typing.py b/src/ffmpegio/typing.py
@@ -10,19 +10,7 @@
 
 from .stream_spec import MediaType, StreamSpecDict, StreamSpecDictMediaType
 
-# from typing_extensions import *
-
+from .configure import FFmpegArgs, FFmpegUrlType
 
-class FFmpegArgs(TypedDict):
-    """FFmpeg arguments"""
-
-    inputs: list[
-        tuple[FFmpegUrlType | FilterGraphObject, dict | None]
-    ]  # list of input definitions (pairs of url and options)
-    outputs: list[
-        tuple[FFmpegUrlType, dict | None]
-    ]  # list of output definitions (pairs of url and options)
-    global_options: NotRequired[dict | None]  # FFmpeg global options
+# from typing_extensions import *
 
-FFmpegInputUrlComposite = Union[FFmpegUrlType, FilterGraphObject, IO, Buffer]
-FFmpegOutputUrlComposite = Union[FFmpegUrlType, IO]
diff --git a/src/ffmpegio/utils/typing.py b/src/ffmpegio/utils/typing.py
