aas-http-client 1.2.4__tar.gz → 1.2.6__tar.gz

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 1.2.4
+Version: 1.2.6
 Summary: Flexible Python HTTP client for communication with various types of AAS servers.
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/aas_http_client/classes/client/aas_client.py

@@ -22,6 +22,7 @@ from aas_http_client.classes.client.implementations import (
     get_token,
 )
 from aas_http_client.classes.Configuration.config_classes import AuthenticationConfig
+from aas_http_client.utilities.constants import LogIntensity
 from aas_http_client.utilities.http_helper import (
     STATUS_CODE_200,
     STATUS_CODE_201,
@@ -75,6 +76,7 @@ class AasHttpClient(BaseModel):
     experimental: ExperimentalImplementation | None = Field(default=None)
     submodel_registry: SubmodelRegistryImplementation | None = Field(default=None)
     _cached_token: TokenData | None = PrivateAttr(default=None)
+    _log_intensity: LogIntensity = PrivateAttr(default=LogIntensity.High)
 
     def initialize(self):
         """Initialize the AasHttpClient with the given URL, username and password."""
@@ -107,6 +109,20 @@ class AasHttpClient(BaseModel):
         self.submodel_registry = SubmodelRegistryImplementation(self)
         self.experimental = ExperimentalImplementation(self)
 
+    def set_log_intensity(self, intensity: LogIntensity):
+        """Set the log intensity level for the client.
+
+        :param intensity: LogIntensity level to set (Standard or High)
+        """
+        self._log_intensity = intensity
+
+    def get_log_intensity(self) -> LogIntensity:
+        """Get the log intensity level for the client.
+
+        :return: The current LogIntensity level (Standard or High)
+        """
+        return self._log_intensity
+
     def get_auth_method(self) -> AuthMethod:
         """Get the authentication method used by the client.
 

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/aas_http_client/classes/client/implementations/experimental_implementation.py

@@ -5,6 +5,8 @@ import mimetypes
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from aas_http_client.utilities.constants import LogIntensity
+
 if TYPE_CHECKING:
     from aas_http_client.classes.client.aas_client import AasHttpClient
 
@@ -14,6 +16,7 @@ from pydantic import BaseModel
 from aas_http_client.utilities.encoder import encode_base_64
 from aas_http_client.utilities.http_helper import (
     STATUS_CODE_200,
+    STATUS_CODE_201,
     STATUS_CODE_204,
     STATUS_CODE_404,
     log_response,
@@ -49,7 +52,11 @@ class ExperimentalImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning("Concept descriptions not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning("Concept descriptions not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug("Concept descriptions not found.")
+
                 _logger.debug(response.text)
                 return None
 
@@ -79,7 +86,11 @@ class ExperimentalImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Concept description with id '{concept_description_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Concept description with id '{concept_description_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Concept description with id '{concept_description_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return None
 
@@ -109,11 +120,49 @@ class ExperimentalImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning("Concept descriptions endpoint not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning("Concept descriptions endpoint not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug("Concept descriptions endpoint not found.")
+
                 _logger.debug(response.text)
                 return False
 
-            if response.status_code != STATUS_CODE_200:
+            if response.status_code != STATUS_CODE_201:
+                log_response(response)
+                return False
+
+        except requests.exceptions.RequestException as e:
+            _logger.error(f"Error calling REST API: {e}")
+            return False
+
+        return True
+
+    # DELETE /concept-descriptions/{conceptDescriptionIdentifier}
+    def delete_concept_description_by_id(self, concept_description_identifier: str) -> bool:
+        """Deletes a specific concept description by its identifier. Experimental feature - may not be supported by all servers.
+
+        :param concept_description_identifier: The unique identifier of the concept description
+        :return: True if deletion was successful, False otherwise
+        """
+        url = f"{self._client.base_url}/concept-descriptions/{concept_description_identifier}"
+
+        self._client.set_token()  # ensures Authorization header is set
+
+        try:
+            response = self._session.delete(url, timeout=self._client.time_out)
+            _logger.debug(f"Call REST API url '{response.url}'")
+
+            if response.status_code == STATUS_CODE_404:
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Concept description with id '{concept_description_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Concept description with id '{concept_description_identifier}' not found.")
+
+                _logger.debug(response.text)
+                return False
+
+            if response.status_code != STATUS_CODE_204:
                 log_response(response)
                 return False
 
@@ -143,9 +192,15 @@ class ExperimentalImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(
-                    f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' or file content not found."
-                )
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(
+                        f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' or file content not found."
+                    )
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(
+                        f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' or file content not found."
+                    )
+
                 _logger.debug(response.text)
                 return None
 
@@ -189,7 +244,11 @@ class ExperimentalImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+
                 _logger.debug(response.text)
                 return False
 
@@ -234,7 +293,11 @@ class ExperimentalImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+
                 _logger.debug(response.text)
                 return False
 
@@ -269,7 +332,11 @@ class ExperimentalImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == 404:
-                _logger.warning(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Submodel with id '{submodel_identifier}' or Submodel element with IDShort path '{id_short_path}' not found.")
+
                 return False
 
             if response.status_code != STATUS_CODE_200:

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/aas_http_client/classes/client/implementations/shell_implementation.py

@@ -12,6 +12,7 @@ from pydantic import BaseModel
 if TYPE_CHECKING:
     from aas_http_client.classes.client.aas_client import AasHttpClient
 
+from aas_http_client.utilities.constants import LogIntensity
 from aas_http_client.utilities.encoder import encode_base_64
 from aas_http_client.utilities.http_helper import (
     STATUS_CODE_200,
@@ -34,7 +35,7 @@ class ShellRepoImplementation(BaseModel):
         session = client.get_session()
         if session is None:
             raise ValueError(
-                "HTTP session is not initialized in the client. Call 'initialize()' method of the client before creating SubmodelRegistryImplementation instance."
+                "HTTP session is not initialized in the client. Call 'initialize()' method of the client before creating ShellRepoImplementation instance."
             )
 
         self._session: requests.Session = session
@@ -58,7 +59,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return None
 
@@ -92,12 +97,16 @@ class ShellRepoImplementation(BaseModel):
             response = self._session.put(url, json=request_body, timeout=self._client.time_out)
             _logger.debug(f"Call REST API url '{response.url}'")
 
-            if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+            if response.status_code == STATUS_CODE_404:  #
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return False
 
-            if response.status_code is not STATUS_CODE_204:
+            if response.status_code != STATUS_CODE_204:
                 log_response(response)
                 return False
 
@@ -126,7 +135,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return False
 
@@ -159,7 +172,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or thumbnail file not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or thumbnail file not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' or thumbnail file not found.")
+
                 _logger.debug(response.text)
                 return None
 
@@ -224,7 +241,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return False
 
@@ -258,7 +279,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or thumbnail file not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or thumbnail file not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' or thumbnail file not found.")
+
                 _logger.debug(response.text)
                 return False
 
@@ -370,7 +395,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return None
 
@@ -405,7 +434,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return None
 
@@ -441,7 +474,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return False
 
@@ -479,7 +516,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return False
 
@@ -512,7 +553,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return None
 
@@ -548,7 +593,11 @@ class ShellRepoImplementation(BaseModel):
             _logger.debug(f"Call REST API url '{response.url}'")
 
             if response.status_code == STATUS_CODE_404:
-                _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+                if self._client.get_log_intensity() == LogIntensity.High:
+                    _logger.warning(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+                elif self._client.get_log_intensity() == LogIntensity.Standard:
+                    _logger.debug(f"Asset Administration Shell with id '{aas_identifier}' or submodel with id '{submodel_identifier}' not found.")
+
                 _logger.debug(response.text)
                 return None
 

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/aas_http_client/classes/wrapper/sdk_wrapper.py

@@ -21,6 +21,7 @@ from aas_http_client.classes.wrapper.pagination import (
     create_submodel_element_paging_data,
     create_submodel_paging_data,
 )
+from aas_http_client.utilities.constants import LogIntensity
 from aas_http_client.utilities.sdk_tools import convert_to_dict as _to_dict
 from aas_http_client.utilities.sdk_tools import convert_to_object as _to_object
 
@@ -123,6 +124,13 @@ class SdkWrapper:
         self._client = client
         self.base_url = client.base_url
 
+    def set_log_intensity(self, intensity: LogIntensity):
+        """Sets the log intensity level for the client.
+
+        :param intensity: LogIntensity level to set (Standard or High)
+        """
+        self._client.set_log_intensity(intensity)
+
     def set_encoded_ids(self, encoded_ids: IdEncoding):
         """Sets whether to use encoded IDs for API requests.
 

aas_http_client-1.2.6/aas_http_client/utilities/constants.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+
+class LogIntensity(Enum):
+    """Log intensity levels for the AAS HTTP client. Higher levels produce more detailed logs (e.g. for item not found). Standard level only logs critical errors and warnings."""
+
+    Standard = 1
+    High = 2

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/aas_http_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 1.2.4
+Version: 1.2.6
 Summary: Flexible Python HTTP client for communication with various types of AAS servers.
 Author-email: Daniel Klein <daniel.klein@em.ag>
 License: MIT License

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/aas_http_client.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ aas_http_client/classes/wrapper/sdk_wrapper.py
 aas_http_client/demo/demo_process.py
 aas_http_client/demo/logging_handler.py
 aas_http_client/utilities/__init__.py
+aas_http_client/utilities/constants.py
 aas_http_client/utilities/encoder.py
 aas_http_client/utilities/http_helper.py
 aas_http_client/utilities/model_builder.py

{aas_http_client-1.2.4 → aas_http_client-1.2.6}/pyproject.toml

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