format

Author: devincowan

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)

api/com_res/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

api/com_res/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}")

api/com_res/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(
-        "com_res-outputs", submission.output_path(user.bucket_name)
-    )
+    url = get_minio_client().presigned_get_object("com_res-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(
-        "com_res-outputs", submission.output_path(user.bucket_name)
-    )
+    url = get_minio_client().presigned_get_object("com_res-outputs", submission.output_path(user.bucket_name))
     return {'url': url}
 
 

api/com_res/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))
 

frontend/.husky/pre-commit frontend/.husky/pre-pushfrontend/.husky/pre-commit renamed to frontend/.husky/pre-push

@@ -1,2 +1,3 @@
+make format
 cd frontend
 npm run validate

frontend/src/App.vue

@@ -3,13 +3,20 @@
     <v-main>
       <TheAppBar @toggle-mobile-nav="toggleMobileNav" :paths="paths" />
       <AlertPopup v-bind="alertStore.displayed"></AlertPopup>
-      <TheMobileNavDrawer @toggle-mobile-nav="toggleMobileNav" :show="showMobileNavigation" :paths="paths" />
+      <TheMobileNavDrawer
+        @toggle-mobile-nav="toggleMobileNav"
+        :show="showMobileNavigation"
+        :paths="paths"
+      />
       <RouterView v-slot="{ Component }">
         <KeepAlive>
           <component :is="Component" />
         </KeepAlive>
       </RouterView>
-      <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel="stylesheet" />
+      <link
+        href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"
+        rel="stylesheet"
+      />
       <SnackBar />
       <TheFooter />
     </v-main>
@@ -31,30 +38,30 @@ const alertStore = useAlertStore()
 let showMobileNavigation = ref(false)
 const paths = [
   {
-    attrs: { to: "/" },
-    label: "Home",
+    attrs: { to: '/' },
+    label: 'Home'
   },
   {
-    attrs: { to: "/map" },
-    label: "Map",
+    attrs: { to: '/map' },
+    label: 'Map'
   },
   {
-    attrs: { to: "/submissions" },
-    label: "Submissions",
+    attrs: { to: '/submissions' },
+    label: 'Submissions'
   },
   {
-    attrs: { to: "/api" },
-    label: "API",
+    attrs: { to: '/api' },
+    label: 'API'
   },
   {
-    attrs: { to: "/about" },
-    label: "About",
+    attrs: { to: '/about' },
+    label: 'About'
   },
   {
-    attrs: { to: "/help" },
-    label: "Help",
-  },
-];
+    attrs: { to: '/help' },
+    label: 'Help'
+  }
+]
 
 function toggleMobileNav() {
   showMobileNavigation.value = !showMobileNavigation.value

frontend/src/assets/font/font.css

@@ -1,16 +1,17 @@
-@import "montserrat/stylesheet.css";
+@import 'montserrat/stylesheet.css';
 /* TODO: transition from montserrat to inter: use 1px lower size of inter */
-@import "inter/inter.css";
+@import 'inter/inter.css';
 
-html, body {
-    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.004);
-    text-rendering: optimizeLegibility !important;
-    -webkit-font-smoothing: antialiased !important;
+html,
+body {
+  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.004);
+  text-rendering: optimizeLegibility !important;
+  -webkit-font-smoothing: antialiased !important;
 }
 
 @font-face {
-    font-family: 'friz_quadrata';
-    src: url('friz_quadrata_regular-webfont.woff2') format('woff2');
-    font-weight: normal;
-    font-style: normal;
+  font-family: 'friz_quadrata';
+  src: url('friz_quadrata_regular-webfont.woff2') format('woff2');
+  font-weight: normal;
+  font-style: normal;
 }

frontend/src/assets/font/inter/inter.css

@@ -1,89 +1,89 @@
 @font-face {
   font-family: 'Inter';
-  font-style:  normal;
+  font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url("Inter-Regular.woff2?v=3.11") format("woff2");
+  src: url('Inter-Regular.woff2?v=3.11') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
-  font-style:  italic;
+  font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: url("Inter-Italic.woff2?v=3.11") format("woff2");
+  src: url('Inter-Italic.woff2?v=3.11') format('woff2');
 }
 
 @font-face {
   font-family: 'Inter';
-  font-style:  normal;
+  font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url("Inter-Medium.woff2?v=3.11") format("woff2");
+  src: url('Inter-Medium.woff2?v=3.11') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
-  font-style:  italic;
+  font-style: italic;
   font-weight: 500;
   font-display: swap;
-  src: url("Inter-MediumItalic.woff2?v=3.11") format("woff2");
+  src: url('Inter-MediumItalic.woff2?v=3.11') format('woff2');
 }
 
 @font-face {
   font-family: 'Inter';
-  font-style:  normal;
+  font-style: normal;
   font-weight: 600;
   font-display: swap;
-  src: url("Inter-SemiBold.woff2?v=3.11") format("woff2");
+  src: url('Inter-SemiBold.woff2?v=3.11') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
-  font-style:  italic;
+  font-style: italic;
   font-weight: 600;
   font-display: swap;
-  src: url("Inter-SemiBoldItalic.woff2?v=3.11") format("woff2");
+  src: url('Inter-SemiBoldItalic.woff2?v=3.11') format('woff2');
 }
 
 @font-face {
   font-family: 'Inter';
-  font-style:  normal;
+  font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url("Inter-Bold.woff2?v=3.11") format("woff2");
+  src: url('Inter-Bold.woff2?v=3.11') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
-  font-style:  italic;
+  font-style: italic;
   font-weight: 700;
   font-display: swap;
-  src: url("Inter-BoldItalic.woff2?v=3.11") format("woff2");
+  src: url('Inter-BoldItalic.woff2?v=3.11') format('woff2');
 }
 
 @font-face {
   font-family: 'Inter';
-  font-style:  normal;
+  font-style: normal;
   font-weight: 800;
   font-display: swap;
-  src: url("Inter-ExtraBold.woff2?v=3.11") format("woff2");
+  src: url('Inter-ExtraBold.woff2?v=3.11') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
-  font-style:  italic;
+  font-style: italic;
   font-weight: 800;
   font-display: swap;
-  src: url("Inter-ExtraBoldItalic.woff2?v=3.11") format("woff2");
+  src: url('Inter-ExtraBoldItalic.woff2?v=3.11') format('woff2');
 }
 
 @font-face {
   font-family: 'Inter';
-  font-style:  normal;
+  font-style: normal;
   font-weight: 900;
   font-display: swap;
-  src: url("Inter-Black.woff2?v=3.11") format("woff2");
+  src: url('Inter-Black.woff2?v=3.11') format('woff2');
 }
 @font-face {
   font-family: 'Inter';
-  font-style:  italic;
+  font-style: italic;
   font-weight: 900;
   font-display: swap;
-  src: url("Inter-BlackItalic.woff2?v=3.11") format("woff2");
+  src: url('Inter-BlackItalic.woff2?v=3.11') format('woff2');
 }