diff --git a/mediapipe/tasks/web/components/containers/classification_result.d.ts b/mediapipe/tasks/web/components/containers/classification_result.d.ts index f7294dca..7557560c 100644 --- a/mediapipe/tasks/web/components/containers/classification_result.d.ts +++ b/mediapipe/tasks/web/components/containers/classification_result.d.ts @@ -38,7 +38,7 @@ export declare interface Classifications { } /** Classification results of a model. */ -export interface ClassificationResult { +export declare interface ClassificationResult { /** The classification results for each head of the model. */ classifications: Classifications[]; diff --git a/mediapipe/tasks/web/components/containers/detection_result.d.ts b/mediapipe/tasks/web/components/containers/detection_result.d.ts index 3d0e86a0..287632f2 100644 --- a/mediapipe/tasks/web/components/containers/detection_result.d.ts +++ b/mediapipe/tasks/web/components/containers/detection_result.d.ts @@ -37,7 +37,7 @@ export declare interface Detection { } /** Detection results of a model. */ -export interface DetectionResult { +export declare interface DetectionResult { /** A list of Detections. */ detections: Detection[]; } diff --git a/mediapipe/tasks/web/components/containers/embedding_result.d.ts b/mediapipe/tasks/web/components/containers/embedding_result.d.ts index a4b4ec20..812d66f5 100644 --- a/mediapipe/tasks/web/components/containers/embedding_result.d.ts +++ b/mediapipe/tasks/web/components/containers/embedding_result.d.ts @@ -48,7 +48,7 @@ export declare interface Embedding { } /** Embedding results for a given embedder model. */ -export interface EmbeddingResult { +export declare interface EmbeddingResult { /** * The embedding results for each model head, i.e. one for each output tensor. */ diff --git a/mediapipe/tasks/web/vision/core/image.ts b/mediapipe/tasks/web/vision/core/image.ts index bcc6b7ca..4a7b6dce 100644 --- a/mediapipe/tasks/web/vision/core/image.ts +++ b/mediapipe/tasks/web/vision/core/image.ts @@ -393,3 +393,5 @@ export class MPImage { } } } + + diff --git a/mediapipe/tasks/web/vision/core/mask.ts b/mediapipe/tasks/web/vision/core/mask.ts index da14f104..13deab3f 100644 --- a/mediapipe/tasks/web/vision/core/mask.ts +++ b/mediapipe/tasks/web/vision/core/mask.ts @@ -313,3 +313,5 @@ export class MPMask { } } } + + diff --git a/mediapipe/tasks/web/vision/face_detector/face_detector_options.d.ts b/mediapipe/tasks/web/vision/face_detector/face_detector_options.d.ts index d2539ecb..81c8fb13 100644 --- a/mediapipe/tasks/web/vision/face_detector/face_detector_options.d.ts +++ b/mediapipe/tasks/web/vision/face_detector/face_detector_options.d.ts @@ -18,7 +18,7 @@ import {ClassifierOptions} from '../../../../tasks/web/core/classifier_options'; import {VisionTaskOptions} from '../../../../tasks/web/vision/core/vision_task_options'; /** Options to configure the MediaPipe Face Detector Task */ -export interface FaceDetectorOptions extends VisionTaskOptions { +export declare interface FaceDetectorOptions extends VisionTaskOptions { /** * The minimum confidence score for the face detection to be considered * successful. Defaults to 0.5. diff --git a/mediapipe/tasks/web/vision/face_stylizer/face_stylizer_options.d.ts b/mediapipe/tasks/web/vision/face_stylizer/face_stylizer_options.d.ts index 73942bad..6afd236f 100644 --- a/mediapipe/tasks/web/vision/face_stylizer/face_stylizer_options.d.ts +++ b/mediapipe/tasks/web/vision/face_stylizer/face_stylizer_options.d.ts @@ -17,4 +17,4 @@ import {VisionTaskOptions} from '../../../../tasks/web/vision/core/vision_task_options'; /** Options to configure the MediaPipe Face Stylizer Task */ -export interface FaceStylizerOptions extends VisionTaskOptions {} +export declare interface FaceStylizerOptions extends VisionTaskOptions {} diff --git a/mediapipe/tasks/web/vision/image_segmenter/BUILD b/mediapipe/tasks/web/vision/image_segmenter/BUILD index 4d9aca99..13f01e8b 100644 --- a/mediapipe/tasks/web/vision/image_segmenter/BUILD +++ b/mediapipe/tasks/web/vision/image_segmenter/BUILD @@ -1,6 +1,6 @@ # This contains the MediaPipe Image Segmenter Task. -load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_library") +load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_declaration", "mediapipe_ts_library") load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") package(default_visibility = ["//mediapipe/tasks:internal"]) @@ -11,10 +11,10 @@ mediapipe_ts_library( name = "image_segmenter", srcs = [ "image_segmenter.ts", - "image_segmenter_options.ts", "image_segmenter_result.ts", ], deps = [ + ":image_segmenter_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/framework:calculator_options_jspb_proto", "//mediapipe/tasks/cc/core/proto:base_options_jspb_proto", @@ -25,13 +25,18 @@ mediapipe_ts_library( "//mediapipe/tasks/web/core:classifier_options", "//mediapipe/tasks/web/vision/core:image_processing_options", "//mediapipe/tasks/web/vision/core:mask", - "//mediapipe/tasks/web/vision/core:vision_task_options", "//mediapipe/tasks/web/vision/core:vision_task_runner", "//mediapipe/util:label_map_jspb_proto", "//mediapipe/web/graph_runner:graph_runner_ts", ], ) +mediapipe_ts_declaration( + name = "image_segmenter_types", + srcs = ["image_segmenter_options.d.ts"], + deps = ["//mediapipe/tasks/web/vision/core:vision_task_options"], +) + mediapipe_ts_library( name = "image_segmenter_test_lib", testonly = True, @@ -40,6 +45,7 @@ mediapipe_ts_library( ], deps = [ ":image_segmenter", + ":image_segmenter_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/tasks/web/core", "//mediapipe/tasks/web/core:task_runner_test_utils", diff --git a/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.ts b/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.d.ts similarity index 93% rename from mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.ts rename to mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.d.ts index 5e7fe7a4..f3c3e381 100644 --- a/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.ts +++ b/mediapipe/tasks/web/vision/image_segmenter/image_segmenter_options.d.ts @@ -17,7 +17,7 @@ import {VisionTaskOptions} from '../../../../tasks/web/vision/core/vision_task_options'; /** Options to configure the MediaPipe Image Segmenter Task */ -export interface ImageSegmenterOptions extends VisionTaskOptions { +export declare interface ImageSegmenterOptions extends VisionTaskOptions { /** * The locale to use for display names specified through the TFLite Model * Metadata, if any. Defaults to English. diff --git a/mediapipe/tasks/web/vision/interactive_segmenter/BUILD b/mediapipe/tasks/web/vision/interactive_segmenter/BUILD index c4216463..76493c05 100644 --- a/mediapipe/tasks/web/vision/interactive_segmenter/BUILD +++ b/mediapipe/tasks/web/vision/interactive_segmenter/BUILD @@ -1,6 +1,6 @@ # This contains the MediaPipe Interactive Segmenter Task. -load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_library") +load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_declaration", "mediapipe_ts_library") load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") package(default_visibility = ["//mediapipe/tasks:internal"]) @@ -11,10 +11,10 @@ mediapipe_ts_library( name = "interactive_segmenter", srcs = [ "interactive_segmenter.ts", - "interactive_segmenter_options.ts", "interactive_segmenter_result.ts", ], deps = [ + ":interactive_segmenter_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/framework:calculator_options_jspb_proto", "//mediapipe/tasks/cc/core/proto:base_options_jspb_proto", @@ -26,7 +26,6 @@ mediapipe_ts_library( "//mediapipe/tasks/web/vision/core:image_processing_options", "//mediapipe/tasks/web/vision/core:mask", "//mediapipe/tasks/web/vision/core:types", - "//mediapipe/tasks/web/vision/core:vision_task_options", "//mediapipe/tasks/web/vision/core:vision_task_runner", "//mediapipe/util:color_jspb_proto", "//mediapipe/util:render_data_jspb_proto", @@ -34,6 +33,15 @@ mediapipe_ts_library( ], ) +mediapipe_ts_declaration( + name = "interactive_segmenter_types", + srcs = ["interactive_segmenter_options.d.ts"], + deps = [ + "//mediapipe/tasks/web/core", + "//mediapipe/tasks/web/vision/core:vision_task_options", + ], +) + mediapipe_ts_library( name = "interactive_segmenter_test_lib", testonly = True, diff --git a/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.ts b/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.d.ts similarity index 92% rename from mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.ts rename to mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.d.ts index 952a5190..551088ce 100644 --- a/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.ts +++ b/mediapipe/tasks/web/vision/interactive_segmenter/interactive_segmenter_options.d.ts @@ -18,7 +18,7 @@ import {TaskRunnerOptions} from '../../../../tasks/web/core/task_runner_options'; /** Options to configure the MediaPipe Interactive Segmenter Task */ -export interface InteractiveSegmenterOptions extends TaskRunnerOptions { +export declare interface InteractiveSegmenterOptions extends TaskRunnerOptions { /** Whether to output confidence masks. Defaults to true. */ outputConfidenceMasks?: boolean|undefined; diff --git a/mediapipe/tasks/web/vision/object_detector/object_detector_options.d.ts b/mediapipe/tasks/web/vision/object_detector/object_detector_options.d.ts index d0ead197..cfe604ed 100644 --- a/mediapipe/tasks/web/vision/object_detector/object_detector_options.d.ts +++ b/mediapipe/tasks/web/vision/object_detector/object_detector_options.d.ts @@ -18,5 +18,5 @@ import {ClassifierOptions} from '../../../../tasks/web/core/classifier_options'; import {VisionTaskOptions} from '../../../../tasks/web/vision/core/vision_task_options'; /** Options to configure the MediaPipe Object Detector Task */ -export interface ObjectDetectorOptions extends VisionTaskOptions, - ClassifierOptions {} +export declare interface ObjectDetectorOptions extends VisionTaskOptions, + ClassifierOptions {} diff --git a/mediapipe/tasks/web/vision/pose_landmarker/BUILD b/mediapipe/tasks/web/vision/pose_landmarker/BUILD index 727f4440..ec4c0aea 100644 --- a/mediapipe/tasks/web/vision/pose_landmarker/BUILD +++ b/mediapipe/tasks/web/vision/pose_landmarker/BUILD @@ -3,7 +3,7 @@ # This task takes video frames and outputs synchronized frames along with # the detection results for one or more pose categories, using Pose Landmarker. -load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_library") +load("//mediapipe/framework/port:build_config.bzl", "mediapipe_ts_declaration", "mediapipe_ts_library") load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") package(default_visibility = ["//mediapipe/tasks:internal"]) @@ -14,11 +14,11 @@ mediapipe_ts_library( name = "pose_landmarker", srcs = [ "pose_landmarker.ts", - "pose_landmarker_options.ts", "pose_landmarker_result.ts", ], visibility = ["//visibility:public"], deps = [ + ":pose_landmarker_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/framework:calculator_options_jspb_proto", "//mediapipe/framework/formats:landmark_jspb_proto", @@ -33,12 +33,17 @@ mediapipe_ts_library( "//mediapipe/tasks/web/vision/core:image_processing_options", "//mediapipe/tasks/web/vision/core:mask", "//mediapipe/tasks/web/vision/core:types", - "//mediapipe/tasks/web/vision/core:vision_task_options", "//mediapipe/tasks/web/vision/core:vision_task_runner", "//mediapipe/web/graph_runner:graph_runner_ts", ], ) +mediapipe_ts_declaration( + name = "pose_landmarker_types", + srcs = ["pose_landmarker_options.d.ts"], + deps = ["//mediapipe/tasks/web/vision/core:vision_task_options"], +) + mediapipe_ts_library( name = "pose_landmarker_test_lib", testonly = True, @@ -47,6 +52,7 @@ mediapipe_ts_library( ], deps = [ ":pose_landmarker", + ":pose_landmarker_types", "//mediapipe/framework:calculator_jspb_proto", "//mediapipe/tasks/web/components/processors:landmark_result", "//mediapipe/tasks/web/core", diff --git a/mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.ts b/mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.d.ts similarity index 100% rename from mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.ts rename to mediapipe/tasks/web/vision/pose_landmarker/pose_landmarker_options.d.ts