aas-http-client 0.1.5__tar.gz → 0.1.7__tar.gz

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.1.5
+Version: 0.1.7
 Summary: Generic HTTP client for communicating with various types of AAS servers
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License
@@ -32,20 +32,19 @@ Dynamic: license-file
 
 <!-- TODO: Go through the readme and enter the information here -->
 
-# BaSyx Python PoC
+# AAS HTTP Client
 
 <div align="center">
 <!-- change this to your projects logo if you have on.
   If you don't have one it might be worth trying chatgpt dall-e to create one for you...
  -->
-<img src="docs/assets/fluid_logo.svg" alt="basyx_python_poc" width=500 />
+<img src="docs/assets/fluid_logo.svg" alt="aas_http_client" width=500 />
 </div>
 
 ---
 
 [![License: em](https://img.shields.io/badge/license-emSL-%23f8a602?label=License&labelColor=%23992b2e)](LICENSES/LicenseRef-em.txt)
 [![CI](https://github.com/engineering-methods/basyx_python_poc/actions/workflows/ci.yml/badge.svg?branch=master&cache-bust=1)](https://github.com/engineering-methods/basyx_python_poc/actions)
-[![codecov](https://codecov.io/gh/engineering-methods/basyx_python_poc/branch/master/graph/badge.svg)](https://codecov.io/gh/engineering-methods/basyx_python_poc)
 
 Proof of concept for a AAS application using the BaSyx Python SDK and Python AAS Server.
 
@@ -58,3 +57,5 @@ Proof of concept for a AAS application using the BaSyx Python SDK and Python AAS
 👨‍⚕️ [Troubleshooting](docs/troubleshooting.md)
 
 🤖 [Releases](https://github.com/engineering-methods/basyx_python_poc/releases)
+
+📦 [Pypi Packages](https://pypi.org/project/aas-http-client/)

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/README.md

@@ -1,19 +1,18 @@
 <!-- TODO: Go through the readme and enter the information here -->
 
-# BaSyx Python PoC
+# AAS HTTP Client
 
 <div align="center">
 <!-- change this to your projects logo if you have on.
   If you don't have one it might be worth trying chatgpt dall-e to create one for you...
  -->
-<img src="docs/assets/fluid_logo.svg" alt="basyx_python_poc" width=500 />
+<img src="docs/assets/fluid_logo.svg" alt="aas_http_client" width=500 />
 </div>
 
 ---
 
 [![License: em](https://img.shields.io/badge/license-emSL-%23f8a602?label=License&labelColor=%23992b2e)](LICENSES/LicenseRef-em.txt)
 [![CI](https://github.com/engineering-methods/basyx_python_poc/actions/workflows/ci.yml/badge.svg?branch=master&cache-bust=1)](https://github.com/engineering-methods/basyx_python_poc/actions)
-[![codecov](https://codecov.io/gh/engineering-methods/basyx_python_poc/branch/master/graph/badge.svg)](https://codecov.io/gh/engineering-methods/basyx_python_poc)
 
 Proof of concept for a AAS application using the BaSyx Python SDK and Python AAS Server.
 
@@ -26,3 +25,5 @@ Proof of concept for a AAS application using the BaSyx Python SDK and Python AAS
 👨‍⚕️ [Troubleshooting](docs/troubleshooting.md)
 
 🤖 [Releases](https://github.com/engineering-methods/basyx_python_poc/releases)
+
+📦 [Pypi Packages](https://pypi.org/project/aas-http-client/)

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/aas_http_client/__init__.py

@@ -14,7 +14,9 @@ __package__ = "aas-http-client"
 
 from aas_http_client.core.version_check import check_for_update
 from aas_http_client.client import create_client_by_config, create_client_by_url, AasHttpClient
+from aas_http_client.utilities import model_builder
+from aas_http_client.wrapper.sdk_wrapper import create_wrapper_by_config, create_wrapper_by_url, SdkWrapper
 
 check_for_update()
 
-__all__ = ["create_client_by_config", "create_client_by_url", "AasHttpClient"]
+__all__ = ["create_client_by_config", "create_client_by_url", "AasHttpClient", "model_builder", "create_wrapper_by_config", "create_wrapper_by_url", "SdkWrapper"]

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/aas_http_client/client.py

@@ -166,7 +166,7 @@ class AasHttpClient(BaseModel):
 
         return True
 
-    def put_shells_submodels(self, aas_id: str, submodel_id: str, submodel_data: dict) -> bool:
+    def put_shells_submodels_by_id(self, aas_id: str, submodel_id: str, submodel_data: dict) -> bool:
         """Update a submodel by its ID for a specific Asset Administration Shell (AAS).
 
         :param aas_id: ID of the AAS to update the submodel for
@@ -257,7 +257,7 @@ class AasHttpClient(BaseModel):
         ref_dict_string = response.content.decode("utf-8")
         return json.loads(ref_dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
-    def get_shells_submodels(self, aas_id: str, submodel_id: str) -> Submodel | None:
+    def get_shells_submodels_by_id(self, aas_id: str, submodel_id: str) -> Submodel | None:
         """Get a submodel by its ID for a specific Asset Administration Shell (AAS).
 
         :param aas_id: ID of the AAS to retrieve the submodel from
@@ -268,6 +268,7 @@ class AasHttpClient(BaseModel):
         decoded_submodel_id: str = decode_base_64(submodel_id)
 
         url = f"{self.base_url}/shells/{decoded_aas_id}/submodels/{decoded_submodel_id}"
+        #/shells/{aasIdentifier}/submodels/{submodelIdentifier}
 
         try:
             response = self._session.get(url, headers=HEADERS, timeout=self.time_out)
@@ -307,7 +308,7 @@ class AasHttpClient(BaseModel):
 
         return True
 
-    def post_submodels(self, submodel_data: dict) -> bool:
+    def post_submodels(self, submodel_data: dict) -> dict:
         """Post a submodel to the REST API.
 
         :param submodel_data: Json data of the Submodel to post
@@ -327,9 +328,10 @@ class AasHttpClient(BaseModel):
             logger.error(f"Error call REST API: {e}")
             return False
 
-        return True
+        content = response.content.decode("utf-8")
+        return json.loads(content)
 
-    def put_submodels(self, identifier: str, submodel_data: dict) -> bool:
+    def put_submodels_by_id(self, identifier: str, submodel_data: dict) -> bool:
         """Update a submodel by its ID in the REST API.
 
         :param identifier: Identifier of the submodel to update
@@ -353,30 +355,6 @@ class AasHttpClient(BaseModel):
 
         return True
 
-    def get_submodel_by_id(self, submodel_id: str) -> dict | None:
-        """Get a submodel by its ID from the REST API.
-
-        :param submodel_id: ID of the submodel to retrieve
-        :return: Submodel object or None if an error occurred
-        """
-        decoded_submodel_id: str = decode_base_64(submodel_id)
-        url = f"{self.base_url}/submodels/{decoded_submodel_id}"
-
-        try:
-            response = self._session.get(url, headers=HEADERS, timeout=self.time_out)
-            logger.debug(f"Call REST API url '{response.url}'")
-
-            if response.status_code != STATUS_CODE_200:
-                log_response_errors(response)
-                return None
-
-        except requests.exceptions.RequestException as e:
-            logger.error(f"Error call REST API: {e}")
-            return None
-
-        content = response.content.decode("utf-8")
-        return json.loads(content)
-
     def get_submodels(self) -> list[dict] | None:
         """Get all submodels from the REST API.
 

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/aas_http_client/utilities/model_builder.py

@@ -34,7 +34,10 @@ def create_base_submodel(id_short: str, namespace: str = "basyx_python_aas_serve
     :param description: description of the Submodel, defaults to ""
     :return: Submodel instance
     """
-    identifier = f"{namespace}/{id_short}"
+    if namespace:
+        identifier = f"{namespace}/{id_short}"
+    else:   
+        identifier = id_short
     sm = Submodel(identifier)
     sm.id_short = id_short
 
@@ -101,7 +104,10 @@ def create_base_asset_information(id_short: str, namespace: str = "basyx_python_
     :param namespace: namespace of the AssetInformation, defaults to "basyx_python_aas_server"
     :return: AssetInformation instance
     """
-    identifier = f"{namespace}/{id_short}"
+    if namespace:
+        identifier = f"{namespace}/{id_short}"
+    else:   
+        identifier = id_short
     return AssetInformation(AssetKind.INSTANCE, identifier)
 
 

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/aas_http_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.1.5
+Version: 0.1.7
 Summary: Generic HTTP client for communicating with various types of AAS servers
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License
@@ -32,20 +32,19 @@ Dynamic: license-file
 
 <!-- TODO: Go through the readme and enter the information here -->
 
-# BaSyx Python PoC
+# AAS HTTP Client
 
 <div align="center">
 <!-- change this to your projects logo if you have on.
   If you don't have one it might be worth trying chatgpt dall-e to create one for you...
  -->
-<img src="docs/assets/fluid_logo.svg" alt="basyx_python_poc" width=500 />
+<img src="docs/assets/fluid_logo.svg" alt="aas_http_client" width=500 />
 </div>
 
 ---
 
 [![License: em](https://img.shields.io/badge/license-emSL-%23f8a602?label=License&labelColor=%23992b2e)](LICENSES/LicenseRef-em.txt)
 [![CI](https://github.com/engineering-methods/basyx_python_poc/actions/workflows/ci.yml/badge.svg?branch=master&cache-bust=1)](https://github.com/engineering-methods/basyx_python_poc/actions)
-[![codecov](https://codecov.io/gh/engineering-methods/basyx_python_poc/branch/master/graph/badge.svg)](https://codecov.io/gh/engineering-methods/basyx_python_poc)
 
 Proof of concept for a AAS application using the BaSyx Python SDK and Python AAS Server.
 
@@ -58,3 +57,5 @@ Proof of concept for a AAS application using the BaSyx Python SDK and Python AAS
 👨‍⚕️ [Troubleshooting](docs/troubleshooting.md)
 
 🤖 [Releases](https://github.com/engineering-methods/basyx_python_poc/releases)
+
+📦 [Pypi Packages](https://pypi.org/project/aas-http-client/)

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/aas_http_client.egg-info/SOURCES.txt

@@ -15,4 +15,5 @@ aas_http_client/utilities/__init__.py
 aas_http_client/utilities/model_builder.py
 aas_http_client/wrapper/python_sdk_wrapper_tmp.py
 aas_http_client/wrapper/sdk_wrapper.py
-tests/test_client.py
+tests/test_client_dotnet_server.py
+tests/test_client_java_server.py

{aas_http_client-0.1.5 → aas_http_client-0.1.7}/pyproject.toml

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

aas_http_client-0.1.7/tests/test_client_dotnet_server.py

@@ -0,0 +1,290 @@
+import pytest
+from pathlib import Path
+from aas_http_client.client import create_client_by_config, AasHttpClient
+from basyx.aas.model import AssetAdministrationShell, Submodel, MultiLanguageTextType
+import aas_http_client.utilities.model_builder as model_builder
+import json
+import basyx.aas.adapter.json
+
+@pytest.fixture(scope="module")
+def client() -> AasHttpClient:
+    try:
+        file = Path("./tests/server_configs/test_dotnet_server_config.json").resolve()
+        
+        if not file.exists():
+            raise FileNotFoundError(f"Configuration file {file} does not exist.")
+        
+        client = create_client_by_config(file, password="")
+    except Exception as e:
+        raise RuntimeError("Unable to connect to server.")
+
+    shells = client.get_shells()
+    if shells is None:
+        raise RuntimeError("No shells found on server. Please check the server configuration.")
+
+    for shell in shells.get("result", []):
+        id = shell.get("id", "")
+        client.delete_shells_by_id(id)
+        
+    submodels = client.get_submodels()
+    if submodels is None:
+        raise RuntimeError("No submodels found on server. Please check the server configuration.")
+
+    for submodel in submodels.get("result", []):
+        id = submodel.get("id", "")
+        client.delete_submodels_by_id(id)        
+
+    return client
+
+@pytest.fixture(scope="module")
+def shared_sm() -> Submodel:
+    # create a Submodel
+    return model_builder.create_base_submodel("sm_http_client_unit_tests", "")
+
+@pytest.fixture(scope="module")
+def shared_aas(client: AasHttpClient, shared_sm: Submodel) -> AssetAdministrationShell:
+    # create an AAS
+    aas = model_builder.create_base_ass(id_short="aas_http_client_unit_tests", namespace="")
+
+    # add Submodel to AAS
+    model_builder.add_submodel_to_aas(aas, shared_sm)
+    
+    return aas
+ 
+def test_001_connect(client: AasHttpClient):
+    assert client is not None
+    
+def test_002_get_shells(client: AasHttpClient):
+    result = client.get_shells()
+    assert result is not None
+    shells = result.get("result", [])
+    assert len(shells) == 0
+
+def test_003_post_shells(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    aas_data_string = json.dumps(shared_aas, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    aas_data = json.loads(aas_data_string)
+    result = client.post_shells(aas_data)
+    
+    assert result is not None
+    result_id_short = result.get("idShort", "")
+    assert result_id_short == shared_aas.id_short
+    
+    get_result = client.get_shells()
+    assert get_result is not None
+    shells = get_result.get("result", [])
+    assert len(shells) == 1
+    assert shells[0].get("idShort", "") == shared_aas.id_short
+
+def test_004a_get_shell_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    result = client.get_shells_by_id(shared_aas.id)
+    
+    assert result is not None
+    assert result.get("idShort", "") == shared_aas.id_short
+
+def test_004b_get_shell_by_id_not_found(client: AasHttpClient):
+    result = client.get_shells_by_id("non_existent_id")
+    
+    assert result is None
+    
+def test_005a_put_shells(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    aas = AssetAdministrationShell(id_=shared_aas.asset_information.global_asset_id, asset_information=shared_aas.asset_information)
+    aas.id_short = shared_aas.id_short
+
+    description_text = "Put description for unit tests"
+    aas.description = MultiLanguageTextType({"en": description_text})
+    aas.submodel = shared_aas.submodel  # Keep existing submodels
+    
+    aas_data_string = json.dumps(aas, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    aas_data = json.loads(aas_data_string)
+    
+    result = client.put_shells(shared_aas.id, aas_data)
+    
+    assert result
+    
+    get_result = client.get_shells_by_id(shared_aas.id)
+    
+    assert get_result is not None
+    assert get_result.get("idShort", "") == shared_aas.id_short
+    assert get_result.get("id", "") == shared_aas.id
+    # description must have changed
+    assert get_result.get("description", {})[0].get("text", "") == description_text
+    assert get_result.get("description", {})[0].get("text", "") != shared_aas.description.get("en", "")
+    # submodels must be retained
+    assert len(get_result.get("submodels", [])) == len(shared_aas.submodel)
+    
+    # The display name must be empty 
+    # currently not working in dotnet
+    # assert len(get_result.get("displayName", {})) == 0
+
+def test_005b_put_shells_with_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    # put with other ID
+    id_short = "put_short_id"
+    asset_info = model_builder.create_base_asset_information(id_short)
+    aas = AssetAdministrationShell(id_=asset_info.global_asset_id, asset_information=asset_info)
+    aas.id_short = id_short
+
+    description_text = {"en": "Updated description for unit tests"}
+    aas.description = MultiLanguageTextType(description_text)
+    
+    aas_data_string = json.dumps(shared_aas, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    aas_data = json.loads(aas_data_string)
+    
+    aas_data["id"] = "updated_id"  # Ensure the id is included in the update
+    
+    result = client.put_shells(shared_aas.id, aas_data)
+    
+    assert not result
+
+def test_006_get_shells_reference_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    result = client.get_shells_reference_by_id(shared_aas.id)
+    
+    assert result 
+    keys = result.get("keys", [])
+    assert len(keys) == 1
+    assert keys[0].get("value", "") == shared_aas.id
+        
+def test_007_get_shells_submodels_by_id_not_posted(client: AasHttpClient, shared_aas: AssetAdministrationShell, shared_sm: Submodel):
+    result = client.get_shells_submodels_by_id(shared_aas.id, shared_sm.id)
+
+    assert result is None
+    
+def test_008_get_submodels(client: AasHttpClient):
+    result = client.get_submodels()
+    assert result
+    submodels = result.get("result", [])
+    assert len(submodels) == 0
+    
+def test_009_post_submodels(client: AasHttpClient, shared_sm: Submodel):
+    sm_data_string = json.dumps(shared_sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+    
+    result = client.post_submodels(sm_data)
+
+    assert result is not None
+    result_id_short = result.get("idShort", "")
+    assert result_id_short == shared_sm.id_short
+    
+    get_result = client.get_submodels()
+    assert get_result is not None
+    submodels = get_result.get("result", [])
+    assert len(submodels) == 1
+    assert submodels[0].get("idShort", "") == shared_sm.id_short
+
+def test_010_get_shells_submodels_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell, shared_sm: Submodel):
+    result = client.get_shells_submodels_by_id(shared_aas.id, shared_sm.id)
+
+    assert result is not None
+    result_id_short = result.get("idShort", "")
+    assert result_id_short == shared_sm.id_short
+    
+def test_011a_get_submodels_by_id(client: AasHttpClient, shared_sm: Submodel):
+    result = client.get_submodels_by_id(shared_sm.id)
+
+    assert result is not None
+    result_id_short = result.get("idShort", "")
+    assert result_id_short == shared_sm.id_short
+    
+def test_011b_get_submodels_by_id_not_found(client: AasHttpClient):
+    result = client.get_submodels_by_id("non_existent_id")
+
+    assert result is None
+ 
+def test_012_patch_submodel_by_id(client: AasHttpClient, shared_sm: Submodel):
+    sm = Submodel(shared_sm.id_short)
+    sm.id_short = shared_sm.id_short
+
+    description_text = "Patched description for unit tests"
+    sm.description = MultiLanguageTextType({"en": description_text})
+
+    sm_data_string = json.dumps(sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+
+    result = client.patch_submodel_by_id(shared_sm.id, sm_data)
+
+    assert result
+    
+    get_result = client.get_submodels_by_id(shared_sm.id)
+    assert get_result is not None
+    assert get_result.get("idShort", "") == shared_sm.id_short
+    assert get_result.get("id", "") == shared_sm.id
+    # Only the description may change in patch.
+    assert get_result.get("description", {})[0].get("text", "") == description_text
+    assert get_result.get("description", {})[0].get("text", "") != shared_sm.description.get("en", "")
+    # The display name must remain the same.    
+    assert get_result.get("displayName", {})[0].get("text", "") == shared_sm.display_name.get("en", "")
+        
+def test_013_put_shells_submodels_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell, shared_sm: Submodel):
+    sm = Submodel(shared_sm.id_short)
+    sm.id_short = shared_sm.id_short
+
+    description_text = "Put via shell description for unit tests"
+    sm.description = MultiLanguageTextType({"en": description_text})
+
+    sm_data_string = json.dumps(sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+
+    result = client.put_shells_submodels_by_id(shared_aas.id, shared_sm.id, sm_data)
+    
+    assert result
+    
+    get_result = client.get_shells_submodels_by_id(shared_aas.id, shared_sm.id)
+    assert get_result is not None
+    assert get_result.get("idShort", "") == shared_sm.id_short
+    assert get_result.get("id", "") == shared_sm.id
+    # description must have changed
+    assert get_result.get("description", {})[0].get("text", "") == description_text
+    assert get_result.get("description", {})[0].get("text", "") != shared_sm.description.get("en", "")
+    assert len(get_result.get("displayName", {})) == 0
+    
+    # restore to its original state
+    sm_data_string = json.dumps(shared_sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+    client.put_shells_submodels_by_id(shared_aas.id, shared_sm.id, sm_data)  # Restore original submodel
+            
+def test_014_put_submodels_by_id(client: AasHttpClient, shared_sm: Submodel):
+    sm = Submodel(shared_sm.id_short)
+    sm.id_short = shared_sm.id_short
+
+    description_text = "Put description for unit tests"
+    sm.description = MultiLanguageTextType({"en": description_text})
+
+    sm_data_string = json.dumps(sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+
+    result = client.put_submodels_by_id(shared_sm.id, sm_data)
+
+    assert result
+    
+    get_result = client.get_submodels_by_id(shared_sm.id)
+    assert get_result is not None
+    assert get_result.get("idShort", "") == shared_sm.id_short
+    assert get_result.get("id", "") == shared_sm.id
+    # description must have changed
+    assert get_result.get("description", {})[0].get("text", "") == description_text
+    assert get_result.get("description", {})[0].get("text", "") != shared_sm.description.get("en", "")
+    assert len(get_result.get("displayName", {})) == 0
+    
+    # restore to its original state
+    sm_data_string = json.dumps(shared_sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+    client.put_submodels_by_id(shared_sm.id, sm_data)  # Restore original submodel            
+            
+def test_098_delete_shells_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    result = client.delete_shells_by_id(shared_aas.id)
+    
+    assert result
+    
+    get_result = client.get_shells()
+    assert get_result is not None
+    shells = get_result.get("result", [])
+    assert len(shells) == 0
+        
+def test_099_delete_submodel_by_id(client: AasHttpClient, shared_sm: Submodel):
+    result = client.delete_submodels_by_id(shared_sm.id)
+    
+    assert result
+    
+    get_result = client.get_submodels()
+    assert get_result is not None
+    submodels = get_result.get("result", [])
+    assert len(submodels) == 0

aas_http_client-0.1.7/tests/test_client_java_server.py

@@ -0,0 +1,263 @@
+import pytest
+from pathlib import Path
+from aas_http_client.client import create_client_by_config, AasHttpClient
+from basyx.aas.model import AssetAdministrationShell, Submodel, MultiLanguageTextType
+import aas_http_client.utilities.model_builder as model_builder
+import json
+import basyx.aas.adapter.json
+
+@pytest.fixture(scope="module")
+def client() -> AasHttpClient:
+    try:
+        file = Path("./tests/server_configs/test_java_server_config.json").resolve()
+        
+        if not file.exists():
+            raise FileNotFoundError(f"Configuration file {file} does not exist.")
+        
+        client = create_client_by_config(file, password="")
+    except Exception as e:
+        raise RuntimeError("Unable to connect to server.")
+
+    shells = client.get_shells()
+    if shells is None:
+        raise RuntimeError("No shells found on server. Please check the server configuration.")
+
+    for shell in shells.get("result", []):
+        id = shell.get("id", "")
+        client.delete_shells_by_id(id)
+        
+    submodels = client.get_submodels()
+    if submodels is None:
+        raise RuntimeError("No submodels found on server. Please check the server configuration.")
+
+    for submodel in submodels.get("result", []):
+        id = submodel.get("id", "")
+        client.delete_submodels_by_id(id)        
+
+    return client
+
+@pytest.fixture(scope="module")
+def shared_sm() -> Submodel:
+    # create a Submodel
+    return model_builder.create_base_submodel("sm_http_client_unit_tests", "")
+
+@pytest.fixture(scope="module")
+def shared_aas(client: AasHttpClient, shared_sm: Submodel) -> AssetAdministrationShell:
+    # create an AAS
+    aas = model_builder.create_base_ass(id_short="aas_http_client_unit_tests", namespace="")
+
+    # add Submodel to AAS
+    model_builder.add_submodel_to_aas(aas, shared_sm)
+    
+    return aas
+ 
+def test_001_connect(client: AasHttpClient):
+    assert client is not None
+    
+def test_002_get_shells(client: AasHttpClient):
+    result = client.get_shells()
+    assert result is not None
+    shells = result.get("result", [])
+    assert len(shells) == 0
+
+def test_003_post_shells(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    aas_data_string = json.dumps(shared_aas, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    aas_data = json.loads(aas_data_string)
+    result = client.post_shells(aas_data)
+    
+    assert result is not None
+    result_id_short = result.get("idShort", "")
+    assert result_id_short == shared_aas.id_short
+    
+    get_result = client.get_shells()
+    assert get_result is not None
+    shells = get_result.get("result", [])
+    assert len(shells) == 1
+    assert shells[0].get("idShort", "") == shared_aas.id_short
+
+def test_004a_get_shell_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    result = client.get_shells_by_id(shared_aas.id)
+    
+    assert result is not None
+    assert result.get("idShort", "") == shared_aas.id_short
+
+def test_004b_get_shell_by_id_not_found(client: AasHttpClient):
+    result = client.get_shells_by_id("non_existent_id")
+    
+    assert result is None
+    
+def test_005a_put_shells(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    aas = AssetAdministrationShell(id_=shared_aas.asset_information.global_asset_id, asset_information=shared_aas.asset_information)
+    aas.id_short = shared_aas.id_short
+
+    description_text = "Put description for unit tests"
+    aas.description = MultiLanguageTextType({"en": description_text})
+    aas.submodel = shared_aas.submodel  # Keep existing submodels
+    
+    aas_data_string = json.dumps(aas, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    aas_data = json.loads(aas_data_string)
+    
+    result = client.put_shells(shared_aas.id, aas_data)
+    
+    assert result
+    
+    get_result = client.get_shells_by_id(shared_aas.id)
+    
+    assert get_result is not None
+    assert get_result.get("idShort", "") == shared_aas.id_short
+    assert get_result.get("id", "") == shared_aas.id
+    # description must have changed
+    assert get_result.get("description", {})[0].get("text", "") == description_text
+    assert get_result.get("description", {})[0].get("text", "") != shared_aas.description.get("en", "")
+    # submodels must be retained
+    assert len(get_result.get("submodels", [])) == len(shared_aas.submodel)
+    # The display name must be empty 
+    assert len(get_result.get("displayName", {})) == 0
+
+def test_005b_put_shells_with_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    # put with other ID
+    id_short = "put_short_id"
+    asset_info = model_builder.create_base_asset_information(id_short)
+    aas = AssetAdministrationShell(id_=asset_info.global_asset_id, asset_information=asset_info)
+    aas.id_short = id_short
+
+    description_text = {"en": "Updated description for unit tests"}
+    aas.description = MultiLanguageTextType(description_text)
+    
+    aas_data_string = json.dumps(shared_aas, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    aas_data = json.loads(aas_data_string)
+    
+    aas_data["id"] = "updated_id"  # Ensure the id is included in the update
+    
+    result = client.put_shells(shared_aas.id, aas_data)
+    
+    assert not result
+
+def test_006_get_shells_reference_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    result = client.get_shells_reference_by_id(shared_aas.id)
+    
+    # Basyx java server do not provide this endpoint
+    assert not result
+        
+def test_007_get_shells_submodels_by_id_not_posted(client: AasHttpClient, shared_aas: AssetAdministrationShell, shared_sm: Submodel):
+    result = client.get_shells_submodels_by_id(shared_aas.id, shared_sm.id)
+
+    assert result is None
+    
+def test_008_get_submodels(client: AasHttpClient):
+    result = client.get_submodels()
+    
+    assert result
+    submodels = result.get("result", [])
+    assert len(submodels) == 0
+    
+def test_009_post_submodels(client: AasHttpClient, shared_sm: Submodel):
+    sm_data_string = json.dumps(shared_sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+    
+    result = client.post_submodels(sm_data)
+
+    assert result is not None
+    result_id_short = result.get("idShort", "")
+    assert result_id_short == shared_sm.id_short
+    
+    get_result = client.get_submodels()
+    assert get_result is not None
+    submodels = get_result.get("result", [])
+    assert len(submodels) == 1
+    assert submodels[0].get("idShort", "") == shared_sm.id_short
+
+def test_010_get_shells_submodels_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell, shared_sm: Submodel):
+    result = client.get_shells_submodels_by_id(shared_aas.id, shared_sm.id)
+
+    # Basyx java server do not provide this endpoint
+    assert result is None
+    
+def test_011a_get_submodels_by_id(client: AasHttpClient, shared_sm: Submodel):
+    result = client.get_submodels_by_id(shared_sm.id)
+
+    assert result is not None
+    result_id_short = result.get("idShort", "")
+    assert result_id_short == shared_sm.id_short
+    
+def test_011b_get_submodels_by_id_not_found(client: AasHttpClient):
+    result = client.get_submodels_by_id("non_existent_id")
+
+    assert result is None
+ 
+def test_012_patch_submodel_by_id(client: AasHttpClient, shared_sm: Submodel):
+    sm = Submodel(shared_sm.id_short)
+    sm.id_short = shared_sm.id_short
+
+    description_text = "Patched description for unit tests"
+    sm.description = MultiLanguageTextType({"en": description_text})
+
+    sm_data_string = json.dumps(sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+
+    result = client.patch_submodel_by_id(shared_sm.id, sm_data)
+
+    # Basyx java server do not provide this endpoint
+    assert not result
+
+def test_013_put_shells_submodels_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell, shared_sm: Submodel):
+    sm = Submodel(shared_sm.id_short)
+    sm.id_short = shared_sm.id_short
+
+    description_text = "Put via shell description for unit tests"
+    sm.description = MultiLanguageTextType({"en": description_text})
+
+    sm_data_string = json.dumps(sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+
+    result = client.put_shells_submodels_by_id(shared_aas.id, shared_sm.id, sm_data)
+    
+    assert not result
+            
+def test_014_put_submodels_by_id(client: AasHttpClient, shared_sm: Submodel):
+    sm = Submodel(shared_sm.id_short)
+    sm.id_short = shared_sm.id_short
+
+    description_text = "Put description for unit tests"
+    sm.description = MultiLanguageTextType({"en": description_text})
+
+    sm_data_string = json.dumps(sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+
+    result = client.put_submodels_by_id(shared_sm.id, sm_data)
+    
+    assert result
+    
+    get_result = client.get_submodels_by_id(shared_sm.id)
+    assert get_result is not None
+    assert get_result.get("idShort", "") == shared_sm.id_short
+    assert get_result.get("id", "") == shared_sm.id
+    # description must have changed
+    assert get_result.get("description", {})[0].get("text", "") == description_text
+    assert get_result.get("description", {})[0].get("text", "") != shared_sm.description.get("en", "")
+    assert len(get_result.get("displayName", {})) == 0
+    
+    # restore to its original state
+    sm_data_string = json.dumps(shared_sm, cls=basyx.aas.adapter.json.AASToJsonEncoder)
+    sm_data = json.loads(sm_data_string)
+    client.put_submodels_by_id(shared_sm.id, sm_data)  # Restore original submodel            
+            
+def test_098_delete_shells_by_id(client: AasHttpClient, shared_aas: AssetAdministrationShell):
+    result = client.delete_shells_by_id(shared_aas.id)
+    
+    assert result
+    
+    get_result = client.get_shells()
+    assert get_result is not None
+    shells = get_result.get("result", [])
+    assert len(shells) == 0
+        
+def test_099_delete_submodel_by_id(client: AasHttpClient, shared_sm: Submodel):
+    result = client.delete_submodels_by_id(shared_sm.id)
+    
+    assert result
+    
+    get_result = client.get_submodels()
+    assert get_result is not None
+    submodels = get_result.get("result", [])
+    assert len(submodels) == 0

aas_http_client-0.1.5/tests/test_client.py

@@ -1,21 +0,0 @@
-import pytest
-from pathlib import Path
-from aas_http_client.client import create_client_by_config, AasHttpClient
-
-@pytest.fixture(scope="module")
-def cloud_client() -> AasHttpClient:
-    try:
-        file = Path("./tests/test_server_config.json").resolve()
-        
-        if not file.exists():
-            raise FileNotFoundError(f"Configuration file {file} does not exist.")
-        
-        client = create_client_by_config(file, password="")
-    except Exception as e:
-        raise RuntimeError("Unable to connect to server.")
-
-    return client
-
-def test_001_connect(cloud_client: AasHttpClient):
-    print("Testing connection to the server...")
-    assert cloud_client is not None