aas-http-client 0.1.91__tar.gz → 0.2.0__tar.gz

{aas_http_client-0.1.91 → aas_http_client-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.1.91
+Version: 0.2.0
 Summary: Generic HTTP client for communicating 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.1.91 → aas_http_client-0.2.0}/aas_http_client/wrapper/sdk_wrapper.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 import basyx.aas.adapter.json
 
-from basyx.aas.model import AssetAdministrationShell, Reference, Submodel
+from basyx.aas.model import AssetAdministrationShell, Reference, Submodel, ModelReference
 from aas_http_client.client import AasHttpClient, _create_client
 logger = logging.getLogger(__name__)
 
@@ -37,7 +37,7 @@ class SdkWrapper():
 
         return self._client.put_shells(identifier, aas_data)
 
-    def put_shells_submodels(self, aas_id: str, submodel_id: str, submodel: Submodel) -> bool:
+    def put_shells_submodels_by_id(self, aas_id: str, submodel_id: str, submodel: Submodel) -> 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
@@ -85,11 +85,16 @@ class SdkWrapper():
         :return: AAS object or None if an error occurred
         """
         content: dict = self._client.get_shells_by_id(aas_id)
-        return json.load(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        aas_dict_string = json.dumps(content)
+        return json.loads(aas_dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     def get_shells_reference_by_id(self, aas_id: str) -> Reference | None:
-        content: dict = self._client.get_shells_reference_by_id(aas_id)
-        return json.load(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        #workaround because serialization not working
+        aas = self.get_shells_by_id(aas_id)
+        return ModelReference.from_referable(aas)
+        
+        # content: dict = self._client.get_shells_reference_by_id(aas_id)
+        # return json.loads(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     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).
@@ -99,7 +104,8 @@ class SdkWrapper():
         :return: Submodel object or None if an error occurred
         """
         content: dict = self._client.get_shells_submodels_by_id(aas_id, submodel_id)
-        return json.load(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        sm_dict_string = json.dumps(content)
+        return json.loads(sm_dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     def delete_shells_by_id(self, aas_id: str) -> bool:
         """Get an Asset Administration Shell (AAS) by its ID from the REST API.
@@ -176,8 +182,9 @@ class SdkWrapper():
         if not isinstance(content, dict):
             logger.error(f"Invalid submodel data: {content}")
             return None
-#
-        return json.loads(content, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
+        
+        sm_dict_string = json.dumps(content)
+        return json.loads(sm_dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
 
     def patch_submodel_by_id(self, submodel_id: str, submodel: Submodel):
         sm_dict_string = json.dumps(submodel, cls=basyx.aas.adapter.json.AASToJsonEncoder)
@@ -248,5 +255,10 @@ def create_wrapper_by_config(config_file: Path, password: str = "") -> AasHttpCl
         logger.debug(f"Server config  file '{config_file}' found.")
 
     wrapper = SdkWrapper()
-    wrapper._client = _create_client(config_string, password)                           
+    client = _create_client(config_string, password)
+    
+    if not client:
+        return None
+    
+    wrapper._client = _create_client(config_string, password)       
     return wrapper

{aas_http_client-0.1.91 → aas_http_client-0.2.0}/aas_http_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.1.91
+Version: 0.2.0
 Summary: Generic HTTP client for communicating 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.1.91 → aas_http_client-0.2.0}/aas_http_client.egg-info/SOURCES.txt

@@ -13,6 +13,4 @@ aas_http_client/demo/demo_process.py
 aas_http_client/demo/logging_handler.py
 aas_http_client/utilities/__init__.py
 aas_http_client/utilities/model_builder.py
-aas_http_client/wrapper/sdk_wrapper.py
-tests/test_client_dotnet_server.py
-tests/test_client_java_server.py
+aas_http_client/wrapper/sdk_wrapper.py

{aas_http_client-0.1.91 → aas_http_client-0.2.0}/pyproject.toml

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

aas_http_client-0.1.91/tests/test_client_dotnet_server.py

@@ -1,290 +0,0 @@
-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.91/tests/test_client_java_server.py

@@ -1,263 +0,0 @@
-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