chore(front & backend): ruff and lint

Author: lstein

Makefile

@@ -24,12 +24,12 @@ help:
 
 # Runs ruff, fixing any safely-fixable errors and formatting
 ruff:
-	cd invokeai && uv tool run ruff@0.11.2 format .
+	cd invokeai && uv tool run ruff@0.11.2 format
 
 # Runs ruff, fixing all errors it can fix and formatting
 ruff-unsafe:
 	ruff check . --fix --unsafe-fixes
-	ruff format .
+	ruff format
 
 # Runs mypy, using the config in pyproject.toml
 mypy:
@@ -64,8 +64,12 @@ frontend-dev:
 frontend-typegen:
 	cd invokeai/frontend/web && python ../../../scripts/generate_openapi_schema.py | pnpm typegen
 
-frontend-prettier:
-	cd invokeai/frontend/web/src && pnpm lint:prettier --write
+frontend-lint:
+	cd invokeai/frontend/web/src && \
+	pnpm lint:tsc && \
+	pnpm lint:dpdm && \
+	pnpm lint:eslint --fix && \
+	pnpm lint:prettier --write 
 
 # Tag the release
 wheel:

invokeai/app/api/auth_dependencies.py

@@ -73,7 +73,7 @@ async def get_current_user_or_default(
 
     When multiuser mode is disabled (default), this always returns a system user with admin privileges,
     allowing unrestricted access to all operations.
-    
+
     When multiuser mode is enabled, authentication is required and this function validates the token,
     returning authenticated user data or raising 401 Unauthorized if no valid credentials are provided.
 
@@ -82,7 +82,7 @@ async def get_current_user_or_default(
 
     Returns:
         TokenData containing user information from the token, or system user in single-user mode
-        
+
     Raises:
         HTTPException: 401 Unauthorized if in multiuser mode and credentials are missing, invalid, or user is inactive
     """

invokeai/frontend/web/src/features/auth/components/ProtectedRoute.tsx

@@ -59,7 +59,7 @@ export const ProtectedRoute = memo(({ children, requireAdmin = false }: PropsWit
     if (!multiuserEnabled) {
       return;
     }
-    
+
     // In multiuser mode, check authentication
     if (!isLoadingUser && !isAuthenticated) {
       navigate('/login', { replace: true });

invokeai/frontend/web/src/features/modelManagerV2/hooks/useIsModelManagerEnabled.ts

@@ -5,11 +5,11 @@ import { useGetSetupStatusQuery } from 'services/api/endpoints/auth';
 
 /**
  * Hook to determine if model manager features should be enabled for the current user.
- * 
+ *
  * Returns true if:
  * - Multiuser mode is disabled (single-user mode = always admin)
  * - Multiuser mode is enabled AND user is an admin
- * 
+ *
  * Returns false if:
  * - Multiuser mode is enabled AND user is not an admin
  */

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ControlAdapterModelDefaultSettings/ControlAdapterModelDefaultSettings.tsx

@@ -1,13 +1,12 @@
-import { memo, useCallback } from 'react';
-import type { SubmitHandler } from 'react-hook-form';
-import { useForm } from 'react-hook-form';
 import { Button, Flex, Heading, SimpleGrid } from '@invoke-ai/ui-library';
-
-import { useIsModelManagerEnabled } from 'features/modelManagerV2/hooks/useIsModelManagerEnabled';
 import { useControlAdapterModelDefaultSettings } from 'features/modelManagerV2/hooks/useControlAdapterModelDefaultSettings';
+import { useIsModelManagerEnabled } from 'features/modelManagerV2/hooks/useIsModelManagerEnabled';
 import { DefaultPreprocessor } from 'features/modelManagerV2/subpanels/ModelPanel/ControlAdapterModelDefaultSettings/DefaultPreprocessor';
 import type { FormField } from 'features/modelManagerV2/subpanels/ModelPanel/MainModelDefaultSettings/MainModelDefaultSettings';
 import { toast } from 'features/toast/toast';
+import { memo, useCallback } from 'react';
+import type { SubmitHandler } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { PiCheckBold } from 'react-icons/pi';
 import { useUpdateModelMutation } from 'services/api/endpoints/models';

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/LoRAModelDefaultSettings/LoRAModelDefaultSettings.tsx

@@ -1,5 +1,4 @@
 import { Button, Flex, Heading, SimpleGrid } from '@invoke-ai/ui-library';
-
 import { useIsModelManagerEnabled } from 'features/modelManagerV2/hooks/useIsModelManagerEnabled';
 import { useLoRAModelDefaultSettings } from 'features/modelManagerV2/hooks/useLoRAModelDefaultSettings';
 import { DefaultWeight } from 'features/modelManagerV2/subpanels/ModelPanel/LoRAModelDefaultSettings/DefaultWeight';

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelHeader.tsx

@@ -1,5 +1,4 @@
 import { Flex, Heading, Spacer, Text } from '@invoke-ai/ui-library';
-
 import { useIsModelManagerEnabled } from 'features/modelManagerV2/hooks/useIsModelManagerEnabled';
 import ModelImageUpload from 'features/modelManagerV2/subpanels/ModelPanel/Fields/ModelImageUpload';
 import type { PropsWithChildren } from 'react';

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ModelView.tsx

@@ -1,5 +1,4 @@
 import { Box, Divider, Flex, SimpleGrid } from '@invoke-ai/ui-library';
-
 import { useIsModelManagerEnabled } from 'features/modelManagerV2/hooks/useIsModelManagerEnabled';
 import { ControlAdapterModelDefaultSettings } from 'features/modelManagerV2/subpanels/ModelPanel/ControlAdapterModelDefaultSettings/ControlAdapterModelDefaultSettings';
 import { LoRAModelDefaultSettings } from 'features/modelManagerV2/subpanels/ModelPanel/LoRAModelDefaultSettings/LoRAModelDefaultSettings';

scripts/userlist.py

@@ -50,9 +50,7 @@ def list_users_table():
 
         # Print header
         print("\n=== InvokeAI Users ===\n")
-        print(
-            f"{'User ID':<36} {'Email':<30} {'Display Name':<20} {'Admin':<8} {'Active':<8}"
-        )
+        print(f"{'User ID':<36} {'Email':<30} {'Display Name':<20} {'Admin':<8} {'Active':<8}")
         print("-" * 108)
 
         # Print each user
@@ -109,6 +107,7 @@ def list_users_json():
         print(f'{{"error": "{e}"}}', file=sys.stderr)
         return False
 
+
 def main():
     """Main entry point for the script."""
     parser = argparse.ArgumentParser(

tests/app/routers/test_boards_multiuser.py

@@ -45,15 +45,15 @@ def enable_multiuser_for_tests(monkeypatch: Any, mock_invoker: Invoker):
     """Enable multiuser mode and set up ApiDependencies for testing."""
     # Enable multiuser mode
     mock_invoker.services.configuration.multiuser = True
-    
+
     # Set ApiDependencies.invoker as a class attribute
     ApiDependencies.invoker = mock_invoker
-    
+
     yield
-    
+
     # Cleanup
-    if hasattr(ApiDependencies, 'invoker'):
-        delattr(ApiDependencies, 'invoker')
+    if hasattr(ApiDependencies, "invoker"):
+        delattr(ApiDependencies, "invoker")
 
 
 @pytest.fixture