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

aas_http_client/client.py

@@ -577,19 +577,19 @@ def create_client_by_url(
     connection_time_out: int = 60,
     ssl_verify: str = True,  # noqa: FBT002
 ) -> AasHttpClient | None:
-    """Create a AAS HTTP client from the given parameters.
+    """Create a HTTP client 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 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 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
-    :return: An instance of AasHttpClient initialized with the provided parameters.
+    :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
+    :return: An instance of Http client initialized with the provided parameters.
     """
-    logger.info(f"Create BaSyx server interface client from URL '{base_url}'")
+    logger.info(f"Create AAS server http client from URL '{base_url}'")
     config_dict: dict[str, str] = {}
     config_dict["base_url"] = base_url
     config_dict["username"] = username
@@ -598,19 +598,31 @@ def create_client_by_url(
     config_dict["time_out"] = time_out
     config_dict["connection_time_out"] = connection_time_out
     config_dict["ssl_verify"] = ssl_verify
-    config_string = json.dumps(config_dict, indent=4)
+    return create_client_by_dict(config_dict, password)
+
+
+def create_client_by_dict(configuration: dict, password: str = "") -> AasHttpClient | None:
+    """Create a HTTP client for a AAS server connection from the given configuration.
+
+    :param configuration: Dictionary containing the BaSyx server connection settings.
+    :param password: Password for the AAS server, defaults to ""_
+    :return: An instance of Http client initialized with the provided parameters.
+    """
+    logger.info(f"Create AAS server http client from configuration '{configuration}'")
+    config_string = json.dumps(configuration, indent=4)
+
     return _create_client(config_string, password)
 
 
 def create_client_by_config(config_file: Path, password: str = "") -> AasHttpClient | None:
-    """Create a AAS HTTP client from the given parameters.
+    """Create a HTTP client 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 config_file: Path to the configuration file containing the AAS server connection settings.
     :param password: password for the BaSyx server interface client, defaults to ""_
-    :return: An instance of HttpClient initialized with the provided parameters.
+    :return: An instance of Http client initialized with the provided parameters.
     """
     config_file = config_file.resolve()
-    logger.info(f"Create AAS HTTP client from Configuration file '{config_file}'")
+    logger.info(f"Create AAS server http client from configuration file '{config_file}'")
     if not config_file.exists():
         config_string = "{}"
         logger.warning(f"Configuration file '{config_file}' not found. Using default configuration.")

aas_http_client/wrapper/sdk_wrapper.py

@@ -19,6 +19,20 @@ class SdkWrapper:
     _client: AasHttpClient = None
     base_url: str = ""
 
+    def __init__(self, config_string: str, password: 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 "".
+        """
+        client = _create_client(config_string, password)
+
+        if not client:
+            raise ValueError("Failed to create AAS HTTP client with the provided configuration.")
+
+        self._client = client
+        self.base_url = client.base_url
+
     # region shells
 
     def post_asset_administration_shell(self, aas: model.AssetAdministrationShell) -> model.AssetAdministrationShell | None:
@@ -266,6 +280,8 @@ class SdkWrapper:
 
 # endregion
 
+# region utils
+
 
 def _to_object(content: dict) -> Any | None:
     try:
@@ -287,6 +303,8 @@ def _to_dict(object: Any) -> dict | None:
         return None
 
 
+# endregion
+
 # region wrapper
 
 
@@ -300,7 +318,7 @@ def create_wrapper_by_url(
     connection_time_out: int = 60,
     ssl_verify: str = True,  # noqa: FBT002
 ) -> SdkWrapper | None:
-    """Create a wrapper for the BaSyx Python SDK from the given parameters.
+    """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 ""_
@@ -312,7 +330,7 @@ def create_wrapper_by_url(
     :param ssl_verify: whether to verify SSL certificates, defaults to True
     :return: An instance of SdkWrapper initialized with the provided parameters.
     """
-    logger.info(f"Create BaSyx Python SDK wrapper from URL '{base_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
@@ -321,43 +339,36 @@ def create_wrapper_by_url(
     config_dict["time_out"] = time_out
     config_dict["connection_time_out"] = connection_time_out
     config_dict["ssl_verify"] = ssl_verify
-    config_string = json.dumps(config_dict, indent=4)
+    return create_wrapper_by_dict(config_dict, password)
 
-    wrapper = SdkWrapper()
-    client = _create_client(config_string, password)
 
-    if not client:
-        return None
+def create_wrapper_by_dict(configuration: dict, password: str = "") -> SdkWrapper | None:
+    """Create a wrapper for a AAS server connection from the given configuration.
 
-    wrapper._client = client
-    wrapper.base_url = client.base_url
-    return wrapper
+    :param config: Dictionary containing the BaSyx server connection settings.
+    :param password: Password for the BaSyx server interface client, defaults to "".
+    :return: An instance of SdkWrapper initialized with the provided parameters.
+    """
+    logger.info(f"Create AAS server wrapper from configuration '{configuration}'")
+    config_string = json.dumps(configuration, indent=4)
+    return SdkWrapper(config_string, password)
 
 
 def create_wrapper_by_config(config_file: Path, password: str = "") -> SdkWrapper | None:
-    """Create a wrapper for the BaSyx Python SDK from the given parameters.
+    """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 ""_
     :return: An instance of SdkWrapper initialized with the provided parameters.
     """
-    logger.info(f"Create BaSyx Python SDK wrapper from configuration file '{config_file}'")
+    logger.info(f"Create AAS wrapper client from configuration file '{config_file}'")
     if not config_file.exists():
         config_string = "{}"
         logger.warning(f"Configuration file '{config_file}' not found. Using default config.")
     else:
         config_string = config_file.read_text(encoding="utf-8")
         logger.debug(f"Configuration file '{config_file}' found.")
-
-    wrapper = SdkWrapper()
-    client = _create_client(config_string, password)
-
-    if not client:
-        return None
-
-    wrapper._client = client
-    wrapper.base_url = client.base_url
-    return wrapper
+    return SdkWrapper(config_string, password)
 
 
 # endregion

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

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

@@ -1,14 +1,14 @@
 aas_http_client/__init__.py,sha256=cAr1mQzWp0G0LKtkAOYzc9t95OY3jM3Aj4bKnxx0Dso,901
-aas_http_client/client.py,sha256=neuEMk1lyOHOgVv3OBzNeXDWEtkN4qfox-hMRjtDWHM,25350
+aas_http_client/client.py,sha256=tangqT-KJgI28y-CrPPWVc26ZEik4IfgZBjmakkG4lU,25930
 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=pphxkTwnaoG44hOqelwnqBWupGfDX2ExBDhAdZNFQuQ,13512
-aas_http_client-0.3.1.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
-aas_http_client-0.3.1.dist-info/METADATA,sha256=LAC3u23U1X84glQ5zg77p3oPn-pl1mAOGHOgYaWsTdU,10467
-aas_http_client-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.3.1.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.3.1.dist-info/RECORD,,
+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,,