Remove custom modelapi patch in visual prompting (#2359)

* Remove custom modelapi patch

* Update test

Author: sungchul1

src/otx/algorithms/visual_prompting/adapters/openvino/model_wrappers/__init__.py

@@ -14,5 +14,4 @@
 # See the License for the specific language governing permissions
 # and limitations under the License.
 
-from .openvino_adapters import VisualPromptingOpenvinoAdapter  # noqa: F401
 from .openvino_models import Decoder, ImageEncoder  # noqa: F401

src/otx/algorithms/visual_prompting/adapters/openvino/model_wrappers/openvino_adapters.py

@@ -29,16 +29,13 @@
 import numpy as np
 import openvino.runtime as ov
 from nncf.common.quantization.structs import QuantizationPreset
-from openvino.model_api.adapters import create_core
+from openvino.model_api.adapters import OpenvinoAdapter, create_core
 from openvino.model_api.models import Model
 
 from otx.algorithms.common.utils.ir import check_if_quantized
 from otx.algorithms.common.utils.logger import get_logger
 from otx.algorithms.common.utils.utils import get_default_async_reqs_num
 from otx.algorithms.visual_prompting.adapters.openvino import model_wrappers
-from otx.algorithms.visual_prompting.adapters.openvino.model_wrappers import (
-    VisualPromptingOpenvinoAdapter,
-)
 from otx.algorithms.visual_prompting.adapters.pytorch_lightning.datasets.dataset import (
     OTXVisualPromptingDataset,
     get_transform,
@@ -126,7 +123,7 @@ def __init__(
             },
         }
         for name in ["image_encoder", "decoder"]:
-            model_adapter = VisualPromptingOpenvinoAdapter(
+            model_adapter = OpenvinoAdapter(
                 core=create_core(),
                 model=model_files.get(name),
                 weights_path=weight_files.get(name, None),

src/otx/algorithms/visual_prompting/tasks/openvino.py

@@ -10,12 +10,11 @@
 import pytest
 from openvino.model_api.adapters.openvino_adapter import OpenvinoAdapter
 from openvino.model_api.models import ImageModel, SegmentationModel
-from openvino.model_api.models.types import BooleanValue, NumericalValue
+from openvino.model_api.models.types import NumericalValue
 
 from otx.algorithms.visual_prompting.adapters.openvino.model_wrappers import (
     Decoder,
     ImageEncoder,
-    VisualPromptingOpenvinoAdapter,
 )
 from otx.api.entities.label import LabelEntity
 from tests.test_suite.e2e_test_system import e2e_pytest_unit
@@ -52,7 +51,7 @@ class TestDecoder:
     @pytest.fixture(autouse=True)
     def setup(self, mocker):
         mocker.patch.object(SegmentationModel, "__init__")
-        mocker_model_adapter = mocker.Mock(spec=VisualPromptingOpenvinoAdapter)
+        mocker_model_adapter = mocker.Mock(spec=OpenvinoAdapter)
         self.decoder = Decoder(mocker_model_adapter)
         self.decoder.image_size = 6
 

tests/unit/algorithms/visual_prompting/adapters/openvino/model_wrappers/test_openvino_models.py

@@ -58,8 +58,7 @@ def setup(self, mocker):
                 labels=[ScoredLabel(LabelEntity(name="fake", domain="VISUALPROMPTING"), probability=1.0)],
             )
         ]
-        # FIXME: change VisualPromptingOpenvinoAdapter to OpenvinoAdapter after model api version update
-        mocker.patch("otx.algorithms.visual_prompting.tasks.openvino.VisualPromptingOpenvinoAdapter")
+        mocker.patch("otx.algorithms.visual_prompting.tasks.openvino.OpenvinoAdapter")
         mocker.patch.object(Model, "create_model")
         mocker.patch.object(
             VisualPromptingToAnnotationConverter, "convert_to_annotation", return_value=self.fake_annotation
@@ -231,8 +230,7 @@ def otx_model(self):
     @pytest.fixture(autouse=True)
     def setup(self, mocker, otx_model):
         """Load the OpenVINOVisualPromptingTask."""
-        # FIXME: change VisualPromptingOpenvinoAdapter to OpenvinoAdapter after model api version update
-        mocker.patch("otx.algorithms.visual_prompting.tasks.openvino.VisualPromptingOpenvinoAdapter")
+        mocker.patch("otx.algorithms.visual_prompting.tasks.openvino.OpenvinoAdapter")
         mocker.patch.object(Model, "create_model")
         self.task_environment = init_environment()
         visual_prompting_hparams = self.task_environment.get_hyper_parameters(VisualPromptingBaseConfig)