From ec5111627f76345c4e819a291190c56adda0bd75 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Tue, 31 May 2022 09:42:38 +0200 Subject: [PATCH 1/2] Pass version to backend on Put and Delete requests --- examples/test.ipynb | 2 +- src/ansys/acp/core/_db.py | 4 ++-- src/ansys/acp/core/_model.py | 6 +++++- src/ansys/acp/core/_modeling_group.py | 6 +++++- tests/helpers.py | 5 ++--- tests/test_model.py | 4 +--- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/examples/test.ipynb b/examples/test.ipynb index 5153cabd67..a04f98e4a3 100644 --- a/examples/test.ipynb +++ b/examples/test.ipynb @@ -44,7 +44,7 @@ "metadata": {}, "outputs": [], "source": [ - "wait_for_server(server, timeout=10)" + "wait_for_server(server, timeout=30)" ] }, { diff --git a/src/ansys/acp/core/_db.py b/src/ansys/acp/core/_db.py index 2575c51c14..5290c58498 100644 --- a/src/ansys/acp/core/_db.py +++ b/src/ansys/acp/core/_db.py @@ -1,7 +1,7 @@ from typing import Any, Optional from ansys.api.acp.v0.base_pb2 import CollectionPath -from ansys.api.acp.v0.model_pb2 import ListModelsRequest, ModelRequest +from ansys.api.acp.v0.model_pb2 import DeleteModelRequest, ListModelsRequest from ansys.api.acp.v0.model_pb2_grpc import ModelStub from ._model import Model @@ -68,4 +68,4 @@ def clear(self) -> None: for model in model_stub.List( ListModelsRequest(collection_path=CollectionPath(value=Model.COLLECTION_LABEL)) ).models: - model_stub.Delete(ModelRequest(resource_path=model.info.resource_path)) + model_stub.Delete(DeleteModelRequest(info=model.info)) diff --git a/src/ansys/acp/core/_model.py b/src/ansys/acp/core/_model.py index c0630ee6aa..53ba64a6d1 100644 --- a/src/ansys/acp/core/_model.py +++ b/src/ansys/acp/core/_model.py @@ -89,7 +89,11 @@ def _put(self) -> None: if self._data_object is None: raise RuntimeError("Cannot create PUT request, the data_object is uninitialized.") request = ModelInfo( - info=BasicInfo(resource_path=self._get_pb_resource_path(), name=self._data_object.name), + info=BasicInfo( + resource_path=self._get_pb_resource_path(), + name=self._data_object.name, + version=self._data_object.version, + ), modeling_properties=ModelInfo.ModelingProperties( use_nodal_thicknesses=self._data_object.use_nodal_thicknesses, draping_offset_correction=self._data_object.draping_offset_correction, diff --git a/src/ansys/acp/core/_modeling_group.py b/src/ansys/acp/core/_modeling_group.py index c64a62f259..7d041c8697 100644 --- a/src/ansys/acp/core/_modeling_group.py +++ b/src/ansys/acp/core/_modeling_group.py @@ -34,7 +34,11 @@ def _put(self) -> None: if self._data_object is None: raise RuntimeError("Cannot create PUT request, the data_object is uninitialized.") request = PutModelingGroupRequest( - info=BasicInfo(resource_path=self._get_pb_resource_path(), name=self._data_object.name) + info=BasicInfo( + resource_path=self._get_pb_resource_path(), + name=self._data_object.name, + version=self._data_object.version, + ) ) self._stub.Put(request) diff --git a/tests/helpers.py b/tests/helpers.py index bb40f62a16..65b4b2232a 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -1,8 +1,7 @@ +from contextlib import contextmanager import os +from typing import Any, TypeVar import warnings -from contextlib import contextmanager -from typing import Any -from typing import TypeVar IS_PYACP = True diff --git a/tests/test_model.py b/tests/test_model.py index a64f5f0014..832b41e837 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -3,9 +3,7 @@ import tempfile from ansys.acp.core import DB -from helpers import check_property -from helpers import relpath_if_possible -from helpers import suppress_for_pyacp +from helpers import check_property, relpath_if_possible, suppress_for_pyacp def test_unittest(db_kwargs, model_data_dir_server, convert_temp_path): From b6b3cdfe47ee8850fb9786971d4ba6275f19bd44 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Thu, 2 Jun 2022 10:09:25 +0200 Subject: [PATCH 2/2] Update lock file to consume new API repository version --- poetry.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index 0bf7949297..dfbf71f44e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -9,7 +9,7 @@ python-versions = "*" [[package]] name = "ansys-api-acp" version = "0.1.0.dev0" -description = "Autogenerated python gRPC interface package for ansys-api-acp, built on 11:20:27 on 01 June 2022" +description = "Autogenerated python gRPC interface package for ansys-api-acp, built on 10:08:40 on 02 June 2022" category = "main" optional = false python-versions = ">=3.7" @@ -23,7 +23,7 @@ protobuf = ">=3.19,<4.0" type = "git" url = "https://github.com/ansys/ansys-api-acp-private.git" reference = "main" -resolved_reference = "bdb363e478309a6f89c535b149863dee66143f19" +resolved_reference = "da462f0ab5faa444a18b50bc174eb3dfb69f7895" [[package]] name = "appnope" @@ -517,7 +517,7 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "jsonschema" -version = "4.5.1" +version = "4.6.0" description = "An implementation of JSON Schema validation for Python" category = "main" optional = true @@ -532,7 +532,7 @@ typing-extensions = {version = "*", markers = "python_version < \"3.8\""} [package.extras] format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"] -format_nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"] +format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"] [[package]] name = "jupyter" @@ -1510,7 +1510,7 @@ test = ["pre-commit", "pytest"] [[package]] name = "twine" -version = "4.0.0" +version = "4.0.1" description = "Collection of utilities for publishing packages on PyPI" category = "main" optional = true @@ -1520,7 +1520,7 @@ python-versions = ">=3.7" importlib-metadata = ">=3.6" keyring = ">=15.1" pkginfo = ">=1.8.1" -readme-renderer = ">=21.0" +readme-renderer = ">=35.0" requests = ">=2.20" requests-toolbelt = ">=0.8.0,<0.9.0 || >0.9.0" rfc3986 = ">=1.4.0" @@ -1996,8 +1996,8 @@ jinja2 = [ {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, ] jsonschema = [ - {file = "jsonschema-4.5.1-py3-none-any.whl", hash = "sha256:71b5e39324422543546572954ce71c67728922c104902cb7ce252e522235b33f"}, - {file = "jsonschema-4.5.1.tar.gz", hash = "sha256:7c6d882619340c3347a1bf7315e147e6d3dae439033ae6383d6acb908c101dfc"}, + {file = "jsonschema-4.6.0-py3-none-any.whl", hash = "sha256:1c92d2db1900b668201f1797887d66453ab1fbfea51df8e4b46236689c427baf"}, + {file = "jsonschema-4.6.0.tar.gz", hash = "sha256:9d6397ba4a6c0bf0300736057f649e3e12ecbc07d3e81a0dacb72de4e9801957"}, ] jupyter = [ {file = "jupyter-1.0.0-py2.py3-none-any.whl", hash = "sha256:5b290f93b98ffbc21c0c7e749f054b3267782166d72fa5e3ed1ed4eaf34a2b78"}, @@ -2572,8 +2572,8 @@ traitlets = [ {file = "traitlets-5.2.2.post1.tar.gz", hash = "sha256:74803a1baa59af70f023671d86d5c7a834c931186df26d50d362ee6a1ff021fd"}, ] twine = [ - {file = "twine-4.0.0-py3-none-any.whl", hash = "sha256:6f7496cf14a3a8903474552d5271c79c71916519edb42554f23f42a8563498a9"}, - {file = "twine-4.0.0.tar.gz", hash = "sha256:817aa0c0bdc02a5ebe32051e168e23c71a0608334e624c793011f120dbbc05b7"}, + {file = "twine-4.0.1-py3-none-any.whl", hash = "sha256:42026c18e394eac3e06693ee52010baa5313e4811d5a11050e7d48436cf41b9e"}, + {file = "twine-4.0.1.tar.gz", hash = "sha256:96b1cf12f7ae611a4a40b6ae8e9570215daff0611828f5fe1f37a16255ab24a0"}, ] typed-ast = [ {file = "typed_ast-1.5.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4"},