holado 0.22.6__tar.gz → 0.22.7.dev2__tar.gz

{holado-0.22.6 → holado-0.22.7.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: holado
-Version: 0.22.6
+Version: 0.22.7.dev2
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

holado-0.22.7.dev2/packaging/VERSION

@@ -0,0 +1 @@
+0.22.7.dev2

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_crypto/tests/behave/steps/crypto_steps.py

@@ -60,17 +60,17 @@ def step_impl(context, var_name, data, private_key):
     
     __get_variable_manager().register_variable(var_name, res)
 
-@Step(r"(?P<var_name>{Variable}) = encrypt (?P<data>{Bytes}) with public key (?P<public_key>{Str})")
-def step_impl(context, var_name, data, public_key):
-    """ Encrypt data with a public key.
-    """
-    var_name = StepTools.evaluate_variable_name(var_name)
-    data = StepTools.evaluate_scenario_parameter(data)
-    public_key = StepTools.evaluate_scenario_parameter(public_key)
-    
-    res = CryptoManager.cipher_data(data, public_key)
-    
-    __get_variable_manager().register_variable(var_name, res)
+# @Step(r"(?P<var_name>{Variable}) = encrypt (?P<data>{Bytes}) with public key (?P<public_key>{Str})")
+# def step_impl(context, var_name, data, public_key):
+#     """ Encrypt data with a public key.
+#     """
+#     var_name = StepTools.evaluate_variable_name(var_name)
+#     data = StepTools.evaluate_scenario_parameter(data)
+#     public_key = StepTools.evaluate_scenario_parameter(public_key)
+#
+#     res = CryptoManager.cipher_data(data, public_key)
+#
+#     __get_variable_manager().register_variable(var_name, res)
 
 @Step(r"(?P<var_name>{Variable}) = new cipher \(algorithm: (?P<algorithm>{Str}) ; key: (?P<key>{Bytes})\)")
 def step_impl(context, var_name, algorithm, key):

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_data/data/generator/base.py

@@ -58,7 +58,7 @@ class BaseGenerator(Generator):
         return Generator.throw(self, typ, val=val, tb=tb)
 
     def next_batch(self, size=None, raise_if_incomplete=False, raise_if_empty=True):
-        """ Return a batch as a liste of defined size.
+        """ Return a batch as a list of defined size.
         If size parameter is not defined, batch size is supposed to be defined at generator instantiation or with property batch_size.
         If raise_if_incomplete is True, and last batch can not be of batch size, a StopIteration is thrown.
         """
@@ -74,13 +74,19 @@ class BaseGenerator(Generator):
                 try:
                     element = next(self)
                 except StopIteration as exc:
-                    if raise_if_empty and len(res) == 0 or raise_if_incomplete:
-                        raise exc
+                    # if raise_if_empty and len(res) == 0 or raise_if_incomplete:
+                    #     raise exc
+                    # else:
+                    #     break
+                    if raise_if_empty and len(res) == 0:
+                        raise StopIteration("No element")
+                    elif raise_if_incomplete:
+                        raise StopIteration(f"Not enough elements ({len(res)}/{size})")
                     else:
                         break
                 else:
                     # if element is not None:
-                        res.append(element)
+                    res.append(element)
         finally:
             self.__is_in_next_batch = False
 

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_data/data/version/version_manager.py

@@ -87,7 +87,7 @@ class UIDHashVersionManager(Object):
 
     def __get_last_version(self, uid):
         client = self.__get_db_client()
-        result = client.select("uid_hash_versions", where_data={'scope': self.__scope, 'uid': uid}, sql_return="max(version)")
+        result = client.select("uid_hash_versions", where_data={'scope': self.__scope, 'uid': uid}, sql_return="version", order_bys=[('id', 'DESC')])
         if result.nb_rows == 0:
             return None
         else:

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_docker/sdk/docker/container_logs.py

@@ -15,6 +15,7 @@ import logging
 
 from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado.common.handlers.object import DeleteableObject
+from holado_core.common.tools.converters.converter import Converter
 from holado_multitask.multithreading.functionthreaded import FunctionThreaded
 from holado_python.common.tools.datetime import DateTime
 import json
@@ -73,7 +74,10 @@ class DockerContainerLogsFollower(DeleteableObject):
         """Follow logs from Docker Engine
         """
         if isinstance(since, str):
-            since = DateTime.str_2_datetime(since)
+            if Converter.is_float(since):
+                since = Converter.to_float(since)
+            else:
+                since = DateTime.str_2_datetime(since)
         
         if self.__logs_stream is not None:
             raise TechnicalException(f"Logs of container '{self.name}' are already followed")
@@ -94,11 +98,17 @@ class DockerContainerLogsFollower(DeleteableObject):
         if wait_before_s is not None:
             time.sleep(wait_before_s)
         
-        if since is not None and isinstance(since, datetime):
-            since = DateTime.datetime_2_str(since)
-        if until is not None and isinstance(until, datetime):
-            until = DateTime.datetime_2_str(until)
-        
+        if since is not None:
+            if isinstance(since, datetime):
+                since = DateTime.datetime_2_str(since)
+            elif isinstance(since, float):
+                since = DateTime.datetime_2_str(DateTime.timestamp_to_datetime(since))
+        if until is not None:
+            if isinstance(until, datetime):
+                until = DateTime.datetime_2_str(until)
+            elif isinstance(until, float):
+                until = DateTime.datetime_2_str(DateTime.timestamp_to_datetime(until))
+
         res = []
         for log in self.__logs:
             if log[1] and not stdout or not log[1] and not stderr:

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_docker/sdk/docker/docker_client.py

@@ -15,6 +15,7 @@ from holado_core.common.exceptions.functional_exception import FunctionalExcepti
 import logging
 from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado.common.handlers.object import DeleteableObject
+from holado_core.common.tools.converters.converter import Converter
 from holado_core.common.tools.tools import Tools
 from holado_docker.sdk.docker.container_logs import DockerContainerLogsFollower
 import re
@@ -448,9 +449,15 @@ class DockerContainer(DeleteableObject):
             time.sleep(wait_before_s)
         
         if isinstance(since, str):
-            since = DateTime.str_2_datetime(since)
+            if Converter.is_float(since):
+                since = Converter.to_float(since)
+            else:
+                since = DateTime.str_2_datetime(since)
         if isinstance(until, str):
-            until = DateTime.str_2_datetime(until)
+            if Converter.is_float(until):
+                until = Converter.to_float(until)
+            else:
+                until = DateTime.str_2_datetime(until)
             
         logs_bytes = self.__container.logs(stdout=stdout, stderr=stderr, timestamps=timestamps, tail=tail, since=since, until=until)
         return self._get_logs_from_logs_bytes(logs_bytes, with_timestamps=timestamps)

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_python/standard_library/csv.py

@@ -87,9 +87,29 @@ class CsvManager():
         return res
         
     @classmethod
-    def dict_list_with_content_of_CSV_file(cls, path, encoding=None, dialect=None, delimiter=None, quotechar=None, quoting=None):
-        dg = cls.dict_generator_with_content_of_CSV_file(path, encoding, dialect, delimiter, quotechar, quoting)
-        return [d for d in dg]
+    def dict_list_with_content_of_CSV_file(cls, path, encoding=None, dialect=None, delimiter=None, quotechar=None, quoting=None,
+                                           size=None, start_cond=None, end_cond=None):
+        """ Extract data from CSV file as a list of dictionaries.
+        Parameters start_cond and end_cond are condition functions defining bounds of returned data.
+        """
+        dict_gen = cls.dict_generator_with_content_of_CSV_file(path, encoding, dialect, delimiter, quotechar, quoting)
+
+        res = []
+        for row_dict in dict_gen:
+            # Manage start and end conditions
+            if start_cond is not None and not start_cond(row_dict):
+                continue
+            if end_cond is not None and not end_cond(row_dict):
+                break
+
+            # Add row to result
+            res.append(row_dict)
+
+            # Manage result size
+            if size is not None and len(res) >= size:
+                break
+
+        return res
     
     @classmethod
     def dict_generator_with_content_of_CSV_file(cls, path, encoding=None, dialect=None, delimiter=None, quotechar=None, quoting=None):

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_rabbitmq/tests/behave/steps/tools/rabbitmq_client_steps.py

@@ -422,15 +422,25 @@ if rabbitmq_client.RMQClient.is_available():
         nb = __get_rabbitmq_manager().await_message_reception(consumers, timeout_seconds=timeout_sec, polling_seconds=polling_sec, raise_exception=False)
         if nb > 0:
             raise FunctionalException(f"[{', '.join([c.name for c in consumers])}] Consumers have received {nb} messages")
-    
+
+    @Then(r"consumers (?P<list_consumers>{List}) received (?P<nb_msg>{Int}) messages")
+    def step_impl(context, list_consumers, nb_msg):
+        consumers = StepTools.evaluate_list_scenario_parameter(list_consumers, "list_consumers")
+        nb_msg = StepTools.evaluate_scenario_parameter(nb_msg)
+
+        nb_received = sum( (len(c.messages) for c in consumers) )
+        if nb_received != nb_msg:
+            raise FunctionalException(f"[{list_consumers}] The number of received messages is {nb_received} (expected: {nb_msg}).")
+
     @Then(r"consumer (?P<var_con>{Variable}) received (?P<nb_msg>{Int}) messages")
     def step_impl(context, var_con, nb_msg):
         con = StepTools.evaluate_variable_value(var_con)
         nb_msg = StepTools.evaluate_scenario_parameter(nb_msg)
-    
+
         if len(con.messages) != nb_msg:
-            raise FunctionalException(f"[{con.name}] The number of received messages is {len(con.messages)} (expected: {nb_msg}). Received messages:\n    {(chr(10)+'    ').join((str(m[3]) for m in con.messages))}")
-    
+            raise FunctionalException(
+                f"[{con.name}] The number of received messages is {len(con.messages)} (expected: {nb_msg}). Received messages:\n    {(chr(10) + '    ').join((str(m[3]) for m in con.messages))}")
+
     @Then(r"consumer (?P<var_con>{Variable}) received(?: (?P<nb_msg>{Int}))? string messages:")
     def step_impl(context, var_con, nb_msg):
         con = StepTools.evaluate_variable_value(var_con)

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_test/behave/scenario/behave_scenario_tools.py

@@ -108,7 +108,10 @@ class BehaveScenarioTools(ScenarioTools):
 
     @classmethod
     def _get_scenario_version_in_instance(cls, scenario):
-        return scenario.scenario_version
+        if scenario.parent and isinstance(scenario.parent, ScenarioOutline):
+            return scenario.parent.scenario_version
+        else:
+            return scenario.scenario_version
 
     @classmethod
     def _set_scenario_version_in_instance(cls, scenario, version):

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_test/scenario/scenario_tools.py

@@ -638,28 +638,33 @@ class ScenarioTools(object):
     def _manage_scenario_version_automatic_by_test_server(cls):
         """ Manage scenario versions automatically by test-server.
         Scenario versions are requested to test-server according their uid and hash,
-        and stored in Scenario instances as attribute 'scenario_version
+        and stored in Scenario instances as attribute 'scenario_version'.
+        Note: method implementation manages the case where many scenarios have the same UID.
         """
         if not cls._get_test_server_client().is_available:
             raise TechnicalException(f"test-server is not available")
 
         # Get elements info
-        scenario_by_uid = {}
+        scenarios_by_uid = {}
         hash_by_uid = {}
         for scenario in cls.get_scenarios():
             scenario_uid = cls.get_scenario_uid(scenario)
-            scenario_by_uid[scenario_uid] = scenario
+            if scenario_uid not in scenarios_by_uid:
+                scenarios_by_uid[scenario_uid] = []
+            scenarios_by_uid[scenario_uid].append(scenario)
 
-            scenario_hash = cls.compute_scenario_hash(scenario)
-            hash_by_uid[scenario_uid] = scenario_hash
+            if scenario_uid not in hash_by_uid:
+                scenario_hash = cls.compute_scenario_hash(scenario)
+                hash_by_uid[scenario_uid] = scenario_hash
 
         # Request version to test-server
         version_by_uid = cls._get_test_server_client().get_versions(scope='scenario', hash_by_uid=hash_by_uid)
 
-        for uid, scenario in scenario_by_uid.items():
+        for uid, scenarios in scenarios_by_uid.items():
             if uid not in version_by_uid:
                 raise TechnicalException(f"Scenario version is missing for UID '{uid}' in returned versions by test-server: {version_by_uid}")
-            cls._set_scenario_version_in_instance(scenario, version_by_uid[uid])
+            for scenario in scenarios:
+                cls._set_scenario_version_in_instance(scenario, version_by_uid[uid])
 
     @classmethod
     def _get_scenario_version_in_instance(cls, scenario):

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_tools/tools/host_controller/client/rest/host_controller_client.py

@@ -249,10 +249,14 @@ class HostControllerClient(RestClient):
         if since not in [undefined_argument, None]:
             if isinstance(since, datetime):
                 since = DateTime.datetime_2_str(since)
+            elif isinstance(since, float):
+                since = str(since)
             data['since'] = since
         if until not in [undefined_argument, None]:
             if isinstance(until, datetime):
                 until = DateTime.datetime_2_str(until)
+            elif isinstance(until, float):
+                until = str(until)
             data['until'] = until
         
         return self.get(f"docker/logs/{name}", json=data, result_on_statuses={204:[], default:None})

holado-0.22.7.dev2/src/holado_tools/tools/host_controller/server/requirements.txt

@@ -0,0 +1,2 @@
+# HolAdo framework
+holado[api-connexion,docker,ssl,yaml]>=0.22.7.dev1

{holado-0.22.6 → holado-0.22.7.dev2}/src/holado_tools/tools/host_controller/server/rest/openapi.yaml

@@ -69,7 +69,7 @@ paths:
       description: List container names (and their status and exit code if requested)
       parameters:
         - in: "query"
-          name: "all"
+          name: "all_"
           description: if set to 'true', list all containers, not only running ones
           schema:
             type: boolean
@@ -107,7 +107,7 @@ paths:
           schema:
             type: string
         - in: "query"
-          name: "all"
+          name: "all_"
           description: if set to 'true', search container in all containers, not only running ones
           schema:
             type: boolean
@@ -131,7 +131,7 @@ paths:
           schema:
             type: string
         - in: "query"
-          name: "all"
+          name: "all_"
           description: if set to 'true', search container in all containers, not only running ones
           schema:
             type: boolean
@@ -155,7 +155,7 @@ paths:
           schema:
             type: string
         - in: "query"
-          name: "all"
+          name: "all_"
           description: if set to 'true', search container in all containers, not only running ones
           schema:
             type: boolean
@@ -337,7 +337,7 @@ paths:
             type: string
         - in: "query"
           name: "status"
-          description: Status to wait (possible status: created, restarting, running, removing, paused, exited, dead, removed)
+          description: "Status to wait (possible status: created, restarting, running, removing, paused, exited, dead, removed)"
           schema:
             type: string
             default: "running"
@@ -366,7 +366,7 @@ paths:
             type: string
         - in: "query"
           name: "status"
-          description: Health status to wait (possible status: starting, healthy, unhealthy, removed)
+          description: "Health status to wait (possible status: starting, healthy, unhealthy, removed)"
           schema:
             type: string
             default: "healthy"
@@ -404,11 +404,11 @@ paths:
                   type: boolean
                   default: true
                 since:
-                  description: Since which datetime save logs
+                  description: Since which datetime/timestamp get logs
                   type: string
                   nullable: true
                 until:
-                  description: Until which datetime save logs
+                  description: Until which datetime/timestamp get logs
                   type: string
                   nullable: true
       responses:
@@ -434,7 +434,7 @@ paths:
                   description: Destination path of log files
                   type: string
                 file_format:
-                  description: Log file format (ex: 'CSV', 'JSON', 'PrettyTable') (default: JSON)
+                  description: "Log file format (ex: 'CSV', 'JSON', 'PrettyTable') (default: JSON)"
                   type: string
                   nullable: true
                 container_include_patterns:
@@ -472,11 +472,11 @@ paths:
                   type: string
                   nullable: true
                 since:
-                  description: Since which datetime save logs
+                  description: Since which datetime/timestamp save logs
                   type: string
                   nullable: true
                 until:
-                  description: Until which datetime save logs
+                  description: Until which datetime/timestamp save logs
                   type: string
                   nullable: true
       responses:

holado-0.22.6/packaging/VERSION

@@ -1 +0,0 @@
-0.22.6

holado-0.22.6/src/holado_tools/tools/host_controller/server/requirements.txt

@@ -1,2 +0,0 @@
-# HolAdo framework
-holado[api-connexion,docker,ssl,yaml]>=0.17.8