chore: reformat and fix lints

Author: lervag

src/apyanki/anki.py

@@ -333,9 +333,13 @@ def list_tags(self, sort_by_count: bool = False) -> None:
         table.add_column("notes", style="magenta", justify="right")
 
         if sort_by_count:
-            sorter = lambda x: x[1]
+
+            def sorter(x):  # type: ignore[no-untyped-def]
+                return x[1]
         else:
-            sorter = lambda x: x[0]
+
+            def sorter(x):  # type: ignore[no-untyped-def]
+                return x[0]
 
         tags = [(t, len(self.col.find_notes(f"tag:{t}"))) for t in self.col.tags.all()]
         for tag, n in sorted(tags, key=sorter):
@@ -482,7 +486,7 @@ def add_notes_with_editor(
             model = self.set_model(model_name)
             input_strings += [
                 x
-                for y in [[f'## {field["name"]}', ""] for field in model["flds"]]
+                for y in [[f"## {field['name']}", ""] for field in model["flds"]]
                 for x in y
             ]
 

src/apyanki/cli.py

@@ -530,7 +530,7 @@ def edit(query: str, force_multiple: bool) -> None:
                 preview_text = note.n.fields[0][:50].replace("\n", " ")
                 if len(preview_text) == 50:
                     preview_text += "..."
-                console.print(f"{i+1}. nid:{note.n.id} - {preview_text}")
+                console.print(f"{i + 1}. nid:{note.n.id} - {preview_text}")
 
             console.print(
                 "\nHints:\n"
@@ -544,7 +544,7 @@ def edit(query: str, force_multiple: bool) -> None:
         for i, note in enumerate(notes):
             if len(notes) > 1:
                 console.print(
-                    f"\nEditing note {i+1} of {len(notes)} (nid: {note.n.id})"
+                    f"\nEditing note {i + 1} of {len(notes)} (nid: {note.n.id})"
                 )
 
                 # Show a brief preview of the note
@@ -640,7 +640,7 @@ def tag(
             if changes.count > 0:
                 console.print(f"[yellow]Purged {changes.count} unused tags.")
             else:
-                console.print(f"No unused tags found.")
+                console.print("No unused tags found.")
 
             return
 

src/apyanki/note.py

@@ -17,9 +17,6 @@
 from rich.table import Table
 from rich.text import Text
 
-if TYPE_CHECKING:
-    from anki.notes import NoteId
-    from anki.cards import CardId
 
 from apyanki import cards
 from apyanki.config import cfg
@@ -272,7 +269,7 @@ def change_model(self) -> Optional[Note]:
             console.clear()
             console.print("Please choose new model:")
             for n, m in enumerate(models):
-                console.print(f"  {n+1}: {m}")
+                console.print(f"  {n + 1}: {m}")
             index: int = console.prompt_int(">>> ", suffix="") - 1
             try:
                 new_model = models[index]
@@ -452,9 +449,9 @@ def review(
         note_number_string = ""
         if i is not None:
             if number_of_notes:
-                note_number_string = f" {i+1} of {number_of_notes}"
+                note_number_string = f" {i + 1} of {number_of_notes}"
             else:
-                note_number_string = f" {i+1}"
+                note_number_string = f" {i + 1}"
 
         menu = Columns(
             [
@@ -590,7 +587,7 @@ def add_to_collection(self, anki: Anki) -> Note:
         field_names = [x.replace(" (markdown)", "") for x in self.fields.keys()]
         for x, y in zip(model_field_names, field_names):
             if x != y:
-                console.print("Warning: Inconsistent field names " f"({x} != {y})")
+                console.print(f"Warning: Inconsistent field names ({x} != {y})")
 
         notetype = anki.col.models.current(for_deck=False)
         new_note = anki.col.new_note(notetype)

src/apyanki/utilities.py

@@ -61,7 +61,7 @@ def choose(items: list[chooseType], text: str = "Choose from list:") -> chooseTy
     """Choose from list of items"""
     console.print(text)
     for i, element in enumerate(items):
-        console.print(f"{i+1}: {element}")
+        console.print(f"{i + 1}: {element}")
 
     index = _read_number_between(1, len(items)) - 1
     return items[index]

tests/test_batch_edit.py

@@ -1,4 +1,5 @@
 """Test batch editing"""
+# ruff: noqa: F401, F811
 
 import os
 import pytest
@@ -33,11 +34,11 @@ def test_add_from_file(collection):
                 """
                 model: Basic
                 tags: marked
-                
+
                 # Note 1
                 ## Front
                 Question?
-                
+
                 ## Back
                 Answer.
                 """