Debug a validator, modify a test and change the alembic version number.

Author: EstelleDa

alembic/versions/0b29eefbe1dd_controlled_keyword_modification.py

@@ -1,7 +1,7 @@
 """controlled keyword modification
 
 Revision ID: 0b29eefbe1dd
-Revises: af87c9953d2d
+Revises: 2b7a977e7e98
 Create Date: 2025-08-07 15:45:43.241567
 
 """
@@ -11,7 +11,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '0b29eefbe1dd'
-down_revision = 'af87c9953d2d'
+down_revision = '2b7a977e7e98'
 branch_labels = None
 depends_on = None
 

src/mavedb/view_models/keyword.py

@@ -3,7 +3,7 @@
 
 from typing import Optional
 
-from pydantic import field_validator
+from pydantic import field_validator, model_validator
 
 from mavedb.lib.validation import keywords
 from mavedb.view_models import record_type_validator, set_record_type
@@ -29,12 +29,11 @@ def validate_key(cls, v: str) -> str:
         keywords.validate_keyword(v)
         return v
 
-    @field_validator("code")
-    def validate_code(cls, value, values):
-        key = values.get("key")
-        label = values.get("label")
-        keywords.validate_code(key, label, value)
-        return value
+    @model_validator(mode="after")
+    def validate_code(self):
+        keywords.validate_code(self.key, self.label, self.code)
+        return self
+
 
     # TODO#273: Un-commenting this block will require new experiments to contain a keyword on creation.
     # @field_validator("label")

tests/routers/test_experiments.py

@@ -363,7 +363,7 @@ def test_cannot_create_experiment_that_keyword_has_an_invalid_code(client, setup
     response = client.post("/api/v1/experiments/", json=experiment)
     assert response.status_code == 422
     response_data = response.json()
-    assert response_data["detail"][0]["msg"] == "Invalid Gene Ontology accession."
+    assert "Invalid Gene Ontology accession." in response_data["detail"][0]["msg"]
 
 
 def test_cannot_create_experiment_that_keyword_label_is_other_without_description(client, setup_router_db):