aas-http-client 0.3.8__tar.gz → 0.3.9__tar.gz

{aas_http_client-0.3.8 → aas_http_client-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.8
+Version: 0.3.9
 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.8 → aas_http_client-0.3.9}/aas_http_client/utilities/model_builder.py

@@ -39,17 +39,15 @@ def create_base_submodel_element_property(
     return sme
 
 
-def create_base_submodel(id_short: str, namespace: str = "fluid40", display_name: str = "", description: str = "") -> model.Submodel:
+def create_base_submodel(identifier: str, id_short: str, display_name: str = "", description: str = "") -> model.Submodel:
     """Create a basic Submodel.
 
+    :param identifier: identifier of the Submodel
     :param id_short: ID short of the Submodel
-    :param namespace: namespace of the Submodel , defaults to "fluid40"
     :param display_name: display name of the Submodel, defaults to ""
     :param description: description of the Submodel, defaults to ""
     :return: Submodel instance
     """
-    identifier = f"{namespace}/{id_short}" if namespace else id_short
-
     sm = model.Submodel(identifier)
     sm.id_short = id_short
 
@@ -68,16 +66,16 @@ def create_base_submodel(id_short: str, namespace: str = "fluid40", display_name
     return sm
 
 
-def create_base_ass(id_short: str, namespace: str = "fluid40", display_name: str = "", description: str = "") -> model.AssetAdministrationShell:
+def create_base_ass(identifier: str, id_short: str, display_name: str = "", description: str = "") -> model.AssetAdministrationShell:
     """Create a basic AAS.
 
+    :param identifier: identifier of the AAS
     :param id_short: ID short of the AAS
-    :param namespace: namespace of the AAS, defaults to "basyx_python_aas_server"
     :param display_name: display name of the AAS, defaults to ""
     :param description: description of the AAS, defaults to ""
     :return: AssetAdministrationShell instance
     """
-    asset_info = create_base_asset_information(id_short, namespace)
+    asset_info = create_base_asset_information(identifier)
 
     aas = model.AssetAdministrationShell(id_=asset_info.global_asset_id, asset_information=asset_info)
     aas.id_short = id_short
@@ -97,14 +95,13 @@ def create_base_ass(id_short: str, namespace: str = "fluid40", display_name: str
     return aas
 
 
-def create_base_asset_information(id_short: str, namespace: str = "basyx_python_aas_server") -> model.AssetInformation:
+def create_base_asset_information(identifier: str) -> model.AssetInformation:
     """Return a basic AssetInformation instance.
 
     :param id_short: short ID of the AssetInformation
     :param namespace: namespace of the AssetInformation, defaults to "basyx_python_aas_server"
     :return: AssetInformation instance
     """
-    identifier = f"{namespace}/{id_short}" if namespace else id_short
     return model.AssetInformation(model.AssetKind.INSTANCE, identifier)
 
 

{aas_http_client-0.3.8 → aas_http_client-0.3.9}/aas_http_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.8
+Version: 0.3.9
 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.8 → aas_http_client-0.3.9}/pyproject.toml

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

{aas_http_client-0.3.8 → aas_http_client-0.3.9}/tests/test_client.py

@@ -62,12 +62,12 @@ def shared_sme_float() -> model.Property:
 @pytest.fixture(scope="module")
 def shared_sm() -> model.Submodel:
     # create a Submodel
-    return model_builder.create_base_submodel("sm_http_client_unit_tests", "")
+    return model_builder.create_base_submodel(identifier="fluid40/sm_http_client_unit_tests", id_short="sm_http_client_unit_tests")
 
 @pytest.fixture(scope="module")
 def shared_aas(shared_sm: model.Submodel) -> model.AssetAdministrationShell:
     # create an AAS
-    aas = model_builder.create_base_ass(id_short="aas_http_client_unit_tests", namespace="")
+    aas = model_builder.create_base_ass(identifier="fluid40/aas_http_client_unit_tests", id_short="aas_http_client_unit_tests")
 
     # add Submodel to AAS
     sdk_tools.add_submodel_to_aas(aas, shared_sm)
@@ -134,20 +134,22 @@ def test_003_post_asset_administration_shell(client: AasHttpClient, shared_aas:
     result = client.post_asset_administration_shell(aas_data)
 
     assert result is not None
-    result_id_short = result.get("idShort", "")
-    assert result_id_short == shared_aas.id_short
+    assert result.get("idShort", "") == shared_aas.id_short
+    assert result.get("id", "") == shared_aas.id
 
     get_result = client.get_all_asset_administration_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
+    assert shells[0].get("id", "") == shared_aas.id
 
 def test_004a_get_asset_administration_shell_by_id(client: AasHttpClient, shared_aas: model.AssetAdministrationShell):
     result = client.get_asset_administration_shell_by_id(shared_aas.id)
 
     assert result is not None
     assert result.get("idShort", "") == shared_aas.id_short
+    assert result.get("id", "") == shared_aas.id
 
 def test_004b_get_asset_administration_shell_by_id(client: AasHttpClient):
     result = client.get_asset_administration_shell_by_id("non_existent_id")
@@ -192,7 +194,8 @@ def test_005a_put_asset_administration_shell_by_id(client: AasHttpClient, shared
 def test_005b_put_asset_administration_shell_by_id(client: AasHttpClient, shared_aas: model.AssetAdministrationShell):
     # put with other ID
     id_short = "put_short_id"
-    asset_info = model_builder.create_base_asset_information(id_short)
+    identifier = f"fluid40/{id_short}"
+    asset_info = model_builder.create_base_asset_information(identifier)
     aas = model.AssetAdministrationShell(id_=asset_info.global_asset_id, asset_information=asset_info)
     aas.id_short = id_short
 
@@ -310,7 +313,7 @@ def test_012_patch_submodel_by_id(client: AasHttpClient, shared_sm: model.Submod
         assert get_result.get("displayName", {})[0].get("text", "") == shared_sm.display_name.get("en", "")
 
 def test_013_put_submodel_by_id_aas_repository(client: AasHttpClient, shared_aas: model.AssetAdministrationShell, shared_sm: model.Submodel):
-    sm = model.Submodel(shared_sm.id_short)
+    sm = model.Submodel(shared_sm.id)
     sm.id_short = shared_sm.id_short
 
     description_text = "Put via shell description for unit tests"
@@ -343,7 +346,7 @@ def test_013_put_submodel_by_id_aas_repository(client: AasHttpClient, shared_aas
     client.put_submodel_by_id_aas_repository(shared_aas.id, shared_sm.id, sm_data)  # Restore original submodel
 
 def test_014_put_submodels_by_id(client: AasHttpClient, shared_sm: model.Submodel):
-    sm = model.Submodel(shared_sm.id_short)
+    sm = model.Submodel(shared_sm.id)
     sm.id_short = shared_sm.id_short
 
     description_text = "Put description for unit tests"

{aas_http_client-0.3.8 → aas_http_client-0.3.9}/tests/test_wrapper.py

@@ -62,14 +62,14 @@ def shared_sme_float() -> model.Property:
 @pytest.fixture(scope="module")
 def shared_sm() -> model.Submodel:
     # create a Submodel
-    submodel = model_builder.create_base_submodel("sm_http_client_unit_tests", "")
+    submodel = model_builder.create_base_submodel(identifier="fluid40/sm_http_client_unit_tests", id_short="sm_http_client_unit_tests")
     submodel.category = "Unit Test"
     return submodel
 
 @pytest.fixture(scope="module")
 def shared_aas(shared_sm: model.Submodel) -> model.AssetAdministrationShell:
     # create an AAS
-    aas = model_builder.create_base_ass(id_short="aas_http_client_unit_tests", namespace="")
+    aas = model_builder.create_base_ass(identifier="fluid40/aas_http_client_unit_tests", id_short="aas_http_client_unit_tests")
 
     # add Submodel to AAS
     sdk_tools.add_submodel_to_aas(aas, shared_sm)
@@ -163,7 +163,8 @@ def test_005a_put_asset_administration_shell_by_id(wrapper: SdkWrapper, shared_a
 def test_005b_put_asset_administration_shell_by_id(wrapper: SdkWrapper, shared_aas: model.AssetAdministrationShell):
     # put with other ID
     id_short = "put_short_id"
-    asset_info = model_builder.create_base_asset_information(id_short)
+    identifier = f"fluid40/{id_short}"
+    asset_info = model_builder.create_base_asset_information(identifier)
     aas = model.AssetAdministrationShell(id_=asset_info.global_asset_id, asset_information=asset_info)
     aas.id_short = id_short
 
@@ -268,7 +269,7 @@ def test_012_patch_submodel_by_id(wrapper: SdkWrapper, shared_sm: model.Submodel
         assert len(submodel.submodel_element) == len(shared_sm.submodel_element)
 
 def test_013_put_submodel_by_id_aas_repository(wrapper: SdkWrapper, shared_aas: model.AssetAdministrationShell, shared_sm: model.Submodel):
-    sm = model.Submodel(shared_sm.id_short)
+    sm = model.Submodel(shared_sm.id)
     sm.id_short = shared_sm.id_short
 
     description_text = "Put via shell description for unit tests"
@@ -301,7 +302,7 @@ def test_013_put_submodel_by_id_aas_repository(wrapper: SdkWrapper, shared_aas:
         wrapper.put_submodel_by_id_aas_repository(shared_aas.id, shared_sm.id, shared_sm)  # Restore original submodel
 
 def test_014_put_submodels_by_id(wrapper: SdkWrapper, shared_sm: model.Submodel):
-    sm = model.Submodel(shared_sm.id_short)
+    sm = model.Submodel(shared_sm.id)
     sm.id_short = shared_sm.id_short
 
     description_text = "Put description for unit tests"