Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Clean up kinds #618

Merged
merged 7 commits into from
Sep 6, 2024
Merged

[WIP] Clean up kinds #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6e98b1
Rename kinds
PawelPeczek-Roboflow Aug 28, 2024
9a85751
Replace kinds used by blocks
PawelPeczek-Roboflow Aug 28, 2024
2acd0ab
Resolve conflicts with main
PawelPeczek-Roboflow Sep 5, 2024
4d42949
Get rid of all old kinds
PawelPeczek-Roboflow Sep 5, 2024
1e40d34
Make linters happy
PawelPeczek-Roboflow Sep 5, 2024
e3ab07e
Merge branch 'main' into fix/clean_up_kinds
PawelPeczek-Roboflow Sep 5, 2024
612e2b1
Merge branch 'main' into fix/clean_up_kinds
PawelPeczek-Roboflow Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions inference/core/workflows/core_steps/classical_cv/camera_focus/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_IMAGES_KIND,
FLOAT_KIND,
IMAGE_KIND,
StepOutputImageSelector,
WorkflowImageSelector,
)
Expand Down Expand Up @@ -57,9 +57,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
return [
OutputDefinition(
name=OUTPUT_IMAGE_KEY,
kind=[
BATCH_OF_IMAGES_KIND,
],
kind=[IMAGE_KIND],
),
OutputDefinition(
name="focus_measure",
Expand Down
4 changes: 2 additions & 2 deletions inference/core/workflows/core_steps/classical_cv/contours/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_IMAGES_KIND,
CONTOURS_KIND,
IMAGE_KIND,
INTEGER_KIND,
NUMPY_ARRAY_KIND,
StepOutputImageSelector,
Expand Down Expand Up @@ -64,7 +64,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
OutputDefinition(
name=OUTPUT_IMAGE_KEY,
kind=[
BATCH_OF_IMAGES_KIND,
IMAGE_KIND,
],
),
OutputDefinition(
Expand Down
4 changes: 2 additions & 2 deletions inference/core/workflows/core_steps/classical_cv/convert_grayscale/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_IMAGES_KIND,
IMAGE_KIND,
StepOutputImageSelector,
WorkflowImageSelector,
)
Expand Down Expand Up @@ -53,7 +53,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
OutputDefinition(
name=OUTPUT_IMAGE_KEY,
kind=[
BATCH_OF_IMAGES_KIND,
IMAGE_KIND,
],
),
]
Expand Down
4 changes: 2 additions & 2 deletions inference/core/workflows/core_steps/classical_cv/image_blur/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_IMAGES_KIND,
IMAGE_KIND,
INTEGER_KIND,
STRING_KIND,
StepOutputImageSelector,
Expand Down Expand Up @@ -73,7 +73,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
OutputDefinition(
name=OUTPUT_IMAGE_KEY,
kind=[
BATCH_OF_IMAGES_KIND,
IMAGE_KIND,
],
),
]
Expand Down
3 changes: 1 addition & 2 deletions inference/core/workflows/core_steps/classical_cv/pixel_color_count/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_INTEGER_KIND,
INTEGER_KIND,
RGB_COLOR_KIND,
STRING_KIND,
Expand Down Expand Up @@ -73,7 +72,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
return [
OutputDefinition(
name="matching_pixels_count",
kind=[BATCH_OF_INTEGER_KIND],
kind=[INTEGER_KIND],
),
]

Expand Down
4 changes: 2 additions & 2 deletions inference/core/workflows/core_steps/classical_cv/sift/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_IMAGES_KIND,
IMAGE_KEYPOINTS_KIND,
IMAGE_KIND,
NUMPY_ARRAY_KIND,
StepOutputImageSelector,
WorkflowImageSelector,
Expand Down Expand Up @@ -66,7 +66,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
return [
OutputDefinition(
name=OUTPUT_IMAGE_KEY,
kind=[BATCH_OF_IMAGES_KIND],
kind=[IMAGE_KIND],
),
OutputDefinition(
name="keypoints",
Expand Down
8 changes: 4 additions & 4 deletions inference/core/workflows/core_steps/classical_cv/template_matching/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_INTEGER_KIND,
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BOOLEAN_KIND,
FLOAT_KIND,
FLOAT_ZERO_TO_ONE_KIND,
INTEGER_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
FloatZeroToOne,
StepOutputImageSelector,
WorkflowImageSelector,
Expand Down Expand Up @@ -110,11 +110,11 @@ def describe_outputs(cls) -> List[OutputDefinition]:
return [
OutputDefinition(
name="predictions",
kind=[BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND],
kind=[OBJECT_DETECTION_PREDICTION_KIND],
),
OutputDefinition(
name="number_of_matches",
kind=[BATCH_OF_INTEGER_KIND],
kind=[INTEGER_KIND],
),
]

Expand Down
4 changes: 2 additions & 2 deletions inference/core/workflows/core_steps/classical_cv/threshold/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_IMAGES_KIND,
IMAGE_KIND,
INTEGER_KIND,
STRING_KIND,
StepOutputImageSelector,
Expand Down Expand Up @@ -86,7 +86,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
OutputDefinition(
name=OUTPUT_IMAGE_KEY,
kind=[
BATCH_OF_IMAGES_KIND,
IMAGE_KIND,
],
),
]
Expand Down
4 changes: 2 additions & 2 deletions inference/core/workflows/core_steps/common/query_language/entities/operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
StatementsGroupsOperator,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_CLASSIFICATION_PREDICTION_KIND,
BOOLEAN_KIND,
CLASSIFICATION_PREDICTION_KIND,
DETECTION_KIND,
DICTIONARY_KIND,
FLOAT_KIND,
Expand Down Expand Up @@ -214,7 +214,7 @@ class ClassificationPropertyExtract(OperationDefinition):
"(as a list of elements - one element represents single detection)",
"compound": False,
"input_kind": [
BATCH_OF_CLASSIFICATION_PREDICTION_KIND,
CLASSIFICATION_PREDICTION_KIND,
],
"output_kind": [STRING_KIND, LIST_OF_VALUES_KIND, FLOAT_ZERO_TO_ONE_KIND],
},
Expand Down
16 changes: 8 additions & 8 deletions inference/core/workflows/core_steps/formatters/property_definition/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
)
from inference.core.workflows.execution_engine.entities.base import OutputDefinition
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_CLASSIFICATION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
CLASSIFICATION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
KEYPOINT_DETECTION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
StepOutputSelector,
)
from inference.core.workflows.prototypes.block import (
Expand Down Expand Up @@ -62,10 +62,10 @@ class BlockManifest(WorkflowBlockManifest):
]
data: StepOutputSelector(
kind=[
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
BATCH_OF_CLASSIFICATION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
KEYPOINT_DETECTION_PREDICTION_KIND,
CLASSIFICATION_PREDICTION_KIND,
]
) = Field(
description="Reference data to extract property from",
Expand Down
22 changes: 11 additions & 11 deletions inference/core/workflows/core_steps/fusion/detections_classes_replacement/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
OutputDefinition,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_CLASSIFICATION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
CLASSIFICATION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
KEYPOINT_DETECTION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
StepOutputSelector,
)
from inference.core.workflows.prototypes.block import (
Expand Down Expand Up @@ -56,17 +56,17 @@ class BlockManifest(WorkflowBlockManifest):
]
object_detection_predictions: StepOutputSelector(
kind=[
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
KEYPOINT_DETECTION_PREDICTION_KIND,
]
) = Field(
title="Regions of Interest",
description="The output of a detection model describing the bounding boxes that will have classes replaced.",
examples=["$steps.my_object_detection_model.predictions"],
)
classification_predictions: StepOutputSelector(
kind=[BATCH_OF_CLASSIFICATION_PREDICTION_KIND]
kind=[CLASSIFICATION_PREDICTION_KIND]
) = Field(
title="Classification results for crops",
description="The output of classification model for crops taken based on RoIs pointed as the other parameter",
Expand Down Expand Up @@ -94,9 +94,9 @@ def describe_outputs(cls) -> List[OutputDefinition]:
OutputDefinition(
name="predictions",
kind=[
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
KEYPOINT_DETECTION_PREDICTION_KIND,
],
)
]
Expand Down
14 changes: 7 additions & 7 deletions inference/core/workflows/core_steps/fusion/detections_consensus/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
OutputDefinition,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BOOLEAN_KIND,
DICTIONARY_KIND,
FLOAT_ZERO_TO_ONE_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
INTEGER_KIND,
KEYPOINT_DETECTION_PREDICTION_KIND,
LIST_OF_VALUES_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
FloatZeroToOne,
StepOutputSelector,
WorkflowParameterSelector,
Expand Down Expand Up @@ -83,9 +83,9 @@ class BlockManifest(WorkflowBlockManifest):
predictions_batches: List[
StepOutputSelector(
kind=[
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
KEYPOINT_DETECTION_PREDICTION_KIND,
]
),
] = Field(
Expand Down Expand Up @@ -162,7 +162,7 @@ def describe_outputs(cls) -> List[OutputDefinition]:
return [
OutputDefinition(
name="predictions",
kind=[BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND],
kind=[OBJECT_DETECTION_PREDICTION_KIND],
),
OutputDefinition(
name="object_present", kind=[BOOLEAN_KIND, DICTIONARY_KIND]
Expand Down
12 changes: 6 additions & 6 deletions inference/core/workflows/core_steps/fusion/detections_stitch/v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
WorkflowImageData,
)
from inference.core.workflows.execution_engine.entities.types import (
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
FLOAT_ZERO_TO_ONE_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
STRING_KIND,
FloatZeroToOne,
StepOutputImageSelector,
Expand Down Expand Up @@ -65,8 +65,8 @@ class BlockManifest(WorkflowBlockManifest):
)
predictions: StepOutputSelector(
kind=[
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
]
) = Field(
description="The output of a detection model describing the bounding boxes to be merged.",
Expand Down Expand Up @@ -105,8 +105,8 @@ def describe_outputs(cls) -> List[OutputDefinition]:
OutputDefinition(
name="predictions",
kind=[
BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
OBJECT_DETECTION_PREDICTION_KIND,
INSTANCE_SEGMENTATION_PREDICTION_KIND,
],
),
]
Expand Down
Loading
Loading