github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Chore Ruff check & format

Browse Source
This commit is contained in:
Alexander Eichhorn
2026-03-28 14:50:57 +01:00
parent edde0b4737
commit 18315db7f0
8 changed files with 69 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/app/api/routers/app_info.py
View File

@@ -12,12 +12,12 @@ from pydantic import BaseModel, Field
from invokeai.app.api.dependencies import ApiDependencies
from invokeai.app.services.config.config_default import (
DefaultInvokeAIAppConfig,
EXTERNAL_PROVIDER_CONFIG_FIELDS,
DefaultInvokeAIAppConfig,
InvokeAIAppConfig,
get_config,
load_external_api_keys,
load_and_migrate_config,
load_external_api_keys,
)
from invokeai.app.services.external_generation.external_generation_common import ExternalProviderStatus
from invokeai.app.services.invocation_cache.invocation_cache_common import InvocationCacheStatus

2
invokeai/app/services/external_generation/__init__.py
View File

@@ -3,9 +3,9 @@ from invokeai.app.services.external_generation.external_generation_base import (
ExternalProvider,
)
from invokeai.app.services.external_generation.external_generation_common import (
ExternalGeneratedImage,
ExternalGenerationRequest,
ExternalGenerationResult,
ExternalGeneratedImage,
ExternalProviderStatus,
ExternalReferenceImage,
)

5
invokeai/app/services/external_generation/providers/gemini.py
View File

@@ -6,7 +6,10 @@ import uuid
import requests
from PIL.Image import Image as PILImageType
from invokeai.app.services.external_generation.errors import ExternalProviderRateLimitError, ExternalProviderRequestError
from invokeai.app.services.external_generation.errors import (
ExternalProviderRateLimitError,
ExternalProviderRequestError,
)
from invokeai.app.services.external_generation.external_generation_base import ExternalProvider
from invokeai.app.services.external_generation.external_generation_common import (
ExternalGeneratedImage,

5
invokeai/app/services/external_generation/providers/openai.py
View File

@@ -5,7 +5,10 @@ import io
import requests
from PIL.Image import Image as PILImageType
from invokeai.app.services.external_generation.errors import ExternalProviderRateLimitError, ExternalProviderRequestError
from invokeai.app.services.external_generation.errors import (
ExternalProviderRateLimitError,
ExternalProviderRequestError,
)
from invokeai.app.services.external_generation.external_generation_base import ExternalProvider
from invokeai.app.services.external_generation.external_generation_common import (
ExternalGeneratedImage,

90
invokeai/backend/image_util/controlnet_processor.py
View File

@@ -14,43 +14,61 @@ def _get_processor_invocation_class(processor_type: str):
"""Get the invocation class for a processor type."""
# Import processor invocation classes on demand
processor_class_map = {
"canny_image_processor": lambda: __import__(
"invokeai.app.invocations.canny", fromlist=["CannyEdgeDetectionInvocation"]
).CannyEdgeDetectionInvocation,
"hed_image_processor": lambda: __import__(
"invokeai.app.invocations.hed", fromlist=["HEDEdgeDetectionInvocation"]
).HEDEdgeDetectionInvocation,
"mlsd_image_processor": lambda: __import__(
"invokeai.app.invocations.mlsd", fromlist=["MLSDDetectionInvocation"]
).MLSDDetectionInvocation,
"depth_anything_image_processor": lambda: __import__(
"invokeai.app.invocations.depth_anything", fromlist=["DepthAnythingDepthEstimationInvocation"]
).DepthAnythingDepthEstimationInvocation,
"normalbae_image_processor": lambda: __import__(
"invokeai.app.invocations.normal_bae", fromlist=["NormalMapInvocation"]
).NormalMapInvocation,
"pidi_image_processor": lambda: __import__(
"invokeai.app.invocations.pidi", fromlist=["PiDiNetEdgeDetectionInvocation"]
).PiDiNetEdgeDetectionInvocation,
"lineart_image_processor": lambda: __import__(
"invokeai.app.invocations.lineart", fromlist=["LineartEdgeDetectionInvocation"]
).LineartEdgeDetectionInvocation,
"lineart_anime_image_processor": lambda: __import__(
"invokeai.app.invocations.lineart_anime", fromlist=["LineartAnimeEdgeDetectionInvocation"]
).LineartAnimeEdgeDetectionInvocation,
"content_shuffle_image_processor": lambda: __import__(
"invokeai.app.invocations.content_shuffle", fromlist=["ContentShuffleInvocation"]
).ContentShuffleInvocation,
"dw_openpose_image_processor": lambda: __import__(
"invokeai.app.invocations.dw_openpose", fromlist=["DWOpenposeDetectionInvocation"]
).DWOpenposeDetectionInvocation,
"mediapipe_face_processor": lambda: __import__(
"invokeai.app.invocations.mediapipe_face", fromlist=["MediaPipeFaceDetectionInvocation"]
).MediaPipeFaceDetectionInvocation,
"canny_image_processor": lambda: (
__import__(
"invokeai.app.invocations.canny", fromlist=["CannyEdgeDetectionInvocation"]
).CannyEdgeDetectionInvocation
),
"hed_image_processor": lambda: (
__import__(
"invokeai.app.invocations.hed", fromlist=["HEDEdgeDetectionInvocation"]
).HEDEdgeDetectionInvocation
),
"mlsd_image_processor": lambda: (
__import__("invokeai.app.invocations.mlsd", fromlist=["MLSDDetectionInvocation"]).MLSDDetectionInvocation
),
"depth_anything_image_processor": lambda: (
__import__(
"invokeai.app.invocations.depth_anything", fromlist=["DepthAnythingDepthEstimationInvocation"]
).DepthAnythingDepthEstimationInvocation
),
"normalbae_image_processor": lambda: (
__import__("invokeai.app.invocations.normal_bae", fromlist=["NormalMapInvocation"]).NormalMapInvocation
),
"pidi_image_processor": lambda: (
__import__(
"invokeai.app.invocations.pidi", fromlist=["PiDiNetEdgeDetectionInvocation"]
).PiDiNetEdgeDetectionInvocation
),
"lineart_image_processor": lambda: (
__import__(
"invokeai.app.invocations.lineart", fromlist=["LineartEdgeDetectionInvocation"]
).LineartEdgeDetectionInvocation
),
"lineart_anime_image_processor": lambda: (
__import__(
"invokeai.app.invocations.lineart_anime", fromlist=["LineartAnimeEdgeDetectionInvocation"]
).LineartAnimeEdgeDetectionInvocation
),
"content_shuffle_image_processor": lambda: (
__import__(
"invokeai.app.invocations.content_shuffle", fromlist=["ContentShuffleInvocation"]
).ContentShuffleInvocation
),
"dw_openpose_image_processor": lambda: (
__import__(
"invokeai.app.invocations.dw_openpose", fromlist=["DWOpenposeDetectionInvocation"]
).DWOpenposeDetectionInvocation
),
"mediapipe_face_processor": lambda: (
__import__(
"invokeai.app.invocations.mediapipe_face", fromlist=["MediaPipeFaceDetectionInvocation"]
).MediaPipeFaceDetectionInvocation
),
# Note: zoe_depth_image_processor doesn't have a processor invocation implementation
"color_map_image_processor": lambda: __import__(
"invokeai.app.invocations.color_map", fromlist=["ColorMapInvocation"]
).ColorMapInvocation,
"color_map_image_processor": lambda: (
__import__("invokeai.app.invocations.color_map", fromlist=["ColorMapInvocation"]).ColorMapInvocation
),
}
if processor_type in processor_class_map:

6
invokeai/backend/model_manager/starter_models.py
View File

@@ -939,9 +939,7 @@ gemini_flash_image = StarterModel(
format=ModelFormat.ExternalApi,
capabilities=ExternalModelCapabilities(
modes=["txt2img", "img2img", "inpaint"],
supports_seed=True,
supports_reference_images=True,
max_images_per_request=1,
allowed_aspect_ratios=[
@@ -981,9 +979,7 @@ gemini_pro_image_preview = StarterModel(
format=ModelFormat.ExternalApi,
capabilities=ExternalModelCapabilities(
modes=["txt2img", "img2img", "inpaint"],
supports_seed=True,
supports_reference_images=True,
max_reference_images=14,
max_images_per_request=1,
@@ -1003,9 +999,7 @@ gemini_3_1_flash_image_preview = StarterModel(
format=ModelFormat.ExternalApi,
capabilities=ExternalModelCapabilities(
modes=["txt2img", "img2img", "inpaint"],
supports_seed=True,
supports_reference_images=True,
max_reference_images=14,
max_images_per_request=1,

8
tests/app/services/external_generation/test_external_generation_service.py
View File

@@ -3,19 +3,19 @@ import logging
import pytest
from PIL import Image
from invokeai.app.services.config.config_default import InvokeAIAppConfig
from invokeai.app.services.external_generation.errors import (
ExternalProviderCapabilityError,
ExternalProviderNotConfiguredError,
ExternalProviderNotFoundError,
)
from invokeai.app.services.external_generation.external_generation_base import ExternalProvider
from invokeai.app.services.external_generation.external_generation_common import (
ExternalGeneratedImage,
ExternalGenerationRequest,
ExternalGenerationResult,
ExternalReferenceImage,
)
from invokeai.app.services.config.config_default import InvokeAIAppConfig
from invokeai.app.services.external_generation.external_generation_base import ExternalProvider
from invokeai.app.services.external_generation.external_generation_default import ExternalGenerationService
from invokeai.backend.model_manager.configs.external_api import (
ExternalApiModelConfig,
@@ -215,9 +215,7 @@ def test_generate_validates_allowed_aspect_ratios_with_bucket_sizes() -> None:
def test_generate_happy_path() -> None:
model = _build_model(
ExternalModelCapabilities(modes=["txt2img"], supports_seed=True)
)
model = _build_model(ExternalModelCapabilities(modes=["txt2img"], supports_seed=True))
request = _build_request(model=model, seed=42)
result = ExternalGenerationResult(images=[ExternalGeneratedImage(image=_make_image(), seed=42)])
provider = DummyProvider("openai", configured=True, result=result)

2
tests/conftest.py
View File

@@ -16,8 +16,8 @@ from invokeai.app.services.boards.boards_default import BoardService
from invokeai.app.services.bulk_download.bulk_download_default import BulkDownloadService
from invokeai.app.services.client_state_persistence.client_state_persistence_sqlite import ClientStatePersistenceSqlite
from invokeai.app.services.config.config_default import InvokeAIAppConfig
from invokeai.app.services.image_records.image_records_sqlite import SqliteImageRecordStorage
from invokeai.app.services.external_generation.external_generation_default import ExternalGenerationService
from invokeai.app.services.image_records.image_records_sqlite import SqliteImageRecordStorage
from invokeai.app.services.images.images_default import ImageService
from invokeai.app.services.invocation_cache.invocation_cache_memory import MemoryInvocationCache
from invokeai.app.services.invocation_services import InvocationServices