Fix compatibility with pydantic<2.12

Author: multiplemonomials

tools/python/mbed_tools/build/_internal/config/assemble_build_config.py

@@ -98,7 +98,7 @@ def _assemble_config_from_sources(
         # if it does not pass the schema. This provides compatibility with older projects, as mbed_app.json has
         # historically been a total wild west where any internal Mbed state could potentially be overridden.
         try:
-            MbedAppJSON.model_validate(mbed_app_json_dict, extra="forbid", strict=True)
+            MbedAppJSON.model_validate(mbed_app_json_dict, strict=True)
         except pydantic.ValidationError as ex:
             logger.warning(
                 "mbed_app.json5 failed to validate against the schema. This likely means it contains deprecated attributes, misspelled attributes, or overrides for things that should not be set in mbed_app.json5. This version of mbed-os still allows this, but this will change in the future."

tools/python/mbed_tools/build/_internal/config/schemas.py

@@ -12,7 +12,7 @@
 from typing import Union, Literal
 from typing_extensions import Self
 
-from pydantic import BaseModel, Field, model_validator
+from pydantic import BaseModel, Field, model_validator, ConfigDict
 
 ConfigSettingValue = Union[int, float, bool, str, None]
 
@@ -23,6 +23,9 @@ class ConfigEntryDetails(BaseModel):
     for a library, target, or application.
     """
 
+    # Throw an error during validation if there are extra fields
+    model_config = ConfigDict(extra="forbid")
+
     macro_name: str | None = None
     """
     Name of the macro that this setting shall generate. If unset, defaults to 
@@ -71,6 +74,9 @@ class MemoryBankConfiguration(BaseModel):
     This is a "mini" version of MemoryBankDefinition that just allows setting the size and start address.
     """
 
+    # Throw an error during validation if there are extra fields
+    model_config = ConfigDict(extra="forbid")
+
     start: int | None = None
     """
     Start address of the memory region.
@@ -88,6 +94,9 @@ class BaseJSONConfig(BaseModel):
     as well as each entry in targets.json5.
     """
 
+    # Throw an error during validation if there are extra fields
+    model_config = ConfigDict(extra="forbid")
+
     config: dict[str, ConfigSettingValue | ConfigEntryDetails] = Field(default_factory=dict)
     """
     Configuration items for this library or app. These can be defined directly as "name": default value, or as
@@ -158,6 +167,9 @@ class MbedLibJSON(BaseJSONConfig):
     to the Mbed configuration system.
     """
 
+    # Throw an error during validation if there are extra fields
+    model_config = ConfigDict(extra="forbid")
+
     name: str
     """
     The name of this library. This is also considered the 'namespace' and will be prepended to all
@@ -196,6 +208,9 @@ class MemoryBankDefinition(BaseModel):
     (though this data gets converted from XML to JSON by the cmsis-pack-manager tool)
     """
 
+    # Throw an error during validation if there are extra fields
+    model_config = ConfigDict(extra="forbid")
+
     default: bool = False
     """
     Hint from the CMSIS data that this memory region should be used for storing general data/code.
@@ -240,6 +255,9 @@ class TargetJSON(BaseJSONConfig):
     Schema for one entry in targets.json5.
     """
 
+    # Throw an error during validation if there are extra fields
+    model_config = ConfigDict(extra="forbid")
+
     inherits: list[str] = Field(default_factory=list)
     """
     Parent target(s) to inherit this target's attributes from.
@@ -563,6 +581,9 @@ class MbedAppJSON(BaseJSONConfig):
     Schema for mbed_app.json5 files.
     """
 
+    # Throw an error during validation if there are extra fields
+    model_config = ConfigDict(extra="forbid")
+
     target_overrides: dict[str, dict[str, ConfigSettingValue | MemoryBankConfiguration]] = Field(default_factory=dict)
     """
     List of overrides applied based on target labels. This is similar to the "overrides" section,

tools/python/mbed_tools/build/_internal/config/source.py

@@ -120,7 +120,7 @@ def from_mbed_lib_json_file(
 
     # Load JSON file using schema
     try:
-        mbed_lib = schemas.MbedLibJSON.model_validate(decode_json_file(mbed_lib_json_path), extra="forbid", strict=True)
+        mbed_lib = schemas.MbedLibJSON.model_validate(decode_json_file(mbed_lib_json_path), strict=True)
     except pydantic.ValidationError as ex:
         logger.error(f"{context} did not validate against the schema for mbed_lib.json5!")
         raise ex

tools/python/mbed_tools/build/config.py

@@ -84,7 +84,7 @@ def _load_raw_targets_data(program: MbedProgram) -> dict[str, TargetJSON]:
     results = {}
     for target, target_json_dict in targets_data.items():
         try:
-            target_json = TargetJSON.model_validate(target_json_dict, extra="forbid", strict=True)
+            target_json = TargetJSON.model_validate(target_json_dict, strict=True)
 
             # Issue warnings if any config entries have invalid names.
             # We need to do this here, or otherwise warnings will only get printed