aas-http-client 0.2.7__tar.gz → 0.2.9__tar.gz

{aas_http_client-0.2.7 → aas_http_client-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.2.7
+Version: 0.2.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.2.7 → aas_http_client-0.2.9}/aas_http_client/client.py

@@ -510,6 +510,32 @@ class AasHttpClient(BaseModel):
         content = response.content.decode("utf-8")
         return json.loads(content)
 
+    def get_submodel_element_by_path_submodel_repo(self, submodel_id: str, submodel_element_path: str) -> dict | None:
+        """Returns a specific submodel element from the Submodel at a specified path.
+
+        :param submodel_id: Encoded ID of the Submodel to retrieve element from
+        :param submodel_element_path: Path of the Submodel element to retrieve
+        :return: Submodel element data or None if an error occurred
+        """
+        decoded_submodel_id: str = decode_base_64(submodel_id)
+
+        url = f"{self.base_url}/submodels/{decoded_submodel_id}/submodel-elements/{submodel_element_path}"
+
+        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)
+
 
 # endregion
 

{aas_http_client-0.2.7 → aas_http_client-0.2.9}/aas_http_client/wrapper/sdk_wrapper.py

@@ -253,6 +253,16 @@ class SdkWrapper:
         content: dict = self._client.post_submodel_element_submodel_repo(submodel_id, sme_data)
         return _to_object(content)
 
+    def get_submodel_element_by_path_submodel_repo(self, submodel_id: str, submodel_element_path: str) -> model.SubmodelElement | None:
+        """Returns a specific submodel element from the Submodel at a specified path.
+
+        :param submodel_id: Encoded ID of the Submodel to retrieve element from
+        :param submodel_element_path: Path of the Submodel element to retrieve
+        :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)
+        return _to_object(content)
+
 
 # endregion
 
@@ -260,6 +270,7 @@ class SdkWrapper:
 def _to_object(content: dict) -> Any | None:
     try:
         dict_string = json.dumps(content)
+        print(dict_string)
         return json.loads(dict_string, cls=basyx.aas.adapter.json.AASFromJsonDecoder)
     except Exception as e:
         logger.error(f"Decoding error: {e}")

{aas_http_client-0.2.7 → aas_http_client-0.2.9}/aas_http_client.egg-info/PKG-INFO

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

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

{aas_http_client-0.2.7 → aas_http_client-0.2.9}/tests/test_client.py

@@ -354,9 +354,16 @@ def test_016_post_submodel_element_submodel_repo(client: AasHttpClient, shared_s
 
     get_result = client.get_all_submodel_elements_submodel_repository(shared_sm.id)
 
-    parsed = urlparse(client.base_url)
     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)
+
+    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", "")
+
 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)
 

{aas_http_client-0.2.7 → aas_http_client-0.2.9}/tests/test_wrapper.py

@@ -7,6 +7,7 @@ from urllib.parse import urlparse
 
 JAVA_SERVER_PORTS = [8075]
 PYTHON_SERVER_PORTS = [8080, 80]
+DOTNET_SERVER_PORTS = [5043]
 
 CONFIG_FILES = [
     "./tests/server_configs/test_dotnet_server_config.json",
@@ -296,20 +297,38 @@ def test_016_post_submodel_element_submodel_repo(wrapper: SdkWrapper, shared_sm:
 
     assert submodel_element is not None
 
-    # currently only dict is returned
+    parsed = urlparse(wrapper.base_url)
+    if int(parsed.port) in DOTNET_SERVER_PORTS:
+        # NOTE: dotNet server provides a wrong representation of submodel elements
+        return
 
-    # property: model.Property = submodel_element
+    assert isinstance(submodel_element, model.Property)
 
-    # assert property.id_short == shared_sme.id_short
-    # assert property.description.get("em", "") == shared_sme.description.get("en", "")
-    # assert property.display_name.get("em", "")  == shared_sme.display_name.get("en", "")
-    # assert property.value == shared_sme.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", "")
 
     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)
+
+    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)
+
+    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", "")
+
 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)