Add pre-push hook for formatting and validation

app/Makefile

@@ -24,5 +24,5 @@ test:
 
 .PHONY: format
 format:
-	docker compose run api $(isort)
-	docker compose run api $(black)
+	docker compose run -T api $(isort)
+	docker compose run -T api $(black)

app/api/subsetter/app/models.py

@@ -1,5 +1,5 @@
-from typing import Annotated, Any
 from enum import Enum
+from typing import Annotated, Any
 
 from fastapi import Depends, HTTPException, Path, status
 from pydantic import BaseModel, Field
@@ -42,11 +42,13 @@ class UserSubmissionsResponseModel(BaseModel):
 class SubmissionResponseModel(Submission):
     workflow_id: str
 
+
 class NWMVersionEnum(str, Enum):
     nwm1 = "nwm1"
     nwm2 = "nwm2"
     nwm3 = "nwm3"
 
+
 class ExtractMetadataRequestBody(BaseModel):
     workflow_id: str
     metadata: Any = None

app/api/subsetter/app/routers/argo/router.py

@@ -12,13 +12,13 @@
 
 from app.db import Submission, User
 from app.models import (
+    ExtractMetadataRequestBody,
     LogsResponseModel,
+    NWMVersionEnum,
     SubmissionResponseModel,
     UrlResponseModel,
     UserSubmissionsResponseModel,
     WorkflowDep,
-    NWMVersionEnum,
-    ExtractMetadataRequestBody,
 )
 from app.users import current_active_user
 from config import get_minio_client, get_settings
@@ -41,9 +41,7 @@
 api_instance = workflow_service_api.WorkflowServiceApi(api_client)
 
 
-def parflow_submission_body(
-    hucs: list, bucket_name: str, workflow_name: str, output_path
-):
+def parflow_submission_body(hucs: list, bucket_name: str, workflow_name: str, output_path):
     return {
         "resourceKind": "WorkflowTemplate",
         "resourceName": "parflow-subset-v1-by-huc-minio",
@@ -162,9 +160,7 @@ async def extract_metadata(
     user: User = Depends(current_active_user),
 ):
     submission = next(
-        submission
-        for submission in user.submissions
-        if submission.workflow_id == metadata_request.workflow_id
+        submission for submission in user.submissions if submission.workflow_id == metadata_request.workflow_id
     )
     if not submission:
         raise Exception(f"No Submission found for id {metadata_request.workflow_id}")

app/api/subsetter/app/routers/storage/router.py

@@ -1,29 +1,24 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 
-from app.models import WorkflowDep
-from config import get_minio_client
 from app.db import User
-from fastapi import APIRouter, Depends
+from app.models import WorkflowDep
 from app.users import current_active_user
+from config import get_minio_client
 
 router = APIRouter()
 
 
 @router.get('/presigned/get/{workflow_id}', description="Create a download url")
 async def presigned_get_minio(workflow_params: WorkflowDep, user: User = Depends(current_active_user)):
     submission = workflow_params.user.get_submission(workflow_params.workflow_id)
-    url = get_minio_client().presigned_get_object(
-        "subsetter-outputs", submission.output_path(user.bucket_name)
-    )
+    url = get_minio_client().presigned_get_object("subsetter-outputs", submission.output_path(user.bucket_name))
     return {'url': url}
 
 
 @router.get('/url/{workflow_id}', description="Create a download url")
 async def presigned_get_url(workflow_params: WorkflowDep, user: User = Depends(current_active_user)):
     submission = workflow_params.user.get_submission(workflow_params.workflow_id)
-    url = get_minio_client().presigned_get_object(
-        "subsetter-outputs", submission.output_path(user.bucket_name)
-    )
+    url = get_minio_client().presigned_get_object("subsetter-outputs", submission.output_path(user.bucket_name))
     return {'url': url}
 
 

app/api/subsetter/app/routers/utilities/router.py

@@ -1,8 +1,9 @@
+from typing import Any, List
+
 from fastapi import APIRouter
-from shapely.geometry import GeometryCollection, shape, Polygon
-from pyproj import Transformer, CRS
-from typing import List, Any
 from pydantic import BaseModel
+from pyproj import CRS, Transformer
+from shapely.geometry import GeometryCollection, Polygon, shape
 
 router = APIRouter()
 
@@ -41,9 +42,7 @@ def geojson_to_geometry_collection(
     geometries = []
 
     for feature in feature_collection.features:
-        shapely_geom = shape(
-            {"type": feature.geometry.type, "coordinates": feature.geometry.coordinates}
-        )
+        shapely_geom = shape({"type": feature.geometry.type, "coordinates": feature.geometry.coordinates})
         # NOTE: buffer(0) is a trick for fixing scenarios where polygons have overlapping coordinates
         geometries.append(shapely_geom.buffer(0))
 

app/frontend/.eslintrc.cjs

@@ -10,7 +10,8 @@ module.exports = {
   extends: [
     'plugin:vue/vue3-essential',
     'eslint:recommended',
-    '@vue/eslint-config-prettier/skip-formatting'
+    '@vue/eslint-config-prettier/skip-formatting',
+    'plugin:cypress/recommended'
   ],
   overrides: [
     {

app/frontend/.husky/pre-push

@@ -0,0 +1,4 @@
+cd app
+make format
+cd frontend
+npm run validate