aas-http-client 0.3.4__tar.gz → 0.3.6__tar.gz

{aas_http_client-0.3.4 → aas_http_client-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.4
+Version: 0.3.6
 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.4 → aas_http_client-0.3.6}/aas_http_client/client.py

@@ -80,6 +80,7 @@ class AasHttpClient(BaseModel):
     time_out: int = 200
     connection_time_out: int = 100
     ssl_verify: bool = True
+    trust_env: bool = True
     _session: Session = PrivateAttr(default=None)
 
     def initialize(self, password: str):
@@ -93,6 +94,7 @@ class AasHttpClient(BaseModel):
         self._session = requests.Session()
         self._session.auth = HTTPBasicAuth(self.username, password)
         self._session.verify = self.ssl_verify
+        self._session.trust_env = self.trust_env
 
         if self.https_proxy:
             self._session.proxies.update({"https": self.https_proxy})
@@ -600,6 +602,7 @@ def create_client_by_url(
     time_out: int = 200,
     connection_time_out: int = 60,
     ssl_verify: str = True,  # noqa: FBT002
+    trust_env: bool = True,  # noqa: FBT001, FBT002
 ) -> AasHttpClient | None:
     """Create a HTTP client for a AAS server connection from the given parameters.
 
@@ -611,6 +614,7 @@ def create_client_by_url(
     :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
+    :param trust_env: Whether to trust environment variables for proxy settings, defaults to True
     :return: An instance of Http client initialized with the provided parameters.
     """
     logger.info(f"Create AAS server http client from URL '{base_url}'")
@@ -622,6 +626,7 @@ 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_dict["trust_env"] = trust_env
     return create_client_by_dict(config_dict, password)
 
 

{aas_http_client-0.3.4 → aas_http_client-0.3.6}/aas_http_client/demo/demo_process.py

@@ -31,8 +31,8 @@ def start() -> None:
     # add submodel to AAS
     model_builder.add_submodel_to_aas(aas, submodel)
 
-    wrapper = _create_sdk_wrapper(Path("./aas_http_client/demo/python_server_config.json"))
-    # dotnet_sdk_wrapper = _create_sdk_wrapper(Path("./aas_http_client/demo/dotnet_server_config.json"))
+    wrapper = _create_sdk_wrapper(Path("./aas_http_client/demo/python_server_config.yml"))
+    # dotnet_sdk_wrapper = _create_sdk_wrapper(Path("./aas_http_client/demo/dotnet_server_config.yml"))
 
     for existing_shell in wrapper.get_all_asset_administration_shells():
         logger.warning(f"Delete shell '{existing_shell.id}'")

{aas_http_client-0.3.4 → aas_http_client-0.3.6}/aas_http_client/wrapper/sdk_wrapper.py

@@ -335,6 +335,7 @@ def create_wrapper_by_url(
     time_out: int = 200,
     connection_time_out: int = 60,
     ssl_verify: str = True,  # noqa: FBT002
+    trust_env: bool = True,  # noqa: FBT001, FBT002
 ) -> SdkWrapper | None:
     """Create a wrapper for a AAS server connection from the given parameters.
 
@@ -346,6 +347,7 @@ def create_wrapper_by_url(
     :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
+    :param trust_env: Whether to trust environment variables for proxy settings, defaults to True
     :return: An instance of SdkWrapper initialized with the provided parameters.
     """
     logger.info(f"Create AAS server wrapper from URL '{base_url}'")
@@ -357,6 +359,7 @@ 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_dict["trust_env"] = trust_env
     return create_wrapper_by_dict(config_dict, password)
 
 

{aas_http_client-0.3.4 → aas_http_client-0.3.6}/aas_http_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.4
+Version: 0.3.6
 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.4 → aas_http_client-0.3.6}/aas_http_client.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ aas_http_client.egg-info/top_level.txt
 aas_http_client/core/encoder.py
 aas_http_client/core/version_check.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/model_builder.py
 aas_http_client/wrapper/sdk_wrapper.py

{aas_http_client-0.3.4 → aas_http_client-0.3.6}/pyproject.toml

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

{aas_http_client-0.3.4 → aas_http_client-0.3.6}/tests/test_client.py

@@ -11,9 +11,9 @@ JAVA_SERVER_PORTS = [8075]
 PYTHON_SERVER_PORTS = [8080, 80]
 
 CONFIG_FILES = [
-    "./tests/server_configs/test_dotnet_server_config.json",
-    "./tests/server_configs/test_java_server_config.json",
-    "./tests/server_configs/test_python_server_config.json"
+    "./tests/server_configs/test_dotnet_server_config.yml",
+    "./tests/server_configs/test_java_server_config.yml",
+    "./tests/server_configs/test_python_server_config.yml"
 ]
 
 # CONFIG_FILES = [

{aas_http_client-0.3.4 → aas_http_client-0.3.6}/tests/test_wrapper.py

@@ -11,9 +11,9 @@ PYTHON_SERVER_PORTS = [8080, 80]
 DOTNET_SERVER_PORTS = [5043]
 
 CONFIG_FILES = [
-    "./tests/server_configs/test_dotnet_server_config.json",
-    "./tests/server_configs/test_java_server_config.json",
-    "./tests/server_configs/test_python_server_config.json"
+    "./tests/server_configs/test_dotnet_server_config.yml",
+    "./tests/server_configs/test_java_server_config.yml",
+    "./tests/server_configs/test_python_server_config.yml"
 ]
 
 # CONFIG_FILES = [

aas_http_client-0.3.4/aas_http_client/demo/logging_handler.py

@@ -1,177 +0,0 @@
-"""
-Logging handler.
-
-This module contains all methods and functions to handle the logging.
-"""
-
-import json
-import logging
-import queue
-import sys
-import uuid
-from datetime import UTC, datetime
-from logging.handlers import QueueHandler
-from pathlib import Path
-from typing import ClassVar
-
-from pythonjsonlogger import jsonlogger
-
-LOG_FOLDER: str = "./_log"
-LOG_FILE_SUFFIX: str = "_log.json"
-
-
-class ColorCodes:
-    """Define the color codes for the console output."""
-
-    grey = "\x1b[38;21m"
-    green = "\x1b[1;32m"
-    yellow = "\x1b[33;21m"
-    red = "\x1b[31;21m"
-    bold_red = "\x1b[31;1m"
-    blue = "\x1b[1;34m"
-    light_blue = "\x1b[1;36m"
-    purple = "\x1b[1;35m"
-    reset = "\x1b[0m"
-
-
-class CustomConsoleFormatter(logging.Formatter):
-    """Custom console formatter for logging with colored level.
-
-    :param logging: formatter
-    """
-
-    FORMATS: ClassVar[dict] = {
-        logging.DEBUG: ColorCodes.blue + "%(levelname)s" + ColorCodes.reset + ":   %(message)s (%(filename)s:%(lineno)d)",
-        logging.INFO: ColorCodes.green + "%(levelname)s" + ColorCodes.reset + ":   %(message)s",
-        logging.WARNING: ColorCodes.yellow + "%(levelname)s" + ColorCodes.reset + ":   %(message)s",
-        logging.ERROR: ColorCodes.red + "%(levelname)s" + ColorCodes.reset + ":    %(message)s (%(filename)s:%(lineno)d)",
-        logging.CRITICAL: ColorCodes.bold_red + "%(levelname)s:  %(message)s (%(filename)s:%(lineno)d)" + ColorCodes.reset,
-    }
-
-    def format(self, record) -> str:
-        """Format the log record.
-
-        :param record: record to format
-        :return: formatted record
-        """
-        log_fmt = self.FORMATS.get(record.levelno)
-        formatter = logging.Formatter(log_fmt)
-        return formatter.format(record)
-
-
-def _handle_file_rotation(log_file_path: Path, max_file_count: int = 5) -> None:
-    log_folder: Path = log_file_path.resolve()
-
-    if max_file_count < 1:
-        return
-
-    if not log_folder.exists():
-        return
-
-    existing_log_files: list[Path] = [file for file in log_folder.iterdir() if file.name.endswith(LOG_FILE_SUFFIX)]
-
-    if len(existing_log_files) < max_file_count:
-        return
-
-    existing_log_files.sort(key=lambda x: x.stat().st_ctime)
-
-    files_to_delete: int = len(existing_log_files) - (max_file_count - 1)
-
-    for file in existing_log_files[:files_to_delete]:
-        file.unlink()
-
-    return
-
-
-def initialize_logging(console_level=logging.INFO) -> Path:
-    """Initialize the standard logging.
-
-    :param debug_mode_status: Status of the debug mode
-    :param log_file_name: Name of the (path and extension)
-    """
-    log_path = Path(LOG_FOLDER).resolve()
-    log_path.mkdir(parents=True, exist_ok=True)
-
-    log_file_path = log_path / "api.log"
-
-    log_file_format = "%(asctime)s %(levelname)s: %(message)s   (%(filename)s:%(lineno)d)"
-    logging.basicConfig(
-        filename=log_file_path,
-        level=logging.DEBUG,
-        format=log_file_format,
-        filemode="w",
-    )
-
-    # set console logging
-    console_handler = logging.StreamHandler()
-    console_handler.setLevel(console_level)
-    console_handler.setFormatter(CustomConsoleFormatter())
-    logging.getLogger("").addHandler(console_handler)
-
-    # set queue logging
-    log_queue: queue.Queue = queue.Queue(-1)  # Use default max size
-    queue_handler = QueueHandler(log_queue)
-    logging.getLogger("").addHandler(queue_handler)
-
-    logger = logging.getLogger(__name__)
-    script_path = Path(sys.argv[0])
-    python_version = sys.version.replace("\n", "")
-
-    print("")
-    logger.info(f"Run script '{script_path.name.replace('.py', '')}'")
-    logger.info(f"Script executed by Python v{python_version}")
-    logger.info("Logging initialized")
-
-    return log_file_path.resolve()
-
-
-def read_log_file_as_list(log_file_path: Path) -> list[dict]:
-    """Read the log file as a list of dictionaries (Json conform).
-
-    :param log_file_path: Path to the log file
-    :return: list of dictionaries (Json conform)
-    """
-    with Path.open(log_file_path, "r", encoding="utf-8") as f:
-        return [json.loads(line) for line in f if line.strip()]
-
-
-def set_log_file(
-    max_log_files: int = 10,
-) -> Path:
-    """Set the log file.
-
-    :param max_log_files: max number of log files in folder, defaults to 5
-    :return: log file path
-    """
-    logger = logging.getLogger()  # Get the root logger
-
-    # Remove all existing file handlers
-    for handler in logger.handlers[:]:
-        if isinstance(handler, logging.FileHandler):
-            logger.removeHandler(handler)
-            handler.close()
-
-    now = datetime.now(tz=UTC)
-    time_string = now.strftime("%Y-%m-%d_%H-%M-%S")
-
-    # handle log file and folder
-    log_path: Path = Path(LOG_FOLDER).resolve()
-    log_path = Path(LOG_FOLDER, "runtime").resolve()
-
-    log_path.mkdir(parents=True, exist_ok=True)
-    log_file_name = f"{uuid.uuid4().hex}{LOG_FILE_SUFFIX}"
-    log_file_path = log_path / f"{time_string}_{log_file_name}"
-
-    _handle_file_rotation(log_path, max_log_files)
-
-    # Add a new file handler with the new log file path
-    json_formatter = jsonlogger.JsonFormatter("%(asctime)s %(levelname)s %(name)s %(message)s %(filename)s %(lineno)d")
-    json_file_handler = logging.FileHandler(log_file_path, mode="w")
-    json_file_handler.setFormatter(json_formatter)
-    json_file_handler.setLevel(logging.DEBUG)
-    logger.addHandler(json_file_handler)
-
-    logging.info(f"Maximum log file number is: {max_log_files}")  # noqa: LOG015
-    logging.info(f"Write log file to: '{log_file_path}'")  # noqa: LOG015
-
-    return log_file_path.resolve()