diff --git a/mediapipe/tasks/python/components/containers/proto/BUILD b/mediapipe/tasks/python/components/containers/BUILD similarity index 100% rename from mediapipe/tasks/python/components/containers/proto/BUILD rename to mediapipe/tasks/python/components/containers/BUILD diff --git a/mediapipe/tasks/python/components/containers/proto/__init__.py b/mediapipe/tasks/python/components/containers/__init__.py similarity index 100% rename from mediapipe/tasks/python/components/containers/proto/__init__.py rename to mediapipe/tasks/python/components/containers/__init__.py diff --git a/mediapipe/tasks/python/components/containers/proto/bounding_box.py b/mediapipe/tasks/python/components/containers/bounding_box.py similarity index 100% rename from mediapipe/tasks/python/components/containers/proto/bounding_box.py rename to mediapipe/tasks/python/components/containers/bounding_box.py diff --git a/mediapipe/tasks/python/components/containers/proto/category.py b/mediapipe/tasks/python/components/containers/category.py similarity index 100% rename from mediapipe/tasks/python/components/containers/proto/category.py rename to mediapipe/tasks/python/components/containers/category.py diff --git a/mediapipe/tasks/python/components/containers/proto/classifications.py b/mediapipe/tasks/python/components/containers/classifications.py similarity index 98% rename from mediapipe/tasks/python/components/containers/proto/classifications.py rename to mediapipe/tasks/python/components/containers/classifications.py index 2c43370b..c51816e0 100644 --- a/mediapipe/tasks/python/components/containers/proto/classifications.py +++ b/mediapipe/tasks/python/components/containers/classifications.py @@ -17,7 +17,7 @@ import dataclasses from typing import Any, List, Optional from mediapipe.tasks.cc.components.containers.proto import classifications_pb2 -from mediapipe.tasks.python.components.containers.proto import category as category_module +from mediapipe.tasks.python.components.containers import category as category_module from mediapipe.tasks.python.core.optional_dependencies import doc_controls _ClassificationEntryProto = classifications_pb2.ClassificationEntry diff --git a/mediapipe/tasks/python/components/containers/proto/detections.py b/mediapipe/tasks/python/components/containers/detections.py similarity index 100% rename from mediapipe/tasks/python/components/containers/proto/detections.py rename to mediapipe/tasks/python/components/containers/detections.py diff --git a/mediapipe/tasks/python/components/processors/proto/BUILD b/mediapipe/tasks/python/components/processors/BUILD similarity index 100% rename from mediapipe/tasks/python/components/processors/proto/BUILD rename to mediapipe/tasks/python/components/processors/BUILD diff --git a/mediapipe/tasks/python/components/processors/proto/classifier_options.py b/mediapipe/tasks/python/components/processors/classifier_options.py similarity index 100% rename from mediapipe/tasks/python/components/processors/proto/classifier_options.py rename to mediapipe/tasks/python/components/processors/classifier_options.py diff --git a/mediapipe/tasks/python/test/vision/BUILD b/mediapipe/tasks/python/test/vision/BUILD index 107a78a3..09bbf195 100644 --- a/mediapipe/tasks/python/test/vision/BUILD +++ b/mediapipe/tasks/python/test/vision/BUILD @@ -46,9 +46,9 @@ py_test( ], deps = [ "//mediapipe/python:_framework_bindings", - "//mediapipe/tasks/python/components/processors/proto:classifier_options", - "//mediapipe/tasks/python/components/containers/proto:category", - "//mediapipe/tasks/python/components/containers/proto:classifications", + "//mediapipe/tasks/python/components/processors:classifier_options", + "//mediapipe/tasks/python/components/containers:category", + "//mediapipe/tasks/python/components/containers:classifications", "//mediapipe/tasks/python/core:base_options", "//mediapipe/tasks/python/test:test_utils", "//mediapipe/tasks/python/vision:image_classifier", diff --git a/mediapipe/tasks/python/test/vision/image_classifier_test.py b/mediapipe/tasks/python/test/vision/image_classifier_test.py index 0ce70395..7fbd96dd 100644 --- a/mediapipe/tasks/python/test/vision/image_classifier_test.py +++ b/mediapipe/tasks/python/test/vision/image_classifier_test.py @@ -19,9 +19,9 @@ from absl.testing import absltest from absl.testing import parameterized from mediapipe.python._framework_bindings import image as image_module -from mediapipe.tasks.python.components.processors.proto import classifier_options -from mediapipe.tasks.python.components.containers.proto import category as category_module -from mediapipe.tasks.python.components.containers.proto import classifications as classifications_module +from mediapipe.tasks.python.components.processors import classifier_options +from mediapipe.tasks.python.components.containers import category as category_module +from mediapipe.tasks.python.components.containers import classifications as classifications_module from mediapipe.tasks.python.core import base_options as base_options_module from mediapipe.tasks.python.test import test_utils from mediapipe.tasks.python.vision import image_classifier diff --git a/mediapipe/tasks/python/vision/BUILD b/mediapipe/tasks/python/vision/BUILD index 69fd8f2a..7d44e332 100644 --- a/mediapipe/tasks/python/vision/BUILD +++ b/mediapipe/tasks/python/vision/BUILD @@ -47,8 +47,8 @@ py_library( "//mediapipe/python:packet_creator", "//mediapipe/python:packet_getter", "//mediapipe/tasks/cc/vision/image_classifier/proto:image_classifier_graph_options_py_pb2", - "//mediapipe/tasks/python/components/processors/proto:classifier_options", - "//mediapipe/tasks/python/components/containers/proto:classifications", + "//mediapipe/tasks/python/components/processors:classifier_options", + "//mediapipe/tasks/python/components/containers:classifications", "//mediapipe/tasks/python/core:base_options", "//mediapipe/tasks/python/core:optional_dependencies", "//mediapipe/tasks/python/core:task_info", diff --git a/mediapipe/tasks/python/vision/image_classifier.py b/mediapipe/tasks/python/vision/image_classifier.py index 809429c3..94dcd4d7 100644 --- a/mediapipe/tasks/python/vision/image_classifier.py +++ b/mediapipe/tasks/python/vision/image_classifier.py @@ -22,8 +22,8 @@ from mediapipe.python._framework_bindings import image as image_module from mediapipe.python._framework_bindings import packet as packet_module from mediapipe.python._framework_bindings import task_runner as task_runner_module from mediapipe.tasks.cc.vision.image_classifier.proto import image_classifier_graph_options_pb2 -from mediapipe.tasks.python.components.processors.proto import classifier_options -from mediapipe.tasks.python.components.containers.proto import classifications as classifications_module +from mediapipe.tasks.python.components.processors import classifier_options +from mediapipe.tasks.python.components.containers import classifications as classifications_module from mediapipe.tasks.python.core import base_options as base_options_module from mediapipe.tasks.python.core import task_info as task_info_module from mediapipe.tasks.python.core.optional_dependencies import doc_controls