Upgrade ty to 0.0.61

plain-admin/plain/admin/views/registry.py

@@ -71,9 +71,9 @@ def inner(viewset: type[VS]) -> type[VS]:
 
     def get_nav_sections(
         self, *, plain_packages: bool, user: Model
-    ) -> dict[str, list[type]]:
+    ) -> dict[str, list[type[AdminView]]]:
         """Returns nav sections filtered by package type."""
-        sections: dict[str, list[type]] = {}
+        sections: dict[str, list[type[AdminView]]] = {}
 
         for view in self.registered_views:
             is_plain = view.__module__.startswith("plain.")

plain-postgres/plain/postgres/sql/compiler.py

@@ -1258,28 +1258,29 @@ def _get_first_selected_col_from_model(klass_info: dict) -> Any | None:
                     return self.select[select_index][0]
             return None
 
-        def _get_field_choices() -> Generator[str]:
+        def _get_field_choices(root_klass_info: dict[str, Any]) -> Generator[str]:
             """Yield all allowed field paths in breadth-first search order."""
-            queue = collections.deque([(None, self.klass_info)])
+            yield "self"
+
+            queue: collections.deque[tuple[list[str], dict[str, Any]]] = (
+                collections.deque(
+                    ([], related_klass_info)
+                    for related_klass_info in root_klass_info.get(
+                        "related_klass_infos", []
+                    )
+                )
+            )
             while queue:
                 parent_path, klass_info = queue.popleft()
-                if parent_path is None:
-                    path = []
-                    yield "self"
-                else:
-                    assert klass_info is not None  # Only first iteration has None
-                    field = klass_info["field"]
-                    if klass_info["reverse"]:
-                        field = field.remote_field
-                    path = parent_path + [field.name]
-                    yield LOOKUP_SEP.join(path)
-                if klass_info is not None:
-                    queue.extend(
-                        (path, related_klass_info)
-                        for related_klass_info in klass_info.get(
-                            "related_klass_infos", []
-                        )
-                    )
+                field = klass_info["field"]
+                if klass_info["reverse"]:
+                    field = field.remote_field
+                path = parent_path + [field.name]
+                yield LOOKUP_SEP.join(path)
+                queue.extend(
+                    (path, related_klass_info)
+                    for related_klass_info in klass_info.get("related_klass_infos", [])
+                )
 
         if not self.klass_info:
             return []
@@ -1316,7 +1317,7 @@ def _get_field_choices() -> Generator[str]:
                 "Only relational fields followed in the query are allowed. "
                 "Choices are: {}.".format(
                     ", ".join(invalid_names),
-                    ", ".join(_get_field_choices()),
+                    ", ".join(_get_field_choices(self.klass_info)),
                 )
             )
         return result

pyproject.toml

@@ -38,7 +38,7 @@ dev = [
   "plain-tunnel",
   "plain-vendor",
   # Type checking and better dev experience
-  "ty>=0.0.59",
+  "ty>=0.0.61",
   "psycopg[binary]>=3.2.12",
 ]