Commit a9efa91
committed
Enforce Embedding.embedder_path NOT NULL to match partial unique constraints
The field was declared null=True, blank=True while its Python annotation
claimed str, surfacing as a mypy assignment mismatch in the #1331 baseline.
More importantly, the unique_embedding_per_{document,annotation,note,
conversation,message}_embedder partial unique constraints (migration 0059)
key on (embedder_path, <parent>) and filter by <parent>__isnull=False — so
any row with NULL embedder_path bypassed duplicate prevention for its
parent entirely.
Every production creation path already supplies a concrete embedder_path:
Embedding.objects.store_embedding(), HasEmbeddingMixin.add_embedding(),
worker_uploads._store_embeddings() (which skips when empty). Enforcing
NOT NULL matches actual behaviour.
Migration 0068 backfills legacy NULL rows with settings.DEFAULT_EMBEDDER,
deleting rows whose backfill would collide with an existing
(default_embedder_path, parent) row (those rows were already unreachable
since no query path filters on NULL). Runs atomic=False so the RunPython
commits before AlterField takes the ACCESS EXCLUSIVE lock to SET NOT NULL,
matching the pattern from migration 0059.
Also removed the now-unreachable `or 'Unknown Model'` fallback in
Embedding.__str__.
Closes #13571 parent d9709c4 commit a9efa91
3 files changed
Lines changed: 118 additions & 4 deletions
File tree
- opencontractserver/annotations
- migrations
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
10 | 14 | | |
11 | 15 | | |
12 | 16 | | |
| |||
Lines changed: 112 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
458 | 458 | | |
459 | 459 | | |
460 | 460 | | |
461 | | - | |
| 461 | + | |
462 | 462 | | |
463 | 463 | | |
464 | | - | |
465 | | - | |
466 | 464 | | |
467 | 465 | | |
468 | 466 | | |
| |||
584 | 582 | | |
585 | 583 | | |
586 | 584 | | |
587 | | - | |
| 585 | + | |
588 | 586 | | |
589 | 587 | | |
590 | 588 | | |
| |||
0 commit comments