From 9f448fecb7cc8bb07a7741ee898294661fc92cc9 Mon Sep 17 00:00:00 2001 From: Ryan Dick Date: Wed, 31 Jul 2024 10:00:30 -0400 Subject: [PATCH] Move invokeai/backend/grounded_sam -> invokeai/backend/image_util/grounded_sam --- invokeai/app/invocations/grounded_sam.py | 8 ++++---- .../backend/{ => image_util}/grounded_sam/__init__.py | 0 .../{ => image_util}/grounded_sam/detection_result.py | 0 .../grounded_sam/grounding_dino_pipeline.py | 2 +- .../{ => image_util}/grounded_sam/mask_refinement.py | 0 .../grounded_sam/segment_anything_model.py | 2 +- invokeai/backend/model_manager/load/model_util.py | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) rename invokeai/backend/{ => image_util}/grounded_sam/__init__.py (100%) rename invokeai/backend/{ => image_util}/grounded_sam/detection_result.py (100%) rename invokeai/backend/{ => image_util}/grounded_sam/grounding_dino_pipeline.py (94%) rename invokeai/backend/{ => image_util}/grounded_sam/mask_refinement.py (100%) rename invokeai/backend/{ => image_util}/grounded_sam/segment_anything_model.py (95%) diff --git a/invokeai/app/invocations/grounded_sam.py b/invokeai/app/invocations/grounded_sam.py index 3a1cb9be56..d741c3d6ad 100644 --- a/invokeai/app/invocations/grounded_sam.py +++ b/invokeai/app/invocations/grounded_sam.py @@ -14,10 +14,10 @@ from invokeai.app.invocations.baseinvocation import BaseInvocation, invocation from invokeai.app.invocations.fields import ImageField, InputField from invokeai.app.invocations.primitives import ImageOutput from invokeai.app.services.shared.invocation_context import InvocationContext -from invokeai.backend.grounded_sam.detection_result import DetectionResult -from invokeai.backend.grounded_sam.grounding_dino_pipeline import GroundingDinoPipeline -from invokeai.backend.grounded_sam.mask_refinement import mask_to_polygon, polygon_to_mask -from invokeai.backend.grounded_sam.segment_anything_model import SegmentAnythingModel +from invokeai.backend.image_util.grounded_sam.detection_result import DetectionResult +from invokeai.backend.image_util.grounded_sam.grounding_dino_pipeline import GroundingDinoPipeline +from invokeai.backend.image_util.grounded_sam.mask_refinement import mask_to_polygon, polygon_to_mask +from invokeai.backend.image_util.grounded_sam.segment_anything_model import SegmentAnythingModel GROUNDING_DINO_MODEL_ID = "IDEA-Research/grounding-dino-tiny" SEGMENT_ANYTHING_MODEL_ID = "facebook/sam-vit-base" diff --git a/invokeai/backend/grounded_sam/__init__.py b/invokeai/backend/image_util/grounded_sam/__init__.py similarity index 100% rename from invokeai/backend/grounded_sam/__init__.py rename to invokeai/backend/image_util/grounded_sam/__init__.py diff --git a/invokeai/backend/grounded_sam/detection_result.py b/invokeai/backend/image_util/grounded_sam/detection_result.py similarity index 100% rename from invokeai/backend/grounded_sam/detection_result.py rename to invokeai/backend/image_util/grounded_sam/detection_result.py diff --git a/invokeai/backend/grounded_sam/grounding_dino_pipeline.py b/invokeai/backend/image_util/grounded_sam/grounding_dino_pipeline.py similarity index 94% rename from invokeai/backend/grounded_sam/grounding_dino_pipeline.py rename to invokeai/backend/image_util/grounded_sam/grounding_dino_pipeline.py index 97c92f9249..c03a3d8cab 100644 --- a/invokeai/backend/grounded_sam/grounding_dino_pipeline.py +++ b/invokeai/backend/image_util/grounded_sam/grounding_dino_pipeline.py @@ -4,7 +4,7 @@ import torch from PIL import Image from transformers.pipelines import ZeroShotObjectDetectionPipeline -from invokeai.backend.grounded_sam.detection_result import DetectionResult +from invokeai.backend.image_util.grounded_sam.detection_result import DetectionResult class GroundingDinoPipeline: diff --git a/invokeai/backend/grounded_sam/mask_refinement.py b/invokeai/backend/image_util/grounded_sam/mask_refinement.py similarity index 100% rename from invokeai/backend/grounded_sam/mask_refinement.py rename to invokeai/backend/image_util/grounded_sam/mask_refinement.py diff --git a/invokeai/backend/grounded_sam/segment_anything_model.py b/invokeai/backend/image_util/grounded_sam/segment_anything_model.py similarity index 95% rename from invokeai/backend/grounded_sam/segment_anything_model.py rename to invokeai/backend/image_util/grounded_sam/segment_anything_model.py index 1cc105c5fd..c9959424f2 100644 --- a/invokeai/backend/grounded_sam/segment_anything_model.py +++ b/invokeai/backend/image_util/grounded_sam/segment_anything_model.py @@ -5,7 +5,7 @@ from PIL import Image from transformers.models.sam import SamModel from transformers.models.sam.processing_sam import SamProcessor -from invokeai.backend.grounded_sam.detection_result import DetectionResult +from invokeai.backend.image_util.grounded_sam.detection_result import DetectionResult class SegmentAnythingModel: diff --git a/invokeai/backend/model_manager/load/model_util.py b/invokeai/backend/model_manager/load/model_util.py index 22d493f7a0..351331176c 100644 --- a/invokeai/backend/model_manager/load/model_util.py +++ b/invokeai/backend/model_manager/load/model_util.py @@ -11,8 +11,8 @@ from diffusers.pipelines.pipeline_utils import DiffusionPipeline from diffusers.schedulers.scheduling_utils import SchedulerMixin from transformers import CLIPTokenizer -from invokeai.backend.grounded_sam.grounding_dino_pipeline import GroundingDinoPipeline -from invokeai.backend.grounded_sam.segment_anything_model import SegmentAnythingModel +from invokeai.backend.image_util.grounded_sam.grounding_dino_pipeline import GroundingDinoPipeline +from invokeai.backend.image_util.grounded_sam.segment_anything_model import SegmentAnythingModel from invokeai.backend.ip_adapter.ip_adapter import IPAdapter from invokeai.backend.lora import LoRAModelRaw from invokeai.backend.model_manager.config import AnyModel