Skip to content

[CVAT] Update deps, fix warnings #2728

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

Merged
merged 4 commits into from
Oct 30, 2024
Merged

[CVAT] Update deps, fix warnings #2728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11a388e
Update fastapi and sqlalchemy to mitigate DOS attacks
zhiltsov-max Oct 30, 2024
a69a38f
Remove invalid subquery call
zhiltsov-max Oct 30, 2024
7a39245
Remove extra alembic hooks
zhiltsov-max Oct 30, 2024
a279a5b
Fix foreign key overlap warnings
zhiltsov-max Oct 30, 2024
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 packages/examples/cvat/exchange-oracle/alembic.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ sqlalchemy.url =
# on newly generated revision scripts. See the documentation for further
# detail and examples

hooks=ruff, ruff_format, types_update
hooks=ruff, ruff_format

ruff.type = exec
ruff.executable = ruff
Expand Down
243 changes: 117 additions & 126 deletions packages/examples/cvat/exchange-oracle/poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion packages/examples/cvat/exchange-oracle/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ packages = [{include = "exchange_oracle"}]

[tool.poetry.dependencies]
python = "^3.10,<3.13"
fastapi = "^0.111.1"
fastapi = {version = "^0.115.4", extras = ["standard"]}
uvicorn = "^0.30.0"
python-dotenv = "^1.0.0"
psycopg2 = "^2.9.6"
Expand All @@ -32,6 +32,7 @@ fastapi-filter = "^1.1.0"
fastapi-limiter = "^0.1.6"
strenum = "^0.4.15"
pyjwt = "^2.9.0"
starlette = ">=0.40.0" # avoid the vulnerability with multipart/form-data


[tool.poetry.group.dev.dependencies]
Expand Down
4 changes: 4 additions & 0 deletions packages/examples/cvat/exchange-oracle/src/models/cvat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class Project(Base):
")"
),
foreign_keys=[escrow_address, chain_id],
overlaps="escrow_validation",
)
escrow_validation: Mapped[EscrowValidation] = relationship(
back_populates="projects",
Expand All @@ -73,6 +74,7 @@ class Project(Base):
")"
),
foreign_keys=[escrow_address, chain_id],
overlaps="escrow_creation",
)

def __repr__(self) -> str:
Expand Down Expand Up @@ -129,6 +131,7 @@ class EscrowCreation(Base):
")"
),
foreign_keys=[Project.escrow_address, Project.chain_id],
overlaps="projects, escrow_validation",
)

def __repr__(self) -> str:
Expand Down Expand Up @@ -157,6 +160,7 @@ class EscrowValidation(Base):
")"
),
foreign_keys=[Project.escrow_address, Project.chain_id],
overlaps="projects, escrow_creation",
)


Expand Down
1 change: 0 additions & 1 deletion packages/examples/cvat/exchange-oracle/src/services/cvat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,6 @@ def prepare_escrows_for_validation(
.where(EscrowValidation.status == EscrowValidationStatuses.awaiting)
.limit(limit)
.order_by(EscrowValidation.attempts.asc())
.subquery()
)
update_stmt = (
update(EscrowValidation)
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/cvat/recording-oracle/alembic.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ sqlalchemy.url = driver://user:pass@localhost/dbname
# on newly generated revision scripts. See the documentation for further
# detail and examples

hooks=ruff, ruff_format, types_update
hooks=ruff, ruff_format

ruff.type = exec
ruff.executable = ruff
Expand Down
243 changes: 117 additions & 126 deletions packages/examples/cvat/recording-oracle/poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion packages/examples/cvat/recording-oracle/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ packages = [{include = "recording_oracle"}]

[tool.poetry.dependencies]
python = "^3.10, <3.13"
fastapi = "^0.111.1"
fastapi = {version = "^0.115.4", extras = ["standard"]}
uvicorn = "^0.22.0"
python-dotenv = "^1.0.0"
SQLAlchemy = "^2.0.17"
Expand All @@ -24,6 +24,7 @@ google-cloud-storage = "^2.14.0"
datumaro = {git = "https://github.com/cvat-ai/datumaro.git", rev = "ff83c00c2c1bc4b8fdfcc55067fcab0a9b5b6b11"}
human-protocol-sdk = "^3.0.4"
hexbytes = ">=1.2.0" # required for to_0x_hex() function
starlette = ">=0.40.0" # avoid the vulnerability with multipart/form-data

[tool.poetry.group.dev.dependencies]
hypothesis = "^6.82.6"
Expand Down