More linter

Author: jeffmaki

alembic/versions/add6266277c7_.py

@@ -5,6 +5,7 @@
 Create Date: 2025-09-12 04:18:05.931799
 
 """
+
 import sqlalchemy as sa
 
 from alembic import op
@@ -15,10 +16,13 @@
 depends_on = None
 down_revision = None
 
+
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table("workspaces_long_quests", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("type", sa.Integer(), nullable=False, server_default="0"))
+        batch_op.add_column(
+            sa.Column("type", sa.Integer(), nullable=False, server_default="0")
+        )
         batch_op.add_column(sa.Column("url", sa.Unicode(), nullable=True))
 
     # ### end Alembic commands ###

api/core/config.py

@@ -8,17 +8,20 @@ class Settings(BaseSettings):
     DATABASE_URL: str = "postgresql+asyncpg://user:pass@localhost:5432/dbname"
     DEBUG: bool = False
 
-    WS_LONGFORM_SCHEMA_URL: str = "https://raw.githubusercontent.com/TaskarCenterAtUW/asr-imagery-list/refs/heads/main/schema/schema.json"
+    WS_LONGFORM_SCHEMA_URL: str = (
+        "https://raw.githubusercontent.com/TaskarCenterAtUW/asr-imagery-list/refs/heads/main/schema/schema.json"
+    )
     WS_OSM_HOST: str = "https://osm.workspaces-dev.sidewalks.washington.edu"
 
     # JWT Settings
-    JWT_SECRET: str = "your-secret-key" 
+    JWT_SECRET: str = "your-secret-key"
     JWT_ALGORITHM: str = "HS256"
-    JWT_EXPIRATION: int = 24 * 60 # 1d
+    JWT_EXPIRATION: int = 24 * 60  # 1d
 
     model_config = SettingsConfigDict(
         env_file=".env",
         env_file_encoding="utf-8",
     )
 
+
 settings = Settings()

api/core/database.py

@@ -12,6 +12,7 @@
 # Create declarative base for models
 Base = declarative_base()
 
+
 async def get_session() -> AsyncSession:
     """Dependency for getting async database session.
 

api/core/security.py

@@ -7,12 +7,17 @@
 from jose import JWTError, jwt
 
 security = HTTPBearer()
+
+
 class UserInfo:
     scheme: str
     credentials: str
     projectGroups: list[str]
 
-async def validate_token(credentials: HTTPAuthorizationCredentials = Depends(security)) -> UserInfo:
+
+async def validate_token(
+    credentials: HTTPAuthorizationCredentials = Depends(security),
+) -> UserInfo:
     """Dependency to get current authenticated user."""
 
     credentials_exception = HTTPException(
@@ -32,35 +37,38 @@ async def validate_token(credentials: HTTPAuthorizationCredentials = Depends(sec
         raise credentials_exception
 
     async with httpx.AsyncClient() as client:
-            headers = {
-                'Authorization': 'Bearer ' + credentials.credentials,
-                'Content-Type': 'application/json',
-            }
-
-            authorizationUrl = os.environ.get("TM_TDEI_BACKEND_URL", "https://portal-api-dev.tdei.us/api/v1/") + "/project-group-roles/" + user_id + "?page_no=1&page_size=50"
-            response = await client.get(authorizationUrl, headers=headers)
-
-            # token is not valid or server unavailable
-            if response.status_code != 200:
-                raise credentials_exception
+        headers = {
+            "Authorization": "Bearer " + credentials.credentials,
+            "Content-Type": "application/json",
+        }
+
+        authorizationUrl = (
+            os.environ.get(
+                "TM_TDEI_BACKEND_URL", "https://portal-api-dev.tdei.us/api/v1/"
+            )
+            + "/project-group-roles/"
+            + user_id
+            + "?page_no=1&page_size=50"
+        )
+        response = await client.get(authorizationUrl, headers=headers)
+
+        # token is not valid or server unavailable
+        if response.status_code != 200:
+            raise credentials_exception
 
-            try:
-                content = response.read()
-                j = json.loads(content)
-            except json.JSONDecodeError:
-                raise credentials_exception
+        try:
+            content = response.read()
+            j = json.loads(content)
+        except json.JSONDecodeError:
+            raise credentials_exception
 
-            pgs = []
-            for i in j: 
-                pgs.append(i["tdei_project_group_id"])
+        pgs = []
+        for i in j:
+            pgs.append(i["tdei_project_group_id"])
 
     r = UserInfo()
     r.scheme = credentials.scheme
     r.credentials = credentials.credentials
     r.projectGroups = pgs
 
     return r
-
-
-
-

api/main.py

@@ -30,47 +30,66 @@
 # Include routers
 app.include_router(workspaces_router)
 
+
 @app.get("/health")
 async def health_check():
     return {"status": "ok"}
 
+
 @app.get("/")
 async def root():
     """Root endpoint."""
     logger.debug("Root endpoint called")
     return {"message": "Welcome to Workspaces API!"}
 
-def get_workspace_service(session: AsyncSession = Depends(get_session)) -> WorkspaceService:
+
+def get_workspace_service(
+    session: AsyncSession = Depends(get_session),
+) -> WorkspaceService:
     repository = WorkspaceRepository(session)
     return WorkspaceService(repository)
 
+
 # This API route catches anything not otherwise defined above--MUST be last in this file
 #
 # h/t: https://stackoverflow.com/questions/70610266/proxy-an-external-website-using-python-fast-api-not-supporting-query-params
 #
-@app.api_route("/{full_path:path}", methods=["GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD", "PATCH", "TRACE"])
+@app.api_route(
+    "/{full_path:path}",
+    methods=["GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD", "PATCH", "TRACE"],
+)
 async def catch_all(
     request: Request,
     current_user: UserInfo = Depends(validate_token),
     service: WorkspaceService = Depends(get_workspace_service),
 ):
-    validWorkspace = await service.get_workspace(current_user.projectGroups, int(request.headers.get("X-Workspace") or "-1"))
+    validWorkspace = await service.get_workspace(
+        current_user.projectGroups, int(request.headers.get("X-Workspace") or "-1")
+    )
 
-    if(validWorkspace is None):
+    if validWorkspace is None:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Invalid authentication credentials",
             headers={"WWW-Authenticate": "Bearer"},
         )
 
-    print(f"Path proxied: {request.url} workspace_id: {request.headers.get("X-Workspace")}")
+    print(
+        f"Path proxied: {request.url} workspace_id: {request.headers.get("X-Workspace")}"
+    )
 
-    url = httpx.URL(path=request.url.path.strip(), query=request.url.query.encode("utf-8"))
+    url = httpx.URL(
+        path=request.url.path.strip(), query=request.url.query.encode("utf-8")
+    )
     client = httpx.AsyncClient(base_url=settings.WS_OSM_HOST)
 
     new_headers = list()
-    new_headers.append((bytes("Authorization", "utf-8"), request.headers.get("Authorization")))
-    new_headers.append((bytes("X-Workspace", "utf-8"), bytes(str(validWorkspace.id), "utf-8")))
+    new_headers.append(
+        (bytes("Authorization", "utf-8"), request.headers.get("Authorization"))
+    )
+    new_headers.append(
+        (bytes("X-Workspace", "utf-8"), bytes(str(validWorkspace.id), "utf-8"))
+    )
     new_headers.append((bytes("Host", "utf-8"), bytes(client.base_url.host, "utf-8")))
 
     rp_req = client.build_request(

api/src/workspaces/models.py

@@ -22,8 +22,9 @@ class ExternalAppsDefinitionType(Enum):
     PUBLIC = 1
     PROJECT_GROUP = 2
 
+
 class Workspace(Base):
-    """ Workspaces """
+    """Workspaces"""
 
     __tablename__ = "workspaces"
 
@@ -45,29 +46,27 @@ class Workspace(Base):
 
     geometry = Column(Geometry("MULTIPOLYGON", srid=4326))
 
-    externalAppAccess = Column(SmallInteger, nullable=False, default=ExternalAppsDefinitionType.NONE.value)
+    externalAppAccess = Column(
+        SmallInteger, nullable=False, default=ExternalAppsDefinitionType.NONE.value
+    )
 
     kartaViewToken = Column(Unicode)
 
     longFormQuestDef: Mapped[list["WorkspaceLongQuest"]] = relationship(
-        "WorkspaceLongQuest",
-        uselist=False,
-        lazy="joined",
-        cascade="all, delete"
+        "WorkspaceLongQuest", uselist=False, lazy="joined", cascade="all, delete"
     )
 
     imageryListDef: Mapped[list["WorkspaceImagery"]] = relationship(
-        "WorkspaceImagery",
-        uselist=False, 
-        lazy="joined",
-        cascade="all, delete"
+        "WorkspaceImagery", uselist=False, lazy="joined", cascade="all, delete"
     )
 
+
 class QuestDefinitionType(Enum):
     NONE = 0
     JSON = 1
     URL = 2
 
+
 class WorkspaceLongQuest(Base):
     """Stores mobile app quest definitions for a workspace"""
 
@@ -79,10 +78,13 @@ class WorkspaceLongQuest(Base):
     type = Column(Integer, nullable=False, default=QuestDefinitionType.NONE.value)
     url = Column(Unicode, nullable=True, default=None)
 
-    modifiedAt = Column(DateTime, nullable=False, default=func.now(), onupdate=func.now())
+    modifiedAt = Column(
+        DateTime, nullable=False, default=func.now(), onupdate=func.now()
+    )
     modifiedBy = Column(UUID(as_uuid=True), nullable=False)
     modifiedByName = Column(Unicode, nullable=False)
 
+
 class WorkspaceImagery(Base):
     """Stores imagery list for a workspace"""
 
@@ -91,6 +93,8 @@ class WorkspaceImagery(Base):
     workspace_id = Column(Integer, ForeignKey(Workspace.id), primary_key=True)
     definition = Column(JSON, nullable=True, default=None)
 
-    modifiedAt = Column(DateTime, nullable=False, default=func.now(), onupdate=func.now())
+    modifiedAt = Column(
+        DateTime, nullable=False, default=func.now(), onupdate=func.now()
+    )
     modifiedBy = Column(UUID(as_uuid=True), nullable=False)
-    modifiedByName = Column(Unicode, nullable=False)
+    modifiedByName = Column(Unicode, nullable=False)

api/src/workspaces/repository.py

@@ -12,11 +12,15 @@ class WorkspaceRepository:
     def __init__(self, session: AsyncSession):
         self.session = session
 
-    async def create(self, projectGroupIds: list[str], workspace_data: WorkspaceCreate) -> Workspace:
+    async def create(
+        self, projectGroupIds: list[str], workspace_data: WorkspaceCreate
+    ) -> Workspace:
         workspace = Workspace(**workspace_data.model_dump())
         try:
-            if(workspace.tdeiProjectGroupId not in projectGroupIds):    
-                raise ValueError("User does not have permissions to create a workspace in that project group.")
+            if workspace.tdeiProjectGroupId not in projectGroupIds:
+                raise ValueError(
+                    "User does not have permissions to create a workspace in that project group."
+                )
 
             self.session.add(workspace)
             await self.session.commit()
@@ -28,8 +32,13 @@ async def create(self, projectGroupIds: list[str], workspace_data: WorkspaceCrea
                 f"Workspace with ID {workspace_data.id} already exists"
             )
 
-    async def get_by_id(self, projectGroupIds: list[str], workspace_id: int) -> Workspace:
-        query = select(Workspace).where(Workspace.id == workspace_id and Workspace.tdeiProjectGroupId.in_(projectGroupIds))
+    async def get_by_id(
+        self, projectGroupIds: list[str], workspace_id: int
+    ) -> Workspace:
+        query = select(Workspace).where(
+            Workspace.id == workspace_id
+            and Workspace.tdeiProjectGroupId.in_(projectGroupIds)
+        )
         result = await self.session.execute(query)
         workspace = result.scalar_one_or_none()
 
@@ -38,16 +47,30 @@ async def get_by_id(self, projectGroupIds: list[str], workspace_id: int) -> Work
         return workspace
 
     async def get_all(self, projectGroupIds: list[str]) -> list[Workspace]:
-        query = select(Workspace).where(Workspace.tdeiProjectGroupId.in_(projectGroupIds))
+        query = select(Workspace).where(
+            Workspace.tdeiProjectGroupId.in_(projectGroupIds)
+        )
         result = await self.session.execute(query)
         return list(result.scalars().all())
 
-    async def update(self, projectGroupIds: list[str], workspace_id: int, workspace_data: WorkspaceUpdate) -> Workspace:
+    async def update(
+        self,
+        projectGroupIds: list[str],
+        workspace_id: int,
+        workspace_data: WorkspaceUpdate,
+    ) -> Workspace:
         update_data = workspace_data.model_dump(exclude_unset=True)
         if not update_data:
             raise ValueError("No fields to update")
 
-        query = update(Workspace).where(Workspace.id == workspace_id and Workspace.tdeiProjectGroupId.in_(projectGroupIds)).values(**update_data)
+        query = (
+            update(Workspace)
+            .where(
+                Workspace.id == workspace_id
+                and Workspace.tdeiProjectGroupId.in_(projectGroupIds)
+            )
+            .values(**update_data)
+        )
         result = await self.session.execute(query)
 
         if result.rowcount == 0:
@@ -57,7 +80,10 @@ async def update(self, projectGroupIds: list[str], workspace_id: int, workspace_
         return await self.get_by_id(projectGroupIds, workspace_id)
 
     async def delete(self, projectGroupIds: list[str], workspace_id: int) -> None:
-        query = delete(Workspace).where(Workspace.id == workspace_id and Workspace.tdeiProjectGroupId.in_(projectGroupIds))
+        query = delete(Workspace).where(
+            Workspace.id == workspace_id
+            and Workspace.tdeiProjectGroupId.in_(projectGroupIds)
+        )
         result = await self.session.execute(query)
 
         if result.rowcount == 0: