Fix ty errors

Author: Buried-In-Code

.github/workflows/linting.yaml

@@ -16,7 +16,7 @@ env:
   PY_VERSION: 3.14
 
 jobs:
-  pre-commit:
+  prek:
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -28,5 +28,5 @@ jobs:
           python-version: ${{ env.PY_VERSION }}
       - name: Install project
         run: uv sync --locked --dev
-      - name: Run pre-commit
+      - name: Run prek
         run: uv run prek run -a

perdoo/cli/process.py

@@ -39,9 +39,11 @@ class SyncOption(str, Enum):
 def get_services(settings: Services) -> dict[Service, BaseService]:
     output = {}
     if settings.comicvine.api_key:
-        output[Service.COMICVINE] = Comicvine(settings.comicvine)
+        output[Service.COMICVINE] = Comicvine(api_key=settings.comicvine.api_key)
     if settings.metron.username and settings.metron.password:
-        output[Service.METRON] = Metron(settings.metron)
+        output[Service.METRON] = Metron(
+            username=settings.metron.username, password=settings.metron.password
+        )
     return output
 
 
@@ -98,22 +100,27 @@ def get_id(ids: list[Id], source: InformationSource) -> str | None:
     return next((x.value for x in ids if x.source is source), None)
 
 
-def search_from_metron_info(metron_info: MetronInfo) -> Search:
+def search_from_metron_info(metron_info: MetronInfo, filename: str) -> Search:
     series_id = metron_info.series.id
+    comicvine_id = get_id(metron_info.ids, InformationSource.COMIC_VINE)
+    metron_id = get_id(metron_info.ids, InformationSource.METRON)
     source = next((x.source for x in metron_info.ids if x.primary), None)
     return Search(
         series=SeriesSearch(
             name=metron_info.series.name,
             volume=metron_info.series.volume,
             year=metron_info.series.start_year,
-            comicvine=series_id if source == InformationSource.COMIC_VINE else None,
-            metron=series_id if source == InformationSource.METRON else None,
+            comicvine=int(series_id)
+            if series_id and source == InformationSource.COMIC_VINE
+            else None,
+            metron=int(series_id) if series_id and source == InformationSource.METRON else None,
         ),
         issue=IssueSearch(
             number=metron_info.number,
-            comicvine=get_id(metron_info.ids, InformationSource.COMIC_VINE),
-            metron=get_id(metron_info.ids, InformationSource.METRON),
+            comicvine=int(comicvine_id) if comicvine_id else None,
+            metron=int(metron_id) if metron_id else None,
         ),
+        filename=filename,
     )
 
 
@@ -124,19 +131,21 @@ def search_from_comic_info(comic_info: ComicInfo, filename: str) -> Search:
     return Search(
         series=SeriesSearch(name=comic_info.series or filename, volume=volume, year=year),
         issue=IssueSearch(number=comic_info.number),
+        filename=filename,
     )
 
 
 def search_from_filename(filename: str) -> Search:
-    series_name = comicfn2dict(filename).get("series", filename).replace("-", " ")
-    return Search(series=SeriesSearch(name=series_name), issue=IssueSearch())
+    series_name = comicfn2dict(filename).get("series", filename)
+    series_name = str(series_name).replace("-", " ")
+    return Search(series=SeriesSearch(name=series_name), issue=IssueSearch(), filename=filename)
 
 
 def build_search(
     metron_info: MetronInfo | None, comic_info: ComicInfo | None, filename: str
 ) -> Search:
     if metron_info and metron_info.series and metron_info.series.name:
-        return search_from_metron_info(metron_info=metron_info)
+        return search_from_metron_info(metron_info=metron_info, filename=filename)
     if comic_info and comic_info.series:
         return search_from_comic_info(comic_info=comic_info, filename=filename)
     return search_from_filename(filename=filename)
@@ -166,7 +175,6 @@ def resolve_metadata(
     search = build_search(
         metron_info=metron_info, comic_info=comic_info, filename=entry.filepath.stem
     )
-    search.filename = entry.filepath.stem
     return sync_metadata(search=search, services=services, service_order=settings.order)
 
 

perdoo/comic/archives/session.py

@@ -71,7 +71,8 @@ def __exit__(
     def list(self) -> list[str]:
         if self._archive.IS_EDITABLE:
             return self._archive.list_filenames()
-        assert self._folder
+        if not self._folder:
+            return []
         return [p.name for p in self._folder.iterdir()]
 
     def contains(self, filename: str) -> bool:
@@ -80,7 +81,8 @@ def contains(self, filename: str) -> bool:
     def read(self, filename: str) -> bytes:
         if self._archive.IS_READABLE:
             return self._archive.read_file(filename=filename)
-        assert self._folder
+        if not self._folder:
+            return b""
         return (self._folder / filename).read_bytes()
 
     def write(self, filename: str, data: str | bytes) -> None:
@@ -90,7 +92,8 @@ def write(self, filename: str, data: str | bytes) -> None:
         if self._archive.IS_EDITABLE:
             self._archive.write_file(filename=filename, data=data)
         else:
-            assert self._folder
+            if not self._folder:
+                return
             (self._folder / filename).write_bytes(data)
         self._updated = True
 
@@ -99,7 +102,8 @@ def delete(self, filename: str) -> None:
         if self._archive.IS_EDITABLE:
             self._archive.delete_file(filename=filename)
         else:
-            assert self._folder
+            if not self._folder:
+                return
             (self._folder / filename).unlink(missing_ok=True)
         self._updated = True
 
@@ -108,7 +112,8 @@ def rename(self, filename: str, new_name: str, override: bool = False) -> None:
         if self._archive.IS_EDITABLE:
             self._archive.rename_file(filename=filename, new_name=new_name, override=override)
         else:
-            assert self._folder
+            if not self._folder:
+                return
             src = self._folder / filename
             if not src.exists():
                 raise ComicArchiveError(f"Unable to rename '{src}' as it does not exist.")

perdoo/comic/metadata/_base.py

@@ -24,8 +24,8 @@
 LOGGER = logging.getLogger(__name__)
 
 
-def sanitize(value: str | None, seperator: Literal["-", "_", ".", " "]) -> str | None:
-    if not value:
+def sanitize(value: str | int | None, seperator: Literal["-", "_", ".", " "]) -> str | None:
+    if value is None:
         return value
     value = str(value)
     value = re.sub(r"[^0-9a-zA-Z&! ]+", "", value.replace(seperator, " "))
@@ -59,9 +59,10 @@ def from_bytes(cls, content: bytes) -> Self:
         return cls.from_xml(content)
 
     def to_bytes(self) -> bytes:
-        return b'<?xml version="1.0" encoding="UTF-8"?>\n' + self.to_xml(
-            skip_empty=True, pretty_print=True, encoding="UTF-8"
-        )
+        content = self.to_xml(skip_empty=True, pretty_print=True, encoding="UTF-8")
+        if isinstance(content, str):
+            return ('<?xml version="1.0" encoding="UTF-8"?>\n' + content).encode("UTF-8")
+        return b'<?xml version="1.0" encoding="UTF-8"?>\n' + content
 
     def to_file(self, file: Path) -> None:
         file.write_bytes(self.to_bytes())
@@ -76,7 +77,7 @@ def display(self) -> None:
 
     def evaluate_pattern(
         self,
-        pattern_map: dict[str, Callable[[Self], str]],
+        pattern_map: dict[str, Callable[[Self], str | int | None]],
         pattern: str,
         seperator: Literal["-", "_", ".", " "],
     ) -> str:

perdoo/services/comicvine.py

@@ -17,17 +17,16 @@
 from perdoo.comic.metadata import ComicInfo, MetronInfo
 from perdoo.comic.metadata.metron_info import InformationSource
 from perdoo.services._base import BaseService
-from perdoo.settings import Comicvine as ComicvineSettings
 from perdoo.utils import IssueSearch, Search, SeriesSearch
 
 LOGGER = logging.getLogger(__name__)
 DEFAULT_CHOICE = Choice(title="None of the Above", value=None)
 
 
 class Comicvine(BaseService[Volume, Issue]):
-    def __init__(self, settings: ComicvineSettings):
+    def __init__(self, api_key: str):
         cache = SQLiteCache(path=get_cache_root() / "simyan.sqlite")
-        self.session = Simyan(api_key=settings.api_key, cache=cache)
+        self.session = Simyan(api_key=api_key, cache=cache)
 
     def _search_series(
         self, name: str | None, volume: int | None, year: int | None, filename: str
@@ -187,17 +186,28 @@ def load_role(value: str) -> Role:
 
         return MetronInfo(
             ids=[Id(primary=True, source=InformationSource.COMIC_VINE, value=str(issue.id))],
-            publisher=Publisher(id=str(series.publisher.id), name=series.publisher.name),
-            series=Series(id=str(series.id), name=series.name, start_year=series.start_year),
+            publisher=Publisher(id=str(series.publisher.id), name=series.publisher.name)
+            if series.publisher and series.publisher.name
+            else None,
+            series=Series(
+                id=str(series.id),
+                name=series.name,
+                start_year=series.start_year,
+                alternative_names=[],
+            ),
             collection_title=issue.name,
             number=issue.number,
             summary=issue.summary,
             cover_date=issue.cover_date,
             store_date=issue.store_date,
-            arcs=[Arc(id=str(x.id), name=x.name) for x in issue.story_arcs],
-            characters=[Resource[str](id=str(x.id), value=x.name) for x in issue.characters],
-            teams=[Resource[str](id=str(x.id), value=x.name) for x in issue.teams],
-            locations=[Resource[str](id=str(x.id), value=x.name) for x in issue.locations],
+            arcs=[Arc(id=str(x.id), name=x.name) for x in issue.story_arcs if x.name],
+            characters=[
+                Resource[str](id=str(x.id), value=x.name) for x in issue.characters if x.name
+            ],
+            teams=[Resource[str](id=str(x.id), value=x.name) for x in issue.teams if x.name],
+            locations=[
+                Resource[str](id=str(x.id), value=x.name) for x in issue.locations if x.name
+            ],
             urls=[Url(primary=True, value=issue.site_url)],
             credits=[
                 Credit(
@@ -209,8 +219,15 @@ def load_role(value: str) -> Role:
                     ],
                 )
                 for x in issue.creators
+                if x.name
             ],
             last_modified=datetime.now(),
+            genres=[],
+            prices=[],
+            reprints=[],
+            stories=[],
+            tags=[],
+            universes=[],
         )
 
     def _process_comic_info(self, series: Volume, issue: Issue) -> ComicInfo | None:
@@ -221,17 +238,19 @@ def _process_comic_info(self, series: Volume, issue: Issue) -> ComicInfo | None:
             summary=issue.summary,
             publisher=series.publisher.name if series.publisher else None,
             web=issue.site_url,
+            pages=[],
         )
 
         comic_info.cover_date = issue.cover_date
         comic_info.credits = {
             x.name: [r.strip() for r in re.split(r"[~\r\n,]+", x.roles) if r.strip()]
             for x in issue.creators
+            if x.name
         }
-        comic_info.character_list = [x.name for x in issue.characters]
-        comic_info.team_list = [x.name for x in issue.teams]
-        comic_info.location_list = [x.name for x in issue.locations]
-        comic_info.story_arc_list = [x.name for x in issue.story_arcs]
+        comic_info.character_list = [x.name for x in issue.characters if x.name]
+        comic_info.team_list = [x.name for x in issue.teams if x.name]
+        comic_info.location_list = [x.name for x in issue.locations if x.name]
+        comic_info.story_arc_list = [x.name for x in issue.story_arcs if x.name]
 
         return comic_info
 

perdoo/services/metron.py

@@ -15,17 +15,16 @@
 from perdoo.comic.metadata import ComicInfo, MetronInfo
 from perdoo.comic.metadata.metron_info import InformationSource
 from perdoo.services._base import BaseService
-from perdoo.settings import Metron as MetronSettings
 from perdoo.utils import IssueSearch, Search, SeriesSearch
 
 LOGGER = logging.getLogger(__name__)
 DEFAULT_CHOICE = Choice(title="None of the Above", value=None)
 
 
 class Metron(BaseService[Series, Issue]):
-    def __init__(self, settings: MetronSettings):
+    def __init__(self, username: str, password: str):
         cache = SQLiteCache(path=get_cache_root() / "seagrin.sqlite")
-        self.session = Seagrin(username=settings.username, password=settings.password, cache=cache)
+        self.session = Seagrin(username=username, password=password, cache=cache)
 
     def _search_series_by_comicvine(self, comicvine_id: int | None) -> int | None:
         if not comicvine_id:
@@ -220,8 +219,9 @@ def load_role(value: str) -> Role:
                 volume=series.volume,
                 format=Format.load(value=series.series_type.name),
                 start_year=series.year_began,
+                alternative_names=[],
             ),
-            collection_title=issue.collection_title or None,
+            collection_title=issue.title or None,
             number=issue.number,
             stories=[Resource[str](value=x) for x in issue.story_titles],
             summary=issue.desc,
@@ -250,6 +250,8 @@ def load_role(value: str) -> Role:
                 for x in issue.credits
             ],
             last_modified=datetime.now(),
+            locations=[],
+            tags=[],
         )
 
     def _process_comic_info(self, series: Series, issue: Issue) -> ComicInfo | None:
@@ -262,7 +264,7 @@ def load_age_rating(value: str) -> AgeRating:
                 return AgeRating.UNKNOWN
 
         comic_info = ComicInfo(
-            title=issue.collection_title,
+            title=issue.title,
             series=series.name,
             number=issue.number,
             volume=series.volume,
@@ -272,6 +274,7 @@ def load_age_rating(value: str) -> AgeRating:
             page_count=issue.page_count or 0,
             format=series.series_type.name,
             age_rating=load_age_rating(value=issue.rating.name),
+            pages=[],
         )
 
         comic_info.cover_date = issue.cover_date

perdoo/utils.py

@@ -45,22 +45,22 @@ class SeriesSearch:
     name: str
     volume: int | None = None
     year: int | None = None
-    comicvine: str | None = None
-    metron: str | None = None
+    comicvine: int | None = None
+    metron: int | None = None
 
 
 @dataclass
 class IssueSearch:
     number: str | None = None
-    comicvine: str | None = None
-    metron: str | None = None
+    comicvine: int | None = None
+    metron: int | None = None
 
 
 @dataclass
 class Search:
     series: SeriesSearch
     issue: IssueSearch
-    filename: str | None = None
+    filename: str
 
 
 def list_files(path: Path, *extensions: str) -> list[Path]:

prek.toml

@@ -2,9 +2,9 @@
 hooks = [
   {args = ["--all", "--in-place"], entry = "toml-sort", id = "toml-sort", language = "system", name = "toml sort", types = ["toml"]},
   {args = ["--number", "--wrap=keep"], entry = "mdformat", exclude = "(.github/ISSUE_TEMPLATE/.*|README).md", id = "mdformat", language = "system", name = "mdformat", types = ["markdown"]},
-  {entry = "ruff check .", id = "ruff-check", language = "system", name = "ruff check", types = ["python"]},
-  {entry = "ruff format .", id = "ruff-format", language = "system", name = "ruff format", types = ["python"]},
-  {entry = "ty check .", id = "ty", language = "system", name = "ty", types = ["python"]},
+  {entry = "ruff check .", id = "ruff-check", language = "system", name = "ruff check", pass_filenames = false, types = ["python"]},
+  {entry = "ruff format .", id = "ruff-format", language = "system", name = "ruff format", pass_filenames = false, types = ["python"]},
+  {entry = "ty check .", id = "ty", language = "system", name = "ty", pass_filenames = false, types = ["python"]},
 ]
 repo = "local"
 
@@ -47,7 +47,7 @@ rev = "v6.0.0"
 
 [[repos]]
 hooks = [
-  {id = "check-hooks-apply"},
+  # {id = "check-hooks-apply"},
   {id = "check-useless-excludes"},
 ]
 repo = "meta"

pyproject.toml

@@ -163,3 +163,7 @@ min_version = "4.22"
 [tool.tox.env_run_base]
 commands = [["pytest"]]
 dependency_groups = ["tests"]
+
+[tool.ty.src]
+exclude = ["**/tests/"]
+include = ["**/perdoo"]