Skip to content

Pydantic upgrade #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Thingus wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Pydantic upgrade #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73bceda
Pydantic upgrade
Thingus Jul 2, 2025
723e0e4
Adding this to dev requirements
Thingus Jul 2, 2025
86407db
Pinning pydantic to v2 and above
Thingus Jul 2, 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
2 changes: 1 addition & 1 deletion constraints.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pydantic < 2
pydantic >= 2
1 change: 1 addition & 0 deletions dev-requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ pytest-cov>=3.0.0
pytest-mock>=3.7.0
pytest-asyncio
pytest-dotenv

91 changes: 54 additions & 37 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aiohappyeyeballs==2.6.1
# via
# -c requirements.txt
# aiohttp
aiohttp==3.11.18
aiohttp==3.12.13
# via
# -c requirements.txt
# -r requirements.in
Expand All @@ -30,6 +30,10 @@ aniso8601==10.0.1
# via
# -c requirements.txt
# -r requirements.in
annotated-types==0.7.0
# via
# -c requirements.txt
# pydantic
anyio==3.7.1
# via
# -c requirements.txt
Expand Down Expand Up @@ -58,7 +62,7 @@ attrs==25.3.0
# via
# -c requirements.txt
# aiohttp
auth0-python==4.9.0
auth0-python==4.10.0
# via
# -c requirements.txt
# -r requirements.in
Expand All @@ -74,7 +78,7 @@ cachetools==5.5.2
# -r requirements.in
# asyncache
# google-auth
certifi==2025.4.26
certifi==2025.6.15
# via
# -c requirements.txt
# -r requirements.in
Expand All @@ -89,11 +93,11 @@ chardet==5.2.0
# via
# -c requirements.txt
# -r requirements.in
charset-normalizer==3.4.1
charset-normalizer==3.4.2
# via
# -c requirements.txt
# requests
click==8.1.8
click==8.2.1
# via
# -c requirements.txt
# black
Expand All @@ -102,13 +106,13 @@ colorama==0.4.6
# via
# -c requirements.txt
# -r requirements.in
coverage==7.8.0
coverage==7.9.1
# via
# coverage-badge
# pytest-cov
coverage-badge==1.1.2
# via -r dev-requirements.in
cryptography==44.0.2
cryptography==45.0.4
# via
# -c requirements.txt
# auth0-python
Expand All @@ -129,21 +133,21 @@ email-validator==2.2.0
# -r requirements.in
executing==2.2.0
# via stack-data
fastapi==0.115.12
fastapi==0.115.14
# via
# -c requirements.txt
# -r requirements.in
frozenlist==1.6.0
frozenlist==1.7.0
# via
# -c requirements.txt
# aiohttp
# aiosignal
google-api-core==2.24.2
google-api-core==2.25.1
# via
# -c requirements.txt
# google-cloud-core
# google-cloud-storage
google-auth==2.39.0
google-auth==2.40.3
# via
# -c requirements.txt
# -r requirements.in
Expand All @@ -154,7 +158,7 @@ google-cloud-core==2.4.3
# via
# -c requirements.txt
# google-cloud-storage
google-cloud-storage==3.1.0
google-cloud-storage==3.1.1
# via
# -c requirements.txt
# -r requirements.in
Expand Down Expand Up @@ -215,7 +219,7 @@ idna==3.10
# yarl
iniconfig==2.1.0
# via pytest
ipython==9.2.0
ipython==9.4.0
# via black
ipython-pygments-lexers==1.1.1
# via ipython
Expand All @@ -236,7 +240,7 @@ markupsafe==3.0.2
# jinja2
matplotlib-inline==0.1.7
# via ipython
multidict==6.4.3
multidict==6.6.3
# via
# -c requirements.txt
# aiohttp
Expand Down Expand Up @@ -267,17 +271,19 @@ pendulum==3.1.0
# -r requirements.in
pexpect==4.9.0
# via ipython
platformdirs==4.3.7
platformdirs==4.3.8
# via black
pluggy==1.5.0
# via pytest
pluggy==1.6.0
# via
# pytest
# pytest-cov
promise==2.3
# via
# -c requirements.txt
# -r requirements.in
prompt-toolkit==3.0.51
# via ipython
propcache==0.3.1
propcache==0.3.2
# via
# -c requirements.txt
# aiohttp
Expand All @@ -286,7 +292,7 @@ proto-plus==1.26.1
# via
# -c requirements.txt
# google-api-core
protobuf==6.30.2
protobuf==6.31.1
# via
# -c requirements.txt
# google-api-core
Expand All @@ -296,30 +302,35 @@ ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.3
# via stack-data
pyasn1==0.4.8
pyasn1==0.6.1
# via
# -c requirements.txt
# pyasn1-modules
# python-jose
# rsa
pyasn1-modules==0.4.1
pyasn1-modules==0.4.2
# via
# -c requirements.txt
# google-auth
pycparser==2.22
# via
# -c requirements.txt
# cffi
pydantic==1.10.22
pydantic==2.11.7
# via
# -c constraints.in
# -c requirements.txt
# -r requirements.in
# fastapi
pygments==2.19.1
pydantic-core==2.33.2
# via
# -c requirements.txt
# pydantic
pygments==2.19.2
# via
# ipython
# ipython-pygments-lexers
# pytest
pyjwt==2.10.1
# via
# -c requirements.txt
Expand All @@ -328,30 +339,30 @@ pymysql==1.1.1
# via
# -c requirements.txt
# aiomysql
pytest==8.3.5
pytest==8.4.1
# via
# -r dev-requirements.in
# pytest-asyncio
# pytest-cov
# pytest-dotenv
# pytest-mock
pytest-asyncio==0.26.0
pytest-asyncio==1.0.0
# via -r dev-requirements.in
pytest-cov==6.1.1
pytest-cov==6.2.1
# via -r dev-requirements.in
pytest-dotenv==0.5.2
# via -r dev-requirements.in
pytest-mock==3.14.0
pytest-mock==3.14.1
# via -r dev-requirements.in
python-dateutil==2.9.0.post0
# via
# -c requirements.txt
# -r requirements.in
# graphene
# pendulum
python-dotenv==1.1.0
python-dotenv==1.1.1
# via pytest-dotenv
python-jose==3.4.0
python-jose==3.5.0
# via
# -c requirements.txt
# -r requirements.in
Expand All @@ -363,7 +374,7 @@ pyyaml==6.0.2
# via
# -c requirements.txt
# -r requirements.in
requests==2.32.3
requests==2.32.4
# via
# -c requirements.txt
# auth0-python
Expand All @@ -378,7 +389,7 @@ rx==3.2.0
# via
# -c requirements.txt
# -r requirements.in
setuptools==80.0.1
setuptools==80.9.0
# via coverage-badge
six==1.17.0
# via
Expand All @@ -399,23 +410,23 @@ starlette==0.46.2
# -r requirements.in
# asgi-correlation-id
# fastapi
structlog==25.3.0
structlog==25.4.0
# via
# -c requirements.txt
# -r requirements.in
timing-asgi==0.3.1
# via
# -c requirements.txt
# -r requirements.in
tokenize-rt==6.1.0
tokenize-rt==6.2.0
# via black
tomli==2.2.1
# via coverage
traitlets==5.14.3
# via
# ipython
# matplotlib-inline
typing-extensions==4.13.2
typing-extensions==4.14.0
# via
# -c requirements.txt
# -r requirements.in
Expand All @@ -424,6 +435,12 @@ typing-extensions==4.13.2
# graphene
# ipython
# pydantic
# pydantic-core
# typing-inspection
typing-inspection==0.4.1
# via
# -c requirements.txt
# pydantic
tzdata==2025.2
# via
# -c requirements.txt
Expand All @@ -432,13 +449,13 @@ ujson==5.10.0
# via
# -c requirements.txt
# -r requirements.in
urllib3==2.4.0
urllib3==2.5.0
# via
# -c requirements.txt
# -r requirements.in
# auth0-python
# requests
uvicorn==0.34.2
uvicorn==0.35.0
# via
# -c requirements.txt
# -r requirements.in
Expand All @@ -456,7 +473,7 @@ websockets==15.0.1
# via
# -c requirements.txt
# -r requirements.in
yarl==1.20.0
yarl==1.20.1
# via
# -c requirements.txt
# aiohttp
2 changes: 1 addition & 1 deletion flowkit_ui_backend/db/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from xmlrpc.client import boolean
from http import HTTPStatus
from aiomysql import Pool
from pydantic import BaseModel
from pydantic.v1 import BaseModel
from flowkit_ui_backend.models.extra_models import TokenModel
from flowkit_ui_backend.util import util

Expand Down
2 changes: 1 addition & 1 deletion flowkit_ui_backend/impl/accounts_api_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from cachetools import TTLCache
from fastapi import HTTPException
from fastapi.params import Depends
from pydantic import SecretStr
from pydantic.v1 import SecretStr
Copy link
Contributor

@greenape greenape Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presumably the v1 import actually means we now need to constrain to >= 2?


from flowkit_ui_backend.models.extra_models import TokenModel
from flowkit_ui_backend.models.user_metadata import UserMetadata
Expand Down
2 changes: 1 addition & 1 deletion flowkit_ui_backend/models/bin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import re # noqa: F401
from typing import Any, Dict, List, Optional # noqa: F401

from pydantic import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401
from pydantic.v1 import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401

# required to make arbitrary datatypes work, see https://github.com/tiangolo/fastapi/issues/2382
BaseConfig.arbitrary_types_allowed = True
Expand Down
2 changes: 1 addition & 1 deletion flowkit_ui_backend/models/categories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import re # noqa: F401
from typing import Any, Dict, List, Optional # noqa: F401

from pydantic import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401
from pydantic.v1 import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401

# required to make arbitrary datatypes work, see https://github.com/tiangolo/fastapi/issues/2382
BaseConfig.arbitrary_types_allowed = True
Expand Down
2 changes: 1 addition & 1 deletion flowkit_ui_backend/models/category.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import re # noqa: F401
from typing import Any, Dict, List, Optional # noqa: F401

from pydantic import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401
from pydantic.v1 import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401

# required to make arbitrary datatypes work, see https://github.com/tiangolo/fastapi/issues/2382
BaseConfig.arbitrary_types_allowed = True
Expand Down
2 changes: 1 addition & 1 deletion flowkit_ui_backend/models/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import re # noqa: F401
from typing import Any, Dict, List, Optional # noqa: F401

from pydantic import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401
from pydantic.v1 import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401

# required to make arbitrary datatypes work, see https://github.com/tiangolo/fastapi/issues/2382
BaseConfig.arbitrary_types_allowed = True
Expand Down
2 changes: 1 addition & 1 deletion flowkit_ui_backend/models/data_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import re # noqa: F401
from typing import Any, Dict, List, Optional # noqa: F401

from pydantic import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401
from pydantic.v1 import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401

# required to make arbitrary datatypes work, see https://github.com/tiangolo/fastapi/issues/2382
BaseConfig.arbitrary_types_allowed = True
Expand Down
2 changes: 1 addition & 1 deletion flowkit_ui_backend/models/data_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import re # noqa: F401
from typing import Any, Dict, List, Optional # noqa: F401

from pydantic import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401
from pydantic.v1 import AnyUrl, BaseModel, EmailStr, validator, BaseConfig # noqa: F401

# required to make arbitrary datatypes work, see https://github.com/tiangolo/fastapi/issues/2382
BaseConfig.arbitrary_types_allowed = True
Expand Down
Loading