holado 0.8.2__tar.gz → 0.13.13.dev6__tar.gz

holado-0.13.13.dev6/.gitlab-ci.yml

@@ -0,0 +1,270 @@
+stages:
+  - publish-holado-dockerhub
+  - publish-holado-gitlab
+  - publish-test-server-dockerhub
+  - publish-test-server-gitlab
+  - publish-host-controller-dockerhub
+  - publish-host-controller-gitlab
+  - publish-host-viewer-dockerhub
+  - publish-host-viewer-gitlab
+#  - publish-holado-pypi
+
+variables:
+  DOCKER_IMAGE_TAG: "26.1"
+  PYTHON_IMAGE_TAG: "3.12"
+
+
+publish-holado-dockerhub-latest:
+  stage: publish-holado-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+  
+  variables:
+    IMAGE_TAG: index.docker.io/holado/python:latest
+
+  script:
+    - docker build -t ${IMAGE_TAG} .
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+
+publish-holado-dockerhub-tag:
+  stage: publish-holado-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/python:$CI_COMMIT_TAG
+
+  script:
+    - docker build -t ${IMAGE_TAG} .
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+
+publish-holado-gitlab:
+  stage: publish-holado-gitlab
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+
+  variables:
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  script:
+    - docker build -t ${IMAGE_TAG} .
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push ${IMAGE_TAG}
+    
+
+
+publish-test-server-dockerhub-latest:
+  stage: publish-test-server-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/test_server:latest
+
+  script:
+    - docker build ./src/holado_test/tools/test_server/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+  when: manual
+
+publish-test-server-dockerhub-tag:
+  stage: publish-test-server-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/test_server:$CI_COMMIT_TAG
+
+  script:
+    - docker build ./src/holado_test/tools/test_server/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+  when: manual
+
+publish-test-server-gitlab:
+  stage: publish-test-server-gitlab
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+  script:
+    - docker build ./src/holado_test/tools/test_server/server/ -t ${IMAGE_TAG}
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+      when: never
+  when: manual
+
+
+
+publish-host-controller-dockerhub-latest:
+  stage: publish-host-controller-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/host_controller:latest
+
+  script:
+    - docker build ./src/holado_tools/tools/host_controller/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+  when: manual
+
+publish-host-controller-dockerhub-tag:
+  stage: publish-host-controller-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/host_controller:$CI_COMMIT_TAG
+
+  script:
+    - docker build ./src/holado_tools/tools/host_controller/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+  when: manual
+
+publish-host-controller-gitlab:
+  stage: publish-host-controller-gitlab
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+  script:
+    - docker build ./src/holado_tools/tools/host_controller/server/ -t ${IMAGE_TAG}
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+      when: never
+  when: manual
+
+
+
+publish-host-viewer-dockerhub-latest:
+  stage: publish-host-viewer-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/host_viewer:latest
+
+  script:
+    - docker build ./src/holado_tools/tools/host_viewer/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+  when: manual
+
+publish-host-viewer-dockerhub-tag:
+  stage: publish-host-viewer-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/host_viewer:$CI_COMMIT_TAG
+
+  script:
+    - docker build ./src/holado_tools/tools/host_viewer/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+  when: manual
+
+publish-host-viewer-gitlab:
+  stage: publish-host-viewer-gitlab
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+  script:
+    - docker build ./src/holado_tools/tools/host_viewer/server/ -t ${IMAGE_TAG}
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+      when: never
+  when: manual
+
+
+
+# publish-holado-pypi:
+#   stage: publish-holado-pypi
+# 
+#   image:
+#     name: python:${PYTHON_IMAGE_TAG}
+# 
+#   script:
+#     - apt-get update -q -y
+#     - apt-get install -y python-pip
+#     - shopt -s expand_aliases
+#     - alias python=python3
+# #     - echo "$CI_COMMIT_TAG" > ./packaging/VERSION
+#     - ./packaging/generate_distribution_archive.sh
+#     - TWINE_PASSWORD=${PYPI_TOKEN} TWINE_USERNAME=__token__ ./packaging/publish_distribution_archive.sh
+#     
+#  rules:
+#    - if: $CI_COMMIT_TAG =~ /\d+\.\d+\.\d+.*/
+
+
+  

{holado-0.8.2 → holado-0.13.13.dev6}/Dockerfile

@@ -2,10 +2,9 @@
 
 ### Build
 
-#FROM python:3.10.15-alpine3.20 AS build
-#FROM python:3.11.10-alpine3.20 AS build
-#FROM python:3.12.8-alpine3.21 AS build
-FROM python:3.12.9-alpine3.21 AS build
+#FROM python:3.12.9-alpine3.21 AS build
+#FROM python:3.12.12-alpine3.21 AS build
+FROM python:3.12.12-alpine3.22 AS build
 #FROM python:3.13.2-alpine3.21 AS build
 
 # Install to build python requirements
@@ -39,16 +38,15 @@ WORKDIR /code/holado/python
 # Create python venv and install requirements
 RUN python -m venv /code/env \
     && source /code/env/bin/activate \
-    && pip install -r requirements_docker.txt
+    && pip install --no-cache-dir -r requirements_docker.txt
 
 
 
 ### Runtime
 
-#FROM python:3.10.15-alpine3.20 AS runtime
-#FROM python:3.11.10-alpine3.20 AS runtime
-#FROM python:3.12.8-alpine3.21 AS runtime
-FROM python:3.12.9-alpine3.21 AS runtime
+#FROM python:3.12.9-alpine3.21 AS runtime
+#FROM python:3.12.12-alpine3.21 AS runtime
+FROM python:3.12.12-alpine3.22 AS runtime
 #FROM python:3.13.2-alpine3.21 AS runtime
 
 # Install for python requirements

{holado-0.8.2 → holado-0.13.13.dev6}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.8.2
+Version: 0.13.13.dev6
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues
 Author-email: Eric Klumpp <eric.klumpp@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
-Keywords: AIS,BDD,Behavior Driver Development,Behaviour Driven Development,DB,Protobuf,REST,RabbitMQ,Redis,S3,Specification By Example,Web Services,YAML,automation,docker,functional test,gRPC,logging,multitask,script,test,test automation
+Keywords: AIS,BDD,Behavior Driver Development,Behaviour Driven Development,DB,Protobuf,REST,RabbitMQ,Redis,S3,Specification By Example,Web Services,XML,YAML,automation,docker,functional test,gRPC,logging,multitask,script,test,test automation
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -15,11 +15,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
-Requires-Dist: behave==1.2.7.dev6
+Requires-Dist: behave
 Requires-Dist: psutil
 Requires-Dist: pypika
 Requires-Dist: python-dateutil
 Requires-Dist: sql-metadata
+Requires-Dist: xmltodict
 Provides-Extra: ais
 Requires-Dist: pyais; extra == 'ais'
 Provides-Extra: all
@@ -39,6 +40,7 @@ Requires-Dist: minio; extra == 'all'
 Requires-Dist: moto; extra == 'all'
 Requires-Dist: paramiko<4.0.0; extra == 'all'
 Requires-Dist: pika; extra == 'all'
+Requires-Dist: prettytable; extra == 'all'
 Requires-Dist: protobuf; extra == 'all'
 Requires-Dist: psycopg; extra == 'all'
 Requires-Dist: psycopg-binary; extra == 'all'
@@ -59,9 +61,7 @@ Requires-Dist: psycopg; extra == 'db-postgresql'
 Requires-Dist: psycopg-binary; extra == 'db-postgresql'
 Provides-Extra: docker
 Requires-Dist: docker; extra == 'docker'
-Provides-Extra: docker-tools
-Requires-Dist: connexion[flask,swagger-ui,uvicorn]; extra == 'docker-tools'
-Requires-Dist: docker; extra == 'docker-tools'
+Requires-Dist: prettytable; extra == 'docker'
 Provides-Extra: grpc
 Requires-Dist: google; extra == 'grpc'
 Requires-Dist: google-api-core; extra == 'grpc'

{holado-0.8.2 → holado-0.13.13.dev6}/build/Dockerfile_with_docker

@@ -1,6 +1,7 @@
 ### Build
 
-FROM python:3.12.9-alpine3.21 AS build
+#FROM python:3.12.9-alpine3.21 AS build
+FROM python:3.12.12-alpine3.22 AS build
 
 # Install to build python requirements
 RUN apk update \
@@ -39,7 +40,8 @@ RUN python -m venv /code/env \
 
 ### Runtime
 
-FROM python:3.12.9-alpine3.21 AS runtime
+#FROM python:3.12.9-alpine3.21 AS runtime
+FROM python:3.12.12-alpine3.22 AS runtime
 
 # Install for python requirements
 RUN apk update \

holado-0.13.13.dev6/packaging/VERSION

@@ -0,0 +1 @@
+0.13.13.dev6

{holado-0.8.2 → holado-0.13.13.dev6}/pyproject.toml

@@ -25,24 +25,25 @@ keywords = [
     "automation", "test", "test automation", "functional test", "script", 
     "Specification By Example", "BDD", "Behavior Driver Development", "Behaviour Driven Development", 
     "AIS", "logging", "DB", "docker", "gRPC", "multitask", "Protobuf", 
-    "RabbitMQ", "Redis", "REST", "S3", "Web Services", "YAML"]
+    "RabbitMQ", "Redis", "REST", "S3", "Web Services", "XML", "YAML"]
 dependencies = [
-  "behave==1.2.7.dev6",
+  "behave",
   "python-dateutil",
   "psutil",
   # For sqlite DB internal needs
-  "pypika", "sql_metadata"
+  "pypika", "sql_metadata",
+  # For reports in xml format
+  "xmltodict"
 ]
 
 [project.optional-dependencies]
-all = ["holado[ais]", "holado[api-connexion]", "holado[db-postgresql]", "holado[docker]", "holado[docker-tools]", 
+all = ["holado[ais]", "holado[api-connexion]", "holado[db-postgresql]", "holado[docker]", 
        "holado[helper_debug]", "holado[protobuf]", "holado[grpc]", "holado[rabbitmq]", "holado[redis]", 
        "holado[s3]", "holado[sftp]", "holado[ssl]", "holado[ws-zeep]", "holado[yaml]" ]
 ais = ["pyais"]
 api-connexion = ["connexion[flask,swagger-ui,uvicorn]"]
 db-postgresql = ["psycopg", "psycopg_binary"]
-docker = ["docker"]
-docker-tools = ["holado[docker]", "holado[api-connexion]"]
+docker = ["docker", "prettytable"]
 helper_debug = ["pympler"]
 grpc = ["holado[protobuf]", "grpc_requests", "grpcio", "grpcio-reflection", "grpcio-tools"]
 protobuf = ["google", "google-api-core", "protobuf"]
@@ -70,7 +71,7 @@ packages = ["src/holado", "src/holado_ais", "src/holado_binary", "src/holado_con
     "src/holado_keycloak", "src/holado_logging", "src/holado_multitask", "src/holado_protobuf", "src/holado_python", 
     "src/holado_rabbitmq", "src/holado_redis", "src/holado_report", "src/holado_rest", "src/holado_s3", 
     "src/holado_scripting", "src/holado_sftp", "src/holado_swagger", "src/holado_system", "src/holado_test", 
-    "src/holado_value", "src/holado_ws", "src/holado_yaml",
+    "src/holado_tools", "src/holado_value", "src/holado_ws", "src/holado_xml", "src/holado_yaml",
     "tests/behave/test_holado"]
 
 

{holado-0.8.2 → holado-0.13.13.dev6}/requirements_docker.txt

@@ -1,5 +1,5 @@
-#behave
-behave==1.2.7.dev6
+behave
+#behave==1.2.7.dev6
 #git+https://github.com/behave/behave@v1.2.7.dev5
 
 python-dateutil
@@ -66,6 +66,9 @@ openpyxl
 pympler     # memory profiling
 #py-spy      # deadlock
 
+# For xml module
+xmltodict
+
 # For yaml module
 #pyyaml
 ruamel.yaml

{holado-0.8.2 → holado-0.13.13.dev6}/src/holado/__init__.py

@@ -38,13 +38,14 @@ def __initialize_holado_loggers():
     
     
     
-def _initialize_logging(use_holado_logger=True, logging_config_file_path=None, log_level=None, log_on_console=False, log_in_file=True):
+def _initialize_logging(use_holado_logger=True, logging_config_file_path=None, log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True):
     # print_imported_modules("[initialize]")
     import holado_logging
     # print_imported_modules("[after import holado_logging]")
 
     # Configure logging module
-    holado_logging.configure(use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path, log_level=log_level, log_on_console=log_on_console, log_in_file=log_in_file)
+    holado_logging.configure(use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path, 
+                             log_level=log_level, log_time_in_utc=log_time_in_utc, log_on_console=log_on_console, log_in_file=log_in_file)
     # print_imported_modules("[after import holado_logging]")
 
     # Initialize holado loggers
@@ -77,12 +78,12 @@ def initialize_minimal():
     #            session_kwargs={'with_session_path':False}, 
     #            garbage_collector_periodicity=None)
     initialize(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None,
-               log_level=None, log_on_console=True, log_in_file=False,
+               log_level=None, log_time_in_utc=None, log_on_console=True, log_in_file=False,
                garbage_collector_periodicity=None)
 
 def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None, 
-               log_level=None, log_on_console=False, log_in_file=True, session_kwargs=None,
-               garbage_collector_periodicity=default_value):
+               log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True, 
+               config_kwargs=None, session_kwargs=None, garbage_collector_periodicity=default_value):
     global __initialized
     if __initialized:
         from holado_core.common.exceptions.technical_exception import TechnicalException
@@ -108,14 +109,20 @@ def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file
     
     # Initialize logging
     _initialize_logging(use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path,
-                        log_level=log_level, log_on_console=log_on_console, log_in_file=log_in_file and with_session_path)
+                        log_level=log_level, log_time_in_utc=log_time_in_utc, log_on_console=log_on_console, log_in_file=log_in_file and with_session_path)
     if Tools.do_log(logger, logging.DEBUG):
         logger.debug("Configured logging")
     
+    # Import modules
     if Tools.do_log(logger, logging.DEBUG):
         logger.debug("Importing HolAdo modules")
     _import_modules(get_holado_module_names())
     
+    # Update config with given kwargs
+    # Note: it is made after modules import to enable override modules specific config parameters
+    _update_config(config_kwargs)
+    
+    # Initialize session context
     _initialize_session_context(session_kwargs)
     
     # Initialize garbage collector
@@ -132,17 +139,29 @@ def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file
     __initialized = True
     
 def initialize_for_script(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None, 
-                          log_level=logging.WARNING, log_on_console=True, log_in_file=False, session_kwargs=None,
-                          garbage_collector_periodicity=None):
+                          log_level=logging.WARNING, log_time_in_utc=None, log_on_console=True, log_in_file=False, 
+                          config_kwargs=None, session_kwargs=None, garbage_collector_periodicity=None):
     if session_kwargs is None:
         session_kwargs={'with_session_path':log_in_file, 'raise_if_not_exist':False}
         
     initialize(TSessionContext=TSessionContext, use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path, 
-               log_level=log_level, log_on_console=log_on_console, log_in_file=log_in_file,
-               session_kwargs=session_kwargs,
+               log_level=log_level, log_time_in_utc=log_time_in_utc, log_on_console=log_on_console, log_in_file=log_in_file,
+               config_kwargs=config_kwargs, session_kwargs=session_kwargs,
                garbage_collector_periodicity=garbage_collector_periodicity )
     
+
+def _update_config(config_kwargs):
+    from holado.holado_config import Config
     
+    if config_kwargs is not None:
+        for name, value in config_kwargs.items():
+            if hasattr(Config, name):
+                setattr(Config, name, value)
+            else:
+                from holado_core.common.exceptions.technical_exception import TechnicalException
+                from holado_python.standard_library.typing import Typing
+                raise TechnicalException(f"Parameter '{name}' is not configurable, it doesn't exist. Available configurable parameters: {Typing.get_object_attributes(Config)}")
+
 def _initialize_session_context(session_kwargs=None):
     from holado_core.common.tools.tools import Tools
     
@@ -181,6 +200,7 @@ def _import_modules(module_names):
     from holado_core.common.tools.tools import Tools
     
     imported_modules = __import_modules(module_names)
+    __configure_modules(imported_modules)
     remaining_imported_modules = __register_modules_with_dependencies(imported_modules)
     
     # Register modules with cross dependencies
@@ -217,6 +237,25 @@ def __import_modules(module_names):
             res[module_name] = module
     return res
     
+def __configure_modules(imported_modules):
+    from holado_core.common.tools.tools import Tools
+    
+    if Tools.do_log(logger, logging.DEBUG):
+        logger.debug(f"Configuring imported HolAdo modules: {sorted(imported_modules.keys())}")
+    
+    imported_module_names = list(imported_modules.keys())
+    for module_name in imported_module_names:
+        if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
+            logger.trace(f"Configuring HolAdo module '{module_name}'...")
+        module = imported_modules[module_name]
+        if hasattr(module, 'configure_module'):
+            module.configure_module()
+            if Tools.do_log(logger, logging.DEBUG):
+                logger.debug(f"Configured HolAdo module '{module_name}'")
+        else:
+            if Tools.do_log(logger, logging.DEBUG):
+                logger.debug(f"Nothing to configure for HolAdo module '{module_name}'")
+    
 def __register_modules_with_dependencies(imported_modules):
     from holado_core.common.tools.tools import Tools