Skip to content

Commit d978084

Browse files
committed
Setup and run ruff for the first time.
1 parent 612c2e2 commit d978084

24 files changed

+332
-323
lines changed

.pre-commit-config.yaml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ repos:
2525
name: prettier
2626
entry: bash -c "cd frontend && npx prettier src --write"
2727
language: system
28-
- repo: https://github.com/psf/black
29-
rev: 24.10.0
30-
hooks:
31-
- id: black
32-
- repo: https://github.com/PyCQA/isort
33-
rev: 5.13.2
34-
hooks:
35-
- id: isort
36-
args: [ "--profile=black" ]
3728
- repo: https://github.com/pre-commit/pre-commit-hooks
3829
rev: v5.0.0
3930
hooks:
@@ -43,11 +34,17 @@ repos:
4334
exclude: 'openapi.json|frontend/src/openapi/v2/'
4435
- id: trailing-whitespace
4536
exclude: 'openapi.json|frontend/src/openapi/v2/'
37+
# Failing under uv
4638
# - repo: https://github.com/shellcheck-py/shellcheck-py
4739
# rev: v0.10.0.1
4840
# hooks:
4941
# - id: shellcheck
50-
- repo: https://github.com/PyCQA/flake8
51-
rev: 7.1.1
52-
hooks:
53-
- id: flake8
42+
- repo: https://github.com/astral-sh/ruff-pre-commit
43+
# Ruff version.
44+
rev: v0.8.2
45+
hooks:
46+
# Run the linter.
47+
- id: ruff
48+
args: [ --fix ]
49+
# Run the formatter.
50+
- id: ruff-format

backend/app/heartbeat_listener_sync.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from app.models.search import SearchCriteria
99
from app.routers.feeds import FeedDB, FeedListener
1010
from packaging import version
11-
from pymongo import MongoClient
1211

1312
logging.basicConfig(level=logging.INFO)
1413
logger = logging.getLogger(__name__)
@@ -34,13 +33,10 @@ def callback(ch, method, properties, body):
3433
if owner is not None:
3534
extractor_db.access = {"owner": owner}
3635

37-
mongo_client = MongoClient(settings.MONGODB_URL)
38-
db = mongo_client[settings.MONGO_DATABASE]
39-
4036
# check to see if extractor already exists
4137
if owner is None:
4238
existing_extractor = EventListenerDB.find_one(
43-
EventListenerDB.name == msg["queue"], EventListenerDB.access == None
39+
EventListenerDB.name == msg["queue"], EventListenerDB.access is None
4440
)
4541
else:
4642
existing_extractor = EventListenerDB.find_one(

backend/app/models/licenses.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ class LicenseOption(BaseModel):
7373
description="CC0 (aka CC Zero) is a public dedication tool, which enables creators to give up their copyright and put their works into the worldwide public domain. CC0 enables reusers to distribute, remix, adapt, and build upon the material in any medium or format, with no conditions.",
7474
url="https://creativecommons.org/publicdomain/zero/1.0/",
7575
),
76-
LicenseOption(id="Custom", description="Create your own custom license", url="")
76+
LicenseOption(id="Custom", description="Create your own custom license", url=""),
7777
# Add more standard license options as needed
7878
]

backend/app/routers/authorization.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from app.search.index import index_dataset, index_dataset_files
2828
from beanie import PydanticObjectId
2929
from beanie.operators import In, Or
30-
from bson import ObjectId
3130
from fastapi import APIRouter, Depends
3231
from fastapi.exceptions import HTTPException
3332

backend/app/routers/files.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
from app import dependencies
77
from app.config import settings
8-
from app.db.dataset.version import remove_file_entry, remove_local_file_entry
98
from app.db.file.download import _increment_file_downloads
109
from app.deps.authorization_deps import FileAuthorization
1110
from app.keycloak_auth import get_current_user, get_token

backend/app/routers/jobs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from app.models.pages import Paged, _construct_page_metadata, _get_page_query
1313
from beanie import PydanticObjectId
1414
from beanie.operators import GTE, LT, Or, RegEx
15-
from bson import ObjectId
1615
from fastapi import APIRouter, Depends, HTTPException
1716

1817
router = APIRouter()

backend/app/routers/licenses.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async def save_license(
2323
license_in: LicenseIn,
2424
user=Depends(get_current_user),
2525
):
26-
if license_in.holders == None:
26+
if license_in.holders is None:
2727
license_in = user
2828
license_db = LicenseDB(**license_in.dict(), creator=user.email)
2929
await license_db.insert()

backend/app/routers/listeners.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ async def search_listeners(
263263
if dataset_id is None:
264264
criteria_list.append(
265265
Or(
266-
EventListenerDB.access == None,
266+
EventListenerDB.access is None,
267267
EventListenerDB.access.owner == user_id,
268268
EventListenerDB.access.users == user_id,
269269
In(EventListenerDB.access.groups, user_groups),
@@ -272,7 +272,7 @@ async def search_listeners(
272272
else:
273273
criteria_list.append(
274274
Or(
275-
EventListenerDB.access == None,
275+
EventListenerDB.access is None,
276276
EventListenerDB.access.owner == user_id,
277277
EventListenerDB.access.users == user_id,
278278
In(EventListenerDB.access.groups, user_groups),
@@ -377,7 +377,7 @@ async def get_listeners(
377377
if label:
378378
aggregation_pipeline.append({"$match": {"properties.default_labels": label}})
379379
if alive_only:
380-
aggregation_pipeline.append({"$match": {"alive": True}}),
380+
(aggregation_pipeline.append({"$match": {"alive": True}}),)
381381
if process:
382382
if process == "file":
383383
aggregation_pipeline.append(
@@ -420,7 +420,7 @@ async def get_listeners(
420420
if dataset_id is None:
421421
criteria_list.append(
422422
Or(
423-
EventListenerDB.access == None,
423+
EventListenerDB.access is None,
424424
EventListenerDB.access.owner == user_id,
425425
EventListenerDB.access.users == user_id,
426426
In(EventListenerDB.access.groups, user_groups),
@@ -429,7 +429,7 @@ async def get_listeners(
429429
else:
430430
criteria_list.append(
431431
Or(
432-
EventListenerDB.access == None,
432+
EventListenerDB.access is None,
433433
EventListenerDB.access.owner == user_id,
434434
EventListenerDB.access.users == user_id,
435435
In(EventListenerDB.access.groups, user_groups),

backend/app/routers/public_files.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
)
1414
from beanie import PydanticObjectId
1515
from beanie.odm.operators.find.logical import Or
16-
from bson import ObjectId
1716
from fastapi import APIRouter, Depends, Form, HTTPException
1817
from fastapi.responses import StreamingResponse
1918
from fastapi.security import HTTPBearer

backend/app/routers/public_folders.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from app.models.folders import FolderDBViewList
22
from beanie import PydanticObjectId
3-
from bson import ObjectId
43
from fastapi import APIRouter, HTTPException
54

65
router = APIRouter()

0 commit comments

Comments
 (0)