aas-http-client 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

aas_http_client/client.py

@@ -75,12 +75,12 @@ class AasHttpClient(BaseModel):
 
     base_url: str = "http://javaaasserver:5060/"
     username: str | None = None
-    _password: str | None = PrivateAttr(default=None)
     https_proxy: str | None = None
     http_proxy: str | None = None
     time_out: int = 200
     connection_time_out: int = 100
     ssl_verify: bool = True
+    trust_env: bool = False
     _session: Session = PrivateAttr(default=None)
 
     def initialize(self, password: str):
@@ -88,14 +88,13 @@ class AasHttpClient(BaseModel):
 
         :param password: password
         """
-        self._password = password
-
         if self.base_url.endswith("/"):
             self.base_url = self.base_url[:-1]
 
         self._session = requests.Session()
-        self._session.auth = HTTPBasicAuth(self.username, self._password)
+        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})
@@ -660,11 +659,11 @@ def create_client_by_config(config_file: Path, password: str = "") -> AasHttpCli
     return _create_client(config_string, password)
 
 
-def _create_client(config_string: str, password) -> AasHttpClient | None:
+def _create_client(config_string: str, password: str) -> AasHttpClient | None:
     try:
         client = AasHttpClient.model_validate_json(config_string)
     except ValidationError as ve:
-        raise ValidationError(f"Invalid BaSyx server connection file: {ve}") from ve
+        raise ValidationError(f"Invalid BaSyx server configuration file: {ve}") from ve
 
     logger.info(
         f"Using server configuration: '{client.base_url}' | "

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/wrapper/sdk_wrapper.py

@@ -288,8 +288,15 @@ class SdkWrapper:
         """
         return self._client.patch_submodel_element_by_path_value_only_submodel_repo(submodel_id, submodel_element_path, value)
 
+    # endregion
+
+    def get_client(self) -> AasHttpClient:
+        """Returns the underlying AAS HTTP client.
+
+        :return: The AAS HTTP client instance.
+        """
+        return self._client
 
-# endregion
 
 # region utils
 

{aas_http_client-0.3.3.dist-info → aas_http_client-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.3
+Version: 0.3.5
 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.5.dist-info/RECORD

@@ -0,0 +1,13 @@
+aas_http_client/__init__.py,sha256=cAr1mQzWp0G0LKtkAOYzc9t95OY3jM3Aj4bKnxx0Dso,901
+aas_http_client/client.py,sha256=OJc5gm2AziSABhDU0exxUt_pTcGXXmD-4jJ0-aq0_rQ,27031
+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=J-f5CEvCQYfqDoMzM2EgQhHFfTXdZDgbmIus8dB8iiQ,3299
+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=dSckMIbFJ_9wFvYKVjWNPIofcl5aINk43nIY3Un0ht4,15197
+aas_http_client-0.3.5.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
+aas_http_client-0.3.5.dist-info/METADATA,sha256=D9g2hkwHjAbRyxMyp7c3Vd6JwHwWzFBXGs8jdF8RJcg,10467
+aas_http_client-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aas_http_client-0.3.5.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
+aas_http_client-0.3.5.dist-info/RECORD,,

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()

aas_http_client-0.3.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-aas_http_client/__init__.py,sha256=cAr1mQzWp0G0LKtkAOYzc9t95OY3jM3Aj4bKnxx0Dso,901
-aas_http_client/client.py,sha256=LXqhMLkNO9Itu9Pj369vJurBCd0kiqvhrgnahEmkUtI,27041
-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=KOPcnW0SrpoH6Z6ycDtzSmMdbk2MHj_UqbEbKGgGfWA,15010
-aas_http_client-0.3.3.dist-info/licenses/LICENSE,sha256=ayt4HY-Tjoe1Uvj47j6UdNq8mEufKcKFangurChIHxQ,5990
-aas_http_client-0.3.3.dist-info/METADATA,sha256=RtgD4C2wO1BBzPXRaU7xVRxZHuGuSQX6M7ca5B-tJHM,10467
-aas_http_client-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aas_http_client-0.3.3.dist-info/top_level.txt,sha256=vzvoz2vjeTLwpuz-Y-eEfoQ7T3byoaKshVlFMFH5NaM,16
-aas_http_client-0.3.3.dist-info/RECORD,,