diff --git a/invokeai/app/invocations/grounding_dino.py b/invokeai/app/invocations/grounding_dino.py index ade5b1456e..779c946d40 100644 --- a/invokeai/app/invocations/grounding_dino.py +++ b/invokeai/app/invocations/grounding_dino.py @@ -9,8 +9,8 @@ from invokeai.app.invocations.baseinvocation import BaseInvocation, invocation from invokeai.app.invocations.fields import BoundingBoxField, ImageField, InputField from invokeai.app.invocations.primitives import BoundingBoxCollectionOutput from invokeai.app.services.shared.invocation_context import InvocationContext -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.grounding_dino.detection_result import DetectionResult +from invokeai.backend.image_util.grounding_dino.grounding_dino_pipeline import GroundingDinoPipeline GROUNDING_DINO_MODEL_ID = "IDEA-Research/grounding-dino-tiny" diff --git a/invokeai/app/invocations/segment_anything_model.py b/invokeai/app/invocations/segment_anything_model.py index 39e2ee6d7f..ad264c9584 100644 --- a/invokeai/app/invocations/segment_anything_model.py +++ b/invokeai/app/invocations/segment_anything_model.py @@ -13,8 +13,8 @@ from invokeai.app.invocations.baseinvocation import BaseInvocation, invocation from invokeai.app.invocations.fields import BoundingBoxField, ImageField, InputField from invokeai.app.invocations.primitives import ImageOutput from invokeai.app.services.shared.invocation_context import InvocationContext -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 +from invokeai.backend.image_util.segment_anything.mask_refinement import mask_to_polygon, polygon_to_mask +from invokeai.backend.image_util.segment_anything.segment_anything_model import SegmentAnythingModel SEGMENT_ANYTHING_MODEL_ID = "facebook/sam-vit-base" diff --git a/invokeai/backend/image_util/grounded_sam/__init__.py b/invokeai/backend/image_util/grounding_dino/__init__.py similarity index 100% rename from invokeai/backend/image_util/grounded_sam/__init__.py rename to invokeai/backend/image_util/grounding_dino/__init__.py diff --git a/invokeai/backend/image_util/grounded_sam/detection_result.py b/invokeai/backend/image_util/grounding_dino/detection_result.py similarity index 100% rename from invokeai/backend/image_util/grounded_sam/detection_result.py rename to invokeai/backend/image_util/grounding_dino/detection_result.py diff --git a/invokeai/backend/image_util/grounded_sam/grounding_dino_pipeline.py b/invokeai/backend/image_util/grounding_dino/grounding_dino_pipeline.py similarity index 94% rename from invokeai/backend/image_util/grounded_sam/grounding_dino_pipeline.py rename to invokeai/backend/image_util/grounding_dino/grounding_dino_pipeline.py index d998eb1d57..68c2b8decc 100644 --- a/invokeai/backend/image_util/grounded_sam/grounding_dino_pipeline.py +++ b/invokeai/backend/image_util/grounding_dino/grounding_dino_pipeline.py @@ -4,7 +4,7 @@ import torch from PIL import Image from transformers.pipelines import ZeroShotObjectDetectionPipeline -from invokeai.backend.image_util.grounded_sam.detection_result import DetectionResult +from invokeai.backend.image_util.grounding_dino.detection_result import DetectionResult from invokeai.backend.raw_model import RawModel diff --git a/invokeai/backend/image_util/segment_anything/__init__.py b/invokeai/backend/image_util/segment_anything/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/invokeai/backend/image_util/grounded_sam/mask_refinement.py b/invokeai/backend/image_util/segment_anything/mask_refinement.py similarity index 100% rename from invokeai/backend/image_util/grounded_sam/mask_refinement.py rename to invokeai/backend/image_util/segment_anything/mask_refinement.py diff --git a/invokeai/backend/image_util/grounded_sam/segment_anything_model.py b/invokeai/backend/image_util/segment_anything/segment_anything_model.py similarity index 100% rename from invokeai/backend/image_util/grounded_sam/segment_anything_model.py rename to invokeai/backend/image_util/segment_anything/segment_anything_model.py diff --git a/invokeai/backend/model_manager/load/model_util.py b/invokeai/backend/model_manager/load/model_util.py index 351331176c..9c2570978a 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.image_util.grounded_sam.grounding_dino_pipeline import GroundingDinoPipeline -from invokeai.backend.image_util.grounded_sam.segment_anything_model import SegmentAnythingModel +from invokeai.backend.image_util.grounding_dino.grounding_dino_pipeline import GroundingDinoPipeline +from invokeai.backend.image_util.segment_anything.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