Code

Update to supporting Pydantic V2#203

Code

Merged

yarikoptic merged 81 commits intodandi:masterdandi/dandi-schema:masterfrom candleindark:pydantic-v2candleindark/dandi-schema:pydantic-v2Copy head branch name to clipboardJan 22, 2024

+842-451

Commits

Commits on Nov 4, 2023

• Change Pydantic dependency requirement to ~= 2.4

  candleindark

  committed
  a6f3288

  Copy full SHA for a6f3288

Commits on Nov 14, 2023

• Merge branch 'master' into pydantic-v2

  candleindark

  committed
  4395ad4

  Copy full SHA for 4395ad4

• Migrate to Pydantic 2.0 using bump-pydantic 0.7.0

  Show description for 1decc23
  candleindark

  committed
  1decc23

  Copy full SHA for 1decc23

Commits on Nov 17, 2023

• Merge branch 'master' into with-bump-pydantic

  candleindark

  committed
  14f742c

  Copy full SHA for 14f742c

• Update from BaseModel.__fields__ to BaseModel.model_fields

  candleindark

  committed
  3b4ecf3

  Copy full SHA for 3b4ecf3

Commits on Nov 21, 2023

• Remove DandiBaseModel.json_dict

  Show description for b211bfd
  candleindark

  committed
  b211bfd

  Copy full SHA for b211bfd

• Remove DandiBaseModel.unvalidated

  Show description for b697d76
  candleindark

  committed
  b697d76

  Copy full SHA for b697d76

Commits on Nov 29, 2023

• Keep DandiBaseModel.json_dict()

  Show description for e0f75ce
  candleindark

  committed
  e0f75ce

  Copy full SHA for e0f75ce

• Keeping DandiBaseModel.unvalidated()

  Show description for 92b5cb9
  candleindark

  committed
  92b5cb9

  Copy full SHA for 92b5cb9

Commits on Nov 30, 2023

• Replace the use of parse_obj_as() with TypeAdapter

  candleindark

  committed
  739db75

  Copy full SHA for 739db75

Commits on Dec 1, 2023

• Replace the use of update_forward_refs() with model_rebuild()

  candleindark

  committed
  5528c3d

  Copy full SHA for 5528c3d

• Replace the use of BaseModel.json() with BaseModel.model_dump_json()

  Show description for ca3fff5
  candleindark

  committed
  ca3fff5

  Copy full SHA for ca3fff5

• Replace the use of BaseModel.parse_raw() with BaseModel.model_validate_json()

  candleindark

  committed
  1d85790

  Copy full SHA for 1d85790

• Add additional comments regarding BaseModel.model_rebuild()

  candleindark

  committed
  5616209

  Copy full SHA for 5616209

Commits on Dec 4, 2023

• Migrate the use of @validator() to @field_validator for schemaKey

  candleindark

  committed
  e1adfb1

  Copy full SHA for e1adfb1

• Specify default of None for PropertyValue.value

  Show description for 8c0e159
  candleindark

  committed
  8c0e159

  Copy full SHA for 8c0e159

• Migrate from @validator to @field_validator for PropertyValue.value

  candleindark

  committed
  c21f918

  Copy full SHA for c21f918

• Migrate from @validator to @field_validator for BareAsset.digest

  candleindark

  committed
  3b5fa3a

  Copy full SHA for 3b5fa3a

• Migrate from @validator to @field_validator for PublishedAsset.digest

  candleindark

  committed
  acef6e1

  Copy full SHA for acef6e1

• Migrate from @root_validator to @model_validator for Resource

  candleindark

  committed
  c5b51bb

  Copy full SHA for c5b51bb

• Migrate from @root_validator to @model_validator for AccessRequirements

  candleindark

  committed
  7fcb9be

  Copy full SHA for 7fcb9be

• Use json_schema_extra to pass extra JSON Schema properties

  candleindark

  committed
  b9604f5

  Copy full SHA for b9604f5

Commits on Dec 5, 2023

• Migrate the use of BaseModel.schema and BaseModel.schema_json to BaseModel.model_json_schema

  candleindark

  committed
  14b0d16

  Copy full SHA for 14b0d16

Commits on Dec 6, 2023

• Migrate the use of Config class to model_config

  candleindark

  committed
  fe85089

  Copy full SHA for fe85089

• Migrate to the use of json_schema_extra in pydantic.Field

  candleindark

  committed
  1d8724f

  Copy full SHA for 1d8724f

• Correct typo in kwarg to Field

  Show description for ba04133
  candleindark

  committed
  ba04133

  Copy full SHA for ba04133

• Migrate to the use of BaseModel.model_json_schema in dynamic calls

  candleindark

  committed
  97bf307

  Copy full SHA for 97bf307

• Replace use of DandiBaseModel.unvalidated with BaseModel.model_construct in tests

  candleindark

  committed
  5b2e6af

  Copy full SHA for 5b2e6af

Commits on Dec 8, 2023

• Define ByteSizeJsonSchema

  candleindark

  committed
  6d95f7c

  Copy full SHA for 6d95f7c

• Replace use of ByteSize with ByteSizeJsonSchema

  candleindark

  committed
  9668104

  Copy full SHA for 9668104

• Update signatures and usage for post_process_json_schema

  Show description for 57d9600
  candleindark

  committed
  57d9600

  Copy full SHA for 57d9600

• Update Pydantic Metaclass import path

  Show description for 16be659
  candleindark

  committed
  16be659

  Copy full SHA for 16be659

• Update tests to match new schema path for definitions

  Show description for b6443ec
  candleindark

  committed
  b6443ec

  Copy full SHA for b6443ec

• Update pydantic ModelMetaclass references in tests

  Show description for 496d431
  candleindark

  committed
  496d431

  Copy full SHA for 496d431

• Migrate the use of BaseModel.__fields__ to BaseModel.model_fields

  candleindark

  committed
  a976015

  Copy full SHA for a976015

• Adapt to the new representation of a private attribute

  candleindark

  committed
  64522a6

  Copy full SHA for 64522a6

• Migrate the use of BaseModel.__fields__ to BaseModel.model_fields

  candleindark

  committed
  ecd98ed

  Copy full SHA for ecd98ed

• Adapt to the FieldInfo the new class for representing a field in generate_context

  candleindark

  committed
  be176ab

  Copy full SHA for be176ab

• Adapt to the FieldInfo the new class for representing a field in test_duplicate_classes

  candleindark

  committed
  6d945a9

  Copy full SHA for 6d945a9

• Adapt to the new representation of private attribute in test_duplicate_classes

  candleindark

  committed
  fc423ae

  Copy full SHA for fc423ae

• Adapt to FieldInfo the new class for representing a field in test_properties_mismatch

  candleindark

  committed
  d251dc5

  Copy full SHA for d251dc5

• Update dandischema/metadata.py

  Show description for db55273
  

  candleindark

  and

  jwodder

  authored
  db55273

  Copy full SHA for db55273

• Update JSON serialization methods in zarr.py

  Show description for 439d07b
  candleindark

  committed
  439d07b

  Copy full SHA for 439d07b

• Remove redundant comment

  candleindark

  committed
  fc72189

  Copy full SHA for fc72189

• Provide missing import for typing.get_origin

  candleindark

  committed
  ae9a09b

  Copy full SHA for ae9a09b

• Rename args in ByteSizeJsonSchema.__get_pydantic_json_schema__()

  Show description for 0b14166
  candleindark

  committed
  0b14166

  Copy full SHA for 0b14166

• Replace logic for checking for Pydantic models in models.py

  Show description for 7808f87
  candleindark

  committed
  7808f87

  Copy full SHA for 7808f87

• Eliminate unnecessary JSON dumping and loading in tests

  candleindark

  committed
  e095ed7

  Copy full SHA for e095ed7

Commits on Dec 9, 2023

• Merge master with conflict manually resolved

  candleindark

  committed
  50ee928

  Copy full SHA for 50ee928

Commits on Dec 11, 2023

• Use BaseModel.__get_pydantic_json_schema__()

  Show description for 82f802f
  candleindark

  committed
  82f802f

  Copy full SHA for 82f802f

• Add JSON schema to Pydantic.ByteSize through annotation

  Show description for ab462ec
  candleindark

  committed
  ab462ec

  Copy full SHA for ab462ec

• Add JSON schema to Pydantic.ByteSize through annotation

  Show description for 0d38117
  candleindark

  committed
  0d38117

  Copy full SHA for 0d38117

Commits on Dec 12, 2023

• Implement TransitionalGenerateJsonSchema

  Show description for 2c9d9e3
  candleindark

  committed
  2c9d9e3

  Copy full SHA for 2c9d9e3

• Utilize TransitionalGenerateJsonSchema in JSON schema generation

  candleindark

  committed
  ce49d6a

  Copy full SHA for ce49d6a

• Update test_asset_digest

  Show description for 193b4a8
  candleindark

  committed
  193b4a8

  Copy full SHA for 193b4a8

• Update test_dantimeta_1

  Show description for 545adb9
  candleindark

  committed
  545adb9

  Copy full SHA for 545adb9

• Update test_missing_ok

  Show description for 328cefa
  candleindark

  committed
  328cefa

  Copy full SHA for 328cefa

• Update metadata.validate

  Show description for 00f0e91
  candleindark

  committed
  00f0e91

  Copy full SHA for 00f0e91

Commits on Dec 13, 2023

• Disable type check for unpacking dict as kwargs

  Show description for a23c521
  candleindark

  committed
  a23c521

  Copy full SHA for a23c521

• Convert AnyHttpURL to a str

  Show description for d508645
  candleindark

  committed
  d508645

  Copy full SHA for d508645

• Check for field.json_schema_extra being a dict

  Show description for e9579f3
  candleindark

  committed
  e9579f3

  Copy full SHA for e9579f3

• Cast field.json_schema_extra["nskey"] to str

  Show description for 60c51ef
  candleindark

  committed
  60c51ef

  Copy full SHA for 60c51ef

• ignore[call-arg] for calling BaseModel.model_construct()

  Show description for 5733137
  candleindark

  committed
  5733137

  Copy full SHA for 5733137

• Correct type annotation

  Show description for bbee1dc
  candleindark

  committed
  bbee1dc

  Copy full SHA for bbee1dc

• Correct type annotation

  Show description for a0e043c
  candleindark

  committed
  a0e043c

  Copy full SHA for a0e043c

• Remove unreachable code block

  Show description for 9676268
  candleindark

  committed
  9676268

  Copy full SHA for 9676268

Commits on Dec 14, 2023

• Define utils.strip_top_level_optional

  candleindark

  committed
  1e5a224

  Copy full SHA for 1e5a224

• Specify tests for utils.strip_top_level_optional

  candleindark

  committed
  41f5efc

  Copy full SHA for 41f5efc

• Adapt generate_context to field annotation in Pydantic V2

  candleindark

  committed
  1a707e6

  Copy full SHA for 1a707e6

• Merge branch 'master' into pydantic-v2

  satra

  authored
  2fcc005

  Copy full SHA for 2fcc005

Commits on Dec 19, 2023

• Revert marking of @container using stringification

  Show description for 0c97b8e
  candleindark

  committed
  0c97b8e

  Copy full SHA for 0c97b8e

Commits on Dec 21, 2023

• Merge branch 'master' into pydantic-v2

  satra

  authored
  a104fb2

  Copy full SHA for a104fb2

Commits on Jan 16, 2024

• Boost dandi schema version to 0.7.0 (since exported jsonschema does have incompatible changes)

  yarikoptic

  committed
  bddffd8

  Copy full SHA for bddffd8

• Added placeholder for where to add migration

  yarikoptic

  committed
  e36e003

  Copy full SHA for e36e003

• [pre-commit.ci] auto fixes from pre-commit.com hooks

  Show description for 54315ae
  pre-commit-ci[bot]

  committed
  54315ae

  Copy full SHA for 54315ae

Commits on Jan 18, 2024

• Remove unneeded code in TransitionalGenerateJsonSchema.nullable_schema

  Show description for 7eb7272
  candleindark

  committed
  7eb7272

  Copy full SHA for 7eb7272

Commits on Jan 19, 2024

• Remove stub for migration to schema 0.7.0

  Show description for 51d4c53
  candleindark

  committed
  51d4c53

  Copy full SHA for 51d4c53

• Use JSON Schema validator for Draft 2020-12 in _validate_obj_json

  Show description for b718dc2
  candleindark

  committed
  b718dc2

  Copy full SHA for b718dc2

• Annotate two possible type of validator in _validate_obj_json

  Show description for 2e97166
  candleindark

  committed
  2e97166

  Copy full SHA for 2e97166

• Change the current version of the generated schema to 0.6.5 instead

  Show description for 889c775
  candleindark

  committed
  889c775

  Copy full SHA for 889c775

Commits on Jan 22, 2024

• Merge branch 'master' into pydantic-v2

  yarikoptic

  authored
  2d48a09

  Copy full SHA for 2d48a09