Skip to content

Commit b9dc346

Browse files
committed
Rename SegmentAnythingModel -> SegmentAnythingPipeline.
1 parent 63581ec commit b9dc346

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

invokeai/app/invocations/segment_anything_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from invokeai.app.invocations.primitives import MaskOutput
1414
from invokeai.app.services.shared.invocation_context import InvocationContext
1515
from invokeai.backend.image_util.segment_anything.mask_refinement import mask_to_polygon, polygon_to_mask
16-
from invokeai.backend.image_util.segment_anything.segment_anything_model import SegmentAnythingModel
16+
from invokeai.backend.image_util.segment_anything.segment_anything_pipeline import SegmentAnythingPipeline
1717

1818
SEGMENT_ANYTHING_MODEL_ID = "facebook/sam-vit-base"
1919

@@ -75,7 +75,7 @@ def _load_sam_model(model_path: Path):
7575

7676
sam_processor = AutoProcessor.from_pretrained(model_path, local_files_only=True)
7777
assert isinstance(sam_processor, SamProcessor)
78-
return SegmentAnythingModel(sam_model=sam_model, sam_processor=sam_processor)
78+
return SegmentAnythingPipeline(sam_model=sam_model, sam_processor=sam_processor)
7979

8080
def _segment(
8181
self,
@@ -91,7 +91,7 @@ def _segment(
9191
source=SEGMENT_ANYTHING_MODEL_ID, loader=SegmentAnythingModelInvocation._load_sam_model
9292
) as sam_pipeline,
9393
):
94-
assert isinstance(sam_pipeline, SegmentAnythingModel)
94+
assert isinstance(sam_pipeline, SegmentAnythingPipeline)
9595
masks = sam_pipeline.segment(image=image, bounding_boxes=sam_bounding_boxes)
9696

9797
masks = self._process_masks(masks)

invokeai/backend/image_util/segment_anything/segment_anything_model.py renamed to invokeai/backend/image_util/segment_anything/segment_anything_pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from invokeai.backend.raw_model import RawModel
99

1010

11-
class SegmentAnythingModel(RawModel):
11+
class SegmentAnythingPipeline(RawModel):
1212
"""A wrapper class for the transformers SAM model and processor that makes it compatible with the model manager."""
1313

1414
def __init__(self, sam_model: SamModel, sam_processor: SamProcessor):

invokeai/backend/model_manager/load/model_util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from transformers import CLIPTokenizer
1313

1414
from invokeai.backend.image_util.grounding_dino.grounding_dino_pipeline import GroundingDinoPipeline
15-
from invokeai.backend.image_util.segment_anything.segment_anything_model import SegmentAnythingModel
15+
from invokeai.backend.image_util.segment_anything.segment_anything_pipeline import SegmentAnythingPipeline
1616
from invokeai.backend.ip_adapter.ip_adapter import IPAdapter
1717
from invokeai.backend.lora import LoRAModelRaw
1818
from invokeai.backend.model_manager.config import AnyModel
@@ -44,7 +44,7 @@ def calc_model_size_by_data(logger: logging.Logger, model: AnyModel) -> int:
4444
LoRAModelRaw,
4545
SpandrelImageToImageModel,
4646
GroundingDinoPipeline,
47-
SegmentAnythingModel,
47+
SegmentAnythingPipeline,
4848
),
4949
):
5050
return model.calc_size()

0 commit comments

Comments
 (0)