feat: port pydantic files all over to use full v2

src/braket/device_schema/aqt/aqt_device_capabilities_v1.py

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License
 
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.aqt.aqt_provider_properties_v1 import AqtProviderProperties
 from braket.device_schema.device_action_properties import DeviceActionType
@@ -47,7 +47,7 @@ class AqtDeviceCapabilities(BraketSchemaBase, DeviceCapabilities):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.aqt.aqt_device_capabilities", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     action: dict[
         DeviceActionType | str,
         OpenQASMDeviceActionProperties | OpenQASMProgramSetDeviceActionProperties,

src/braket/device_schema/aqt/aqt_provider_properties_v1.py

@@ -13,7 +13,7 @@
 
 from datetime import datetime
 
-from pydantic.v1 import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from braket.schema_common.schema_base import BraketSchemaBase
 from braket.schema_common.schema_header import BraketSchemaHeader
@@ -161,5 +161,5 @@ class AqtProviderProperties(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.aqt.aqt_provider_properties", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     properties: Characterisation

src/braket/device_schema/blackbird_device_action_properties.py

@@ -12,7 +12,9 @@
 # language governing permissions and limitations under the License.
 
 
-from pydantic.v1 import conlist, constr
+from typing import Annotated
+
+from pydantic import Field
 
 from braket.device_schema.device_action_properties import DeviceActionProperties
 from braket.device_schema.result_type import ResultType
@@ -40,6 +42,6 @@ class BlackbirdDeviceActionProperties(DeviceActionProperties):
 
     """
 
-    actionType: constr(regex=r"^braket\.ir\.blackbird\.program$")
+    actionType: Annotated[str, Field(pattern=r"^braket\.ir\.blackbird\.program$")]
     supportedOperations: list[str]
-    supportedResultTypes: conlist(ResultType, max_items=0)
+    supportedResultTypes: Annotated[list[ResultType], Field(max_length=0)]

src/braket/device_schema/common/gate_model_device_parameters_v1.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.gate_model_parameters_v1 import GateModelParameters
 from braket.schema_common.schema_base import BraketSchemaBase
@@ -29,5 +29,5 @@ class GateModelDeviceParameters(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.common.gate_model_device_parameters", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     paradigmParameters: GateModelParameters

src/braket/device_schema/continuous_variable_qpu_paradigm_properties_v1.py

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.schema_common import BraketSchemaBase, BraketSchemaHeader
 
@@ -61,7 +61,7 @@ class ContinuousVariableQpuParadigmProperties(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.continuous_variable_qpu_paradigm_properties", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     modes: dict[str, float]
     layout: str
     compiler: list[str]

src/braket/device_schema/device_action_properties.py

@@ -13,7 +13,7 @@
 
 from enum import Enum
 
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
 
 
 class DeviceActionType(str, Enum):

src/braket/device_schema/device_capabilities.py

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
 
 from braket.device_schema.device_action_properties import DeviceActionProperties, DeviceActionType
 from braket.device_schema.device_service_properties_v1 import DeviceServiceProperties

src/braket/device_schema/device_connectivity.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
 
 
 class DeviceConnectivity(BaseModel):

src/braket/device_schema/device_execution_window.py

@@ -14,7 +14,7 @@
 from datetime import time
 from enum import Enum
 
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
 
 
 class ExecutionDay(str, Enum):

src/braket/device_schema/device_service_properties_v1.py

@@ -13,7 +13,7 @@
 
 from datetime import datetime
 
-from pydantic.v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 
 from braket.device_schema.device_execution_window import DeviceExecutionWindow
 from braket.schema_common import BraketSchemaBase, BraketSchemaHeader
@@ -60,9 +60,9 @@ class DeviceDocumentation(BaseModel):
         >>> DeviceDocumentation.parse_raw(json.dumps(input_json))
     """
 
-    imageUrl: str | None
-    summary: str | None
-    externalDocumentationUrl: str | None
+    imageUrl: str | None = None
+    summary: str | None = None
+    externalDocumentationUrl: str | None = None
 
 
 class DeviceServiceProperties(BraketSchemaBase):
@@ -116,11 +116,11 @@ class DeviceServiceProperties(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.device_service_properties", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     executionWindows: list[DeviceExecutionWindow]
     shotsRange: tuple[int, int]
-    deviceCost: DeviceCost | None
-    deviceDocumentation: DeviceDocumentation | None
-    deviceLocation: str | None
-    updatedAt: datetime | None
-    getTaskPollIntervalMillis: int | None
+    deviceCost: DeviceCost | None = None
+    deviceDocumentation: DeviceDocumentation | None = None
+    deviceLocation: str | None = None
+    updatedAt: datetime | None = None
+    getTaskPollIntervalMillis: int | None = None

src/braket/device_schema/dwave/dwave_2000Q_device_level_parameters_v1.py

@@ -13,7 +13,7 @@
 
 # ruff: noqa: N999
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.dwave.dwave_provider_level_parameters_v1 import (
     PostProcessingType,
@@ -79,21 +79,21 @@ class Dwave2000QDeviceLevelParameters(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_2000Q_device_level_parameters", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
-    annealingOffsets: list[float] | None
-    annealingSchedule: list[list[float]] | None
-    annealingDuration: float | None = Field(gt=0)
-    autoScale: bool | None
-    beta: float | None
-    chains: list[list[int]] | None
-    compensateFluxDrift: bool | None
-    fluxBiases: list[float] | None
-    initialState: list[int] | None
-    maxResults: int | None = Field(gt=0)
-    postprocessingType: PostProcessingType | str | None
-    programmingThermalizationDuration: int | None
-    readoutThermalizationDuration: int | None
-    reduceIntersampleCorrelation: bool | None
-    reinitializeState: bool | None
-    resultFormat: ResultFormat | None
-    spinReversalTransformCount: int | None = Field(gt=0)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
+    annealingOffsets: list[float] | None = None
+    annealingSchedule: list[list[float]] | None = None
+    annealingDuration: float | None = Field(default=None, gt=0)
+    autoScale: bool | None = None
+    beta: float | None = None
+    chains: list[list[int]] | None = None
+    compensateFluxDrift: bool | None = None
+    fluxBiases: list[float] | None = None
+    initialState: list[int] | None = None
+    maxResults: int | None = Field(default=None, gt=0)
+    postprocessingType: PostProcessingType | str | None = None
+    programmingThermalizationDuration: int | None = None
+    readoutThermalizationDuration: int | None = None
+    reduceIntersampleCorrelation: bool | None = None
+    reinitializeState: bool | None = None
+    resultFormat: ResultFormat | None = None
+    spinReversalTransformCount: int | None = Field(default=None, gt=0)

src/braket/device_schema/dwave/dwave_2000Q_device_parameters_v1.py

@@ -13,7 +13,7 @@
 
 # ruff: noqa: N999
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.dwave.dwave_2000Q_device_level_parameters_v1 import (
     Dwave2000QDeviceLevelParameters,
@@ -32,5 +32,5 @@ class Dwave2000QDeviceParameters(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_2000Q_device_parameters", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     deviceLevelParameters: Dwave2000QDeviceLevelParameters

src/braket/device_schema/dwave/dwave_advantage_device_level_parameters_v1.py

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License
 
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.dwave.dwave_provider_level_parameters_v1 import ResultFormat
 from braket.schema_common import BraketSchemaBase, BraketSchemaHeader
@@ -67,18 +67,18 @@ class DwaveAdvantageDeviceLevelParameters(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_advantage_device_level_parameters", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
-    annealingOffsets: list[float] | None
-    annealingSchedule: list[list[float]] | None
-    annealingDuration: float | None = Field(gt=0)
-    autoScale: bool | None
-    compensateFluxDrift: bool | None
-    fluxBiases: list[float] | None
-    initialState: list[int] | None
-    maxResults: int | None = Field(gt=0)
-    programmingThermalizationDuration: int | None
-    readoutThermalizationDuration: int | None
-    reduceIntersampleCorrelation: bool | None
-    reinitializeState: bool | None
-    resultFormat: ResultFormat | None
-    spinReversalTransformCount: int | None = Field(gt=0)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
+    annealingOffsets: list[float] | None = None
+    annealingSchedule: list[list[float]] | None = None
+    annealingDuration: float | None = Field(default=None, gt=0)
+    autoScale: bool | None = None
+    compensateFluxDrift: bool | None = None
+    fluxBiases: list[float] | None = None
+    initialState: list[int] | None = None
+    maxResults: int | None = Field(default=None, gt=0)
+    programmingThermalizationDuration: int | None = None
+    readoutThermalizationDuration: int | None = None
+    reduceIntersampleCorrelation: bool | None = None
+    reinitializeState: bool | None = None
+    resultFormat: ResultFormat | None = None
+    spinReversalTransformCount: int | None = Field(default=None, gt=0)

src/braket/device_schema/dwave/dwave_advantage_device_parameters_v1.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.dwave.dwave_advantage_device_level_parameters_v1 import (
     DwaveAdvantageDeviceLevelParameters,
@@ -30,5 +30,5 @@ class DwaveAdvantageDeviceParameters(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_advantage_device_parameters", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     deviceLevelParameters: DwaveAdvantageDeviceLevelParameters

src/braket/device_schema/dwave/dwave_device_capabilities_v1.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.device_capabilities import DeviceCapabilities
 from braket.device_schema.dwave.dwave_provider_properties_v1 import DwaveProviderProperties
@@ -99,5 +99,5 @@ class DwaveDeviceCapabilities(DeviceCapabilities, BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_device_capabilities", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     provider: DwaveProviderProperties

src/braket/device_schema/dwave/dwave_device_parameters_v1.py

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.device_schema.dwave.dwave_2000Q_device_level_parameters_v1 import (
     Dwave2000QDeviceLevelParameters,
@@ -52,8 +52,8 @@ class DwaveDeviceParameters(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_device_parameters", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
-    providerLevelParameters: DwaveProviderLevelParameters | None
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
+    providerLevelParameters: DwaveProviderLevelParameters | None = None
     deviceLevelParameters: (
         DwaveAdvantageDeviceLevelParameters | Dwave2000QDeviceLevelParameters | None
-    )
+    ) = None

src/braket/device_schema/dwave/dwave_provider_level_parameters_v1.py

@@ -13,7 +13,7 @@
 
 from enum import Enum
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.schema_common import BraketSchemaBase, BraketSchemaHeader
 
@@ -95,21 +95,21 @@ class DwaveProviderLevelParameters(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_provider_level_parameters", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
-    annealingOffsets: list[float] | None
-    annealingSchedule: list[list[float]] | None
-    annealingDuration: int | None = Field(gt=0)
-    autoScale: bool | None
-    beta: float | None
-    chains: list[list[int]] | None
-    compensateFluxDrift: bool | None
-    fluxBiases: list[float] | None
-    initialState: list[int] | None
-    maxResults: int | None = Field(gt=0)
-    postprocessingType: PostProcessingType | str | None
-    programmingThermalizationDuration: int | None
-    readoutThermalizationDuration: int | None
-    reduceIntersampleCorrelation: bool | None
-    reinitializeState: bool | None
-    resultFormat: ResultFormat | None
-    spinReversalTransformCount: int | None = Field(gt=0)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
+    annealingOffsets: list[float] | None = None
+    annealingSchedule: list[list[float]] | None = None
+    annealingDuration: int | None = Field(default=None, gt=0)
+    autoScale: bool | None = None
+    beta: float | None = None
+    chains: list[list[int]] | None = None
+    compensateFluxDrift: bool | None = None
+    fluxBiases: list[float] | None = None
+    initialState: list[int] | None = None
+    maxResults: int | None = Field(default=None, gt=0)
+    postprocessingType: PostProcessingType | str | None = None
+    programmingThermalizationDuration: int | None = None
+    readoutThermalizationDuration: int | None = None
+    reduceIntersampleCorrelation: bool | None = None
+    reinitializeState: bool | None = None
+    resultFormat: ResultFormat | None = None
+    spinReversalTransformCount: int | None = Field(default=None, gt=0)

src/braket/device_schema/dwave/dwave_provider_properties_v1.py

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-from pydantic.v1 import Field
+from pydantic import Field
 
 from braket.schema_common import BraketSchemaBase, BraketSchemaHeader
 
@@ -63,7 +63,7 @@ class DwaveProviderProperties(BraketSchemaBase):
     _PROGRAM_HEADER = BraketSchemaHeader(
         name="braket.device_schema.dwave.dwave_provider_properties", version="1"
     )
-    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER, const=_PROGRAM_HEADER)
+    braketSchemaHeader: BraketSchemaHeader = Field(default=_PROGRAM_HEADER)
     annealingOffsetStep: float
     annealingOffsetStepPhi0: float
     annealingOffsetRanges: list[list[float]]