aas-http-client 0.3.9__tar.gz → 0.4.1__tar.gz

{aas_http_client-0.3.9 → aas_http_client-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aas-http-client
-Version: 0.3.9
+Version: 0.4.1
 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.1/aas_http_client/__init__.py

@@ -0,0 +1,31 @@
+import importlib.metadata
+from datetime import datetime, timezone
+
+__copyright__ = f"Copyright (C) {datetime.now(tz=timezone.utc).year} :em engineering methods AG. All rights reserved."
+__author__ = "Daniel Klein"
+
+try:
+    __version__ = importlib.metadata.version(__name__)
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "0.0.0-dev"
+
+__project__ = "aas-http-client"
+__package__ = "aas-http-client"
+
+from aas_http_client.client import AasHttpClient, create_client_by_config, create_client_by_url
+from aas_http_client.core.version_check import check_for_update
+from aas_http_client.utilities import model_builder, sdk_tools
+from aas_http_client.wrapper.sdk_wrapper import SdkWrapper, create_wrapper_by_config, create_wrapper_by_url
+
+check_for_update()
+
+__all__ = [
+    "create_client_by_config",
+    "create_client_by_url",
+    "AasHttpClient",
+    "model_builder",
+    "create_wrapper_by_config",
+    "create_wrapper_by_url",
+    "SdkWrapper",
+    "sdk_tools",
+]

{aas_http_client-0.3.9 → aas_http_client-0.4.1}/aas_http_client/demo/demo_process.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from basyx.aas import model
 
 from aas_http_client.client import AasHttpClient, create_client_by_config
-from aas_http_client.utilities import model_builder
+from aas_http_client.utilities import model_builder, sdk_tools
 from aas_http_client.wrapper.sdk_wrapper import SdkWrapper, create_wrapper_by_config
 
 logger = logging.getLogger(__name__)
@@ -17,6 +17,7 @@ def start() -> None:
     # create a submodel element
     sme_short_id: str = model_builder.create_unique_short_id("poc_sme")
     sme = model_builder.create_base_submodel_element_property(sme_short_id, model.datatypes.String, "Sample Value")
+    clone = model_builder.clone_submodel_element_property(sme)
 
     # create a submodel
     sm_short_id: str = model_builder.create_unique_short_id("poc_sm")
@@ -29,7 +30,7 @@ def start() -> None:
     aas = model_builder.create_base_ass(aas_short_id)
 
     # add submodel to AAS
-    model_builder.add_submodel_to_aas(aas, submodel)
+    sdk_tools.add_submodel_to_aas(aas, submodel)
 
     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"))

aas_http_client-0.4.1/aas_http_client/demo/logging_handler.py

@@ -0,0 +1,177 @@
+"""
+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.9 → aas_http_client-0.4.1}/aas_http_client/utilities/model_builder.py

@@ -39,6 +39,27 @@ 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)
+    sme.description = property.description
+    sme.display_name = property.display_name
+    sme.value = property.value
+    sme.value_type = property.value_type
+    sme.semantic_id = property.semantic_id
+    sme.qualifier = property.qualifier
+    sme.category = property.category
+    sme.extension = property.extension
+    sme.embedded_data_specifications = property.embedded_data_specifications
+    sme.namespace_element_sets = property.namespace_element_sets
+    sme.supplemental_semantic_id = property.supplemental_semantic_id
+    sme.value_id = property.value_id
+    sme.value_type = property.value_type
+    sme.parent = property.parent
+
+    return sme
+
+
 def create_base_submodel(identifier: str, id_short: str, display_name: str = "", description: str = "") -> model.Submodel:
     """Create a basic Submodel.
 

{aas_http_client-0.3.9 → aas_http_client-0.4.1}/aas_http_client/utilities/sdk_tools.py

@@ -16,10 +16,18 @@ def add_submodel_to_aas(aas: model.AssetAdministrationShell, submodel: model.Sub
     :param aas: provided AssetAdministrationShell to which the Submodel should be added
     :param submodel: given Submodel to add
     """
-    # aas.submodel.add(submodel)
     aas.submodel.add(model.ModelReference.from_referable(submodel))
 
 
+def remove_submodel_from_aas(aas: model.AssetAdministrationShell, submodel: model.Submodel) -> None:
+    """Remove a given Submodel correctly from a provided AssetAdministrationShell.
+
+    :param aas: provided AssetAdministrationShell from which the Submodel should be removed
+    :param submodel: given Submodel to remove
+    """
+    aas.submodel.remove(model.ModelReference.from_referable(submodel))
+
+
 def convert_to_object(content: dict) -> Any | None:
     """Convert a dictionary to a BaSyx SDK framework object.
 

{aas_http_client-0.3.9 → aas_http_client-0.4.1}/aas_http_client.egg-info/PKG-INFO

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

@@ -11,6 +11,7 @@ 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/utilities/sdk_tools.py

{aas_http_client-0.3.9 → aas_http_client-0.4.1}/pyproject.toml

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

aas_http_client-0.3.9/aas_http_client/__init__.py

@@ -1,22 +0,0 @@
-from datetime import datetime
-import importlib.metadata
-
-__copyright__ = f"Copyright (C) {datetime.now().year} :em engineering methods AG. All rights reserved."
-__author__ = "Daniel Klein"
-
-try:
-    __version__ = importlib.metadata.version(__name__)
-except importlib.metadata.PackageNotFoundError:
-    __version__ = "0.0.0-dev"
-    
-__project__ = "aas-http-client"
-__package__ = "aas-http-client"
-
-from aas_http_client.core.version_check import check_for_update
-from aas_http_client.client import create_client_by_config, create_client_by_url, AasHttpClient
-from aas_http_client.utilities import model_builder
-from aas_http_client.wrapper.sdk_wrapper import create_wrapper_by_config, create_wrapper_by_url, SdkWrapper
-
-check_for_update()
-
-__all__ = ["create_client_by_config", "create_client_by_url", "AasHttpClient", "model_builder", "create_wrapper_by_config", "create_wrapper_by_url", "SdkWrapper"]