use json_schema examples

Author: sanderegg

services/dynamic-scheduler/tests/unit/api_frontend/helpers.py

@@ -92,8 +92,7 @@ async def assert_not_contains_text(
 
 def get_new_style_service_status(state: str) -> DynamicServiceGet:
     return TypeAdapter(DynamicServiceGet).validate_python(
-        DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
-        | {"state": state}
+        DynamicServiceGet.model_json_schema()["examples"][0] | {"state": state}
     )
 
 

services/dynamic-scheduler/tests/unit/service_tracker/test__api.py

@@ -126,11 +126,9 @@ async def test_services_tracer_workflow(
         ],
         *[
             DynamicServiceGet.model_validate(o)
-            for o in DynamicServiceGet.model_config["json_schema_extra"]["examples"]
+            for o in DynamicServiceGet.model_json_schema()["examples"]
         ],
-        NodeGetIdle.model_validate(
-            NodeGetIdle.model_config["json_schema_extra"]["example"]
-        ),
+        NodeGetIdle.model_validate(NodeGetIdle.model_json_schema()["example"]),
     ],
 )
 async def test_set_if_status_changed(
@@ -182,11 +180,11 @@ async def test_set_service_status_task_uid(
                 TypeAdapter(DynamicServiceGet).validate_python(o),
                 NORMAL_RATE_POLL_INTERVAL,
             )
-            for o in DynamicServiceGet.model_config["json_schema_extra"]["examples"]
+            for o in DynamicServiceGet.model_json_schema()["examples"]
         ],
         (
             TypeAdapter(NodeGetIdle).validate_python(
-                NodeGetIdle.model_config["json_schema_extra"]["example"]
+                NodeGetIdle.model_json_schema()["example"]
             ),
             _LOW_RATE_POLL_INTERVAL,
         ),
@@ -208,15 +206,15 @@ def _get_node_get_from(service_state: ServiceState) -> NodeGet:
 def _get_dynamic_service_get_from(
     service_state: ServiceState,
 ) -> DynamicServiceGet:
-    dict_data = DynamicServiceGet.model_config["json_schema_extra"]["examples"][1]
+    dict_data = DynamicServiceGet.model_json_schema()["examples"][1]
     assert "service_state" in dict_data
     dict_data["service_state"] = service_state
     return TypeAdapter(DynamicServiceGet).validate_python(dict_data)
 
 
 def _get_node_get_idle() -> NodeGetIdle:
     return TypeAdapter(NodeGetIdle).validate_python(
-        NodeGetIdle.model_config["json_schema_extra"]["example"]
+        NodeGetIdle.model_json_schema()["example"]
     )
 
 

services/dynamic-scheduler/tests/unit/status_monitor/test_services_status_monitor__monitor.py

@@ -94,9 +94,7 @@ def _get_node_get_with(state: str, node_id: NodeID = _DEFAULT_NODE_ID) -> NodeGe
 def _get_dynamic_service_get_legacy_with(
     state: str, node_id: NodeID = _DEFAULT_NODE_ID
 ) -> DynamicServiceGet:
-    dict_data = deepcopy(
-        DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
-    )
+    dict_data = deepcopy(DynamicServiceGet.model_json_schema()["examples"][0])
     _add_to_dict(
         dict_data,
         [
@@ -110,9 +108,7 @@ def _get_dynamic_service_get_legacy_with(
 def _get_dynamic_service_get_new_style_with(
     state: str, node_id: NodeID = _DEFAULT_NODE_ID
 ) -> DynamicServiceGet:
-    dict_data = deepcopy(
-        DynamicServiceGet.model_config["json_schema_extra"]["examples"][1]
-    )
+    dict_data = deepcopy(DynamicServiceGet.model_json_schema()["examples"][1])
     _add_to_dict(
         dict_data,
         [
@@ -124,7 +120,7 @@ def _get_dynamic_service_get_new_style_with(
 
 
 def _get_node_get_idle(node_id: NodeID = _DEFAULT_NODE_ID) -> NodeGetIdle:
-    dict_data = NodeGetIdle.model_config["json_schema_extra"]["example"]
+    dict_data = NodeGetIdle.model_json_schema()["example"]
     _add_to_dict(
         dict_data,
         [
@@ -190,7 +186,6 @@ async def _assert_result(
         retry=retry_if_exception_type(AssertionError),
     ):
         with attempt:
-
             assert deferred_status_spies["on_result"].call_count == len(timeline)
             assert [
                 x.args[0] for x in deferred_status_spies["on_result"].call_args_list

services/web/server/tests/unit/isolated/test_dynamic_scheduler.py

@@ -59,11 +59,9 @@ def dynamic_service_start() -> DynamicServiceStart:
             NodeGet.model_validate(x)
             for x in NodeGet.model_config["json_schema_extra"]["examples"]
         ],
-        NodeGetIdle.model_validate(
-            NodeGetIdle.model_config["json_schema_extra"]["example"]
-        ),
+        NodeGetIdle.model_validate(NodeGetIdle.model_json_schema()["example"]),
         DynamicServiceGet.model_validate(
-            DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
+            DynamicServiceGet.model_json_schema()["examples"][0]
         ),
     ],
 )
@@ -108,7 +106,7 @@ async def test_get_service_status_raises_rpc_server_error(
             for x in NodeGet.model_config["json_schema_extra"]["examples"]
         ],
         DynamicServiceGet.model_validate(
-            DynamicServiceGet.model_config["json_schema_extra"]["examples"][0]
+            DynamicServiceGet.model_json_schema()["examples"][0]
         ),
     ],
 )

services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py

@@ -423,7 +423,7 @@ def num_services(
         ) -> list[DynamicServiceGet]:
             return [
                 DynamicServiceGet.model_validate(
-                    DynamicServiceGet.model_config["json_schema_extra"]["examples"][1]
+                    DynamicServiceGet.model_json_schema()["examples"][1]
                     | {"service_uuid": service_uuid, "project_id": user_project["uuid"]}
                 )
                 for service_uuid in self.running_services_uuids