aas-http-client 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

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/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/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.dist-info → aas_http_client-0.1.7.dist-info}/METADATA

@@ -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.dist-info → aas_http_client-0.1.7.dist-info}/RECORD

@@ -1,15 +1,15 @@
-aas_http_client/__init__.py,sha256=M9EBVZcs0jg7v0RaziftjGcOzNET8gsgJ_-oRXNZxDo,657
-aas_http_client/client.py,sha256=3I29OJJUPd2tP_46dDntyvzAlcFQHrMD2iEfc_mpn2I,21428
+aas_http_client/__init__.py,sha256=cAr1mQzWp0G0LKtkAOYzc9t95OY3jM3Aj4bKnxx0Dso,901
+aas_http_client/client.py,sha256=KppHWikO21T8Z_JP-bbc9DeyCsgFXQ6xTQoOfETJmcU,20672
 aas_http_client/core/encoder.py,sha256=FS7P0FPakzFsGz70eRFDHQZFA_2nlKLlWIxavtnFrPg,660
 aas_http_client/core/version_check.py,sha256=721Zs3xSRrJTYZtAxkaUWg9LLKtpU7oFM62DzQHZdE4,705
 aas_http_client/demo/demo_process.py,sha256=-9-oQEi_B08W-POl2SVP4COodGPHN3mTw9rrPgLLpeY,2170
 aas_http_client/demo/logging_handler.py,sha256=VJtZ4u3x_LhYZQtfNck7FuXhGFZm7gid0uDhvf9GjJ8,5596
 aas_http_client/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aas_http_client/utilities/model_builder.py,sha256=bDK9cOrU4vlkQTHTgmeiVftQduKSZSKGAX10weSHQWs,3756
+aas_http_client/utilities/model_builder.py,sha256=jOFTvZPDG08VgrkkRgw0SZz1e_NjVi_Kx2Ty8lqp35I,3886
 aas_http_client/wrapper/python_sdk_wrapper_tmp.py,sha256=J1ze7TXKMiOjA5dDVNrc-GRoxQ_9r7rU8qW8C0yErG0,24206
 aas_http_client/wrapper/sdk_wrapper.py,sha256=sUfdawn9TWNbs7YELBTuMKBhiqd_eeQwk-AmzPWgLII,11117
-aas_http_client-0.1.5.dist-info/licenses/LICENSE,sha256=simqYMD2P9Ikm0Kh9n7VGNpaVcm2TMVVQmECYZ_xVZ8,1065
-aas_http_client-0.1.5.dist-info/METADATA,sha256=0W3KjbyhUkX7Pva9H8Mgl5dhgPl-r7Yce3ni_6w5ajI,2754
-aas_http_client-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.1.5.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.1.5.dist-info/RECORD,,
+aas_http_client-0.1.7.dist-info/licenses/LICENSE,sha256=simqYMD2P9Ikm0Kh9n7VGNpaVcm2TMVVQmECYZ_xVZ8,1065
+aas_http_client-0.1.7.dist-info/METADATA,sha256=WwFnZPlDsH_T8MLPyYvaFPM2PpX8XSl5yUUscqiuMrI,2654
+aas_http_client-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_http_client-0.1.7.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
+aas_http_client-0.1.7.dist-info/RECORD,,