Merge pull request #385 from lsst-sqre/tickets/DM-47811

DM-47811: Fixes to address FAST001 and FAST002 ruff rules and update-deps #232
lsst-sqre · Nov 27, 2024 · 1e726ab · 1e726ab
2 parents e1d9976 + a9e8956
commit 1e726ab
Show file tree

Hide file tree

Showing 10 changed files with 447 additions and 458 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.8.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/main.txt b/requirements/main.txt
diff --git a/src/mobu/__init__.py b/src/mobu/__init__.py
@@ -1,6 +1,6 @@
 """The mobu service."""
 
-__all__ = ["__version__", "metadata", "main"]
+__all__ = ["__version__", "main", "metadata"]
 
 from importlib.metadata import PackageNotFoundError, version
 

diff --git a/src/mobu/dependencies/context.py b/src/mobu/dependencies/context.py
@@ -21,8 +21,8 @@
 __all__ = [
     "ContextDependency",
     "RequestContext",
-    "context_dependency",
     "anonymous_context_dependency",
+    "context_dependency",
 ]
 
 

diff --git a/src/mobu/exceptions.py b/src/mobu/exceptions.py
@@ -39,8 +39,8 @@
     "MobuSlackException",
     "MobuSlackWebException",
     "MonkeyNotFoundError",
-    "TAPClientError",
     "SubprocessError",
+    "TAPClientError",
 ]
 
 

diff --git a/src/mobu/handlers/external.py b/src/mobu/handlers/external.py
@@ -47,7 +47,6 @@ def render(self, content: Any) -> bytes:
 @external_router.get(
     "/",
     description=("Metadata about the running version of mobu"),
-    response_model=Index,
     response_model_exclude_none=True,
     summary="Application metadata",
 )
@@ -61,9 +60,7 @@ async def get_index(
     return Index(metadata=metadata)
 
 
-@external_router.get(
-    "/flocks", response_model=list[str], summary="List running flocks"
-)
+@external_router.get("/flocks", summary="List running flocks")
 async def get_flocks(
     context: Annotated[RequestContext, Depends(context_dependency)],
 ) -> list[str]:
@@ -73,7 +70,6 @@ async def get_flocks(
 @external_router.put(
     "/flocks",
     response_class=FormattedJSONResponse,
-    response_model=FlockData,
     response_model_exclude_none=True,
     response_model_exclude_unset=True,
     status_code=201,
@@ -98,7 +94,6 @@ async def put_flock(
 @external_router.get(
     "/flocks/{flock}",
     response_class=FormattedJSONResponse,
-    response_model=FlockData,
     response_model_exclude_none=True,
     response_model_exclude_unset=True,
     responses={404: {"description": "Flock not found", "model": ErrorModel}},
@@ -142,7 +137,6 @@ async def delete_flock(
 @external_router.get(
     "/flocks/{flock}/monkeys",
     response_class=FormattedJSONResponse,
-    response_model=list[str],
     responses={404: {"description": "Flock not found", "model": ErrorModel}},
     summary="Monkeys in flock",
 )
@@ -156,7 +150,6 @@ async def get_monkeys(
 @external_router.get(
     "/flocks/{flock}/monkeys/{monkey}",
     response_class=FormattedJSONResponse,
-    response_model=MonkeyData,
     response_model_exclude_none=True,
     response_model_exclude_unset=True,
     responses={
@@ -212,7 +205,6 @@ def iterfile() -> Iterator[bytes]:
 @external_router.get(
     "/flocks/{flock}/summary",
     response_class=FormattedJSONResponse,
-    response_model=FlockSummary,
     responses={404: {"description": "Flock not found", "model": ErrorModel}},
     summary="Summary of statistics for a flock",
 )
@@ -226,7 +218,6 @@ async def get_flock_summary(
 @external_router.post(
     "/run",
     response_class=FormattedJSONResponse,
-    response_model=SolitaryResult,
     response_model_exclude_none=True,
     response_model_exclude_unset=True,
     summary="Run monkey business once",
@@ -246,7 +237,6 @@ async def put_run(
 @external_router.get(
     "/summary",
     response_class=FormattedJSONResponse,
-    response_model=CombinedSummary,
     summary="Summary of all app state",
 )
 async def get_summary(

diff --git a/src/mobu/handlers/internal.py b/src/mobu/handlers/internal.py
@@ -29,7 +29,6 @@
         " a health check. This route is not exposed outside the cluster and"
         " therefore cannot be used by external clients."
     ),
-    response_model=Metadata,
     response_model_exclude_none=True,
     summary="Application metadata",
 )

diff --git a/src/mobu/models/business/base.py b/src/mobu/models/business/base.py
@@ -10,8 +10,8 @@
 
 __all__ = [
     "BusinessConfig",
-    "BusinessOptions",
     "BusinessData",
+    "BusinessOptions",
     "SerializableTimedelta",
 ]
 

diff --git a/src/mobu/storage/github.py b/src/mobu/storage/github.py
@@ -22,7 +22,7 @@
 
 from ..exceptions import GitHubFileNotFoundError
 
-__all__ = ["GitHubStorage", "CheckRun"]
+__all__ = ["CheckRun", "GitHubStorage"]
 
 
 class _CheckRunRequestOutput(BaseModel):