aas-http-client 0.3.1__tar.gz → 0.3.3__tar.gz

{aas_http_client-0.3.1 → aas_http_client-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.1
+Version: 0.3.3
 Summary: Generic python HTTP client for communication with various types of AAS servers
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: # :em engineering methods AG Software License

{aas_http_client-0.3.1 → aas_http_client-0.3.3}/aas_http_client/client.py

@@ -4,6 +4,7 @@ import json
 import logging
 import time
 from pathlib import Path
+from typing import Any
 
 import basyx.aas.adapter.json
 import basyx.aas.adapter.json.json_serialization as js
@@ -26,7 +27,7 @@ STATUS_CODE_404 = 404
 HEADERS = {"Content-Type": "application/json"}
 
 
-def log_response_errors(response: Response):
+def log_response_errors(response: Response):  # noqa: C901
     """Create error messages from the response and log them.
 
     :param response: response
@@ -561,6 +562,32 @@ class AasHttpClient(BaseModel):
 
         return True
 
+    def patch_submodel_element_by_path_value_only_submodel_repo(self, submodel_id: str, submodel_element_path: str, value: str) -> bool:
+        """Updates the value of an existing SubmodelElement.
+
+        :param submodel_id: Encoded ID of the Submodel to update submodel element for
+        :param submodel_element_path: Path of the Submodel element to update
+        :param value: Submodel element value to update as string
+        :return: True if the patch was successful, False otherwise
+        """
+        decoded_submodel_id: str = decode_base_64(submodel_id)
+
+        url = f"{self.base_url}/submodels/{decoded_submodel_id}/submodel-elements/{submodel_element_path}/$value"
+
+        try:
+            response = self._session.patch(url, headers=HEADERS, json=value, timeout=self.time_out)
+            logger.debug(f"Call REST API url '{response.url}'")
+
+            if response.status_code != STATUS_CODE_204:
+                log_response_errors(response)
+                return False
+
+        except requests.exceptions.RequestException as e:
+            logger.error(f"Error call REST API: {e}")
+            return False
+
+        return True
+
 
 # endregion
 
@@ -577,19 +604,19 @@ def create_client_by_url(
     connection_time_out: int = 60,
     ssl_verify: str = True,  # noqa: FBT002
 ) -> AasHttpClient | None:
-    """Create a AAS HTTP client from the given parameters.
+    """Create a HTTP client for a AAS server connection from the given parameters.
 
-    :param base_url: base URL of the BaSyx server, e.g. "http://basyx_python_server:80/"_
-    :param username: username for the BaSyx server interface client, defaults to ""_
-    :param password: password for the BaSyx server interface client, defaults to ""_
+    :param base_url: Base URL of the AAS server, e.g. "http://basyx_python_server:80/"_
+    :param username: Username for the AAS server, defaults to ""_
+    :param password: Password for the AAS server, defaults to ""_
     :param http_proxy: http proxy URL, defaults to ""_
     :param https_proxy: https proxy URL, defaults to ""_
-    :param time_out: timeout for the API calls, defaults to 200
-    :param connection_time_out: timeout for the connection to the API, defaults to 60
-    :param ssl_verify: whether to verify SSL certificates, defaults to True
-    :return: An instance of AasHttpClient initialized with the provided parameters.
+    :param time_out: Timeout for the API calls, defaults to 200
+    :param connection_time_out: Timeout for the connection to the API, defaults to 60
+    :param ssl_verify: Whether to verify SSL certificates, defaults to True
+    :return: An instance of Http client initialized with the provided parameters.
     """
-    logger.info(f"Create BaSyx server interface client from URL '{base_url}'")
+    logger.info(f"Create AAS server http client from URL '{base_url}'")
     config_dict: dict[str, str] = {}
     config_dict["base_url"] = base_url
     config_dict["username"] = username
@@ -598,19 +625,31 @@ def create_client_by_url(
     config_dict["time_out"] = time_out
     config_dict["connection_time_out"] = connection_time_out
     config_dict["ssl_verify"] = ssl_verify
-    config_string = json.dumps(config_dict, indent=4)
+    return create_client_by_dict(config_dict, password)
+
+
+def create_client_by_dict(configuration: dict, password: str = "") -> AasHttpClient | None:
+    """Create a HTTP client for a AAS server connection from the given configuration.
+
+    :param configuration: Dictionary containing the BaSyx server connection settings.
+    :param password: Password for the AAS server, defaults to ""_
+    :return: An instance of Http client initialized with the provided parameters.
+    """
+    logger.info(f"Create AAS server http client from configuration '{configuration}'")
+    config_string = json.dumps(configuration, indent=4)
+
     return _create_client(config_string, password)
 
 
 def create_client_by_config(config_file: Path, password: str = "") -> AasHttpClient | None:
-    """Create a AAS HTTP client from the given parameters.
+    """Create a HTTP client for a AAS server connection from a given configuration file.
 
-    :param config_file: Path to the configuration file containing the BaSyx server connection settings.
+    :param config_file: Path to the configuration file containing the AAS server connection settings.
     :param password: password for the BaSyx server interface client, defaults to ""_
-    :return: An instance of HttpClient initialized with the provided parameters.
+    :return: An instance of Http client initialized with the provided parameters.
     """
     config_file = config_file.resolve()
-    logger.info(f"Create AAS HTTP client from Configuration file '{config_file}'")
+    logger.info(f"Create AAS server http client from configuration file '{config_file}'")
     if not config_file.exists():
         config_string = "{}"
         logger.warning(f"Configuration file '{config_file}' not found. Using default configuration.")
@@ -623,8 +662,7 @@ def create_client_by_config(config_file: Path, password: str = "") -> AasHttpCli
 
 def _create_client(config_string: str, password) -> AasHttpClient | None:
     try:
-        connection_settings = AasHttpClient.model_validate_json(config_string)
-        client = AasHttpClient(**connection_settings.model_dump())
+        client = AasHttpClient.model_validate_json(config_string)
     except ValidationError as ve:
         raise ValidationError(f"Invalid BaSyx server connection file: {ve}") from ve
 

{aas_http_client-0.3.1 → aas_http_client-0.3.3}/aas_http_client/wrapper/sdk_wrapper.py

@@ -19,6 +19,20 @@ class SdkWrapper:
     _client: AasHttpClient = None
     base_url: str = ""
 
+    def __init__(self, config_string: str, password: str = ""):
+        """Initializes the wrapper with the given configuration.
+
+        :param config_string: Configuration string for the BaSyx server connection.
+        :param password: Password for the BaSyx server interface client, defaults to "".
+        """
+        client = _create_client(config_string, password)
+
+        if not client:
+            raise ValueError("Failed to create AAS HTTP client with the provided configuration.")
+
+        self._client = client
+        self.base_url = client.base_url
+
     # region shells
 
     def post_asset_administration_shell(self, aas: model.AssetAdministrationShell) -> model.AssetAdministrationShell | None:
@@ -261,11 +275,24 @@ class SdkWrapper:
         :return: Submodel element object or None if an error occurred
         """
         content: dict = self._client.get_submodel_element_by_path_submodel_repo(submodel_id, submodel_element_path)
+        print(content)
         return _to_object(content)
 
+    def patch_submodel_element_by_path_value_only_submodel_repo(self, submodel_id: str, submodel_element_path: str, value: str) -> bool:
+        """Updates the value of an existing SubmodelElement.
+
+        :param submodel_id: Encoded ID of the Submodel to update submodel element for
+        :param submodel_element_path: Path of the Submodel element to update
+        :param value: Submodel element value to update as string
+        :return: True if the patch was successful, False otherwise
+        """
+        return self._client.patch_submodel_element_by_path_value_only_submodel_repo(submodel_id, submodel_element_path, value)
+
 
 # endregion
 
+# region utils
+
 
 def _to_object(content: dict) -> Any | None:
     try:
@@ -287,6 +314,8 @@ def _to_dict(object: Any) -> dict | None:
         return None
 
 
+# endregion
+
 # region wrapper
 
 
@@ -300,7 +329,7 @@ def create_wrapper_by_url(
     connection_time_out: int = 60,
     ssl_verify: str = True,  # noqa: FBT002
 ) -> SdkWrapper | None:
-    """Create a wrapper for the BaSyx Python SDK from the given parameters.
+    """Create a wrapper for a AAS server connection from the given parameters.
 
     :param base_url: base URL of the BaSyx server, e.g. "http://basyx_python_server:80/"_
     :param username: username for the BaSyx server interface client, defaults to ""_
@@ -312,7 +341,7 @@ def create_wrapper_by_url(
     :param ssl_verify: whether to verify SSL certificates, defaults to True
     :return: An instance of SdkWrapper initialized with the provided parameters.
     """
-    logger.info(f"Create BaSyx Python SDK wrapper from URL '{base_url}'")
+    logger.info(f"Create AAS server wrapper from URL '{base_url}'")
     config_dict: dict[str, str] = {}
     config_dict["base_url"] = base_url
     config_dict["username"] = username
@@ -321,43 +350,36 @@ def create_wrapper_by_url(
     config_dict["time_out"] = time_out
     config_dict["connection_time_out"] = connection_time_out
     config_dict["ssl_verify"] = ssl_verify
-    config_string = json.dumps(config_dict, indent=4)
+    return create_wrapper_by_dict(config_dict, password)
 
-    wrapper = SdkWrapper()
-    client = _create_client(config_string, password)
 
-    if not client:
-        return None
+def create_wrapper_by_dict(configuration: dict, password: str = "") -> SdkWrapper | None:
+    """Create a wrapper for a AAS server connection from the given configuration.
 
-    wrapper._client = client
-    wrapper.base_url = client.base_url
-    return wrapper
+    :param config: Dictionary containing the BaSyx server connection settings.
+    :param password: Password for the BaSyx server interface client, defaults to "".
+    :return: An instance of SdkWrapper initialized with the provided parameters.
+    """
+    logger.info(f"Create AAS server wrapper from configuration '{configuration}'")
+    config_string = json.dumps(configuration, indent=4)
+    return SdkWrapper(config_string, password)
 
 
 def create_wrapper_by_config(config_file: Path, password: str = "") -> SdkWrapper | None:
-    """Create a wrapper for the BaSyx Python SDK from the given parameters.
+    """Create a wrapper for a AAS server connection from a given configuration file.
 
     :param config_file: Path to the configuration file containing the BaSyx server connection settings.
     :param password: password for the BaSyx server interface client, defaults to ""_
     :return: An instance of SdkWrapper initialized with the provided parameters.
     """
-    logger.info(f"Create BaSyx Python SDK wrapper from configuration file '{config_file}'")
+    logger.info(f"Create AAS wrapper client from configuration file '{config_file}'")
     if not config_file.exists():
         config_string = "{}"
         logger.warning(f"Configuration file '{config_file}' not found. Using default config.")
     else:
         config_string = config_file.read_text(encoding="utf-8")
         logger.debug(f"Configuration file '{config_file}' found.")
-
-    wrapper = SdkWrapper()
-    client = _create_client(config_string, password)
-
-    if not client:
-        return None
-
-    wrapper._client = client
-    wrapper.base_url = client.base_url
-    return wrapper
+    return SdkWrapper(config_string, password)
 
 
 # endregion

{aas_http_client-0.3.1 → aas_http_client-0.3.3}/aas_http_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.1
+Version: 0.3.3
 Summary: Generic python HTTP client for communication with various types of AAS servers
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: # :em engineering methods AG Software License

{aas_http_client-0.3.1 → aas_http_client-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aas-http-client"
-version = "0.3.1"
+version = "0.3.3"
 description = "Generic python HTTP client for communication with various types of AAS servers"
 readme = "README.md"
 license = { file = "LICENSE" }

{aas_http_client-0.3.1 → aas_http_client-0.3.3}/tests/test_client.py

@@ -1,6 +1,6 @@
 import pytest
 from pathlib import Path
-from aas_http_client.client import create_client_by_config, AasHttpClient
+from aas_http_client.client import create_client_by_config, AasHttpClient, create_client_by_dict, create_client_by_url
 from basyx.aas import model
 import aas_http_client.utilities.model_builder as model_builder
 import json
@@ -13,9 +13,13 @@ PYTHON_SERVER_PORTS = [8080, 80]
 CONFIG_FILES = [
     "./tests/server_configs/test_dotnet_server_config.json",
     "./tests/server_configs/test_java_server_config.json",
-    "./tests/server_configs/test_python_server_config.json",
+    "./tests/server_configs/test_python_server_config.json"
 ]
 
+# CONFIG_FILES = [
+#     "./tests/server_configs/test_dotnet_server_config_local.json",
+# ]
+
 @pytest.fixture(params=CONFIG_FILES, scope="module")
 def client(request) -> AasHttpClient:
     try:
@@ -35,9 +39,24 @@ def client(request) -> AasHttpClient:
     return client
 
 @pytest.fixture(scope="module")
-def shared_sme() -> model.Property:
+def shared_sme_string() -> model.Property:
+    # create a Submodel
+    return model_builder.create_base_submodel_element_Property("sme_property_string", model.datatypes.String, "Sample String Value")
+
+@pytest.fixture(scope="module")
+def shared_sme_bool() -> model.Property:
     # create a Submodel
-    return model_builder.create_base_submodel_element_Property("sme_http_client_unit_tests", model.datatypes.String, "Sample Value")
+    return model_builder.create_base_submodel_element_Property("sme_property_bool", model.datatypes.Boolean, True)
+
+@pytest.fixture(scope="module")
+def shared_sme_int() -> model.Property:
+    # create a Submodel
+    return model_builder.create_base_submodel_element_Property("sme_property_int", model.datatypes.Integer, 262)
+
+@pytest.fixture(scope="module")
+def shared_sme_float() -> model.Property:
+    # create a Submodel
+    return model_builder.create_base_submodel_element_Property("sme_property_float", model.datatypes.Float, 262.3)
 
 @pytest.fixture(scope="module")
 def shared_sm() -> model.Submodel:
@@ -54,6 +73,21 @@ def shared_aas(shared_sm: model.Submodel) -> model.AssetAdministrationShell:
 
     return aas
 
+def test_000a_create_client_by_url(client: AasHttpClient):
+    base_url: str = client.base_url
+    new_client: AasHttpClient = create_client_by_url(base_url=base_url)
+    assert new_client is not None
+
+def test_000b_create_client_by_dict(client: AasHttpClient):
+    base_url: str = client.base_url
+
+    config_dict: dict = {
+        "base_url": base_url
+    }
+
+    new_client: AasHttpClient = create_client_by_dict(configuration=config_dict)
+    assert new_client is not None
+
 def test_001a_connect(client: AasHttpClient):
     assert client is not None
 
@@ -262,7 +296,7 @@ def test_012_patch_submodel_by_id(client: AasHttpClient, shared_sm: model.Submod
         # NOTE: Basyx java and python server do not provide this endpoint
         assert not result
     else:
-        assert result
+        assert result is True
 
         get_result = client.get_submodel_by_id(shared_sm.id)
         assert get_result is not None
@@ -319,7 +353,7 @@ def test_014_put_submodels_by_id(client: AasHttpClient, shared_sm: model.Submode
 
     result = client.put_submodels_by_id(shared_sm.id, sm_data)
 
-    assert result
+    assert result is True
 
     get_result = client.get_submodel_by_id(shared_sm.id)
     assert get_result is not None
@@ -341,33 +375,186 @@ def test_015_get_all_submodel_elements_submodel_repository(client: AasHttpClient
     assert submodel_elements is not None
     assert len(submodel_elements.get("result", [])) == 0
 
-def test_016_post_submodel_element_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme: model.Property):
-    sme_data_string = json.dumps(shared_sme, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+def test_016a_post_submodel_element_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_string: model.Property):
+    sme_data_string = json.dumps(shared_sme_string, cls=basyx.aas.adapter.json.AASToJsonEncoder)
     sme_data = json.loads(sme_data_string)
 
     result = client.post_submodel_element_submodel_repo(shared_sm.id, sme_data)
 
     assert result is not None
-    assert result.get("idShort", "") == shared_sme.id_short
-    assert result.get("description", {})[0].get("text", "") == shared_sme.description.get("en", "")
-    assert result.get("displayName", {})[0].get("text", "") == shared_sme.display_name.get("en", "")
+    assert result.get("idShort", "") == shared_sme_string.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_string.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_string.display_name.get("en", "")
+    assert result.get("value", "") == shared_sme_string.value
 
     get_result = client.get_all_submodel_elements_submodel_repository(shared_sm.id)
 
     assert len(get_result.get("result", [])) == 1
 
-def test_017_get_submodel_element_by_path_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme: model.Property):
-    result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme.id_short)
+def test_016b_post_submodel_element_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_bool: model.Property):
+    sme_data_string = json.dumps(shared_sme_bool, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sme_data = json.loads(sme_data_string)
+
+    result = client.post_submodel_element_submodel_repo(shared_sm.id, sme_data)
+
+    assert result is not None
+    assert result.get("idShort", "") == shared_sme_bool.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_bool.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_bool.display_name.get("en", "")
+    assert json.loads(result.get("value", "").lower()) == shared_sme_bool.value
+
+    get_result = client.get_all_submodel_elements_submodel_repository(shared_sm.id)
+
+    assert len(get_result.get("result", [])) == 2
+
+def test_016c_post_submodel_element_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_int: model.Property):
+    sme_data_string = json.dumps(shared_sme_int, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sme_data = json.loads(sme_data_string)
+
+    result = client.post_submodel_element_submodel_repo(shared_sm.id, sme_data)
+
+    assert result is not None
+    assert result.get("idShort", "") == shared_sme_int.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_int.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_int.display_name.get("en", "")
+    assert int(result.get("value", "")) == shared_sme_int.value
+
+    get_result = client.get_all_submodel_elements_submodel_repository(shared_sm.id)
+
+    assert len(get_result.get("result", [])) == 3
+
+def test_016d_post_submodel_element_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_float: model.Property):
+    sme_data_string = json.dumps(shared_sme_float, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sme_data = json.loads(sme_data_string)
+
+    result = client.post_submodel_element_submodel_repo(shared_sm.id, sme_data)
+
+    assert result is not None
+    assert result.get("idShort", "") == shared_sme_float.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_float.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_float.display_name.get("en", "")
+    assert float(result.get("value", "")) == shared_sme_float.value
+
+    get_result = client.get_all_submodel_elements_submodel_repository(shared_sm.id)
+
+    assert len(get_result.get("result", [])) == 4
+
+def test_017a_get_submodel_element_by_path_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_string: model.Property):
+    result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_string.id_short)
 
     assert result is not None
-    assert result.get("idShort", "") == shared_sme.id_short
-    assert result.get("description", {})[0].get("text", "") == shared_sme.description.get("en", "")
-    assert result.get("displayName", {})[0].get("text", "") == shared_sme.display_name.get("en", "")
+    assert result.get("idShort", "") == shared_sme_string.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_string.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_string.display_name.get("en", "")
+    assert result.get("value", "") == shared_sme_string.value
+
+def test_017b_get_submodel_element_by_path_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_bool: model.Property):
+    result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_bool.id_short)
+
+    assert result is not None
+    assert result.get("idShort", "") == shared_sme_bool.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_bool.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_bool.display_name.get("en", "")
+    assert json.loads(result.get("value", "").lower()) == shared_sme_bool.value
+
+def test_017c_get_submodel_element_by_path_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_int: model.Property):
+    result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_int.id_short)
+
+    assert result is not None
+    assert result.get("idShort", "") == shared_sme_int.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_int.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_int.display_name.get("en", "")
+    assert int(result.get("value", "")) == shared_sme_int.value
+
+def test_017d_get_submodel_element_by_path_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_float: model.Property):
+    result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_float.id_short)
+
+    assert result is not None
+    assert result.get("idShort", "") == shared_sme_float.id_short
+    assert result.get("description", {})[0].get("text", "") == shared_sme_float.description.get("en", "")
+    assert result.get("displayName", {})[0].get("text", "") == shared_sme_float.display_name.get("en", "")
+    assert float(result.get("value", "")) == shared_sme_float.value
+
+def test_018a_patch_submodel_element_by_path_value_only_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_string: model.Property):
+    new_value = "Patched String Value"
+    result = client.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_string.id_short, new_value)
+
+    parsed = urlparse(client.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        get_result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_string.id_short)
+
+        assert get_result is not None
+        assert get_result.get("idShort", "") == shared_sme_string.id_short
+        assert get_result.get("value", "") == new_value
+        assert get_result.get("description", {})[0].get("text", "") == shared_sme_string.description.get("en", "")
+        assert get_result.get("displayName", {})[0].get("text", "") == shared_sme_string.display_name.get("en", "")
+
+def test_018b_patch_submodel_element_by_path_value_only_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_bool: model.Property):
+    new_value = "false"
+    result = client.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_bool.id_short, new_value)
+
+    parsed = urlparse(client.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        get_result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_bool.id_short)
+
+        assert get_result is not None
+        assert get_result.get("idShort", "") == shared_sme_bool.id_short
+        assert json.loads(get_result.get("value", "").lower()) == json.loads(new_value)
+        assert get_result.get("description", {})[0].get("text", "") == shared_sme_bool.description.get("en", "")
+        assert get_result.get("displayName", {})[0].get("text", "") == shared_sme_bool.display_name.get("en", "")
+
+def test_018c_patch_submodel_element_by_path_value_only_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_int: model.Property):
+    new_value = "263"
+    result = client.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_int.id_short, new_value)
+
+    parsed = urlparse(client.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        get_result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_int.id_short)
+
+        assert get_result is not None
+        assert get_result.get("idShort", "") == shared_sme_int.id_short
+        assert int(get_result.get("value", "")) == int(new_value)
+        assert get_result.get("description", {})[0].get("text", "") == shared_sme_int.description.get("en", "")
+        assert get_result.get("displayName", {})[0].get("text", "") == shared_sme_int.display_name.get("en", "")
+
+def test_018d_patch_submodel_element_by_path_value_only_submodel_repo(client: AasHttpClient, shared_sm: model.Submodel, shared_sme_float: model.Property):
+    new_value = "262.1"
+    result = client.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_float.id_short, new_value)
+
+    parsed = urlparse(client.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        get_result = client.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_float.id_short)
+
+        assert get_result is not None
+        assert get_result.get("idShort", "") == shared_sme_float.id_short
+        assert float(get_result.get("value", "")) == float(new_value)
+        assert get_result.get("description", {})[0].get("text", "") == shared_sme_float.description.get("en", "")
+        assert get_result.get("displayName", {})[0].get("text", "") == shared_sme_float.display_name.get("en", "")
 
 def test_098_delete_asset_administration_shell_by_id(client: AasHttpClient, shared_aas: model.AssetAdministrationShell):
     result = client.delete_asset_administration_shell_by_id(shared_aas.id)
 
-    assert result
+    assert result is True
 
     get_result = client.get_all_asset_administration_shells()
     assert get_result is not None
@@ -377,7 +564,7 @@ def test_098_delete_asset_administration_shell_by_id(client: AasHttpClient, shar
 def test_099_delete_submodel_by_id(client: AasHttpClient, shared_sm: model.Submodel):
     result = client.delete_submodel_by_id(shared_sm.id)
 
-    assert result
+    assert result is True
 
     get_result = client.get_all_submodels()
     assert get_result is not None

{aas_http_client-0.3.1 → aas_http_client-0.3.3}/tests/test_wrapper.py

@@ -1,9 +1,10 @@
 import pytest
 from pathlib import Path
-from aas_http_client.wrapper.sdk_wrapper import create_wrapper_by_config, SdkWrapper
+from aas_http_client.wrapper.sdk_wrapper import create_wrapper_by_config, SdkWrapper, create_wrapper_by_dict, create_wrapper_by_url
 from basyx.aas import model
 import aas_http_client.utilities.model_builder as model_builder
 from urllib.parse import urlparse
+import json
 
 JAVA_SERVER_PORTS = [8075]
 PYTHON_SERVER_PORTS = [8080, 80]
@@ -15,6 +16,10 @@ CONFIG_FILES = [
     "./tests/server_configs/test_python_server_config.json"
 ]
 
+# CONFIG_FILES = [
+#     "./tests/server_configs/test_dotnet_server_config_local.json",
+# ]
+
 @pytest.fixture(params=CONFIG_FILES, scope="module")
 def wrapper(request) -> SdkWrapper:
     try:
@@ -34,9 +39,24 @@ def wrapper(request) -> SdkWrapper:
     return wrapper
 
 @pytest.fixture(scope="module")
-def shared_sme() -> model.Property:
+def shared_sme_string() -> model.Property:
+    # create a Submodel
+    return model_builder.create_base_submodel_element_Property("sme_property_string", model.datatypes.String, "Sample String Value")
+
+@pytest.fixture(scope="module")
+def shared_sme_bool() -> model.Property:
+    # create a Submodel
+    return model_builder.create_base_submodel_element_Property("sme_property_bool", model.datatypes.Boolean, True)
+
+@pytest.fixture(scope="module")
+def shared_sme_int() -> model.Property:
+    # create a Submodel
+    return model_builder.create_base_submodel_element_Property("sme_property_int", model.datatypes.Integer, 262)
+
+@pytest.fixture(scope="module")
+def shared_sme_float() -> model.Property:
     # create a Submodel
-    return model_builder.create_base_submodel_element_Property("sme_http_client_unit_tests", model.datatypes.String, "Sample Value")
+    return model_builder.create_base_submodel_element_Property("sme_property_float", model.datatypes.Float, 262.3)
 
 @pytest.fixture(scope="module")
 def shared_sm() -> model.Submodel:
@@ -55,6 +75,21 @@ def shared_aas(shared_sm: model.Submodel) -> model.AssetAdministrationShell:
 
     return aas
 
+def test_000a_create_wrapper_by_url(wrapper: SdkWrapper):
+    base_url: str = wrapper.base_url
+    new_client: SdkWrapper = create_wrapper_by_url(base_url=base_url)
+    assert new_client is not None
+
+def test_000b_create_wrapper_by_dict(wrapper: SdkWrapper):
+    base_url: str = wrapper.base_url
+
+    config_dict: dict = {
+        "base_url": base_url
+    }
+
+    new_client: SdkWrapper = create_wrapper_by_dict(configuration=config_dict)
+    assert new_client is not None
+
 def test_001_connect(wrapper: SdkWrapper):
     assert wrapper is not None
 
@@ -292,42 +327,217 @@ def test_015_get_all_submodel_elements_submodel_repository(wrapper: SdkWrapper,
     assert submodel_elements is not None
     assert len(submodel_elements) == 0
 
-def test_016_post_submodel_element_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme: model.Property):
-    submodel_element = wrapper.post_submodel_element_submodel_repo(shared_sm.id, shared_sme)
+def test_016a_post_submodel_element_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_string: model.Property):
+    submodel_element = wrapper.post_submodel_element_submodel_repo(shared_sm.id, shared_sme_string)
 
     assert submodel_element is not None
 
-    parsed = urlparse(wrapper.base_url)
-    if int(parsed.port) in DOTNET_SERVER_PORTS:
-        # NOTE: dotNet server provides a wrong representation of submodel elements
-        return
-
     assert isinstance(submodel_element, model.Property)
+    property: model.Property = submodel_element
+    assert property.value == shared_sme_string.value
 
-    assert submodel_element.id_short == shared_sme.id_short
-    assert submodel_element.description.get("en", "") == shared_sme.description.get("en", "")
-    assert submodel_element.display_name.get("en", "") == shared_sme.display_name.get("en", "")
+    assert submodel_element.id_short == shared_sme_string.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_string.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_string.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_string.value
 
     submodel_elements = wrapper.get_all_submodel_elements_submodel_repository(shared_sm.id)
 
     assert submodel_elements is not None
     assert len(submodel_elements) == 1
 
-def test_017_get_submodel_element_by_path_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme: model.Property):
-    submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme.id_short)
+def test_016b_post_submodel_element_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_bool: model.Property):
+    submodel_element = wrapper.post_submodel_element_submodel_repo(shared_sm.id, shared_sme_bool)
 
     assert submodel_element is not None
 
-    parsed = urlparse(wrapper.base_url)
-    if int(parsed.port) in DOTNET_SERVER_PORTS:
-        # NOTE: dotNet server provides a wrong representation of submodel elements
-        return
+    assert isinstance(submodel_element, model.Property)
+    property: model.Property = submodel_element
+    assert property.value == shared_sme_bool.value
+
+    assert submodel_element.id_short == shared_sme_bool.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_bool.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_bool.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_bool.value
+
+    submodel_elements = wrapper.get_all_submodel_elements_submodel_repository(shared_sm.id)
+
+    assert submodel_elements is not None
+    assert len(submodel_elements) == 2
+
+def test_016c_post_submodel_element_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_int: model.Property):
+    submodel_element = wrapper.post_submodel_element_submodel_repo(shared_sm.id, shared_sme_int)
+
+    assert submodel_element is not None
+
+    assert isinstance(submodel_element, model.Property)
+    property: model.Property = submodel_element
+    assert property.value == shared_sme_int.value
+
+    assert submodel_element.id_short == shared_sme_int.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_int.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_int.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_int.value
+
+    submodel_elements = wrapper.get_all_submodel_elements_submodel_repository(shared_sm.id)
+
+    assert submodel_elements is not None
+    assert len(submodel_elements) == 3
+
+def test_016d_post_submodel_element_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_float: model.Property):
+    submodel_element = wrapper.post_submodel_element_submodel_repo(shared_sm.id, shared_sme_float)
+
+    assert submodel_element is not None
+
+    assert isinstance(submodel_element, model.Property)
+    property: model.Property = submodel_element
+    assert property.value == shared_sme_float.value
+
+    assert submodel_element.id_short == shared_sme_float.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_float.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_float.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_float.value
+
+    submodel_elements = wrapper.get_all_submodel_elements_submodel_repository(shared_sm.id)
+
+    assert submodel_elements is not None
+    assert len(submodel_elements) == 4
+
+def test_017a_get_submodel_element_by_path_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_string: model.Property):
+    submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_string.id_short)
+
+    assert submodel_element is not None
+
+    assert isinstance(submodel_element, model.Property)
+
+    assert submodel_element.id_short == shared_sme_string.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_string.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_string.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_string.value
+
+def test_017b_get_submodel_element_by_path_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_bool: model.Property):
+    submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_bool.id_short)
+
+    assert submodel_element is not None
+
+    assert isinstance(submodel_element, model.Property)
+
+    assert submodel_element.id_short == shared_sme_bool.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_bool.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_bool.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_bool.value
+
+def test_017c_get_submodel_element_by_path_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_int: model.Property):
+    submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_int.id_short)
+
+    assert submodel_element is not None
+
+    assert isinstance(submodel_element, model.Property)
+
+    assert submodel_element.id_short == shared_sme_int.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_int.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_int.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_int.value
+
+def test_017d_get_submodel_element_by_path_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_float: model.Property):
+    submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_float.id_short)
+
+    assert submodel_element is not None
 
     assert isinstance(submodel_element, model.Property)
 
-    assert submodel_element.id_short == shared_sme.id_short
-    assert submodel_element.description.get("en", "") == shared_sme.description.get("en", "")
-    assert submodel_element.display_name.get("en", "") == shared_sme.display_name.get("en", "")
+    assert submodel_element.id_short == shared_sme_float.id_short
+    assert submodel_element.description.get("en", "") == shared_sme_float.description.get("en", "")
+    assert submodel_element.display_name.get("en", "") == shared_sme_float.display_name.get("en", "")
+    assert submodel_element.value == shared_sme_float.value
+
+def test_018a_patch_submodel_element_by_path_value_only_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_string: model.Property):
+    new_value = "Patched String Value"
+    result = wrapper.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_string.id_short, new_value)
+
+    parsed = urlparse(wrapper.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_string.id_short)
+
+        assert submodel_element is not None
+        assert submodel_element.id_short == shared_sme_string.id_short
+        assert submodel_element.description.get("en", "") == shared_sme_string.description.get("en", "")
+        assert submodel_element.display_name.get("en", "") == shared_sme_string.display_name.get("en", "")
+
+        assert isinstance(submodel_element, model.Property)
+        property: model.Property = submodel_element
+        assert property.value == new_value
+
+def test_018b_patch_submodel_element_by_path_value_only_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_bool: model.Property):
+    new_value = "false"
+    result = wrapper.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_bool.id_short, new_value)
+
+    parsed = urlparse(wrapper.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_bool.id_short)
+
+        assert submodel_element is not None
+        assert submodel_element.id_short == shared_sme_bool.id_short
+        assert submodel_element.description.get("en", "") == shared_sme_bool.description.get("en", "")
+        assert submodel_element.display_name.get("en", "") == shared_sme_bool.display_name.get("en", "")
+
+        assert isinstance(submodel_element, model.Property)
+        property: model.Property = submodel_element
+        assert property.value == json.loads(new_value)
+
+def test_018c_patch_submodel_element_by_path_value_only_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_int: model.Property):
+    new_value = "263"
+    result = wrapper.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_int.id_short, new_value)
+
+    parsed = urlparse(wrapper.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_int.id_short)
+
+        assert submodel_element is not None
+        assert submodel_element.id_short == shared_sme_int.id_short
+        assert submodel_element.description.get("en", "") == shared_sme_int.description.get("en", "")
+        assert submodel_element.display_name.get("en", "") == shared_sme_int.display_name.get("en", "")
+
+        assert isinstance(submodel_element, model.Property)
+        property: model.Property = submodel_element
+        assert property.value == int(new_value)
+
+def test_018d_patch_submodel_element_by_path_value_only_submodel_repo(wrapper: SdkWrapper, shared_sm: model.Submodel, shared_sme_float: model.Property):
+    new_value = "262.1"
+    result = wrapper.patch_submodel_element_by_path_value_only_submodel_repo(shared_sm.id, shared_sme_float.id_short, new_value)
+
+    parsed = urlparse(wrapper.base_url)
+    if int(parsed.port) in PYTHON_SERVER_PORTS:
+        # NOTE: python server do not provide this endpoint
+        assert result is False
+    else:
+        assert result is True
+
+        submodel_element = wrapper.get_submodel_element_by_path_submodel_repo(shared_sm.id, shared_sme_float.id_short)
+
+        assert submodel_element is not None
+        assert submodel_element.id_short == shared_sme_float.id_short
+        assert submodel_element.description.get("en", "") == shared_sme_float.description.get("en", "")
+        assert submodel_element.display_name.get("en", "") == shared_sme_float.display_name.get("en", "")
+
+        assert isinstance(submodel_element, model.Property)
+        property: model.Property = submodel_element
+        assert property.value == float(new_value)
 
 def test_098_delete_asset_administration_shell_by_id(wrapper: SdkWrapper, shared_aas: model.AssetAdministrationShell):
     result = wrapper.delete_asset_administration_shell_by_id(shared_aas.id)