Fix or ignore typing issues

Author: pganssle

src/audio_feeder/_compat.py

@@ -6,6 +6,6 @@
 try:
     from enum import StrEnum  # type: ignore[attr-defined]
 except ImportError:
-    from backports.strenum import StrEnum  # type: ignore[import]
+    from backports.strenum import StrEnum  # type: ignore[import,no-redef]
 
 __all__ = ("Self", "StrEnum")

src/audio_feeder/file_probe.py

@@ -67,6 +67,7 @@ class OverdriveMediaMarker:
     @classmethod
     def from_xml(cls, xml: str) -> typing.Sequence[Self]:
         root = lxml.etree.fromstring(xml)
+        assert isinstance(root.tag, str)
         if root.tag != "Markers":
             raise ValueError(
                 f"Unknown media marker tag: {root.tag}. " + "Should be 'Markers'"
@@ -197,6 +198,7 @@ def from_json(cls, json_dict: FFProbeReturnJSON) -> Self:
             if omm_tag in format_info.tags:
                 omm_tags = OverdriveMediaMarker.from_xml(format_info.tags[omm_tag])
                 omm_tags = sorted(omm_tags)
+                assert format_info.duration is not None  # TODO: Handle this gracefully
 
                 for num, start_tag, end_tag in zip(
                     itertools.count(1),

src/audio_feeder/m4btools.py

@@ -271,7 +271,7 @@ def _merge_subsets(
             "\n".join(_to_file_list_entry(x.path, x.start, x.end) for x in subsets)
         )
 
-        cmd_before = [
+        cmd_before: Sequence[str] = (
             "ffmpeg",
             "-loglevel",
             "error",
@@ -289,9 +289,9 @@ def _merge_subsets(
             "0",
             "-c:a",
             audio_codec,
-        ]
+        )
 
-        cmd_after = []
+        cmd_after: Sequence[str] = ()
 
         logging.debug("file list:\n%s", file_list.read_text())
         _try_video_variations(
@@ -332,7 +332,7 @@ def _extract_subset(
     if subset.end:
         subset_directives.extend(("-to", str(subset.end)))
 
-    cmd_before = [
+    cmd_before: Sequence[str] = [
         "ffmpeg",
         "-loglevel",
         "error",
@@ -349,7 +349,7 @@ def _extract_subset(
         "copy",
     ]
 
-    cmd_after = []
+    cmd_after: Sequence[str] = ()
 
     _try_video_variations(
         cmd_before,
@@ -413,7 +413,9 @@ def chapter_split_jobs(
 
             job_pool.append(new_job)
 
-        if abs(chapter.end_time - file_infos[fpath].format_info.duration) < 0.25:
+        duration = file_infos[fpath].format_info.duration
+        assert duration is not None  # TODO: Handle this gracefully
+        if abs(chapter.end_time - duration) < 0.25:
             end_time = None
         else:
             end_time = chapter.end_time

src/audio_feeder/object_handler.py

@@ -50,16 +50,16 @@ class BaseObject:
     id: ID
 
     def to_dict(self) -> typing.Mapping[str, typing.Any]:
-        return attrs.asdict(self)
+        return attrs.asdict(self)  # type: ignore[arg-type]
 
     def to_dict_sparse(
         self, *, _filter=_filter_sparse
     ) -> typing.Mapping[str, typing.Any]:
-        return attrs.asdict(self, filter=_filter)
+        return attrs.asdict(self, filter=_filter)  # type: ignore[arg-type]
 
     def copy(self: Self) -> Self:
         """Make a new copy of this object."""
-        return attrs.evolve(self)
+        return attrs.evolve(self)  # type: ignore[misc]
 
 
 # SqlAlchemy has problems with slots ☹

src/audio_feeder/rss_feeds.py

@@ -208,9 +208,10 @@ def _executor() -> futures.Executor:
             file_hash = None
 
         if entry_obj.file_metadata is None or m_rel_path not in entry_obj.file_metadata:
+            # TODO: Use an assertion or fix fl.path possibly being None
             metadata_futures.append(
                 _executor().submit(
-                    lambda fl, fh: (fl, fp.FileInfo.from_file(fl.path), fh),
+                    lambda fl, fh: (fl, fp.FileInfo.from_file(fl.path), fh),  # type: ignore[arg-type]
                     file_loc,
                     file_hash,
                 )

src/audio_feeder/updater.py

@@ -30,7 +30,7 @@
 # This technically violates PEP 484, but it works. See
 # https://github.com/python/mypy/issues/14023 for more details.
 _PBar = typing.TypeVar(
-    "_PBar", bound=typing.Callable[[typing.Iterable[_T]], typing.Iterable[_T]]
+    "_PBar", bound=typing.Callable[[typing.Iterable[_T]], typing.Iterable[_T]]  # type: ignore[valid-type]
 )
 
 

tox.ini

@@ -85,7 +85,7 @@ description = Run typechecking
 deps =
     attrs
     click
-    mypy>=0.991,<1
+    mypy>=0.991
     types-requests
     types-lxml
     types-pyyaml