Merge pull request #548 from roboflow/cover-model-usage-in-usage-coll…

…ector

Wrap call to 'predict' with usage_collector

inference/core/entities/requests/workflows.py

@@ -22,6 +22,10 @@ class WorkflowInferenceRequest(BaseModel):
 
 class WorkflowSpecificationInferenceRequest(WorkflowInferenceRequest):
     specification: dict
+    is_preview: bool = Field(
+        default=False,
+        description="Reserved, used internally by Roboflow to distinguish between preview and non-preview runs",
+    )
 
 
 class DescribeBlocksRequest(BaseModel):

inference/core/interfaces/stream/inference_pipeline.py

@@ -54,7 +54,6 @@
 from inference.core.workflows.core_steps.common.entities import StepExecutionMode
 from inference.models.aliases import resolve_roboflow_model_alias
 from inference.models.utils import ROBOFLOW_MODEL_TYPES, get_model
-from inference.usage_tracking.collector import usage_collector
 
 INFERENCE_PIPELINE_CONTEXT = "inference_pipeline"
 SOURCE_CONNECTION_ATTEMPT_FAILED_EVENT = "SOURCE_CONNECTION_ATTEMPT_FAILED"

inference/core/interfaces/stream/model_handlers/roboflow_models.py

@@ -15,6 +15,8 @@ def default_process_frame(
     predictions = wrap_in_list(
         model.infer(
             [f.image for f in video_frame],
+            usage_fps=video_frame[0].fps,
+            usage_api_key=model.api_key,
             **postprocessing_args,
         )
     )

inference/core/models/base.py

@@ -7,6 +7,7 @@
 from inference.core.entities.requests.inference import InferenceRequest
 from inference.core.entities.responses.inference import InferenceResponse
 from inference.core.models.types import PreprocessReturnMetadata
+from inference.usage_tracking.collector import usage_collector
 
 
 class BaseInference:
@@ -15,6 +16,7 @@ class BaseInference:
     This class provides a basic interface for inference tasks.
     """
 
+    @usage_collector
     def infer(self, image: Any, **kwargs) -> Any:
         """Runs inference on given data.
         - image:

inference/core/models/roboflow.py

@@ -667,7 +667,7 @@ def validate_model(self) -> None:
     def run_test_inference(self) -> None:
         test_image = (np.random.rand(1024, 1024, 3) * 255).astype(np.uint8)
         logger.debug(f"Running test inference. Image size: {test_image.shape}")
-        result = self.infer(test_image)
+        result = self.infer(test_image, usage_inference_test_run=True)
         logger.debug(f"Test inference finished.")
         return result
 

inference/core/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.16.2"
+__version__ = "0.16.3"
 
 
 if __name__ == "__main__":

inference/core/workflows/execution_engine/core.py

@@ -61,10 +61,12 @@ def run(
         self,
         runtime_parameters: Dict[str, Any],
         fps: float = 0,
+        _is_preview: bool = False,
     ) -> List[Dict[str, Any]]:
         return self._engine.run(
             runtime_parameters=runtime_parameters,
             fps=fps,
+            _is_preview=_is_preview,
         )
 
 

inference/core/workflows/execution_engine/entities/engine.py

@@ -21,5 +21,6 @@ def run(
         self,
         runtime_parameters: Dict[str, Any],
         fps: float = 0,
+        _is_preview: bool = False,
     ) -> List[Dict[str, Any]]:
         pass

inference/core/workflows/execution_engine/v1/core.py

@@ -61,6 +61,7 @@ def run(
         self,
         runtime_parameters: Dict[str, Any],
         fps: float = 0,
+        _is_preview: bool = False,
     ) -> List[Dict[str, Any]]:
         runtime_parameters = assemble_runtime_parameters(
             runtime_parameters=runtime_parameters,
@@ -77,4 +78,5 @@ def run(
             max_concurrent_steps=self._max_concurrent_steps,
             usage_fps=fps,
             usage_workflow_id=self._workflow_id,
+            usage_workflow_preview=_is_preview,
         )