Pydantic deprecation warning bits

Author: stephen-riggs

src/murfey/client/instance_environment.py

@@ -9,7 +9,7 @@
 from urllib.parse import ParseResult
 
 from pydantic import BaseModel, ConfigDict, field_validator
-from pydantic_core.core_schema import FieldValidationInfo
+from pydantic_core.core_schema import ValidationInfo
 
 from murfey.client.watchdir import DirWatcher
 
@@ -69,7 +69,7 @@ class MurfeyInstanceEnvironment(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     @field_validator("data_collection_group_ids")
-    def dcg_callback(cls, v, info: FieldValidationInfo):
+    def dcg_callback(cls, v, info: ValidationInfo):
         with global_env_lock:
             for l in info.data.get("listeners", {}).get(
                 "data_collection_group_ids", []
@@ -80,7 +80,7 @@ def dcg_callback(cls, v, info: FieldValidationInfo):
         return v
 
     @field_validator("data_collection_ids")
-    def dc_callback(cls, v, info: FieldValidationInfo):
+    def dc_callback(cls, v, info: ValidationInfo):
         with global_env_lock:
             for l in info.data.get("listeners", {}).get("data_collection_ids", []):
                 for k in v.keys():
@@ -89,7 +89,7 @@ def dc_callback(cls, v, info: FieldValidationInfo):
         return v
 
     @field_validator("processing_job_ids")
-    def job_callback(cls, v, info: FieldValidationInfo):
+    def job_callback(cls, v, info: ValidationInfo):
         with global_env_lock:
             for l in info.data.get("listeners", {}).get("processing_job_ids", []):
                 for k in v.keys():
@@ -98,7 +98,7 @@ def job_callback(cls, v, info: FieldValidationInfo):
         return v
 
     @field_validator("autoproc_program_ids")
-    def app_callback(cls, v, info: FieldValidationInfo):
+    def app_callback(cls, v, info: ValidationInfo):
         with global_env_lock:
             for l in info.data.get("listeners", {}).get("autoproc_program_ids", []):
                 for k in v.keys():

tests/cli/test_decrypt_password.py

@@ -13,7 +13,7 @@ def test_decrypt_password(capsys, tmp_path):
     crypto_key = Fernet.generate_key()
     security_config.crypto_key = crypto_key.decode("ascii")
     with open(tmp_path / "config.yaml", "w") as cfg:
-        yaml.dump(security_config.dict(), cfg)
+        yaml.dump(security_config.model_dump(), cfg)
     os.environ["MURFEY_SECURITY_CONFIGURATION"] = str(tmp_path / "config.yaml")
     password = "abcd"
     f = Fernet(crypto_key)

tests/cli/test_generate_password.py

@@ -12,7 +12,7 @@ def test_generate_password(capsys, tmp_path):
     crypto_key = Fernet.generate_key()
     security_config.crypto_key = crypto_key.decode("ascii")
     with open(tmp_path / "config.yaml", "w") as cfg:
-        yaml.dump(security_config.dict(), cfg)
+        yaml.dump(security_config.model_dump(), cfg)
     os.environ["MURFEY_SECURITY_CONFIGURATION"] = str(tmp_path / "config.yaml")
     run()
     captured = capsys.readouterr()