Skip to content

Commit bd6a8be

Browse files
giancarloromeogiancarloromeo
committed
upgrade reqs
1 parent 329b00d commit bd6a8be

16 files changed

+127
-123
lines changed

‎services/resource-usage-tracker/requirements/_base.txt‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ aiosignal==1.3.1
4848
# via aiohttp
4949
alembic==1.13.1
5050
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
51+
annotated-types==0.7.0
52+
# via pydantic
5153
anyio==4.3.0
5254
# via
5355
# fast-depends
@@ -60,14 +62,12 @@ arrow==1.3.0
6062
# -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
6163
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
6264
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
65+
# -r requirements/../../../packages/aws-library/requirements/_base.in
6366
# -r requirements/../../../packages/models-library/requirements/_base.in
6467
# -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
6568
# -r requirements/../../../packages/service-library/requirements/_base.in
6669
async-timeout==4.0.3
67-
# via
68-
# aiohttp
69-
# asyncpg
70-
# redis
70+
# via asyncpg
7171
asyncpg==0.29.0
7272
# via sqlalchemy
7373
attrs==23.2.0
@@ -118,25 +118,10 @@ dnspython==2.6.1
118118
# via email-validator
119119
email-validator==2.1.1
120120
# via pydantic
121-
exceptiongroup==1.2.0
122-
# via anyio
123121
fast-depends==2.4.2
124122
# via faststream
125-
fastapi==0.99.1
123+
fastapi==0.115.0
126124
# via
127-
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
128-
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
129-
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
130-
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
131-
# -c requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
132-
# -c requirements/../../../packages/aws-library/requirements/../../../requirements/constraints.txt
133-
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
134-
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
135-
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
136-
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
137-
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
138-
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
139-
# -c requirements/../../../requirements/constraints.txt
140125
# -r requirements/../../../packages/service-library/requirements/_fastapi.in
141126
# -r requirements/_base.in
142127
# prometheus-fastapi-instrumentator
@@ -272,7 +257,7 @@ prometheus-fastapi-instrumentator==6.1.0
272257
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
273258
psycopg2-binary==2.9.9
274259
# via sqlalchemy
275-
pydantic==1.10.14
260+
pydantic==2.9.2
276261
# via
277262
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
278263
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -284,7 +269,6 @@ pydantic==1.10.14
284269
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
285270
# -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
286271
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
287-
# -c requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
288272
# -c requirements/../../../packages/service-library/requirements/../../../requirements/constraints.txt
289273
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
290274
# -c requirements/../../../requirements/constraints.txt
@@ -302,6 +286,26 @@ pydantic==1.10.14
302286
# -r requirements/../../../packages/settings-library/requirements/_base.in
303287
# fast-depends
304288
# fastapi
289+
# pydantic-extra-types
290+
# pydantic-settings
291+
pydantic-core==2.23.4
292+
# via pydantic
293+
pydantic-extra-types==2.9.0
294+
# via
295+
# -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
296+
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
297+
# -r requirements/../../../packages/models-library/requirements/_base.in
298+
# -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
299+
pydantic-settings==2.5.2
300+
# via
301+
# -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
302+
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
303+
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
304+
# -r requirements/../../../packages/aws-library/requirements/../../../packages/settings-library/requirements/_base.in
305+
# -r requirements/../../../packages/models-library/requirements/_base.in
306+
# -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
307+
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
308+
# -r requirements/../../../packages/settings-library/requirements/_base.in
305309
pygments==2.17.2
306310
# via rich
307311
pyinstrument==4.6.2
@@ -318,7 +322,9 @@ python-dateutil==2.9.0.post0
318322
# matplotlib
319323
# pandas
320324
python-dotenv==1.0.1
321-
# via uvicorn
325+
# via
326+
# pydantic-settings
327+
# uvicorn
322328
pytz==2024.1
323329
# via
324330
# dateparser
@@ -412,7 +418,7 @@ sqlalchemy==1.4.52
412418
# -c requirements/../../../requirements/constraints.txt
413419
# -r requirements/../../../packages/postgres-database/requirements/_base.in
414420
# alembic
415-
starlette==0.27.0
421+
starlette==0.38.6
416422
# via
417423
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
418424
# -c requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
@@ -465,16 +471,15 @@ typing-extensions==4.10.0
465471
# aiodebug
466472
# aiodocker
467473
# alembic
468-
# anyio
469474
# fastapi
470475
# faststream
471476
# pydantic
477+
# pydantic-core
472478
# typer
473479
# types-aiobotocore
474480
# types-aiobotocore-ec2
475481
# types-aiobotocore-s3
476482
# types-aiobotocore-ssm
477-
# uvicorn
478483
tzdata==2024.1
479484
# via pandas
480485
tzlocal==5.2

‎services/resource-usage-tracker/requirements/_test.txt‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ alembic==1.13.1
22
# via
33
# -c requirements/_base.txt
44
# -r requirements/_test.in
5+
annotated-types==0.7.0
6+
# via
7+
# -c requirements/_base.txt
8+
# pydantic
59
antlr4-python3-runtime==4.13.2
610
# via moto
711
anyio==4.3.0
@@ -10,10 +14,6 @@ anyio==4.3.0
1014
# httpx
1115
asgi-lifespan==2.1.0
1216
# via -r requirements/_test.in
13-
async-timeout==4.0.3
14-
# via
15-
# -c requirements/_base.txt
16-
# redis
1717
attrs==23.2.0
1818
# via
1919
# -c requirements/_base.txt
@@ -69,11 +69,6 @@ docker==7.1.0
6969
# via
7070
# -r requirements/_test.in
7171
# moto
72-
exceptiongroup==1.2.0
73-
# via
74-
# -c requirements/_base.txt
75-
# anyio
76-
# pytest
7772
faker==27.0.0
7873
# via -r requirements/_test.in
7974
fakeredis==2.23.5
@@ -86,10 +81,6 @@ flask-cors==4.0.1
8681
# via moto
8782
graphql-core==3.2.3
8883
# via moto
89-
greenlet==3.0.3
90-
# via
91-
# -c requirements/_base.txt
92-
# sqlalchemy
9384
h11==0.14.0
9485
# via
9586
# -c requirements/_base.txt
@@ -191,11 +182,15 @@ py-partiql-parser==0.5.5
191182
# via moto
192183
pycparser==2.22
193184
# via cffi
194-
pydantic==1.10.14
185+
pydantic==2.9.2
195186
# via
196187
# -c requirements/../../../requirements/constraints.txt
197188
# -c requirements/_base.txt
198189
# aws-sam-translator
190+
pydantic-core==2.23.4
191+
# via
192+
# -c requirements/_base.txt
193+
# pydantic
199194
pyparsing==3.1.2
200195
# via
201196
# -c requirements/_base.txt
@@ -305,23 +300,17 @@ sympy==1.13.2
305300
# via cfn-lint
306301
termcolor==2.4.0
307302
# via pytest-sugar
308-
tomli==2.0.1
309-
# via
310-
# coverage
311-
# mypy
312-
# pytest
313303
types-requests==2.32.0.20240712
314304
# via -r requirements/_test.in
315305
typing-extensions==4.10.0
316306
# via
317307
# -c requirements/_base.txt
318308
# alembic
319-
# anyio
320309
# aws-sam-translator
321310
# cfn-lint
322-
# fakeredis
323311
# mypy
324312
# pydantic
313+
# pydantic-core
325314
# sqlalchemy2-stubs
326315
urllib3==2.0.7
327316
# via

‎services/resource-usage-tracker/requirements/_tools.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,12 @@ setuptools==73.0.1
7777
# via
7878
# -c requirements/_test.txt
7979
# pip-tools
80-
tomli==2.0.1
81-
# via
82-
# -c requirements/_test.txt
83-
# black
84-
# build
85-
# mypy
86-
# pip-tools
87-
# pylint
8880
tomlkit==0.13.2
8981
# via pylint
9082
typing-extensions==4.10.0
9183
# via
9284
# -c requirements/_base.txt
9385
# -c requirements/_test.txt
94-
# astroid
95-
# black
9686
# mypy
9787
virtualenv==20.26.3
9888
# via pre-commit

‎services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/core/settings.py‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from functools import cached_property
33

44
from models_library.basic_types import BootModeEnum
5-
from pydantic import Field, PositiveInt, validator
5+
from pydantic import AliasChoices, field_validator, Field, PositiveInt
66
from settings_library.base import BaseCustomSettings
77
from settings_library.basic_types import BuildTargetEnum, LogLevel, VersionTag
88
from settings_library.postgres import PostgresSettings
@@ -44,26 +44,32 @@ class _BaseApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
4444
RESOURCE_USAGE_TRACKER_DEBUG: bool = Field(
4545
default=False,
4646
description="Debug mode",
47-
env=["RESOURCE_USAGE_TRACKER_DEBUG", "DEBUG"],
47+
validation_alias=AliasChoices(
48+
"RESOURCE_USAGE_TRACKER_DEBUG",
49+
"DEBUG",
50+
),
4851
)
4952
RESOURCE_USAGE_TRACKER_LOGLEVEL: LogLevel = Field(
5053
default=LogLevel.INFO,
51-
env=["RESOURCE_USAGE_TRACKER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"],
54+
validation_alias=AliasChoices(
55+
"RESOURCE_USAGE_TRACKER_LOGLEVEL",
56+
"LOG_LEVEL",
57+
"LOGLEVEL"),
5258
)
5359
RESOURCE_USAGE_TRACKER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
5460
default=False,
55-
env=[
61+
validation_alias=AliasChoices(
5662
"RESOURCE_USAGE_TRACKER_LOG_FORMAT_LOCAL_DEV_ENABLED",
5763
"LOG_FORMAT_LOCAL_DEV_ENABLED",
58-
],
64+
),
5965
description="Enables local development log format. WARNING: make sure it is disabled if you want to have structured logs!",
6066
)
6167

6268
@cached_property
6369
def LOG_LEVEL(self) -> LogLevel: # noqa: N802
6470
return self.RESOURCE_USAGE_TRACKER_LOGLEVEL
6571

66-
@validator("RESOURCE_USAGE_TRACKER_LOGLEVEL")
72+
@field_validator("RESOURCE_USAGE_TRACKER_LOGLEVEL")
6773
@classmethod
6874
def valid_log_level(cls, value: str) -> str:
6975
return cls.validate_log_level(value)
@@ -77,16 +83,18 @@ class MinimalApplicationSettings(_BaseApplicationSettings):
7783
"""
7884

7985
RESOURCE_USAGE_TRACKER_PROMETHEUS: PrometheusSettings | None = Field(
80-
auto_default_from_env=True
86+
json_schema_extra={"auto_default_from_env":True}
8187
)
8288

8389
RESOURCE_USAGE_TRACKER_POSTGRES: PostgresSettings | None = Field(
84-
auto_default_from_env=True
90+
json_schema_extra={"auto_default_from_env":True},
8591
)
8692

87-
RESOURCE_USAGE_TRACKER_REDIS: RedisSettings = Field(auto_default_from_env=True)
93+
RESOURCE_USAGE_TRACKER_REDIS: RedisSettings = Field(
94+
json_schema_extra={"auto_default_from_env":True},
95+
)
8896
RESOURCE_USAGE_TRACKER_RABBITMQ: RabbitSettings | None = Field(
89-
auto_default_from_env=True
97+
json_schema_extra={"auto_default_from_env":True},
9098
)
9199

92100

@@ -109,4 +117,6 @@ class ApplicationSettings(MinimalApplicationSettings):
109117
description="Heartbeat couter limit when RUT considers service as unhealthy.",
110118
)
111119
RESOURCE_USAGE_TRACKER_PROMETHEUS_INSTRUMENTATION_ENABLED: bool = True
112-
RESOURCE_USAGE_TRACKER_S3: S3Settings | None = Field(auto_default_from_env=True)
120+
RESOURCE_USAGE_TRACKER_S3: S3Settings | None = Field(
121+
json_schema_extra={"auto_default_from_env":True},
122+
)

‎services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_credit_transactions.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
)
1414
from models_library.users import UserID
1515
from models_library.wallets import WalletID
16-
from pydantic import BaseModel
16+
from pydantic import ConfigDict, BaseModel
1717

1818

1919
class CreditTransactionCreate(BaseModel):
@@ -64,6 +64,4 @@ class CreditTransactionDB(BaseModel):
6464
created: datetime
6565
last_heartbeat_at: datetime
6666
modified: datetime
67-
68-
class Config:
69-
orm_mode = True
67+
model_config = ConfigDict(from_attributes=True)

‎services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_pricing_plans.py‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from models_library.resource_tracker import PricingPlanClassification, PricingPlanId
44
from models_library.services import ServiceKey, ServiceVersion
5-
from pydantic import BaseModel
5+
from pydantic import ConfigDict, BaseModel
66

77
## DB Models
88

@@ -15,23 +15,17 @@ class PricingPlansDB(BaseModel):
1515
is_active: bool
1616
created: datetime
1717
pricing_plan_key: str
18-
19-
class Config:
20-
orm_mode = True
18+
model_config = ConfigDict(from_attributes=True)
2119

2220

2321
class PricingPlansWithServiceDefaultPlanDB(PricingPlansDB):
2422
service_default_plan: bool
25-
26-
class Config:
27-
orm_mode = True
23+
model_config = ConfigDict(from_attributes=True)
2824

2925

3026
class PricingPlanToServiceDB(BaseModel):
3127
pricing_plan_id: PricingPlanId
3228
service_key: ServiceKey
3329
service_version: ServiceVersion
3430
created: datetime
35-
36-
class Config:
37-
orm_mode = True
31+
model_config = ConfigDict(from_attributes=True)

‎services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_pricing_unit_costs.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
PricingUnitCostId,
77
PricingUnitId,
88
)
9-
from pydantic import BaseModel
9+
from pydantic import ConfigDict, BaseModel
1010

1111

1212
class PricingUnitCostsDB(BaseModel):
@@ -21,6 +21,4 @@ class PricingUnitCostsDB(BaseModel):
2121
created: datetime
2222
comment: str | None
2323
modified: datetime
24-
25-
class Config:
26-
orm_mode = True
24+
model_config = ConfigDict(from_attributes=True)

0 commit comments

Comments
 (0)