Fix type signatures after rebase

Author: benITo47

apps/computer-vision/components/vision_camera/tasks/ObjectDetectionTask.tsx

@@ -8,6 +8,8 @@ import {
   SSDLITE_320_MOBILENET_V3_LARGE,
   YOLO26N,
   useObjectDetection,
+  CocoLabel,
+  CocoLabelYolo,
 } from 'react-native-executorch';
 import { labelColor, labelColorBg } from '../utils/colors';
 import { TaskProps } from './types';
@@ -50,7 +52,9 @@ export default function ObjectDetectionTask({
         ? rfdetr
         : yolo26n;
 
-  const [detections, setDetections] = useState<Detection[]>([]);
+  type CommonDetection = Omit<Detection, 'label'> & { label: string };
+
+  const [detections, setDetections] = useState<CommonDetection[]>([]);
   const [imageSize, setImageSize] = useState({ width: 1, height: 1 });
   const lastFrameTimeRef = useRef(Date.now());
 
@@ -69,8 +73,19 @@ export default function ObjectDetectionTask({
   const detRof = active.runOnFrame;
 
   const updateDetections = useCallback(
-    (p: { results: Detection[]; imageWidth: number; imageHeight: number }) => {
-      setDetections(p.results);
+    (p: {
+      results:
+        | Detection<typeof CocoLabel>[]
+        | Detection<typeof CocoLabelYolo>[];
+      imageWidth: number;
+      imageHeight: number;
+    }) => {
+      setDetections(
+        p.results.map((det) => ({
+          ...det,
+          label: String(det.label),
+        }))
+      );
       setImageSize({ width: p.imageWidth, height: p.imageHeight });
       const now = Date.now();
       const diff = now - lastFrameTimeRef.current;
@@ -95,7 +110,9 @@ export default function ObjectDetectionTask({
         try {
           if (!detRof) return;
           const isFrontCamera = cameraPositionSync.getDirty() === 'front';
-          const result = detRof(frame, isFrontCamera, 0.5);
+          const result = detRof(frame, isFrontCamera, {
+            detectionThreshold: 0.5,
+          });
           // Sensor frames are landscape-native, so width/height are swapped
           // relative to portrait screen orientation.
           const screenW = frame.height;

packages/react-native-executorch/src/modules/computer_vision/ObjectDetectionModule.ts

@@ -132,9 +132,7 @@ export class ObjectDetectionModule<
 
   /**
    * Returns the available input sizes for this model, or undefined if the model accepts any size.
-   *
    * @returns An array of available input sizes, or undefined if not constrained.
-   *
    * @example
    * ```typescript
    * const sizes = model.getAvailableInputSizes(); // [384, 512, 640] for YOLO models, or undefined for RF-DETR
@@ -146,10 +144,12 @@ export class ObjectDetectionModule<
 
   /**
    * Override runOnFrame to provide an options-based API for VisionCamera integration.
+   * @returns A worklet function for frame processing, or null if the model is not loaded.
    */
   override get runOnFrame():
     | ((
         frame: any,
+        isFrontCamera: boolean,
         options?: ObjectDetectionOptions<ResolveLabels<T>>
       ) => Detection<ResolveLabels<T>>[])
     | null {
@@ -171,6 +171,7 @@ export class ObjectDetectionModule<
 
     return (
       frame: any,
+      isFrontCamera: boolean,
       options?: ObjectDetectionOptions<ResolveLabels<T>>
     ): Detection<ResolveLabels<T>>[] => {
       'worklet';
@@ -192,6 +193,7 @@ export class ObjectDetectionModule<
 
       return baseRunOnFrame(
         frame,
+        isFrontCamera,
         detectionThreshold,
         iouThreshold,
         classIndices,
@@ -206,12 +208,10 @@ export class ObjectDetectionModule<
    * Supports two input types:
    * 1. **String path/URI**: File path, URL, or Base64-encoded string
    * 2. **PixelData**: Raw pixel data from image libraries (e.g., NitroImage)
-   *
    * @param input - A string image source (file path, URI, or Base64) or a {@link PixelData} object.
    * @param options - Optional configuration for detection inference. Includes `detectionThreshold`, `inputSize`, and `classesOfInterest`.
    * @returns A Promise resolving to an array of {@link Detection} objects.
    * @throws {RnExecutorchError} If the model is not loaded or if an invalid `inputSize` is provided.
-   *
    * @example
    * ```typescript
    * const detections = await model.forward('path/to/image.jpg', {

packages/react-native-executorch/src/types/objectDetection.ts

@@ -34,7 +34,6 @@ export interface Detection<L extends LabelEnum = typeof CocoLabel> {
 
 /**
  * Options for configuring object detection inference.
- *
  * @category Types
  * @typeParam L - The label enum type for filtering classes of interest.
  * @property {number} [detectionThreshold] - Minimum confidence score for detections (0-1). Defaults to model-specific value.
@@ -166,9 +165,7 @@ export interface ObjectDetectionType<L extends LabelEnum> {
   /**
    * Returns the available input sizes for multi-method models (e.g., YOLO).
    * Returns undefined for single-method models (e.g., RF-DETR, SSDLite).
-   *
    * @returns Array of available input sizes or undefined
-   *
    * @example
    * ```typescript
    * const sizes = model.getAvailableInputSizes(); // [384, 512, 640] for YOLO models
@@ -189,9 +186,11 @@ export interface ObjectDetectionType<L extends LabelEnum> {
    * @param options - Optional configuration for detection inference
    * @returns Array of Detection objects representing detected items in the frame.
    */
-  runOnFrame: (
-    frame: Frame,
-    isFrontCamera: boolean,
-    options?: ObjectDetectionOptions<L>
-  ) => Detection<L>[];
+  runOnFrame:
+    | ((
+        frame: Frame,
+        isFrontCamera: boolean,
+        options?: ObjectDetectionOptions<L>
+      ) => Detection<L>[])
+    | null;
 }