aas-http-client 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

aas_http_client/client.py

@@ -4,6 +4,7 @@ import json
 import logging
 import time
 from pathlib import Path
+from typing import Any
 
 import basyx.aas.adapter.json
 import basyx.aas.adapter.json.json_serialization as js
@@ -26,7 +27,7 @@ STATUS_CODE_404 = 404
 HEADERS = {"Content-Type": "application/json"}
 
 
-def log_response_errors(response: Response):
+def log_response_errors(response: Response):  # noqa: C901
     """Create error messages from the response and log them.
 
     :param response: response
@@ -74,7 +75,6 @@ class AasHttpClient(BaseModel):
 
     base_url: str = "http://javaaasserver:5060/"
     username: str | None = None
-    _password: str | None = PrivateAttr(default=None)
     https_proxy: str | None = None
     http_proxy: str | None = None
     time_out: int = 200
@@ -87,13 +87,11 @@ class AasHttpClient(BaseModel):
 
         :param password: password
         """
-        self._password = password
-
         if self.base_url.endswith("/"):
             self.base_url = self.base_url[:-1]
 
         self._session = requests.Session()
-        self._session.auth = HTTPBasicAuth(self.username, self._password)
+        self._session.auth = HTTPBasicAuth(self.username, password)
         self._session.verify = self.ssl_verify
 
         if self.https_proxy:
@@ -561,6 +559,32 @@ class AasHttpClient(BaseModel):
 
         return True
 
+    def patch_submodel_element_by_path_value_only_submodel_repo(self, submodel_id: str, submodel_element_path: str, value: str) -> bool:
+        """Updates the value of an existing SubmodelElement.
+
+        :param submodel_id: Encoded ID of the Submodel to update submodel element for
+        :param submodel_element_path: Path of the Submodel element to update
+        :param value: Submodel element value to update as string
+        :return: True if the patch was successful, False otherwise
+        """
+        decoded_submodel_id: str = decode_base_64(submodel_id)
+
+        url = f"{self.base_url}/submodels/{decoded_submodel_id}/submodel-elements/{submodel_element_path}/$value"
+
+        try:
+            response = self._session.patch(url, headers=HEADERS, json=value, timeout=self.time_out)
+            logger.debug(f"Call REST API url '{response.url}'")
+
+            if response.status_code != STATUS_CODE_204:
+                log_response_errors(response)
+                return False
+
+        except requests.exceptions.RequestException as e:
+            logger.error(f"Error call REST API: {e}")
+            return False
+
+        return True
+
 
 # endregion
 
@@ -633,12 +657,11 @@ def create_client_by_config(config_file: Path, password: str = "") -> AasHttpCli
     return _create_client(config_string, password)
 
 
-def _create_client(config_string: str, password) -> AasHttpClient | None:
+def _create_client(config_string: str, password: str) -> AasHttpClient | None:
     try:
-        connection_settings = AasHttpClient.model_validate_json(config_string)
-        client = AasHttpClient(**connection_settings.model_dump())
+        client = AasHttpClient.model_validate_json(config_string)
     except ValidationError as ve:
-        raise ValidationError(f"Invalid BaSyx server connection file: {ve}") from ve
+        raise ValidationError(f"Invalid BaSyx server configuration file: {ve}") from ve
 
     logger.info(
         f"Using server configuration: '{client.base_url}' | "

aas_http_client/wrapper/sdk_wrapper.py

@@ -275,10 +275,28 @@ class SdkWrapper:
         :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)
+        print(content)
         return _to_object(content)
 
+    def patch_submodel_element_by_path_value_only_submodel_repo(self, submodel_id: str, submodel_element_path: str, value: str) -> bool:
+        """Updates the value of an existing SubmodelElement.
+
+        :param submodel_id: Encoded ID of the Submodel to update submodel element for
+        :param submodel_element_path: Path of the Submodel element to update
+        :param value: Submodel element value to update as string
+        :return: True if the patch was successful, False otherwise
+        """
+        return self._client.patch_submodel_element_by_path_value_only_submodel_repo(submodel_id, submodel_element_path, value)
+
+    # endregion
+
+    def get_client(self) -> AasHttpClient:
+        """Returns the underlying AAS HTTP client.
+
+        :return: The AAS HTTP client instance.
+        """
+        return self._client
 
-# endregion
 
 # region utils
 

{aas_http_client-0.3.2.dist-info → aas_http_client-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.2
+Version: 0.3.4
 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.2.dist-info → aas_http_client-0.3.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 aas_http_client/__init__.py,sha256=cAr1mQzWp0G0LKtkAOYzc9t95OY3jM3Aj4bKnxx0Dso,901
-aas_http_client/client.py,sha256=tangqT-KJgI28y-CrPPWVc26ZEik4IfgZBjmakkG4lU,25930
+aas_http_client/client.py,sha256=DFflDiU7oyDQ98-X4KQlkFDKQFN3_hqBd723n_h-NkE,26954
 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=6sN_N3QbA4iLUmzeg1Y_XOwVAuDNtwkR4grAg7EkjWM,3301
 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=EUqVvKgXiyJNtyUeFrL6ronfF4hiF1KCipxSaLj6EiE,4465
-aas_http_client/wrapper/sdk_wrapper.py,sha256=SU-JZwT4O_bOGfjlBUrN_GIJXrSNY8NvfDCGWC7zCOk,14353
-aas_http_client-0.3.2.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
-aas_http_client-0.3.2.dist-info/METADATA,sha256=etLzP5usn0WyK9ovOEUctZKzDdPOMrCfa3HtbsN0_zQ,10467
-aas_http_client-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.3.2.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.3.2.dist-info/RECORD,,
+aas_http_client/wrapper/sdk_wrapper.py,sha256=dSckMIbFJ_9wFvYKVjWNPIofcl5aINk43nIY3Un0ht4,15197
+aas_http_client-0.3.4.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
+aas_http_client-0.3.4.dist-info/METADATA,sha256=Iel95Gsqa7EywECf0qFN1IuMCbK6hlwk_rNzm0_IqgE,10467
+aas_http_client-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_http_client-0.3.4.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
+aas_http_client-0.3.4.dist-info/RECORD,,