Skip to content
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
33694f9
🐛 Enhance `reqs` target in Makefile to support upgrading packages sta…
pcrespov Jun 30, 2025
ffe6901
starts with
pcrespov Jun 30, 2025
42877d5
🐛 Enhance `reqs` target in Makefile to support upgrading packages wit…
pcrespov Jun 30, 2025
d01a761
make reqs startswith=pytest
pcrespov Jun 30, 2025
c3fd298
update ptyest
pcrespov Jun 30, 2025
6ce16b8
upgrades pytest_asyncio using https://pytest-asyncio.readthedocs.io/e…
pcrespov Jun 30, 2025
de1282b
config
pcrespov Jun 30, 2025
d426e67
upgraed
pcrespov Jun 30, 2025
eff219f
upgades pydantic family
pcrespov Jun 30, 2025
80cfef3
Fixes pydantic.warnings.PydanticDeprecatedSince211
pcrespov Jun 30, 2025
00148b0
Fixes deprecation of popuplate_by_name
pcrespov Jun 30, 2025
e696bce
Merge branch 'master' into mai/pydantic-upgrade-repo-wide
pcrespov Jul 11, 2025
355cbdf
cleanup
pcrespov Jul 11, 2025
e62498f
upgrades pydantic
pcrespov Jul 11, 2025
6eb6a3d
minor
pcrespov Jul 11, 2025
4773e3c
feat: add `populate_by_name` option to `BaseCustomSettings` for compa…
pcrespov Jul 11, 2025
3e9b7c2
fix: update model field access to use class reference in serializatio…
pcrespov Jul 11, 2025
0cc449b
fix: update test to use BaseSettings instead of BaseModel for compati…
pcrespov Jul 11, 2025
bbc85dc
chore: update openapi.json for improved documentation clarity
pcrespov Jul 11, 2025
c0a6112
fix: add additionalProperties to JSON schemas for improved flexibility
pcrespov Jul 11, 2025
2e5f8c3
services/dynamic-sidecar version: 1.2.0 → 1.2.1
pcrespov Jul 11, 2025
f523531
fix: update openapi specifications to enhance flexibility and validation
pcrespov Jul 11, 2025
7b4bb19
api-server
pcrespov Jul 11, 2025
eae547f
services/api-server version: 0.9.1 → 0.9.2
pcrespov Jul 11, 2025
6a43d79
services/catalog version: 0.8.1 → 0.8.2
pcrespov Jul 11, 2025
39834d7
services/resource-usage-tracker version: 1.0.0 → 1.0.1
pcrespov Jul 11, 2025
3e8f467
services/storage api version: 0.7.0 → 0.7.1
pcrespov Jul 11, 2025
4d7efc8
services/webserver api version: 0.71.0 → 0.71.1
pcrespov Jul 11, 2025
3ee4fd9
Merge branch 'master' into mai/pydantic-upgrade-repo-wide
pcrespov Jul 14, 2025
fdd2beb
updates versions
pcrespov Jul 14, 2025
4bdafeb
Merge branch 'master' into mai/pydantic-upgrade-repo-wide
pcrespov Jul 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
aiohappyeyeballs==2.6.1
# via aiohttp
aiohttp==3.12.13
aiohttp==3.12.14
# via
# -c ../../requirements/constraints.txt
# -r requirements.in
Expand All @@ -11,7 +11,7 @@ attrs==25.3.0
# aiohttp
# jsonschema
# referencing
certifi==2025.6.15
certifi==2025.7.9
# via
# -c ../../requirements/constraints.txt
# requests
Expand Down
7 changes: 5 additions & 2 deletions ci/helpers/requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ propcache==0.3.1
# via
# aiohttp
# yarl
pydantic==2.10.5
pydantic==2.11.7
# via
# -c requirements/../../../requirements/constraints.txt
# fastapi
pydantic-core==2.27.2
pydantic-core==2.33.2
# via pydantic
requests==2.32.4
# via docker
Expand All @@ -58,6 +58,9 @@ typing-extensions==4.14.1
# fastapi
# pydantic
# pydantic-core
# typing-inspection
typing-inspection==0.4.1
# via pydantic
urllib3==2.5.0
# via
# -c requirements/../../../requirements/constraints.txt
Expand Down
9 changes: 6 additions & 3 deletions packages/aws-library/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ psutil==7.0.0
# via -r requirements/../../../packages/service-library/requirements/_base.in
pycryptodome==3.21.0
# via stream-zip
pydantic==2.10.6
pydantic==2.11.7
# via
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down Expand Up @@ -267,9 +267,9 @@ pydantic==2.10.6
# fast-depends
# pydantic-extra-types
# pydantic-settings
pydantic-core==2.27.2
pydantic-core==2.33.2
# via pydantic
pydantic-extra-types==2.10.2
pydantic-extra-types==2.10.5
# via
# -r requirements/../../../packages/common-library/requirements/_base.in
# -r requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/_base.in
Expand Down Expand Up @@ -417,6 +417,9 @@ typing-extensions==4.14.1
# types-aiobotocore-ec2
# types-aiobotocore-s3
# types-aiobotocore-ssm
# typing-inspection
typing-inspection==0.4.1
# via pydantic
urllib3==2.5.0
# via
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down
9 changes: 7 additions & 2 deletions packages/aws-library/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@ py-partiql-parser==0.6.1
# via moto
pycparser==2.22
# via cffi
pydantic==2.10.6
pydantic==2.11.7
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# aws-sam-translator
# fastapi
pydantic-core==2.27.2
pydantic-core==2.33.2
# via
# -c requirements/_base.txt
# pydantic
Expand Down Expand Up @@ -315,6 +315,11 @@ typing-extensions==4.14.1
# types-aioboto3
# types-aiobotocore
# types-boto3
# typing-inspection
typing-inspection==0.4.1
# via
# -c requirements/_base.txt
# pydantic
tzdata==2025.1
# via faker
urllib3==2.5.0
Expand Down
4 changes: 2 additions & 2 deletions packages/celery-library/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ psutil==7.0.0
# via -r requirements/../../../packages/service-library/requirements/_base.in
pycryptodome==3.23.0
# via stream-zip
pydantic==2.11.4
pydantic==2.11.7
# via
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down Expand Up @@ -254,7 +254,7 @@ pydantic==2.11.4
# pydantic-settings
pydantic-core==2.33.2
# via pydantic
pydantic-extra-types==2.10.4
pydantic-extra-types==2.10.5
# via
# -r requirements/../../../packages/common-library/requirements/_base.in
# -r requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/_base.in
Expand Down
9 changes: 6 additions & 3 deletions packages/common-library/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ orjson==3.10.15
# via
# -c requirements/../../../requirements/constraints.txt
# -r requirements/_base.in
pydantic==2.10.6
pydantic==2.11.7
# via
# -c requirements/../../../requirements/constraints.txt
# -r requirements/_base.in
# pydantic-extra-types
pydantic-core==2.27.2
pydantic-core==2.33.2
# via pydantic
pydantic-extra-types==2.10.2
pydantic-extra-types==2.10.5
# via -r requirements/_base.in
typing-extensions==4.14.1
# via
# pydantic
# pydantic-core
# pydantic-extra-types
# typing-inspection
typing-inspection==0.4.1
# via pydantic
9 changes: 7 additions & 2 deletions packages/common-library/requirements/_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ pluggy==1.5.0
# pytest-cov
pprintpp==0.4.0
# via pytest-icdiff
pydantic==2.10.6
pydantic==2.11.7
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
# pydantic-settings
pydantic-core==2.27.2
pydantic-core==2.33.2
# via
# -c requirements/_base.txt
# pydantic
Expand Down Expand Up @@ -71,5 +71,10 @@ typing-extensions==4.14.1
# -c requirements/_base.txt
# pydantic
# pydantic-core
# typing-inspection
typing-inspection==0.4.1
# via
# -c requirements/_base.txt
# pydantic
tzdata==2025.1
# via faker
8 changes: 6 additions & 2 deletions packages/common-library/src/common_library/serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ def model_dump_with_secrets(
) -> dict[str, Any]:
data = settings_obj.model_dump(**pydantic_export_options)

for field_name in settings_obj.model_fields:
settings_cls = settings_obj.__class__

for field_name in settings_cls.model_fields:
if field_name not in data:
continue

Expand All @@ -29,7 +31,9 @@ def model_dump_with_secrets(
data[field_name] = str(field_data)

elif isinstance(field_data, dict):
possible_pydantic_model = settings_obj.model_fields[field_name].annotation
possible_pydantic_model = settings_obj.__class__.model_fields[
field_name
].annotation
# NOTE: data could be a dict which does not represent a pydantic model or a union of models
with contextlib.suppress(AttributeError, ValidationError):
data[field_name] = model_dump_with_secrets(
Expand Down
4 changes: 2 additions & 2 deletions packages/dask-task-models-library/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ partd==1.4.2
# via dask
psutil==7.0.0
# via distributed
pydantic==2.11.4
pydantic==2.11.7
# via
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand All @@ -94,7 +94,7 @@ pydantic==2.11.4
# pydantic-settings
pydantic-core==2.33.2
# via pydantic
pydantic-extra-types==2.10.4
pydantic-extra-types==2.10.5
# via
# -r requirements/../../../packages/common-library/requirements/_base.in
# -r requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/_base.in
Expand Down
9 changes: 6 additions & 3 deletions packages/models-library/requirements/_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ orjson==3.10.15
# -c requirements/../../../requirements/constraints.txt
# -r requirements/../../../packages/common-library/requirements/_base.in
# -r requirements/_base.in
pydantic==2.10.6
pydantic==2.11.7
# via
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../requirements/constraints.txt
# -r requirements/../../../packages/common-library/requirements/_base.in
# -r requirements/_base.in
# pydantic-extra-types
# pydantic-settings
pydantic-core==2.27.2
pydantic-core==2.33.2
# via pydantic
pydantic-extra-types==2.10.2
pydantic-extra-types==2.10.5
# via
# -r requirements/../../../packages/common-library/requirements/_base.in
# -r requirements/_base.in
Expand Down Expand Up @@ -64,3 +64,6 @@ typing-extensions==4.14.1
# pydantic
# pydantic-core
# pydantic-extra-types
# typing-inspection
typing-inspection==0.4.1
# via pydantic
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Base model classes for schemas in OpenAPI specs (OAS) for this service
Base model classes for schemas in OpenAPI specs (OAS) for this service

"""

Expand Down Expand Up @@ -29,9 +29,8 @@ class InputSchemaWithoutCamelCase(BaseModel):
)


class InputSchema(BaseModel):
class InputSchema(InputSchemaWithoutCamelCase):
model_config = ConfigDict(
**InputSchemaWithoutCamelCase.model_config,
alias_generator=snake_to_camel,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,9 @@ def _not_allowed_in_both_specs(self):
"containers_allowed_outgoing_internet",
"containers_allowed_outgoing_permit_list",
}
if match_keys & set(self.model_fields) != match_keys:
err_msg = f"Expected the following keys {match_keys} to be present {self.model_fields=}"
cls = self.__class__
if match_keys & set(cls.model_fields) != match_keys:
err_msg = f"Expected the following keys {match_keys} to be present {cls.model_fields=}"
raise ValueError(err_msg)

if (
Expand Down
Loading
Loading