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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-orm-lens
-Version: 1.2.2
+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.2 → 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|"
@@ -121,16 +130,21 @@ def _build_body_regexes(indent: int):
         return cached
     w = r"\s{" + str(indent) + r"}"
     w2 = r"\s{" + str(indent * 2) + r"}"
+    # ``(?:\s*:[^=]+)?`` — optional PEP-526 type annotation between the field
+    # name and ``=``, e.g. ``jti: CharField[str] = models.CharField(...)``.
+    # ``[^=]+`` is safe because ``=`` never appears inside a type expression
+    # (subscripts, unions, dotted refs, and generics all use other punctuation).
+    ann = r"(?:\s*:[^=]+)?"
     result = {
         "FIELD_RE": re.compile(
-            rf"^{w}([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*models\.([A-Za-z_][A-Za-z0-9_]*)\s*\("
+            rf"^{w}([a-zA-Z_][a-zA-Z0-9_]*){ann}\s*=\s*models\.([A-Za-z_][A-Za-z0-9_]*)\s*\("
         ),
         "BARE_FIELD_RE": re.compile(
-            rf"^{w}([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*({BARE_FIELD_TYPES})\s*\("
+            rf"^{w}([a-zA-Z_][a-zA-Z0-9_]*){ann}\s*=\s*({BARE_FIELD_TYPES})\s*\("
         ),
         "META_START_RE": re.compile(rf"^{w}class\s+Meta\s*(?:\([^)]*\))?\s*:"),
         "META_ITEM_RE": re.compile(
-            rf"^{w2}([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+?)\s*(#.*)?$"
+            rf"^{w2}([a-zA-Z_][a-zA-Z0-9_]*){ann}\s*=\s*(.+?)\s*(#.*)?$"
         ),
         "META_BODY_RE": re.compile(r"^\s{" + str(indent * 2) + r",}"),
     }

{django_orm_lens-1.2.2 → 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.2
+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.2 → django_orm_lens-1.2.4}/django_orm_lens.egg-info/SOURCES.txt

@@ -30,6 +30,8 @@ tests/test_migration_risk.py
 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.2 → 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.2"
+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_pep526_type_hints.py

@@ -0,0 +1,97 @@
+"""Regression test for issue #25 (jsabater):
+
+Fields annotated with PEP-526 type hints — the modern Django Ninja / typed
+Django style — used to disappear from the parsed model because the field
+regex expected ``name = models.X(`` with no annotation between the name
+and ``=``. When user code writes:
+
+    jti: CharField[str] = models.CharField(max_length=32, unique=True)
+
+the pattern failed silently: no field parsed, sidebar tree empty, ER
+diagram empty entity. Fixed by allowing an optional ``: <type>`` group
+between the field name and the ``=`` in both ``FIELD_RE`` and
+``BARE_FIELD_RE`` (and ``META_ITEM_RE`` for consistency).
+"""
+
+from __future__ import annotations
+
+import unittest
+
+from django_orm_lens.parser import parse_models_file
+
+SAMPLE = '''
+from django.db import models
+from django.db.models import CharField, IntegerField
+
+
+class RevokedToken(models.Model):
+    """A revoked JWT, keyed by its jti claim (the token denylist)."""
+
+    # Exact snippet from the bug report — models.-prefixed with generic type hint.
+    jti: CharField[str] = models.CharField(max_length=32, unique=True)
+
+    # Bare import form + generic type hint.
+    revoked_count: IntegerField[int] = IntegerField(default=0)
+
+    # Simple annotation (no generic).
+    label: str = models.CharField(max_length=64)
+
+    # Backwards-compatible untyped form still works.
+    note = models.TextField(blank=True)
+'''
+
+
+class Pep526TypeAnnotationTest(unittest.TestCase):
+    def setUp(self) -> None:
+        self.models = parse_models_file("auth/models.py", SAMPLE)
+        self.assertEqual(len(self.models), 1, "RevokedToken class parsed")
+        self.token = self.models[0]
+
+    def test_all_four_fields_present(self) -> None:
+        names = [f.name for f in self.token.fields]
+        # The bug: type-hinted fields vanished, only untyped `note` survived.
+        self.assertEqual(names, ["jti", "revoked_count", "label", "note"])
+
+    def test_type_hinted_field_type_extracted(self) -> None:
+        # The field type comes from `models.CharField(...)`, not the annotation.
+        jti = next(f for f in self.token.fields if f.name == "jti")
+        self.assertEqual(jti.type, "CharField")
+
+    def test_bare_import_form_with_annotation(self) -> None:
+        rc = next(f for f in self.token.fields if f.name == "revoked_count")
+        self.assertEqual(rc.type, "IntegerField")
+
+    def test_simple_annotation(self) -> None:
+        label = next(f for f in self.token.fields if f.name == "label")
+        self.assertEqual(label.type, "CharField")
+
+    def test_untyped_form_still_works(self) -> None:
+        note = next(f for f in self.token.fields if f.name == "note")
+        self.assertEqual(note.type, "TextField")
+
+
+META_SAMPLE = '''
+from django.db import models
+
+
+class Item(models.Model):
+    # Type-annotated field followed by Meta with type-annotated attribute.
+    title: str = models.CharField(max_length=100)
+
+    class Meta:
+        ordering: list[str] = ["title"]
+'''
+
+
+class Pep526MetaAnnotationTest(unittest.TestCase):
+    def test_meta_item_with_annotation(self) -> None:
+        models = parse_models_file("shop/models.py", META_SAMPLE)
+        item = models[0]
+        # The field itself must still be visible.
+        self.assertEqual([f.name for f in item.fields], ["title"])
+        # And the Meta annotation must not confuse the Meta reader.
+        self.assertEqual(item.meta.get("ordering"), '["title"]')
+
+
+if __name__ == "__main__":
+    unittest.main()

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()