aas-http-client 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

aas_http_client/client.py

@@ -788,10 +788,10 @@ def create_client_by_url(
     """Create a HTTP client for a AAS server connection from the given parameters.
 
     :param base_url: Base URL of the AAS server, e.g. "http://basyx_python_server:80/"_
-    :param username: Username for the AAS server, defaults to ""_
-    :param password: Password for the AAS server, defaults to ""_
-    :param http_proxy: http proxy URL, defaults to ""_
-    :param https_proxy: https proxy URL, defaults to ""_
+    :param username: Username for the AAS server, defaults to ""
+    :param basic_auth_password: password for the BaSyx server basic auth, defaults to ""
+    :param http_proxy: http proxy URL, defaults to ""
+    :param https_proxy: https proxy URL, defaults to ""
     :param time_out: Timeout for the API calls, defaults to 200
     :param connection_time_out: Timeout for the connection to the API, defaults to 60
     :param ssl_verify: Whether to verify SSL certificates, defaults to True

aas_http_client/demo/demo_process.py

@@ -101,7 +101,7 @@ def _create_sdk_wrapper(config: Path) -> sdk_wrapper.SdkWrapper:
     """
     try:
         file = config
-        client = sdk_wrapper.create_wrapper_by_config(file, password="")
+        client = sdk_wrapper.create_wrapper_by_config(file, basic_auth_password="")
 
     except Exception as e:
         logger.error(f"Failed to create client for {file}: {e}")

aas_http_client/wrapper/sdk_wrapper.py

@@ -19,13 +19,13 @@ class SdkWrapper:
     _client: AasHttpClient = None
     base_url: str = ""
 
-    def __init__(self, config_string: str, password: str = ""):
+    def __init__(self, config_string: str, basic_auth_password: str = "", service_provider_auth_client_secret: str = ""):
         """Initializes the wrapper with the given configuration.
 
         :param config_string: Configuration string for the BaSyx server connection.
-        :param password: Password for the BaSyx server interface client, defaults to "".
+        :param basic_auth_password: Password for the BaSyx server interface client, defaults to "".
         """
-        client = _create_client(config_string, password, "")
+        client = _create_client(config_string, basic_auth_password, service_provider_auth_client_secret)
 
         if not client:
             raise ValueError("Failed to create AAS HTTP client with the provided configuration.")
@@ -317,8 +317,11 @@ class SdkWrapper:
 
 def create_wrapper_by_url(
     base_url: str,
-    username: str = "",
-    password: str = "",
+    basic_auth_username: str = "",
+    basic_auth_password: str = "",
+    service_provider_auth_client_id: str = "",
+    service_provider_auth_client_secret: str = "",
+    service_provider_auth_token_url: str = "",
     http_proxy: str = "",
     https_proxy: str = "",
     time_out: int = 200,
@@ -328,11 +331,11 @@ def create_wrapper_by_url(
 ) -> SdkWrapper | None:
     """Create a wrapper for a AAS server connection from the given parameters.
 
-    :param base_url: base URL of the BaSyx server, e.g. "http://basyx_python_server:80/"_
-    :param username: username for the BaSyx server interface client, defaults to ""_
-    :param password: password for the BaSyx server interface client, defaults to ""_
-    :param http_proxy: http proxy URL, defaults to ""_
-    :param https_proxy: https proxy URL, defaults to ""_
+    :param base_url: base URL of the BaSyx server, e.g. "http://basyx_python_server:80/"
+    :param basic_auth_username: username for the BaSyx server interface client, defaults to ""
+    :param basic_auth_password: password for the BaSyx server basic auth, defaults to ""
+    :param http_proxy: http proxy URL, defaults to ""
+    :param https_proxy: https proxy URL, defaults to ""
     :param time_out: timeout for the API calls, defaults to 200
     :param connection_time_out: timeout for the connection to the API, defaults to 60
     :param ssl_verify: whether to verify SSL certificates, defaults to True
@@ -342,33 +345,42 @@ def create_wrapper_by_url(
     logger.info(f"Create AAS server wrapper from URL '{base_url}'.")
     config_dict: dict[str, str] = {}
     config_dict["base_url"] = base_url
-    config_dict["username"] = username
     config_dict["http_proxy"] = http_proxy
     config_dict["https_proxy"] = https_proxy
     config_dict["time_out"] = time_out
     config_dict["connection_time_out"] = connection_time_out
     config_dict["ssl_verify"] = ssl_verify
     config_dict["trust_env"] = trust_env
-    return create_wrapper_by_dict(config_dict, password)
 
+    if basic_auth_password and basic_auth_username:
+        config_dict["basic_auth"] = {"username": basic_auth_username}
 
-def create_wrapper_by_dict(configuration: dict, password: str = "") -> SdkWrapper | None:
+    if service_provider_auth_client_id and service_provider_auth_client_secret and service_provider_auth_token_url:
+        config_dict["service_provider_auth"] = {
+            "client_id": service_provider_auth_client_id,
+            "token_url": service_provider_auth_token_url,
+        }
+
+    return create_wrapper_by_dict(config_dict, basic_auth_password)
+
+
+def create_wrapper_by_dict(configuration: dict, basic_auth_password: str = "", service_provider_auth_client_secret: str = "") -> SdkWrapper | None:
     """Create a wrapper for a AAS server connection from the given configuration.
 
     :param config: Dictionary containing the BaSyx server connection settings.
-    :param password: Password for the BaSyx server interface client, defaults to "".
+    :param basic_auth_password: password for the BaSyx server basic auth, defaults to ""
     :return: An instance of SdkWrapper initialized with the provided parameters.
     """
     logger.info("Create AAS server wrapper from dictionary.")
     config_string = json.dumps(configuration, indent=4)
-    return SdkWrapper(config_string, password)
+    return SdkWrapper(config_string, basic_auth_password, service_provider_auth_client_secret)
 
 
-def create_wrapper_by_config(config_file: Path, password: str = "") -> SdkWrapper | None:
+def create_wrapper_by_config(config_file: Path, basic_auth_password: str = "", service_provider_auth_client_secret: str = "") -> SdkWrapper | None:
     """Create a wrapper for a AAS server connection from a given configuration file.
 
     :param config_file: Path to the configuration file containing the BaSyx server connection settings.
-    :param password: password for the BaSyx server interface client, defaults to ""_
+    :param basic_auth_password: password for the BaSyx server basic auth, defaults to ""
     :return: An instance of SdkWrapper initialized with the provided parameters.
     """
     logger.info(f"Create AAS wrapper client from configuration file '{config_file}'.")
@@ -378,7 +390,7 @@ def create_wrapper_by_config(config_file: Path, password: str = "") -> SdkWrappe
     else:
         config_string = config_file.read_text(encoding="utf-8")
         logger.debug(f"Configuration file '{config_file}' found.")
-    return SdkWrapper(config_string, password)
+    return SdkWrapper(config_string, basic_auth_password, service_provider_auth_client_secret)
 
 
 # endregion

{aas_http_client-0.4.3.dist-info → aas_http_client-0.4.4.dist-info}/METADATA

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

@@ -1,16 +1,16 @@
 aas_http_client/__init__.py,sha256=bBfrdXUHvukisXIj0CcnNUHUw8_7nrdnfQRve8nM_3U,982
-aas_http_client/client.py,sha256=KL1xT6ZIfjdz4EVZXEPrMyIgPbN622zetr_lr7gWW1k,35438
+aas_http_client/client.py,sha256=wU6IhAR5F52EF7XCZokQ79cGpGEFBDl22_nalsxg5mQ,35458
 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=WBTdiVf1CD3qHCCIFo__JE5ljL5yuCR1DibWO_NM1HA,3960
+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/sdk_tools.py,sha256=CDD0mus8jOi-irgPO6dQHulmEyu8BSG_05Mol_nirK0,2008
-aas_http_client/wrapper/sdk_wrapper.py,sha256=GUftL_FiK7FMHhKifD-Y-zMSrmhd3fXysA-ycPxh_0s,15544
-aas_http_client-0.4.3.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
-aas_http_client-0.4.3.dist-info/METADATA,sha256=aTEPdPs4Uj-Ffzny_XFuRmyCI1L70cpGEfzwfak63B0,10467
-aas_http_client-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.4.3.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.4.3.dist-info/RECORD,,
+aas_http_client/wrapper/sdk_wrapper.py,sha256=OneN_9rtFSYUjnQWFcQneg8cih5YhkyLER4NZTAgUR0,16443
+aas_http_client-0.4.4.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
+aas_http_client-0.4.4.dist-info/METADATA,sha256=Hc-PAH5vOcsBfFbI_DmubGpPfM6g1C6G85pFqeby9uM,10467
+aas_http_client-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_http_client-0.4.4.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
+aas_http_client-0.4.4.dist-info/RECORD,,