chore: Update to use openjd-model based on Pydantic V2 instead of Pydantic V1

Signed-off-by: Mark Wiebe <[email protected]>

Author: mwiebe

hatch.toml

@@ -21,7 +21,7 @@ lint = [
 ]
 
 [[envs.all.matrix]]
-python = ["3.9", "3.10", "3.11"]
+python = ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
 [envs.codebuild.scripts]
 build = "hatch build"

src/openjd/cli/_schema/_schema_command.py

@@ -59,10 +59,7 @@ def do_get_schema(args: Namespace) -> OpenJDCliResult:
     schema_doc: dict = {}
 
     try:
-        # The `schema` attribute will have to be updated if/when Pydantic
-        # is updated to v2.
-        # (AFAIK it can be replaced with `model_json_schema()`.)
-        schema_doc = Template.schema()
+        schema_doc = Template.model_json_schema()
         _process_regex(schema_doc)
     except Exception as e:
         return OpenJDCliResult(status="error", message=f"ERROR generating schema: {str(e)}")

test/openjd/cli/test_common.py

@@ -26,7 +26,7 @@
 from openjd.cli._common._job_from_template import job_from_template
 from openjd.model import (
     DecodeValidationError,
-    decode_template,
+    decode_job_template,
 )
 
 
@@ -364,11 +364,13 @@ def test_job_from_template_success(
     Test that `job_from_template` creates a Job with the provided parameters.
     """
     template_dir, current_working_dir = template_dir_and_cwd
-    template = decode_template(template=template_dict)
+    template = decode_job_template(template=template_dict)
 
     result = job_from_template(template, mock_params, template_dir, current_working_dir)
     assert result.name == expected_job_name
-    assert result.steps == template.steps
+    assert [step.model_dump(exclude_none=True) for step in result.steps] == [
+        step.model_dump(exclude_none=True) for step in template.steps
+    ]
     if result.parameters:
         assert len(result.parameters) == len(mock_params)
 
@@ -410,7 +412,7 @@ def test_job_from_template_error(
     """
     template_dir, current_working_dir = template_dir_and_cwd
 
-    template = decode_template(template=template_dict)
+    template = decode_job_template(template=template_dict)
 
     with pytest.raises(RuntimeError) as rte:
         job_from_template(template, mock_params, template_dir, current_working_dir)

test/openjd/cli/test_schema_command.py

@@ -2,7 +2,7 @@
 
 from openjd.cli._schema._schema_command import do_get_schema, _process_regex
 from openjd.model import TemplateSpecificationVersion
-from pydantic.v1 import BaseModel
+import openjd.model.v2023_09
 
 from argparse import Namespace
 import json
@@ -129,9 +129,10 @@ def test_do_get_schema_error(capsys: pytest.CaptureFixture):
     """
 
     with (
-        patch.object(BaseModel, "schema", side_effect=RuntimeError("Test error")),
+        patch.object(openjd.model.v2023_09, "JobTemplate") as job_template_class,
         pytest.raises(SystemExit),
     ):
+        job_template_class.model_json_schema.side_effect = RuntimeError("Test error")
         do_get_schema(
             Namespace(
                 version=TemplateSpecificationVersion.JOBTEMPLATE_v2023_09.value,