django-orm-lens 1.2.3__tar.gz → 1.2.4__tar.gz

{django_orm_lens-1.2.3 → django_orm_lens-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-orm-lens
-Version: 1.2.3
+Version: 1.2.4
 Summary: Static analysis + MCP server for Django models. Sidebar tree, ER diagrams, and JSON output for terminals and AI coding agents.
 Author: frowningdev
 License: MIT

{django_orm_lens-1.2.3 → django_orm_lens-1.2.4}/django_orm_lens/parser.py

@@ -37,8 +37,17 @@ from .models import (
 
 RELATION_TYPES: Tuple[str, ...] = ("ForeignKey", "ManyToManyField", "OneToOneField")
 
-CLASS_RE = re.compile(r"^class\s+([A-Za-z_][A-Za-z0-9_]*)\s*\(([^)]*)\)\s*:")
-CLASS_START_RE = re.compile(r"^class\s+([A-Za-z_][A-Za-z0-9_]*)\s*\(")
+# ``(?:\s*\[[^\]]*\])?`` — optional PEP-695 generic type parameter list
+# introduced in Python 3.12, e.g. ``class Container[T](models.Model):``.
+# Only handles a single-line, non-nested bracket group — nested brackets in
+# class-header generics are vanishingly rare and don't warrant a full
+# bracket matcher.
+CLASS_RE = re.compile(
+    r"^class\s+([A-Za-z_][A-Za-z0-9_]*)(?:\s*\[[^\]]*\])?\s*\(([^)]*)\)\s*:"
+)
+CLASS_START_RE = re.compile(
+    r"^class\s+([A-Za-z_][A-Za-z0-9_]*)(?:\s*\[[^\]]*\])?\s*\("
+)
 
 NON_MODEL_TAIL = re.compile(
     r"^(ModelAdmin|ModelForm|ModelSerializer|ModelChoiceField|"

{django_orm_lens-1.2.3 → django_orm_lens-1.2.4}/django_orm_lens.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-orm-lens
-Version: 1.2.3
+Version: 1.2.4
 Summary: Static analysis + MCP server for Django models. Sidebar tree, ER diagrams, and JSON output for terminals and AI coding agents.
 Author: frowningdev
 License: MIT

{django_orm_lens-1.2.3 → django_orm_lens-1.2.4}/django_orm_lens.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ tests/test_migrations_parser.py
 tests/test_nplusone_detector.py
 tests/test_parity.py
 tests/test_pep526_type_hints.py
+tests/test_pep695_generic_classes.py
 tests/test_query_analyzer.py
 tests/test_scan_root.py
 tests/test_signals_parser.py

{django_orm_lens-1.2.3 → django_orm_lens-1.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-orm-lens"
-version = "1.2.3"
+version = "1.2.4"
 description = "Static analysis + MCP server for Django models. Sidebar tree, ER diagrams, and JSON output for terminals and AI coding agents."
 readme = "README.md"
 requires-python = ">=3.9"

django_orm_lens-1.2.4/tests/test_pep695_generic_classes.py

@@ -0,0 +1,71 @@
+"""Regression: PEP-695 generic classes (Python 3.12+) must parse.
+
+Before this fix, ``class Container[T](models.Model):`` failed the
+``CLASS_RE`` pattern entirely — the parser walked past it and reported
+zero models for the whole file. Users on Python 3.12+ writing modern
+typed Django models saw an empty sidebar/ER diagram with no error.
+
+The fix adds an optional ``(?:\\s*\\[[^\\]]*\\])?`` group between the
+class name and the opening ``(`` in both ``CLASS_RE`` and
+``CLASS_START_RE``. Covers single/multi-param, bounded, variadic, and
+paramspec generics — the four common PEP-695 shapes.
+"""
+
+from __future__ import annotations
+
+import unittest
+
+from django_orm_lens.parser import parse_models_file
+
+
+class Pep695GenericClassTest(unittest.TestCase):
+    def test_single_param_generic(self) -> None:
+        src = (
+            "class Container[T](models.Model):\n"
+            "    label = models.CharField(max_length=50)\n"
+        )
+        models = parse_models_file("t.py", src)
+        self.assertEqual(len(models), 1)
+        self.assertEqual(models[0].name, "Container")
+        self.assertEqual([f.name for f in models[0].fields], ["label"])
+
+    def test_multi_param_generic(self) -> None:
+        src = (
+            "class Pair[K, V](models.Model):\n"
+            "    key = models.CharField(max_length=10)\n"
+            "    val = models.CharField(max_length=10)\n"
+        )
+        models = parse_models_file("t.py", src)
+        self.assertEqual(len(models), 1)
+        self.assertEqual([f.name for f in models[0].fields], ["key", "val"])
+
+    def test_bounded_generic(self) -> None:
+        src = (
+            "class Bounded[T: str](models.Model):\n"
+            "    x = models.CharField(max_length=5)\n"
+        )
+        models = parse_models_file("t.py", src)
+        self.assertEqual(len(models), 1)
+
+    def test_variadic_and_paramspec(self) -> None:
+        src = (
+            "class Variadic[*Ts, **P](models.Model):\n"
+            "    x = models.CharField(max_length=5)\n"
+        )
+        models = parse_models_file("t.py", src)
+        self.assertEqual(len(models), 1)
+
+    def test_non_generic_still_works(self) -> None:
+        # Backward-compat guard — the ``[T]`` group is optional, plain
+        # class headers must still parse identically.
+        src = (
+            "class Plain(models.Model):\n"
+            "    x = models.CharField(max_length=5)\n"
+        )
+        models = parse_models_file("t.py", src)
+        self.assertEqual(len(models), 1)
+        self.assertEqual(models[0].name, "Plain")
+
+
+if __name__ == "__main__":
+    unittest.main()