Update experiment_set_urn validation to handle None values and add corresponding tests

Author: bencap

src/mavedb/view_models/experiment.py

@@ -84,9 +84,11 @@ class ExperimentCreate(ExperimentModify):
     experiment_set_urn: Optional[str] = None
 
     @field_validator("experiment_set_urn")
-    def validate_experiment_urn(cls, v: str) -> str:
-        if (urn_re.MAVEDB_EXPERIMENT_SET_URN_RE.fullmatch(v) is None) and (
-            urn_re.MAVEDB_TMP_URN_RE.fullmatch(v) is None
+    def validate_experiment_urn(cls, v: Optional[str]) -> Optional[str]:
+        if (
+            v is not None
+            and (urn_re.MAVEDB_EXPERIMENT_SET_URN_RE.fullmatch(v) is None)
+            and (urn_re.MAVEDB_TMP_URN_RE.fullmatch(v) is None)
         ):
             raise ValueError(f"'{v}' is not a valid experiment set URN")
         return v
@@ -130,7 +132,9 @@ def publication_identifiers_validator(cls, v: Any, info: ValidationInfo) -> list
     # the appropriate field on the model itself. Then, proceed with Pydantic ingestion once fields are created.
     @model_validator(mode="before")
     def generate_primary_and_secondary_publications(cls, data: Any):
-        if not hasattr(data, "primary_publication_identifiers") or not hasattr(data, "secondary_publication_identifiers"):
+        if not hasattr(data, "primary_publication_identifiers") or not hasattr(
+            data, "secondary_publication_identifiers"
+        ):
             try:
                 publication_identifiers = transform_publication_identifiers_to_primary_and_secondary(
                     data.publication_identifier_associations

tests/view_models/test_experiment.py

@@ -285,3 +285,21 @@ def test_cannot_create_saved_experiment_without_all_attributed_properties(exclud
 
     assert "Unable to create SavedExperiment without attribute" in str(exc_info.value)
     assert exclude in str(exc_info.value)
+
+
+def test_can_create_experiment_with_nonetype_experiment_set_urn():
+    experiment_test = TEST_MINIMAL_EXPERIMENT.copy()
+    experiment_test["experiment_set_urn"] = None
+    experiment = ExperimentCreate(**experiment_test)
+
+    assert experiment.experiment_set_urn is None
+
+
+def test_cant_create_experiment_with_invalid_experiment_set_urn():
+    experiment_test = TEST_MINIMAL_EXPERIMENT.copy()
+    experiment_test["experiment_set_urn"] = "invalid_urn"
+
+    with pytest.raises(ValueError) as exc_info:
+        ExperimentCreate(**experiment_test)
+
+    assert f"'{experiment_test['experiment_set_urn']}' is not a valid experiment set URN" in str(exc_info.value)