aas-http-client 0.4.5__py3-none-any.whl → 0.4.7__py3-none-any.whl

aas_http_client/client.py

@@ -62,7 +62,8 @@ def log_response_errors(response: Response):  # noqa: C901
             result_error_messages.append(response.text)
 
     except json.JSONDecodeError:
-        result_error_messages.append(response.content)
+        if response.content and response.content != "b''":
+            result_error_messages.append(response.content)
 
     logger.error(f"Status code: {response.status_code}")
     for result_error_message in result_error_messages:
@@ -729,14 +730,7 @@ def get_token_by_basic_auth(endpoint: str, username: str, password: str, timeout
 
     auth = HTTPBasicAuth(username, password)
 
-    try:
-        response = requests.post(endpoint, auth=auth, data=data, timeout=timeout)
-        logger.info(f"Request URL: {response.url}")
-        response.raise_for_status()
-        return response.json().get("access_token")
-    except requests.RequestException as e:
-        logger.error(f"Error getting token: {e}")
-        return None
+    return _get_token(endpoint, data, auth, timeout)
 
 
 def get_token_by_password(endpoint: str, username: str, password: str, timeout=200) -> dict | None:
@@ -750,10 +744,10 @@ def get_token_by_password(endpoint: str, username: str, password: str, timeout=2
     """
     data = {"grant_type": "password", "username": username, "password": password}
 
-    return _get_token(endpoint, data, timeout)
+    return _get_token(endpoint, data, None, timeout)
 
 
-def _get_token(endpoint: str, data: dict[str, str], timeout: int = 200) -> dict | None:
+def _get_token(endpoint: str, data: dict[str, str], auth: HTTPBasicAuth | None = None, timeout: int = 200) -> dict | None:
     """Get token from a specific authentication service provider.
 
     :param endpoint: Get token endpoint for the authentication service provider
@@ -762,13 +756,20 @@ def _get_token(endpoint: str, data: dict[str, str], timeout: int = 200) -> dict
     :return: Access token or None if an error occurred
     """
     try:
-        response = requests.post(endpoint, json=data, timeout=timeout)
-        logger.info(f"Request URL: {response.url}")
-        response.raise_for_status()
-        return response.json().get("access_token")
-    except requests.RequestException as e:
-        logger.error(f"Error getting token: {e}")
-        return None
+        response = requests.post(endpoint, auth=auth, data=data, timeout=timeout)
+        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 False
+
+    content = response.content.decode("utf-8")
+    data = json.loads(content)
+    return data.get("access_token", None)
 
 
 def create_client_by_url(

aas_http_client/utilities/model_builder.py

@@ -39,9 +39,15 @@ def create_base_submodel_element_property(
     return sme
 
 
-def clone_submodel_element_property(property: model.Property) -> model.Property:
-    """Clone a SubmodelElement of type Property."""
-    sme = model.Property(id_short=property.id_short, value_type=property.value_type, value=property.value)
+def clone_submodel_element_property(property: model.Property, new_id_short: str) -> model.Property:
+    """Clones a given property.
+
+    :param property: Given property to clone
+    :param new_id_short: New ID short for the cloned property.
+    :return: Cloned property
+    """
+    sme = model.Property(id_short=new_id_short, value_type=property.value_type, value=property.value)
+
     sme.description = property.description
     sme.display_name = property.display_name
     sme.value = property.value

{aas_http_client-0.4.5.dist-info → aas_http_client-0.4.7.dist-info}/METADATA

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

@@ -1,16 +1,16 @@
 aas_http_client/__init__.py,sha256=bBfrdXUHvukisXIj0CcnNUHUw8_7nrdnfQRve8nM_3U,982
-aas_http_client/client.py,sha256=nanCcuT3dKYN-mH8QFlu0Huz_YxPTz6lnRUYvhGHCvw,35453
+aas_http_client/client.py,sha256=1FXkYzyHQQVBKzx0lzfYJVATyrezbeb1xZChErfPCKQ,35452
 aas_http_client/classes/auth_classes.py,sha256=us1oDlBpI7R3xp2pcr9ZJ_AAaM65J-g8neq-d1M2FHw,619
 aas_http_client/core/encoder.py,sha256=FS7P0FPakzFsGz70eRFDHQZFA_2nlKLlWIxavtnFrPg,660
 aas_http_client/core/version_check.py,sha256=9dR0Q6jCFygH_ctj4vyrjerpHvolT87ayengZFlBWCw,708
 aas_http_client/demo/demo_process.py,sha256=uCyvotKWRItlhjNX7ek7ek3r5gXZ3jSARvvzcKhzyqw,3971
 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=SxAv8DJkKksykw_2gtTV2jHu-MRzevOVzspn807_7VA,4680
+aas_http_client/utilities/model_builder.py,sha256=l-Y8p5SLFwCWvSqukO_pF5Ncv5_oZ3MGoKgVrqkVwPw,4821
 aas_http_client/utilities/sdk_tools.py,sha256=CDD0mus8jOi-irgPO6dQHulmEyu8BSG_05Mol_nirK0,2008
 aas_http_client/wrapper/sdk_wrapper.py,sha256=OneN_9rtFSYUjnQWFcQneg8cih5YhkyLER4NZTAgUR0,16443
-aas_http_client-0.4.5.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
-aas_http_client-0.4.5.dist-info/METADATA,sha256=oqndOuniDMjxkEvJgBpmyvgyCmbFtJxvACEzqFV3msQ,10467
-aas_http_client-0.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.4.5.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.4.5.dist-info/RECORD,,
+aas_http_client-0.4.7.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
+aas_http_client-0.4.7.dist-info/METADATA,sha256=dP54xG69lpc5D-OhzXvDuU_zlg27GFWm_fzGLfhXFQA,10467
+aas_http_client-0.4.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_http_client-0.4.7.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
+aas_http_client-0.4.7.dist-info/RECORD,,