Setup and run ruff for the first time.

Author: lmarini

.pre-commit-config.yaml

@@ -25,15 +25,6 @@ repos:
         name: prettier
         entry: bash -c "cd frontend && npx prettier src --write"
         language: system
-  - repo: https://github.com/psf/black
-    rev: 24.10.0
-    hooks:
-      - id: black
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        args: [ "--profile=black" ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -43,11 +34,17 @@ repos:
         exclude: 'openapi.json|frontend/src/openapi/v2/'
       - id: trailing-whitespace
         exclude: 'openapi.json|frontend/src/openapi/v2/'
+# Failing under uv
 #  - repo: https://github.com/shellcheck-py/shellcheck-py
 #    rev: v0.10.0.1
 #    hooks:
 #      - id: shellcheck
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
-    hooks:
-      - id: flake8
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.8.2
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format

backend/app/heartbeat_listener_sync.py

@@ -8,7 +8,6 @@
 from app.models.search import SearchCriteria
 from app.routers.feeds import FeedDB, FeedListener
 from packaging import version
-from pymongo import MongoClient
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -34,13 +33,10 @@ def callback(ch, method, properties, body):
     if owner is not None:
         extractor_db.access = {"owner": owner}
 
-    mongo_client = MongoClient(settings.MONGODB_URL)
-    db = mongo_client[settings.MONGO_DATABASE]
-
     # check to see if extractor already exists
     if owner is None:
         existing_extractor = EventListenerDB.find_one(
-            EventListenerDB.name == msg["queue"], EventListenerDB.access == None
+            EventListenerDB.name == msg["queue"], EventListenerDB.access is None
         )
     else:
         existing_extractor = EventListenerDB.find_one(

backend/app/models/licenses.py

@@ -73,6 +73,6 @@ class LicenseOption(BaseModel):
         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.",
         url="https://creativecommons.org/publicdomain/zero/1.0/",
     ),
-    LicenseOption(id="Custom", description="Create your own custom license", url="")
+    LicenseOption(id="Custom", description="Create your own custom license", url=""),
     # Add more standard license options as needed
 ]

backend/app/routers/authorization.py

@@ -27,7 +27,6 @@
 from app.search.index import index_dataset, index_dataset_files
 from beanie import PydanticObjectId
 from beanie.operators import In, Or
-from bson import ObjectId
 from fastapi import APIRouter, Depends
 from fastapi.exceptions import HTTPException
 

backend/app/routers/files.py

@@ -5,7 +5,6 @@
 
 from app import dependencies
 from app.config import settings
-from app.db.dataset.version import remove_file_entry, remove_local_file_entry
 from app.db.file.download import _increment_file_downloads
 from app.deps.authorization_deps import FileAuthorization
 from app.keycloak_auth import get_current_user, get_token

backend/app/routers/jobs.py

@@ -12,7 +12,6 @@
 from app.models.pages import Paged, _construct_page_metadata, _get_page_query
 from beanie import PydanticObjectId
 from beanie.operators import GTE, LT, Or, RegEx
-from bson import ObjectId
 from fastapi import APIRouter, Depends, HTTPException
 
 router = APIRouter()

backend/app/routers/licenses.py

@@ -23,7 +23,7 @@ async def save_license(
     license_in: LicenseIn,
     user=Depends(get_current_user),
 ):
-    if license_in.holders == None:
+    if license_in.holders is None:
         license_in = user
     license_db = LicenseDB(**license_in.dict(), creator=user.email)
     await license_db.insert()

backend/app/routers/listeners.py

@@ -263,7 +263,7 @@ async def search_listeners(
         if dataset_id is None:
             criteria_list.append(
                 Or(
-                    EventListenerDB.access == None,
+                    EventListenerDB.access is None,
                     EventListenerDB.access.owner == user_id,
                     EventListenerDB.access.users == user_id,
                     In(EventListenerDB.access.groups, user_groups),
@@ -272,7 +272,7 @@ async def search_listeners(
         else:
             criteria_list.append(
                 Or(
-                    EventListenerDB.access == None,
+                    EventListenerDB.access is None,
                     EventListenerDB.access.owner == user_id,
                     EventListenerDB.access.users == user_id,
                     In(EventListenerDB.access.groups, user_groups),
@@ -377,7 +377,7 @@ async def get_listeners(
     if label:
         aggregation_pipeline.append({"$match": {"properties.default_labels": label}})
     if alive_only:
-        aggregation_pipeline.append({"$match": {"alive": True}}),
+        (aggregation_pipeline.append({"$match": {"alive": True}}),)
     if process:
         if process == "file":
             aggregation_pipeline.append(
@@ -420,7 +420,7 @@ async def get_listeners(
         if dataset_id is None:
             criteria_list.append(
                 Or(
-                    EventListenerDB.access == None,
+                    EventListenerDB.access is None,
                     EventListenerDB.access.owner == user_id,
                     EventListenerDB.access.users == user_id,
                     In(EventListenerDB.access.groups, user_groups),
@@ -429,7 +429,7 @@ async def get_listeners(
         else:
             criteria_list.append(
                 Or(
-                    EventListenerDB.access == None,
+                    EventListenerDB.access is None,
                     EventListenerDB.access.owner == user_id,
                     EventListenerDB.access.users == user_id,
                     In(EventListenerDB.access.groups, user_groups),

backend/app/routers/public_files.py

@@ -13,7 +13,6 @@
 )
 from beanie import PydanticObjectId
 from beanie.odm.operators.find.logical import Or
-from bson import ObjectId
 from fastapi import APIRouter, Depends, Form, HTTPException
 from fastapi.responses import StreamingResponse
 from fastapi.security import HTTPBearer

backend/app/routers/public_folders.py

@@ -1,6 +1,5 @@
 from app.models.folders import FolderDBViewList
 from beanie import PydanticObjectId
-from bson import ObjectId
 from fastapi import APIRouter, HTTPException
 
 router = APIRouter()