Merge pull request #613 from roboflow/dataset_upload_resolution

Dataset Upload Block- Changed the default for upload max_image_size

inference/core/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.16.4"
+__version__ = "0.17.0"
 
 
 if __name__ == "__main__":

inference/core/workflows/core_steps/loader.py

@@ -105,6 +105,9 @@
 from inference.core.workflows.core_steps.sinks.roboflow.dataset_upload.v1 import (
     RoboflowDatasetUploadBlockV1,
 )
+from inference.core.workflows.core_steps.sinks.roboflow.dataset_upload.v2 import (
+    RoboflowDatasetUploadBlockV2,
+)
 from inference.core.workflows.core_steps.transformations.absolute_static_crop.v1 import (
     AbsoluteStaticCropBlockV1,
 )
@@ -291,6 +294,7 @@ def load_blocks() -> List[Type[WorkflowBlock]]:
         ImageContoursDetectionBlockV1,
         ClipComparisonBlockV2,
         CameraFocusBlockV1,
+        RoboflowDatasetUploadBlockV2,
     ]
 
 

inference/core/workflows/core_steps/sinks/roboflow/dataset_upload/v1.py

@@ -1,3 +1,20 @@
+"""
+*****************************************************************
+*                           WARNING!                            *
+*****************************************************************
+This module contains the utility functions used by
+RoboflowDatasetUploadBlockV2.
+
+We do not recommend making multiple blocks dependent on the same code,
+but the change between v1 and v2 was basically the default value of
+some parameter - hence we decided not to replicate the code.
+
+If you need to modify this module beware that you may introduce
+change to RoboflowDatasetUploadBlockV2! If that happens,
+probably that's the time to disentangle those blocks and copy the
+code.
+"""
+
 import hashlib
 import json
 import logging

inference/core/workflows/core_steps/sinks/roboflow/dataset_upload/v2.py

@@ -0,0 +1,322 @@
+import random
+from concurrent.futures import ThreadPoolExecutor
+from typing import List, Literal, Optional, Tuple, Type, Union
+
+import supervision as sv
+from fastapi import BackgroundTasks
+from pydantic import ConfigDict, Field
+from typing_extensions import Annotated
+
+from inference.core.cache.base import BaseCache
+from inference.core.workflows.core_steps.sinks.roboflow.dataset_upload.v1 import (
+    register_datapoint_at_roboflow,
+)
+from inference.core.workflows.execution_engine.entities.base import (
+    Batch,
+    OutputDefinition,
+    WorkflowImageData,
+)
+from inference.core.workflows.execution_engine.entities.types import (
+    BATCH_OF_BOOLEAN_KIND,
+    BATCH_OF_CLASSIFICATION_PREDICTION_KIND,
+    BATCH_OF_INSTANCE_SEGMENTATION_PREDICTION_KIND,
+    BATCH_OF_KEYPOINT_DETECTION_PREDICTION_KIND,
+    BATCH_OF_OBJECT_DETECTION_PREDICTION_KIND,
+    BATCH_OF_STRING_KIND,
+    BOOLEAN_KIND,
+    FLOAT_KIND,
+    ROBOFLOW_PROJECT_KIND,
+    STRING_KIND,
+    ImageInputField,
+    StepOutputImageSelector,
+    StepOutputSelector,
+    WorkflowImageSelector,
+    WorkflowParameterSelector,
+)
+from inference.core.workflows.prototypes.block import (
+    BlockResult,
+    WorkflowBlock,
+    WorkflowBlockManifest,
+)
+
+FloatZeroToHundred = Annotated[float, Field(ge=0.0, le=100.0)]
+
+SHORT_DESCRIPTION = "Save images and predictions in your Roboflow Dataset"
+
+LONG_DESCRIPTION = """
+Block let users save their images and predictions into Roboflow Dataset. Persisting data from
+production environments helps iteratively building more robust models. 
+
+Block provides configuration options to decide how data should be stored and what are the limits 
+to be applied. We advice using this block in combination with rate limiter blocks to effectively 
+collect data that the model struggle with.
+"""
+
+WORKSPACE_NAME_CACHE_EXPIRE = 900  # 15 min
+TIMESTAMP_FORMAT = "%Y_%m_%d"
+DUPLICATED_STATUS = "Duplicated image"
+BatchCreationFrequency = Literal["never", "daily", "weekly", "monthly"]
+
+
+class BlockManifest(WorkflowBlockManifest):
+    model_config = ConfigDict(
+        json_schema_extra={
+            "name": "Roboflow Dataset Upload",
+            "version": "v2",
+            "short_description": SHORT_DESCRIPTION,
+            "long_description": LONG_DESCRIPTION,
+            "license": "Apache-2.0",
+            "block_type": "sink",
+        }
+    )
+    type: Literal["roboflow_core/roboflow_dataset_upload@v2"]
+    images: Union[WorkflowImageSelector, StepOutputImageSelector] = ImageInputField
+    predictions: Optional[
+        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,
+            ]
+        )
+    ] = Field(
+        default=None,
+        description="Reference q detection-like predictions",
+        examples=["$steps.object_detection_model.predictions"],
+    )
+    target_project: Union[
+        WorkflowParameterSelector(kind=[ROBOFLOW_PROJECT_KIND]), str
+    ] = Field(
+        description="name of Roboflow dataset / project to be used as target for collected data",
+        examples=["my_dataset", "$inputs.target_al_dataset"],
+    )
+    usage_quota_name: str = Field(
+        description="Unique name for Roboflow project pointed by `target_project` parameter, that identifies "
+        "usage quota applied for this block.",
+        examples=["quota-for-data-sampling-1"],
+    )
+    data_percentage: Union[
+        FloatZeroToHundred, WorkflowParameterSelector(kind=[FLOAT_KIND])
+    ] = Field(
+        description="Percent of data that will be saved (in range [0.0, 100.0])",
+        examples=[True, False, "$inputs.persist_predictions"],
+    )
+    persist_predictions: Union[bool, WorkflowParameterSelector(kind=[BOOLEAN_KIND])] = (
+        Field(
+            default=True,
+            description="Boolean flag to decide if predictions should be registered along with images",
+            examples=[True, False, "$inputs.persist_predictions"],
+        )
+    )
+    minutely_usage_limit: int = Field(
+        default=10,
+        description="Maximum number of data registration requests per minute accounted in scope of "
+        "single server or whole Roboflow platform, depending on context of usage.",
+        examples=[10, 60],
+    )
+    hourly_usage_limit: int = Field(
+        default=100,
+        description="Maximum number of data registration requests per hour accounted in scope of "
+        "single server or whole Roboflow platform, depending on context of usage.",
+        examples=[10, 60],
+    )
+    daily_usage_limit: int = Field(
+        default=1000,
+        description="Maximum number of data registration requests per day accounted in scope of "
+        "single server or whole Roboflow platform, depending on context of usage.",
+        examples=[10, 60],
+    )
+    max_image_size: Tuple[int, int] = Field(
+        default=(1920, 1080),
+        description="Maximum size of the image to be registered - bigger images will be "
+        "downsized preserving aspect ratio. Format of data: `(width, height)`",
+        examples=[(1920, 1080), (512, 512)],
+    )
+    compression_level: int = Field(
+        default=95,
+        gt=0,
+        le=100,
+        description="Compression level for images registered",
+        examples=[95, 75],
+    )
+    registration_tags: List[
+        Union[WorkflowParameterSelector(kind=[STRING_KIND]), str]
+    ] = Field(
+        default_factory=list,
+        description="Tags to be attached to registered datapoints",
+        examples=[["location-florida", "factory-name", "$inputs.dynamic_tag"]],
+    )
+    disable_sink: Union[bool, WorkflowParameterSelector(kind=[BOOLEAN_KIND])] = Field(
+        default=False,
+        description="boolean flag that can be also reference to input - to arbitrarily disable "
+        "data collection for specific request",
+        examples=[True, "$inputs.disable_active_learning"],
+    )
+    fire_and_forget: Union[bool, WorkflowParameterSelector(kind=[BOOLEAN_KIND])] = (
+        Field(
+            default=True,
+            description="Boolean flag dictating if sink is supposed to be executed in the background, "
+            "not waiting on status of registration before end of workflow run. Use `True` if best-effort "
+            "registration is needed, use `False` while debugging and if error handling is needed",
+        )
+    )
+    labeling_batch_prefix: Union[str, WorkflowParameterSelector(kind=[STRING_KIND])] = (
+        Field(
+            default="workflows_data_collector",
+            description="Prefix of the name for labeling batches that will be registered in Roboflow app",
+            examples=["my_labeling_batch_name"],
+        )
+    )
+    labeling_batches_recreation_frequency: BatchCreationFrequency = Field(
+        default="never",
+        description="Frequency in which new labeling batches are created in Roboflow app. New batches "
+        "are created with name prefix provided in `labeling_batch_prefix` in given time intervals."
+        "Useful in organising labeling flow.",
+        examples=["never", "daily"],
+    )
+
+    @classmethod
+    def accepts_batch_input(cls) -> bool:
+        return True
+
+    @classmethod
+    def describe_outputs(cls) -> List[OutputDefinition]:
+        return [
+            OutputDefinition(name="error_status", kind=[BATCH_OF_BOOLEAN_KIND]),
+            OutputDefinition(name="message", kind=[BATCH_OF_STRING_KIND]),
+        ]
+
+    @classmethod
+    def get_execution_engine_compatibility(cls) -> Optional[str]:
+        return ">=1.0.0,<2.0.0"
+
+
+class RoboflowDatasetUploadBlockV2(WorkflowBlock):
+
+    def __init__(
+        self,
+        cache: BaseCache,
+        api_key: Optional[str],
+        background_tasks: Optional[BackgroundTasks],
+        thread_pool_executor: Optional[ThreadPoolExecutor],
+    ):
+        self._cache = cache
+        self._api_key = api_key
+        self._background_tasks = background_tasks
+        self._thread_pool_executor = thread_pool_executor
+
+    @classmethod
+    def get_init_parameters(cls) -> List[str]:
+        return ["cache", "api_key", "background_tasks", "thread_pool_executor"]
+
+    @classmethod
+    def get_manifest(cls) -> Type[WorkflowBlockManifest]:
+        return BlockManifest
+
+    def run(
+        self,
+        images: Batch[WorkflowImageData],
+        predictions: Optional[Batch[Union[sv.Detections, dict]]],
+        target_project: str,
+        usage_quota_name: str,
+        data_percentage: float,
+        minutely_usage_limit: int,
+        persist_predictions: bool,
+        hourly_usage_limit: int,
+        daily_usage_limit: int,
+        max_image_size: Tuple[int, int],
+        compression_level: int,
+        registration_tags: List[str],
+        disable_sink: bool,
+        fire_and_forget: bool,
+        labeling_batch_prefix: str,
+        labeling_batches_recreation_frequency: BatchCreationFrequency,
+    ) -> BlockResult:
+        if self._api_key is None:
+            raise ValueError(
+                "RoboflowDataCollector block cannot run without Roboflow API key. "
+                "If you do not know how to get API key - visit "
+                "https://docs.roboflow.com/api-reference/authentication#retrieve-an-api-key to learn how to "
+                "retrieve one."
+            )
+        if disable_sink:
+            return [
+                {
+                    "error_status": False,
+                    "message": "Sink was disabled by parameter `disable_sink`",
+                }
+                for _ in range(len(images))
+            ]
+        result = []
+        predictions = [None] * len(images) if predictions is None else predictions
+        for image, prediction in zip(images, predictions):
+            error_status, message = maybe_register_datapoint_at_roboflow(
+                image=image,
+                prediction=prediction,
+                target_project=target_project,
+                usage_quota_name=usage_quota_name,
+                data_percentage=data_percentage,
+                persist_predictions=persist_predictions,
+                minutely_usage_limit=minutely_usage_limit,
+                hourly_usage_limit=hourly_usage_limit,
+                daily_usage_limit=daily_usage_limit,
+                max_image_size=max_image_size,
+                compression_level=compression_level,
+                registration_tags=registration_tags,
+                fire_and_forget=fire_and_forget,
+                labeling_batch_prefix=labeling_batch_prefix,
+                new_labeling_batch_frequency=labeling_batches_recreation_frequency,
+                cache=self._cache,
+                background_tasks=self._background_tasks,
+                thread_pool_executor=self._thread_pool_executor,
+                api_key=self._api_key,
+            )
+            result.append({"error_status": error_status, "message": message})
+        return result
+
+
+def maybe_register_datapoint_at_roboflow(
+    image: WorkflowImageData,
+    prediction: Optional[Union[sv.Detections, dict]],
+    target_project: str,
+    usage_quota_name: str,
+    data_percentage: float,
+    persist_predictions: bool,
+    minutely_usage_limit: int,
+    hourly_usage_limit: int,
+    daily_usage_limit: int,
+    max_image_size: Tuple[int, int],
+    compression_level: int,
+    registration_tags: List[str],
+    fire_and_forget: bool,
+    labeling_batch_prefix: str,
+    new_labeling_batch_frequency: BatchCreationFrequency,
+    cache: BaseCache,
+    background_tasks: Optional[BackgroundTasks],
+    thread_pool_executor: Optional[ThreadPoolExecutor],
+    api_key: str,
+) -> Tuple[bool, str]:
+    normalised_probability = data_percentage / 100
+    if random.random() < normalised_probability:
+        return register_datapoint_at_roboflow(
+            image=image,
+            prediction=prediction,
+            target_project=target_project,
+            usage_quota_name=usage_quota_name,
+            persist_predictions=persist_predictions,
+            minutely_usage_limit=minutely_usage_limit,
+            hourly_usage_limit=hourly_usage_limit,
+            daily_usage_limit=daily_usage_limit,
+            max_image_size=max_image_size,
+            compression_level=compression_level,
+            registration_tags=registration_tags,
+            fire_and_forget=fire_and_forget,
+            labeling_batch_prefix=labeling_batch_prefix,
+            new_labeling_batch_frequency=new_labeling_batch_frequency,
+            cache=cache,
+            background_tasks=background_tasks,
+            thread_pool_executor=thread_pool_executor,
+            api_key=api_key,
+        )
+    return False, "Registration skipped due to sampling settings"