fix mypy errors

ankihub/ankihub_client/models.py

@@ -8,6 +8,7 @@
 from datetime import date, datetime
 from enum import Enum
 from typing import Any, Callable, Dict, List, Optional, Sequence, Set
+
 from mashumaro import field_options
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.json import DataClassJSONMixin

ankihub/gui/media_sync.py

@@ -8,6 +8,7 @@
 
 import aqt
 from anki.errors import NotFoundError
+from anki.models import NotetypeId
 from anki.notes import NoteId
 from aqt.qt import QAction
 
@@ -198,7 +199,7 @@ def _media_referenced_by_notes(self, ah_did: uuid.UUID) -> Set[str]:
             # Extract media references using Anki's files_in_str (handles latex)
             media_names.update(aqt.mw.col.media.files_in_str(note.mid, flds))
         for note_type_id in note_type_ids:
-            note_type = aqt.mw.col.models.get(note_type_id)
+            note_type = aqt.mw.col.models.get(NotetypeId(note_type_id))
             media_names.update(get_media_names_from_notetype(note_type))
         return media_names
 

ankihub/gui/operations/deck_creation.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timezone
 
 import aqt
+from anki.models import NotetypeId
 from aqt import QCheckBox, QMessageBox
 from aqt.studydeck import StudyDeck
 from aqt.utils import showInfo, tooltip
@@ -118,7 +119,7 @@ def on_success(deck_creation_result: DeckCreationResult) -> None:
         if should_upload_media:
             media_names = get_media_names_from_notes_data(
                 deck_creation_result.notes_data,
-                lambda mid: aqt.mw.col.models.get(mid),
+                lambda mid: aqt.mw.col.models.get(NotetypeId(mid)),
             )
             media_sync.start_media_upload(media_names, deck_creation_result.ankihub_did)
 

ankihub/main/suggestions.py

@@ -23,6 +23,7 @@
 )
 
 import aqt
+from anki.models import NotetypeId
 from anki.notes import Note, NoteId
 
 from ..addon_ankihub_client import AddonAnkiHubClient as AnkiHubClient
@@ -411,7 +412,7 @@ def _rename_and_upload_media_for_suggestions(
         note_info for suggestion in suggestions if (note_info := ankihub_db.note_data(NoteId(suggestion.anki_nid)))
     ]
     original_media_names: Set[str] = get_media_names_from_notes_data(
-        original_notes_data, lambda mid: aqt.mw.col.models.get(mid)
+        original_notes_data, lambda mid: aqt.mw.col.models.get(NotetypeId(mid))
     )
     suggestion_media_names: Set[str] = get_media_names_from_suggestions(suggestions)
 

tests/addon/test_unit.py

@@ -16,7 +16,7 @@
 import pytest
 import requests
 from anki.decks import DeckId
-from anki.models import NotetypeDict
+from anki.models import NotetypeDict, NotetypeId
 from anki.notes import Note, NoteId
 from approvaltests.approvals import verify  # type: ignore
 from approvaltests.namer import NamerFactory  # type: ignore
@@ -2136,7 +2136,7 @@ def test_extracts_media_from_note_fields(
                 ),
             ]
 
-            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(mid))
+            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(NotetypeId(mid)))
 
             assert media_names == {"image1.png", "audio1.mp3", "image2.jpg", "audio2.wav"}
 
@@ -2167,7 +2167,7 @@ def test_extracts_media_from_note_type_templates(
                 ),
             ]
 
-            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(mid))
+            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(NotetypeId(mid)))
 
             assert "template_image.png" in media_names
             assert "template_audio.mp3" in media_names
@@ -2202,7 +2202,7 @@ def test_extracts_media_from_note_type_css(
                 ),
             ]
 
-            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(mid))
+            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(NotetypeId(mid)))
 
             assert media_names == {"foo_import.css", "foo_double_quoted.png", "foo_single_quoted.png"}
 
@@ -2228,7 +2228,7 @@ def test_excludes_remote_media_urls(
                 ),
             ]
 
-            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(mid))
+            media_names = get_media_names_from_notes_data(notes_data, lambda mid: mw.col.models.get(NotetypeId(mid)))
 
             assert media_names == {"local.png", "local.mp3"}
 

tests/client/test_client.py

@@ -11,7 +11,7 @@
 from copy import deepcopy
 from datetime import date, datetime, timedelta, timezone
 from pathlib import Path
-from typing import Callable, Generator, List, Optional, cast
+from typing import Any, Callable, Dict, Generator, List, Optional, cast
 from unittest.mock import Mock
 
 import pytest
@@ -1606,7 +1606,7 @@ def test_zips_media_files_from_deck_notes(
         # We will create and check for just one chunk in this test
         path_to_created_zip_file = Path(TEST_MEDIA_PATH / f"{deck_id}_0_deck_assets_part.zip")
 
-        all_media_names_in_notes = get_media_names_from_notes_data(notes_data, lambda mid: {})
+        all_media_names_in_notes = get_media_names_from_notes_data(notes_data, lambda mid: self._empty_notetype())
         assert path_to_created_zip_file.is_file()
         assert len(all_media_names_in_notes) == 14
         with zipfile.ZipFile(path_to_created_zip_file, "r") as zip_ref:
@@ -1673,11 +1673,14 @@ def test_removes_zipped_file_after_upload(
 
         assert not path_to_created_zip_file.is_file()
 
+    @staticmethod
+    def _empty_notetype() -> Dict[str, Any]:
+        return {"css": "", "tmpls": []}
+
     def _upload_media_for_notes_data(
         self, mocker: MockerFixture, client: AnkiHubClient, notes_data: List[NoteInfo], ah_did: uuid.UUID
     ):
-        mocker.patch("ankihub.ankihub_client.models.get_media_names_from_notetype", return_value=set())
-        media_names = get_media_names_from_notes_data(notes_data, lambda mid: {})
+        media_names = get_media_names_from_notes_data(notes_data, lambda mid: self._empty_notetype())
         media_paths = {TEST_MEDIA_PATH / media_name for media_name in media_names}
         client.upload_media(media_paths, ah_did)