Skip to content

Commit 2e37cd1

Browse files
committed
Remove OvmsAdapter
1 parent 8b7457a commit 2e37cd1

File tree

18 files changed

+32
-1579
lines changed

18 files changed

+32
-1579
lines changed

.github/workflows/pre_commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
5353
- name: Install dependencies
5454
run: |
55-
uv sync --locked --extra tests --extra ovms
55+
uv sync --locked --extra tests
5656
- name: Run python unit tests
5757
run: |
5858
uv run pytest tests/unit --cov

.github/workflows/test_precommit.yml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,41 +24,13 @@ jobs:
2424
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
2525
- name: Install dependencies
2626
run: |
27-
uv sync --locked --extra tests --extra ovms --extra-index-url https://download.pytorch.org/whl/cpu
27+
uv sync --locked --extra tests --extra-index-url https://download.pytorch.org/whl/cpu
2828
- name: Prepare test data
2929
run: |
3030
uv run python tests/precommit/prepare_data.py -d data -p tests/precommit/public_scope.json
3131
- name: Run test
3232
run: |
3333
uv run pytest --data=./data tests/functional
34-
serving_api:
35-
strategy:
36-
fail-fast: false
37-
matrix:
38-
os: [ubuntu-22.04, ubuntu-24.04]
39-
python-version: ["3.10", "3.11", "3.13"]
40-
runs-on: ${{ matrix.os }}
41-
steps:
42-
- name: Set up docker for macOS
43-
if: startsWith(matrix.os, 'macos-1')
44-
run: |
45-
brew install colima docker
46-
colima start
47-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
48-
with:
49-
persist-credentials: false
50-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
51-
with:
52-
python-version: ${{ matrix.python-version }}
53-
- name: Install uv
54-
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
55-
- name: serving_api
56-
run: |
57-
uv sync --locked --extra tests --extra ovms
58-
uv run python tests/precommit/prepare_data.py -d data -p tests/precommit/public_scope.json
59-
uv run python -c "from model_api.models import DetectionModel; DetectionModel.create_model('./data/otx_models/detection_model_with_xai_head.xml').save('ovms_models/ssd_mobilenet_v1_fpn_coco/1/ssd_mobilenet_v1_fpn_coco.xml')"
60-
docker run -d --rm -v $GITHUB_WORKSPACE/ovms_models/:/models -p 8000:8000 openvino/model_server:latest --model_path /models/ssd_mobilenet_v1_fpn_coco/ --model_name ssd_mobilenet_v1_fpn_coco --rest_port 8000 --log_level DEBUG --target_device CPU
61-
uv run python examples/serving_api/run.py data/coco128/images/train2017/000000000009.jpg # detects 4 objects
6234
Zizmor-Scan-PR:
6335
runs-on: ubuntu-latest
6436
permissions:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,3 @@ docs/source/_build/
145145
.vscode/
146146

147147
data/
148-
ovms_models/

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ Training Extensions embed all the metadata required for inference into model fil
4848
from model_api.models import Model
4949

5050
# Create a model wrapper from a compatible model generated by OpenVINO Training Extensions
51-
# Use URL to work with OVMS-served model, e.g. "localhost:9000/models/ssdlite_mobilenet_v2"
5251
model = Model.create_model("model.xml")
5352

5453
# Run synchronous inference locally
@@ -60,7 +59,7 @@ print(f"Inference result: {result}")
6059

6160
## Prepare a model for `InferenceAdapter`
6261

63-
There are usecases when it is not possible to modify an internal `ov::Model` and it is hidden behind `InferenceAdapter`. For example the model can be served using [OVMS](https://github.com/openvinotoolkit/model_server). `create_model()` can construct a model from a given `InferenceAdapter`. That approach assumes that the model in `InferenceAdapter` was already configured by `create_model()` called with a string (a path or a model name). It is possible to prepare such model:
62+
There are usecases when it is not possible to modify an internal `ov::Model` and it is hidden behind `InferenceAdapter`. `create_model()` can construct a model from a given `InferenceAdapter`. That approach assumes that the model in `InferenceAdapter` was already configured by `create_model()` called with a string (a path or a model name). It is possible to prepare such model:
6463

6564
```python
6665
model = DetectionModel.create_model("~/.cache/omz/public/ssdlite_mobilenet_v2/FP16/ssdlite_mobilenet_v2.xml")

docs/source/adapters/index.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
[todo]
1212
:::
1313

14-
:::{grid-item-card} Ovms Adapter
15-
:link: ./ovms_adapter
16-
:link-type: doc
17-
1814
[todo]
1915
:::
2016
:::{grid-item-card} Onnx Adapter
@@ -45,6 +41,5 @@
4541
./inference_adapter
4642
./onnx_adapter
4743
./openvino_adapter
48-
./ovms_adapter
4944
./utils
5045
```

docs/source/adapters/ovms_adapter.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/serving_api/README.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

examples/serving_api/run.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ dependencies = [
3131
]
3232

3333
[project.optional-dependencies]
34-
ovms = [
35-
"tritonclient[http]<2.59",
36-
]
3734
tests = [
3835
"pre-commit",
3936
"httpx",

src/README.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,25 +79,13 @@ The following tasks can be solved with wrappers usage:
7979

8080
Model API wrappers are executor-agnostic, meaning it does not implement the specific model inference or model loading, instead it can be used with different executors having the implementation of common interface methods in adapter class respectively.
8181

82-
Currently, `OpenvinoAdapter` and `OVMSAdapter` are supported.
82+
Currently, `OpenvinoAdapter` and `ONNXRuntimeAdapter` are supported.
8383

8484
### OpenVINO Adapter
8585

8686
`OpenvinoAdapter` hides the OpenVINO™ toolkit API, which allows Model API wrappers launching with models represented in Intermediate Representation (IR) format.
8787
It accepts a path to either `xml` model file or `onnx` model file.
8888

89-
### OpenVINO Model Server Adapter
90-
91-
`OVMSAdapter` hides the OpenVINO Model Server python client API, which allows Model API wrappers launching with models served by OVMS.
92-
93-
Refer to **[`OVMSAdapter`](adapters/ovms_adapter.md)** to learn about running demos with OVMS.
94-
95-
For using OpenVINO Model Server Adapter you need to install the package with extra module:
96-
97-
```sh
98-
pip install <omz_dir>/demos/common/python[ovms]
99-
```
100-
10189
### ONNXRuntime Adapter
10290

10391
`ONNXRuntimeAdapter` hides the ONNXRuntime, which Model API wrappers launching with models represented in ONNX format.

0 commit comments

Comments
 (0)