Merge branch 'master' into rhecker/py-bindings-tests

RHeckerIntel · RHeckerIntel · commit 230547e5d283 · 2025-04-14T13:13:22.000+02:00
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Build-Docs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
     steps:
@@ -22,7 +22,7 @@ jobs:
       - name: Install dependencies
         run: pip install 'src/python/.[docs]'
       - name: Install and Generate Doxygen
-        uses: mattnotmitt/doxygen-action@v1.9.8
+        uses: mattnotmitt/doxygen-action@v1.12.0
       - name: Build Docs
         run: |
           cd docs
@@ -46,6 +46,8 @@ jobs:
             git config --local user.name "GitHub Action"
             git checkout --orphan gh-pages
             git reset --hard
+            echo '<html><head><meta http-equiv="refresh" content="0; url=latest/" /></head></html>' > index.html
+            git add index.html
             touch .nojekyll
             git add .nojekyll
             git commit -m "Initializing gh-pages branch"
@@ -62,7 +64,7 @@ jobs:
           mkdir -p /tmp/docs_build
           cp -r docs/build/html/* /tmp/docs_build/
           rm -rf ${{ env.RELEASE_VERSION }}/*
-          echo '<html><head><meta http-equiv="refresh" content="0; url=stable/" /></head></html>' > index.html
+          echo '<html><head><meta http-equiv="refresh" content="0; url=latest/" /></head></html>' > index.html
           mkdir -p ${{ env.RELEASE_VERSION }}
           cp -r /tmp/docs_build/* ./${{ env.RELEASE_VERSION }}
           rm -rf /tmp/docs_build
@@ -72,6 +74,7 @@ jobs:
             ln -sfn ${{ env.RELEASE_VERSION }} latest
           fi
           git add ./latest ${{ env.RELEASE_VERSION }}
+          git add index.html
           git commit -m "Update documentation" -a || true
       - name: Push changes
         uses: ad-m/github-push-action@master
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -24,15 +24,13 @@ jobs:
           python -m pip install --upgrade build
       - name: Build sdist
         run: |
-          sed -i '/omz_tools/d' src/python/pyproject.toml
           python -m build --sdist src/python/
       - uses: actions/upload-artifact@v4
         with:
           name: artifact-sdist
           path: src/python/dist/*.tar.gz
       - name: Build wheel
         run: |
-          sed -i '/omz_tools/d' src/python/pyproject.toml
           python -m build --wheel src/python/
       - uses: actions/upload-artifact@v4
         with:
diff --git a/README.md b/README.md
@@ -1,15 +1,38 @@
 # OpenVINO Model API
 
-Model API is a set of wrapper classes for particular tasks and model architectures, simplifying data preprocess and postprocess as well as routine procedures (model loading, asynchronous execution, etc.). It is aimed at simplifying end-to-end model inference for different deployment scenarious, including local execution and serving. The Model API is based on the OpenVINO inference API.
+[![PyPI](https://img.shields.io/pypi/v/otx)](https://pypi.org/project/openvino-model-api)
+[![Downloads](https://static.pepy.tech/personalized-badge/otx?period=total&units=international_system&left_color=grey&right_color=green&left_text=PyPI%20Downloads)](https://pepy.tech/project/openvino-model-api)
+
+<!-- markdownlint-disable MD042 -->
+
+[![openvino](https://img.shields.io/badge/openvino-2025.0-purple)]()
+
+<!-- markdownlint-enable  MD042 -->
+
+[![Pre-Merge Test](https://github.com/open-edge-platform/model_api/actions/workflows/pre_commit.yml/badge.svg)](https://github.com/open-edge-platform/model_api/actions/workflows/pre_commit.yml)
+[![Build Docs](https://github.com/open-edge-platform/model_api/actions/workflows/docs.yml/badge.svg)](https://github.com/open-edge-platform/model_api/actions/workflows/docs.yml)
+
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+
+## Introduction
+
+Model API is a set of wrapper classes for particular tasks and model architectures, simplifying data preprocess and postprocess as well as routine procedures (model loading, asynchronous execution, etc.). It is aimed at simplifying end-to-end model inference for different deployment scenarios, including local execution and serving. The Model API is based on the OpenVINO inference API.
 
 ## How it works
 
 Model API searches for additional information required for model inference, data, pre/postprocessing, label names, etc. directly in OpenVINO Intermediate Representation. This information is used to prepare the inference data, process and output the inference results in a human-readable format.
 
+Currently, ModelAPI supports models trained in [OpenVINO Training Extensions](https://github.com/openvinotoolkit/training_extensions) framework.
+Training Extensions embed all the metadata required for inference into model file. For models coming from other than Training Extensions frameworks metadata generation step is required before using ModelAPI.
+
+## Supported model formats
+
+- [OpenVINO IR](https://docs.openvino.ai/2025/documentation/openvino-ir-format.html)
+- [ONNX](https://onnx.ai)
+
 ## Features
 
 - Python and C++ API
-- Automatic prefetch of public models from [OpenVINO Model Zoo](https://github.com/openvinotoolkit/open_model_zoo) (Python only)
 - Synchronous and asynchronous inference
 - Local inference and serving through the rest API (Python only)
 - Model preprocessing embedding for faster inference
@@ -18,17 +41,15 @@ Model API searches for additional information required for model inference, data
 
 ### Python
 
-- Clone this repository
-- Navigate to `model_api/python` folder
-- Run `pip install .`
+`pip install openvino-model-api`
 
 ### C++
 
 - Install dependencies. For installation on Ubuntu, you can use the following script:
 
   ```bash
-  chmod +x model_api/cpp/install_dependencies.sh
-  sudo model_api/cpp/install_dependencies.sh
+  chmod +x src/cpp/install_dependencies.sh
+  sudo src/cpp/install_dependencies.sh
   ```
 
 - Build library:
@@ -45,44 +66,48 @@ Model API searches for additional information required for model inference, data
   cmake ../model_api/cpp -DOpenCV_DIR=<OpenCV cmake dir> -DOpenVINO_DIR=<OpenVINO cmake dir>
   ```
 
-  - Build:
+`OpenCV` and `OpenVINO` locations are optional. In most cases, these dependencies are discovered by cmake without extra guidance.
 
-  ```bash
-  cmake --build . -j
-  ```
+- Build:
+
+```bash
+cmake --build . -j
+```
 
-  - To build a `.tar.gz` package with the library, run:
+- To build a `.tar.gz` package with the library, run:
 
-  ```bash
-  cmake --build . --target package -j
-  ```
+```bash
+cmake --build . --target package -j
+```
 
 ## Usage
 
 ### Python
 
 ```python
-from model_api.models import DetectionModel
+from model_api.models import Model
 
-# Create a model (downloaded and cached automatically for OpenVINO Model Zoo models)
-# Use URL to work with served model, e.g. "localhost:9000/models/ssdlite_mobilenet_v2"
-ssd = DetectionModel.create_model("ssdlite_mobilenet_v2")
+# Create a model wrapper from a compatible model generated by OpenVINO Training Extensions
+# Use URL to work with OVMS-served model, e.g. "localhost:9000/models/ssdlite_mobilenet_v2"
+model = Model.create_model("model.xml")
 
 # Run synchronous inference locally
-detections = ssd(image)  # image is numpy.ndarray
+result = model(image)  # image is numpy.ndarray
 
-# Print the list of Detection objects with box coordinates, confidence and label string
-print(f"Detection results: {detections}")
+# Print results in model-specific format
+print(f"Inference result: {result}")
 ```
 
 ### C++
 
+In C++ we have to specify model type in advance, let's set it to detection model.
+
 ```cpp
 #include <models/detection_model.h>
 #include <models/results.h>
 
-// Load the model fetched using Python API
-auto model = DetectionModel::create_model("~/.cache/omz/public/ssdlite_mobilenet_v2/FP16/ssdlite_mobilenet_v2.xml");
+// Load the model
+auto model = Model::create_model("model.xml");
 
 // Run synchronous inference locally
 auto result = model->infer(image); // image is cv::Mat
@@ -125,41 +150,3 @@ auto model = DetectionModel::create_model(adapter);
 ```
 
 For more details please refer to the [examples](https://github.com/openvinotoolkit/model_api/tree/master/examples) of this project.
-
-## Supported models
-
-### Python
-
-- Image Classification:
-  - [OpenVINO Model Zoo models](https://github.com/openvinotoolkit/open_model_zoo/blob/master/models/public/index.md#classification-models)
-- Object Detection:
-  - [OpenVINO Model Zoo models](https://github.com/openvinotoolkit/open_model_zoo/blob/master/models/public/index.md#object-detection-models):
-    - SSD-based models (e.g. "ssdlite_mobilenet_v2", etc.)
-    - YOLO-based models (e.g. "yolov3", "yolov4", etc.)
-    - CTPN: "ctpn"
-    - DETR: "detr-resnet50"
-    - CenterNet: "ctdet_coco_dlav0_512"
-    - FaceBoxes: "faceboxes-pytorch"
-    - RetinaFace: "retinaface-resnet50-pytorch"
-    - Ultra Lightweight Face Detection: "ultra-lightweight-face-detection-rfb-320" and "ultra-lightweight-face-detection-slim-320"
-    - NanoDet with ShuffleNetV2: "nanodet-m-1.5x-416"
-    - NanoDet Plus with ShuffleNetV2: "nanodet-plus-m-1.5x-416"
-- Semantic Segmentation:
-  - [OpenVINO Model Zoo models](https://github.com/openvinotoolkit/open_model_zoo/blob/master/models/public/index.md#semantic-segmentation-models)
-- Instance Segmentation:
-  - [OpenVINO Model Zoo models](https://github.com/openvinotoolkit/open_model_zoo/blob/master/models/public/index.md#instance-segmentation-models)
-
-### C++
-
-- Image Classification:
-  - [OpenVINO Model Zoo models](https://github.com/openvinotoolkit/open_model_zoo/blob/master/models/public/index.md#classification-models)
-- Object Detection:
-  - SSD-based models (e.g. "ssdlite_mobilenet_v2", etc.)
-    - YOLO-based models (e.g. "yolov3", "yolov4", etc.)
-    - CenterNet: "ctdet_coco_dlav0_512"
-    - FaceBoxes: "faceboxes-pytorch"
-    - RetinaFace: "retinaface-resnet50-pytorch"
-- Semantic Segmentation:
-  - [OpenVINO Model Zoo models](https://github.com/openvinotoolkit/open_model_zoo/blob/master/models/public/index.md#semantic-segmentation-models)
-
-[Model configuration](https://github.com/openvinotoolkit/model_api/blob/master/docs/model-configuration.md) discusses possible configurations.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -10,15 +10,15 @@
 from pathlib import Path
 
 # Define the path to your module using Path
-module_path = Path(__file__).parent.parent / "model_api" / "python"
+module_path = Path(__file__).parent.parent / "src" / "python"
 
 # Insert the path to sys.path
 sys.path.insert(0, str(module_path.resolve()))
 
-project = "InferenceSDK"
-copyright = "2024, Intel OpenVINO"
-author = "Intel OpenVINO"
-release = "2024"
+project = "ModelAPI"
+copyright = "2025, Intel"
+author = "Intel"
+release = "2025"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/docs/source/cpp/models/anomaly_model.md b/docs/source/cpp/models/anomaly_model.md
@@ -1,6 +1,6 @@
 # Anomaly Model
 
-The `AnomalyModel` is a generic OpenVINO model that aims to provide a single interface for all the exported models based on [Anomalib](https://github.com/openvinotoolkit/anomalib).
+The `AnomalyModel` is a generic OpenVINO model that aims to provide a single interface for all the exported models based on [Anomalib](https://github.com/open-edge-platform/anomalib).
 
 Currently, the `AnomalyModel` supports the following models:
 
diff --git a/docs/source/python/models/anomaly.md b/docs/source/python/models/anomaly.md
@@ -1,6 +1,6 @@
 # Anomaly
 
-The `AnomalyModel` is a generic OpenVINO model that aims to provide a single interface for all the exported models based on [Anomalib](https://github.com/openvinotoolkit/anomalib).
+The `AnomalyModel` is a generic OpenVINO model that aims to provide a single interface for all the exported models based on [Anomalib](https://github.com/open-edge-platform/anomalib).
 
 Currently, the `AnomalyModel` supports the following models:
 
diff --git a/src/python/docs/visual_prompting.md b/src/python/docs/visual_prompting.md
@@ -58,5 +58,5 @@ Decoder OV model should have the following named inputs:
 
 ## How to use
 
-See demos: [VPT](https://github.com/openvinotoolkit/model_api/tree/master/examples/python/visual_prompting)
-and [ZSL-VPT](https://github.com/openvinotoolkit/model_api/tree/master/examples/python/zsl_visual_prompting)
+See demos: [VPT](https://github.com/open-edge-platform/model_api/tree/master/examples/python/visual_prompting)
+and [ZSL-VPT](https://github.com/open-edge-platform/model_api/tree/master/examples/python/zsl_visual_prompting)
diff --git a/src/python/model_api/adapters/openvino_adapter.py b/src/python/model_api/adapters/openvino_adapter.py
@@ -171,21 +171,8 @@ def __init__(
             )
             self.model = core.read_model(self.model_path, weights_path)
             return
-        if isinstance(model, str):
-            from omz_tools.models import OMZModel, list_models
-
-            if model in list_models():
-                omz_model = OMZModel.download(
-                    model,
-                    precision=precision,
-                    download_dir=download_dir,
-                    cache_dir=cache_dir,
-                )
-                self.model_path = omz_model.model_path
-                log.info(f"Reading model {self.model_path}")
-                self.model = core.read_model(self.model_path)
-                return
-        msg = "Model must be bytes, a file or existing OMZ model name"
+
+        msg = "Model must be bytes or a file"
         raise RuntimeError(msg)
 
     def load_model(self) -> None:
diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml
@@ -28,7 +28,6 @@ dependencies = [
     "opencv-python-headless",
     "scipy>=1.5.4",
     "openvino>=2025.0",
-    "omz_tools @ git+https://github.com/openvinotoolkit/open_model_zoo.git@master#egg=omz_tools&subdirectory=tools/model_tools",
     "pillow",
 ]
 
@@ -63,9 +62,9 @@ build = [
 full = ["openvino_model_api[dependencies, ovms, tests, docs, build]"]
 
 [project.urls]
-Homepage = "https://github.com/openvinotoolkit/model_api"
-Documentation = "https://github.com/openvinotoolkit/model_api/blob/master/README.md"
-Repository = "https://github.com/openvinotoolkit/model_api.git"
+Homepage = "https://github.com/open-edge-platform/model_api"
+Documentation = "https://github.com/open-edge-platform/model_api/blob/master/README.md"
+Repository = "https://github.com/open-edge-platform/model_api.git"
 
 [tool.setuptools.packages.find]
 include = ["model_api*"]
