holado 0.18.22.dev2__tar.gz → 0.18.23__tar.gz

{holado-0.18.22.dev2 → holado-0.18.23}/PKG-INFO

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

holado-0.18.23/packaging/VERSION

@@ -0,0 +1 @@
+0.18.23

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/campaign/campaign_manager.py

@@ -55,7 +55,7 @@ class CampaignManager(object):
                                                                    table_unique_indexes=self.__get_campaign_scenarios_table_unique_indexes(),
                                                                    table_indexes=self.__get_campaign_scenarios_table_indexes(),
                                                                    db_name=self.__db_name)
-    
+
     def initialize(self, resource_manager):
         self.__resource_manager = resource_manager
         
@@ -298,7 +298,52 @@ class CampaignManager(object):
             return res[0]['history']
         else:
             return res
-        
+
+    def get_scenario_last_first_campaigns(self, scenario_name):
+        """ For given scenario, get last campaign in which it passed (respectively failed) and after it first campaign in which it failed (respectively passed).
+        Depending on validation category of the scenario, only one of both couples is generally interesting, but sometimes both are needed.
+        For performance consideration, this method manages in same time the couple (last failed, next first passed) and (last passed, next first failed).
+        :param scenario_name: Name of scenario
+        :return: 2 tuples ((last_passed, first_failed), (last_failed, first_passed)) with campaign names
+        """
+        if scenario_name is None:
+            raise TechnicalException(f"No scenario name provided")
+
+        client = self.__get_db_client()
+        placeholder = client._get_sql_placeholder()
+        query_str = f'''
+            select lp.last_passed, 
+            (select c.name as first_failed from campaign_scenarios csff join campaigns c on c.id = csff.campaign_id
+                where csff.name = {placeholder} and csff.status like 'Failed%'
+                    and csff.status_at > lp.last_passed_at
+                order by csff.status_at
+                limit 1
+            ) first_failed,
+            lf.last_failed,
+            (select c.name as first_passed from campaign_scenarios csfp join campaigns c on c.id = csfp.campaign_id
+                where csfp.name = {placeholder} and csfp.status = 'Passed'
+                    and csfp.status_at > lf.last_failed_at
+                order by csfp.status_at
+                limit 1
+            ) first_passed
+            from
+            (select c.name as last_passed, cslp.status_at as last_passed_at from campaign_scenarios cslp join campaigns c on c.id = cslp.campaign_id
+                where cslp.name = {placeholder} and cslp.status = 'Passed'
+                order by cslp.status_at desc
+                limit 1) lp,
+            (select c.name as last_failed, cs.status_at as last_failed_at from campaign_scenarios cs join campaigns c on c.id = cs.campaign_id
+            where cs.name = {placeholder} and cs.status like 'Failed%'
+            order by cs.status_at desc
+            limit 1) lf        
+        '''
+        where_data = [scenario_name, scenario_name, scenario_name, scenario_name]
+        res_dict_list = client.execute(query_str, *where_data, result_as_dict_list=True, as_generator=False)
+
+        if len(res_dict_list) == 1:
+            return (res_dict_list[0]['last_passed'], res_dict_list[0]['first_failed']), (res_dict_list[0]['last_failed'], res_dict_list[0]['first_passed'])
+        else:
+            return (None, None), (None, None)
+
     def add_campaign_if_needed(self, name, report_path):
         filter_data = {'report_path': report_path}
         if not self.__campaigns_table_manager.has_data(filter_data):

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/qa/qa_report.py

@@ -36,7 +36,9 @@ class QAReport(object):
                         data_window_days, data_window_size, data_window_in_period,
                         since, until, round_nb_decimal, with_details):
         if self.__test_server_client:
-            return self.__test_server_client.get_report_qa(qa_report_type, period_unit)
+            return self.__test_server_client.get_report_qa(qa_report_type=qa_report_type, period_unit=period_unit, period_number=period_number,
+                                                           data_window_days=data_window_days, data_window_size=data_window_size, data_window_in_period=data_window_in_period,
+                                                           since=since, until=until, round_nb_decimal=round_nb_decimal, with_details=with_details)
 
         if since is not None and isinstance(since, str):
             since = DateTime.str_2_datetime(since)

holado-0.18.23/src/holado_report/report/builders/debug_qa_relevancy_scenarios_report_builder.py

@@ -0,0 +1,134 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+
+from holado_core.common.tools.tools import Tools
+from holado_report.report.builders.report_builder import ReportBuilder
+from holado_report.report.enums import ValidationCategory, QAStatus, ValidationRelevancy, ValidationStatus
+from holado_system.system.filesystem.file import File
+from holado_python.common.tools.datetime import DateTime, FORMAT_DATETIME_ISO
+from holado_core.common.exceptions.technical_exception import TechnicalException
+from holado_test.common.context.context_tools import ContextTools
+
+logger = logging.getLogger(__name__)
+
+
+
+class DebugQARelevancyScenariosReportBuilder(ReportBuilder):
+    def __init__(self, filepath, with_details=False, file_format='txt', exclude_statuses=None, exclude_categories=None, with_scenario_end_date=True, with_scenario_period=False, with_step_period=False, use_compact_format=True):
+        super().__init__(needs_build=False)
+
+        self.__file_format = file_format.lower()
+        self.__exclude_statuses = exclude_statuses
+        self.__exclude_categories = exclude_categories
+        self.__with_details = with_details
+        self.__with_scenario_end_date = with_scenario_end_date
+        self.__with_scenario_period = with_scenario_period
+        self.__with_step_period = with_step_period
+        self.__use_compact_format = use_compact_format
+        
+        if self.__file_format == 'txt':
+            self.__file = File(filepath, auto_flush=False, mode='wt')
+        else:
+            raise TechnicalException(f"Unmanaged format '{self.__file_format}' (possible formats: 'txt')")
+        
+        self.__scenarios_by_category = {}
+
+    def after_scenario(self, scenario, scenario_report=None):
+        from holado_report.report.report_manager import ReportManager
+        status_info = ReportManager.ScenarioTools.get_current_scenario_status_info(scenario)
+
+        # Manage excluded scenario
+        if self.__exclude_statuses and (status_info.validation_status in self.__exclude_statuses or status_info.validation_status.value in self.__exclude_statuses):
+            return
+        if self.__exclude_categories and (status_info.validation_category in self.__exclude_categories or status_info.validation_category.value in self.__exclude_categories):
+            return
+
+        # Add scenario information into category
+        category_str = f" => {status_info.validation_category_string}" if status_info.validation_category_string else ""
+        scenario_prefix_str = f"{ContextTools.format_context_period(status_info.scenario_context)} " if self.__with_scenario_period \
+                              else f"{DateTime.datetime_2_str(status_info.scenario_context.end_datetime, FORMAT_DATETIME_ISO)} - " if self.__with_scenario_end_date \
+                              else ""
+        scenario_desc = ReportManager.ScenarioTools.format_scenario_short_description(scenario)
+        if status_info.step_failed:
+            step_format_kwargs = {'step_context': status_info.step_context if self.__with_step_period else None,
+                                  'dt_ref': status_info.scenario_context.start_datetime if self.__use_compact_format else None}
+            step_desc = ReportManager.StepTools.format_step_short_description(status_info.step_failed, status_info.step_failed_nb, has_failed=True, **step_format_kwargs)
+            scenario_list = [f"{scenario_prefix_str}{scenario_desc} - {step_desc} - {status_info.validation_status_string}{category_str}"]
+        else:
+            scenario_list = [f"{scenario_prefix_str}{scenario_desc} - {status_info.validation_status_string}{category_str}"]
+
+        if self.__with_details:
+            if status_info.validation_category not in [ValidationCategory.AlwaysSuccess, ValidationCategory.Fixed]:
+                # Add scenario details
+                scenario_list.append(f"    Feature/Scenario: {scenario.feature.name}  =>  {scenario.name}")
+                scenario_list.append(f"    Report: {scenario_report.report_path}")
+                scenario_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
+
+                # Add scenario/step periods
+                if status_info.step_context and status_info.step_context.start_datetime is not None:
+                    scenario_list.append(f"    Scenario/Step periods: {ContextTools.format_context_period(status_info.scenario_context, use_compact_format=self.__use_compact_format)} -> {ContextTools.format_context_period(status_info.step_context, dt_ref=status_info.scenario_context.start_datetime, use_compact_format=self.__use_compact_format)}")
+                else:
+                    scenario_list.append(f"    Scenario period: {ContextTools.format_context_period(status_info.scenario_context, use_compact_format=self.__use_compact_format)}")
+
+                # Add last and first sessions
+                if status_info.validation_status == ValidationStatus.Passed:
+                    scenario_list.append(f"    Last failed / First passed sessions: {status_info.last_first_campaigns[1][0]} / {status_info.last_first_campaigns[1][1]}")
+                else:
+                    scenario_list.append(f"    Last passed / First failed sessions: {status_info.last_first_campaigns[0][0]} / {status_info.last_first_campaigns[0][1]}")
+
+                # Add error
+                step_error_message = ReportManager.StepTools.get_step_error_message(status_info.step_failed)
+                if step_error_message:
+                    if "\n" in step_error_message:
+                        scenario_list.append(f"    Error message: ")
+                        scenario_list.append(Tools.indent_string(8, step_error_message))
+                    else:
+                        scenario_list.append(f"    Error message: {step_error_message}")
+                elif status_info.scenario_error is not None:
+                    if "\n" in status_info.scenario_error:
+                        scenario_list.append(f"    Scenario error: ")
+                        scenario_list.append(Tools.indent_string(8, status_info.scenario_error))
+                    else:
+                        scenario_list.append(f"    Scenario error: {status_info.scenario_error}")
+
+                scenario_list.append(f"")
+            else:
+                # Add last failed and first passed sessions if it has already failed
+                if status_info.last_first_campaigns[1][0]:
+                    scenario_list.append(f"    Last failed / First passed sessions: {status_info.last_first_campaigns[1][0]} / {status_info.last_first_campaigns[1][1]}")
+
+        if status_info.validation_category not in self.__scenarios_by_category:
+            self.__scenarios_by_category[status_info.validation_category] = []
+        self.__scenarios_by_category[status_info.validation_category].extend(scenario_list)
+            
+        self.__update_file()
+        
+    def __update_file(self):
+        with self.__file as fout:
+            for qa_status in QAStatus:
+                for relevancy in ValidationRelevancy:
+                    for category in ValidationCategory:
+                        if category in self.__scenarios_by_category and category.qa_status == qa_status and category.relevancy == relevancy:
+                            fout.writelines([
+                                # f"## QA:{qa_status.value} - Relevancy:{relevancy.value} - {category.value}",
+                                f"## {category.value}",
+                                ""
+                                ])
+                            fout.writelines(self.__scenarios_by_category[category])
+                            fout.writelines([
+                                "",
+                                ""
+                                ])
+    

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/report/builders/debug_relevancy_summary_report_builder.py

@@ -40,30 +40,20 @@ class DebugRelevancySummaryReportBuilder(ReportBuilder):
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
         status_info = ReportManager.ScenarioTools.get_current_scenario_status_info(scenario)
-        if status_info.validation_category is not None:
-            ind = status_info.validation_category.find(' (')
-            category_str = status_info.validation_category[:ind] if ind > 0 else status_info.validation_category
-        else:
-            category_str = None
-        
+
         # Manage excluded scenarios
-        if self.__exclude_statuses and status_info.validation_status in self.__exclude_statuses:
+        if self.__exclude_statuses and (status_info.validation_status in self.__exclude_statuses or status_info.validation_status.value in self.__exclude_statuses):
             return
-        if category_str is not None and self.__exclude_categories and category_str in self.__exclude_categories:
+        if self.__exclude_categories and (status_info.validation_category in self.__exclude_categories or status_info.validation_category.value in self.__exclude_categories):
             return
 
-        try:
-            category = ValidationCategory(category_str)
-        except KeyError:
-            category = ValidationCategory.Unknown
-
-        if category not in self.__counter_by_category:
-            self.__counter_by_category[category] = 0
-        self.__counter_by_category[category] += 1
+        if status_info.validation_category not in self.__counter_by_category:
+            self.__counter_by_category[status_info.validation_category] = 0
+        self.__counter_by_category[status_info.validation_category] += 1
 
-        if category.relevancy not in self.__counter_by_relevancy:
-            self.__counter_by_relevancy[category.relevancy] = 0
-        self.__counter_by_relevancy[category.relevancy] += 1
+        if status_info.validation_category.relevancy not in self.__counter_by_relevancy:
+            self.__counter_by_relevancy[status_info.validation_category.relevancy] = 0
+        self.__counter_by_relevancy[status_info.validation_category.relevancy] += 1
 
         self.__update_file()
         
@@ -83,7 +73,7 @@ class DebugRelevancySummaryReportBuilder(ReportBuilder):
                 lines.append(f'{relevancy.value}:')
                 for cat in ValidationCategory:
                     if cat.relevancy == relevancy:
-                        lines.append(f'    {cat.value}: {self.__counter_by_relevancy[cat] if cat in self.__counter_by_relevancy else 0}')
+                        lines.append(f'    {cat.value}: {self.__counter_by_category[cat] if cat in self.__counter_by_category else 0}')
                 lines.append('')
 
         with self.__file as fout:

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/report/builders/detailed_scenario_report_builder.py

@@ -14,6 +14,7 @@
 from holado_core.common.tools.tools import Tools
 import logging
 from holado_report.report.builders.report_builder import ReportBuilder
+from holado_report.report.enums import ValidationStatus
 from holado_xml.xml.stream_xml_file import StreamXMLFile
 from holado_system.system.filesystem.file import File
 from holado_core.common.exceptions.technical_exception import TechnicalException
@@ -49,14 +50,11 @@ class DetailedScenarioReportBuilder(ReportBuilder):
         status_info = ReportManager.ScenarioTools.get_current_scenario_status_info(scenario)
         
         # Manage excluded scenarios
-        if self.__exclude_statuses and status_info.validation_status in self.__exclude_statuses:
+        if self.__exclude_statuses and (status_info.validation_status in self.__exclude_statuses or status_info.validation_status.value in self.__exclude_statuses):
             return
-        if status_info.validation_category is not None and self.__exclude_categories:
-            ind = status_info.validation_category.find(' (')
-            category = status_info.validation_category[:ind] if ind > 0 else status_info.validation_category
-            if category in self.__exclude_categories:
-                return
-        
+        if self.__exclude_categories and (status_info.validation_category in self.__exclude_categories or status_info.validation_category.value in self.__exclude_categories):
+            return
+
         self.__file_add_scenario(scenario, scenario_report, status_info)
         
     def after_all(self):
@@ -85,8 +83,8 @@ class DetailedScenarioReportBuilder(ReportBuilder):
                 }
             }
         if status_info.validation_category:
-            data['scenario']['validation_category'] = status_info.validation_category
-        data['scenario']['validation_status'] = status_info.validation_status
+            data['scenario']['validation_category'] = status_info.validation_category_string
+        data['scenario']['validation_status'] = status_info.validation_status_string
         
         failure_data = {}
         if status_info.step_failed is not None:
@@ -123,10 +121,10 @@ class DetailedScenarioReportBuilder(ReportBuilder):
                 
         if failure_data:
             data['scenario']['failure'] = failure_data
-        elif status_info.validation_status != 'Passed':
+        elif status_info.validation_status != ValidationStatus.Passed:
             data['scenario']['failure'] = "No step failed, it has probably failed on a missing step implementation"
             
-        self.__file.write_element_dict(data, pretty=True, indent=Tools.indent_string(4, ''))
+        self.__file.write_element_dict(data, pretty=True, indent=Tools.indent_string(4, ''), with_header=False)
         # Add 2 empty lines for more readability
         self.__file.internal_file.writelines(['', ''])
         
@@ -142,8 +140,15 @@ class DetailedScenarioReportBuilder(ReportBuilder):
         msg_list.append(f"    Scenario period: {ContextTools.format_context_period(status_info.scenario_context)}")
         msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
         if status_info.validation_category:
-            msg_list.append(f"    Validation category: {status_info.validation_category}")
-        msg_list.append(f"    Validation status: {status_info.validation_status}")
+            msg_list.append(f"    Validation category: {status_info.validation_category_string}")
+        msg_list.append(f"    Validation status: {status_info.validation_status_string}")
+
+        # Add last and first sessions
+        if status_info.validation_status == ValidationStatus.Passed:
+            msg_list.append(f"    Last failed / First passed sessions: {status_info.last_first_campaigns[1][0]} / {status_info.last_first_campaigns[1][1]}")
+        else:
+            msg_list.append(f"    Last passed / First failed sessions: {status_info.last_first_campaigns[0][0]} / {status_info.last_first_campaigns[0][1]}")
+
         if status_info.step_failed is not None or status_info.scenario_error:
             msg_list.append(f"    Failure:")
             if status_info.step_failed is not None:

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/report/builders/execution_historic_report_builder.py

@@ -75,8 +75,8 @@ class ExecutionHistoricReportBuilder(ReportBuilder):
         return {
             'scenario': self.__convert_scenario_to_json(eh_scenario.scenario, eh_scenario.scenario_context, eh_scenario.scenario_report),
             'steps_by_scope': {scope_name:[self.__convert_execution_historic_step_to_json(eh_step) for eh_step in steps] for scope_name, steps in eh_scenario.steps_by_scope.items()},
-            'validation_category': eh_scenario.status_info.validation_category if eh_scenario.status_info is not None else None,
-            'validation_status': eh_scenario.status_info.validation_status if eh_scenario.status_info is not None else None,
+            'validation_category': eh_scenario.status_info.validation_category_string if eh_scenario.status_info is not None else None,
+            'validation_status': eh_scenario.status_info.validation_status_string if eh_scenario.status_info is not None else None,
             'step_failed': self.__convert_step_to_json(eh_scenario.status_info.step_failed) if eh_scenario.status_info is not None and eh_scenario.status_info.step_failed is not None else None,
             'step_failed_number': eh_scenario.status_info.step_failed_number if eh_scenario.status_info is not None else None
             }

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/report/builders/failure_report_builder.py

@@ -16,6 +16,8 @@ from holado_report.report.builders.report_builder import ReportBuilder
 from holado_core.common.tools.tools import Tools
 from holado_core.common.exceptions.technical_exception import TechnicalException
 import json
+
+from holado_report.report.enums import ValidationStatus
 from holado_system.system.filesystem.file import File
 from holado_xml.xml.xml_file import XMLFile
 from holado_test.common.context.context_tools import ContextTools
@@ -50,18 +52,15 @@ class FailureReportBuilder(ReportBuilder):
         status_info = ReportManager.ScenarioTools.get_current_scenario_status_info(scenario)
         
         # Manage excluded scenarios
-        if self.__exclude_statuses and status_info.validation_status in self.__exclude_statuses:
+        if self.__exclude_statuses and (status_info.validation_status in self.__exclude_statuses or status_info.validation_status.value in self.__exclude_statuses):
             return
-        if status_info.validation_category is not None and self.__exclude_categories:
-            ind = status_info.validation_category.find(' (')
-            category = status_info.validation_category[:ind] if ind > 0 else status_info.validation_category
-            if category in self.__exclude_categories:
-                return
-        
+        if self.__exclude_categories and (status_info.validation_category in self.__exclude_categories or status_info.validation_category.value in self.__exclude_categories):
+            return
+
         self.__file_add_scenario(scenario, scenario_report, status_info)
     
     def __file_add_scenario(self, scenario, scenario_report, status_info):
-        if status_info.validation_status != "Passed" and status_info.step_failed is not None:
+        if status_info.validation_status != ValidationStatus.Passed and status_info.step_failed is not None:
             self.__add_failure(scenario, scenario_report, status_info)
             self.__update_file()
             
@@ -72,10 +71,12 @@ class FailureReportBuilder(ReportBuilder):
         if step_error_message not in self.__failures:
             self.__failures[step_error_message] = []
         
-        category_str = f" => {status_info.validation_category}" if status_info.validation_category else ""
+        category_str = f" => {status_info.validation_category_string}" if status_info.validation_category_string else ""
+        scenario_desc = ReportManager.ScenarioTools.format_scenario_short_description(scenario)
+        step_desc = ReportManager.StepTools.format_step_short_description(status_info.step_failed, status_info.step_failed_nb, has_failed=True)
         if self.__file_format == 'txt':
             msg_list = []
-            msg_list.append(f"scenario in {ReportManager.ScenarioTools.format_scenario_short_description(scenario)} - {ReportManager.StepTools.format_step_short_description(status_info.step_failed, status_info.step_failed_nb, has_failed=True)} - {status_info.validation_status}{category_str}")
+            msg_list.append(f"{scenario_desc} - {step_desc} - {status_info.validation_status_string}{category_str}")
             msg_list.append(f"    Feature/Scenario: {scenario.feature.name}  =>  {scenario.name}")
             msg_list.append(f"    Report: {scenario_report.report_path}")
             msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
@@ -83,12 +84,13 @@ class FailureReportBuilder(ReportBuilder):
                 msg_list.append(f"    Scenario/Step periods: {ContextTools.format_context_period(status_info.scenario_context)} -> {ContextTools.format_context_period(status_info.step_context)}")
             else:
                 msg_list.append(f"    Scenario period: {ContextTools.format_context_period(status_info.scenario_context)}")
+            msg_list.append(f"    Last passed / First failed sessions: {status_info.last_first_campaigns[0][0]} / {status_info.last_first_campaigns[0][1]}")
             msg_scenario = "\n".join(msg_list)
             
             self.__failures[step_error_message].append(msg_scenario)
         elif self.__file_format in ['json', 'xml']:
             scenario_info = {
-                'title': f"{ReportManager.ScenarioTools.format_scenario_short_description(scenario)} - {ReportManager.StepTools.format_step_short_description(status_info.step_failed, status_info.step_failed_nb, has_failed=True)} - {status_info.validation_status}{category_str}",
+                'title': f"{scenario_desc} - {step_desc} - {status_info.validation_status_string}{category_str}",
                 'scenario': f"{scenario.feature.name}  =>  {scenario.name}",
                 'report': scenario_report.report_path,
                 'tags': "-t " + " -t ".join(scenario.feature.tags + scenario.tags)

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/report/builders/qa_report_builder.py

@@ -13,7 +13,7 @@
 
 import logging
 from holado_report.report.builders.report_builder import ReportBuilder
-from holado_report.report.enums import ValidationCategory, QAStatus
+from holado_report.report.enums import ValidationCategory, QAStatus, AccurateQAStatus
 from holado_system.system.filesystem.file import File
 from holado_core.common.exceptions.technical_exception import TechnicalException
 
@@ -22,13 +22,15 @@ logger = logging.getLogger(__name__)
 
 
 class QAReportBuilder(ReportBuilder):
-    def __init__(self, filepath, file_format='txt', exclude_statuses=None, exclude_categories=None):
+    def __init__(self, filepath, file_format='txt', exclude_statuses=None, exclude_categories=None, with_details=True, with_full_details=False):
         super().__init__(needs_build=False)
 
         self.__file_format = file_format.lower()
         self.__exclude_statuses = exclude_statuses
         self.__exclude_categories = exclude_categories
-        
+        self.__with_details = with_details
+        self.__with_full_details = with_full_details
+
         if self.__file_format == 'txt':
             self.__file = File(filepath, mode='wt')
         else:
@@ -36,27 +38,20 @@ class QAReportBuilder(ReportBuilder):
         
         self.__counter_by_category = {}
         self.__counter_by_qa_status = {}
+        self.__counter_by_accurate_qa_status = {}
 
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
         status_info = ReportManager.ScenarioTools.get_current_scenario_status_info(scenario)
-        if status_info.validation_category is not None:
-            ind = status_info.validation_category.find(' (')
-            category_str = status_info.validation_category[:ind] if ind > 0 else status_info.validation_category
-        else:
-            category_str = None
-        
+
         # Manage excluded scenarios
-        if self.__exclude_statuses and status_info.validation_status in self.__exclude_statuses:
+        if self.__exclude_statuses and (status_info.validation_status in self.__exclude_statuses or status_info.validation_status.value in self.__exclude_statuses):
             return
-        if category_str is not None and self.__exclude_categories and category_str in self.__exclude_categories:
+        if self.__exclude_categories and (status_info.validation_category in self.__exclude_categories or status_info.validation_category.value in self.__exclude_categories):
             return
 
-        try:
-            category = ValidationCategory(category_str)
-        except KeyError:
-            category = ValidationCategory.Unknown
-
+        # Update counters
+        category = status_info.validation_category
         if category not in self.__counter_by_category:
             self.__counter_by_category[category] = 0
         self.__counter_by_category[category] += 1
@@ -65,6 +60,10 @@ class QAReportBuilder(ReportBuilder):
             self.__counter_by_qa_status[category.qa_status] = 0
         self.__counter_by_qa_status[category.qa_status] += 1
 
+        if category.accurate_qa_status not in self.__counter_by_accurate_qa_status:
+            self.__counter_by_accurate_qa_status[category.accurate_qa_status] = 0
+        self.__counter_by_accurate_qa_status[category.accurate_qa_status] += 1
+
         self.__update_file()
         
     def __update_file(self):
@@ -72,19 +71,28 @@ class QAReportBuilder(ReportBuilder):
 
         # Add summary line
         lines.append(' ; '.join([f'{qa.value}: {self.__counter_by_qa_status[qa] if qa in self.__counter_by_qa_status else 0}' for qa in QAStatus if qa != QAStatus.Undefined]))
-        lines.append('')
-        lines.append('')
 
         # Add details
-        lines.append('# Details')
-        lines.append('')
-        for qa_status in QAStatus:
-            if qa_status != QAStatus.Undefined:
-                lines.append(f'{qa_status.value}:')
-                for cat in ValidationCategory:
-                    if cat.qa_status == qa_status:
-                        lines.append(f'    {cat.value}: {self.__counter_by_category[cat] if cat in self.__counter_by_category else 0}')
-                lines.append('')
+        if self.__with_details:
+            lines.append('')
+            lines.append('# Details')
+            lines.append('')
+            for qa_status in AccurateQAStatus:
+                if qa_status != AccurateQAStatus.Undefined:
+                    lines.append(f'{qa_status.value}: {self.__counter_by_accurate_qa_status[qa_status] if qa_status in self.__counter_by_accurate_qa_status else 0}')
+
+        # Add full details
+        if self.__with_full_details:
+            lines.append('')
+            lines.append('# Full Details')
+            lines.append('')
+            for qa_status in QAStatus:
+                if qa_status != QAStatus.Undefined:
+                    lines.append(f'{qa_status.value}:')
+                    for cat in ValidationCategory:
+                        if cat.qa_status == qa_status:
+                            lines.append(f'    {cat.value}: {self.__counter_by_category[cat] if cat in self.__counter_by_category else 0}')
+                    lines.append('')
 
         with self.__file as fout:
             fout.writelines(lines)

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/report/builders/short_scenario_report_builder.py

@@ -15,6 +15,7 @@ import logging
 from holado_report.report.builders.report_builder import ReportBuilder
 from holado_core.common.tools.tools import Tools
 from holado_core.common.exceptions.technical_exception import TechnicalException
+from holado_report.report.enums import ValidationStatus
 from holado_system.system.filesystem.file import File
 from holado_test.common.context.context_tools import ContextTools
 
@@ -41,14 +42,11 @@ class ShortScenarioReportBuilder(ReportBuilder):
         status_info = ReportManager.ScenarioTools.get_current_scenario_status_info(scenario)
         
         # Manage excluded scenarios
-        if self.__exclude_statuses and status_info.validation_status in self.__exclude_statuses:
+        if self.__exclude_statuses and (status_info.validation_status in self.__exclude_statuses or status_info.validation_status.value in self.__exclude_statuses):
             return
-        if status_info.validation_category is not None and self.__exclude_categories:
-            ind = status_info.validation_category.find(' (')
-            category = status_info.validation_category[:ind] if ind > 0 else status_info.validation_category
-            if category in self.__exclude_categories:
-                return
-        
+        if self.__exclude_categories and (status_info.validation_category in self.__exclude_categories or status_info.validation_category.value in self.__exclude_categories):
+            return
+
         self.__file_add_scenario(scenario, scenario_report, status_info)
         
     def after_all(self):
@@ -61,11 +59,13 @@ class ShortScenarioReportBuilder(ReportBuilder):
         self.__open_file_if_needed()
         
         msg_list = []
-        category_str = f" => {status_info.validation_category}" if status_info.validation_category else ""
+        category_str = f" => {status_info.validation_category_string}" if status_info.validation_category_string else ""
+        scenario_desc = ReportManager.ScenarioTools.format_scenario_short_description(scenario)
         if status_info.step_failed:
-            msg_list.append(f"scenario in {ReportManager.ScenarioTools.format_scenario_short_description(scenario)} - {ReportManager.StepTools.format_step_short_description(status_info.step_failed, status_info.step_failed_nb, has_failed=True)} - {status_info.validation_status}{category_str}")
+            step_desc = ReportManager.StepTools.format_step_short_description(status_info.step_failed, status_info.step_failed_nb, has_failed=True)
+            msg_list.append(f"{scenario_desc} - {step_desc} - {status_info.validation_status_string}{category_str}")
         else:
-            msg_list.append(f"scenario in {ReportManager.ScenarioTools.format_scenario_short_description(scenario)} - {status_info.validation_status}{category_str}")
+            msg_list.append(f"{scenario_desc} - {status_info.validation_status_string}{category_str}")
         msg_list.append(f"    Feature/Scenario: {scenario.feature.name}  =>  {scenario.name}")
         msg_list.append(f"    Report: {scenario_report.report_path}")
         msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
@@ -74,7 +74,13 @@ class ShortScenarioReportBuilder(ReportBuilder):
             msg_list.append(f"    Scenario/Step periods: {ContextTools.format_context_period(status_info.scenario_context, use_compact_format=self.__use_compact_format)} -> {ContextTools.format_context_period(status_info.step_context, dt_ref=status_info.scenario_context.start_datetime, use_compact_format=self.__use_compact_format)}")
         else:
             msg_list.append(f"    Scenario period: {ContextTools.format_context_period(status_info.scenario_context, use_compact_format=self.__use_compact_format)}")
-        
+
+        # Add last and first sessions
+        if status_info.validation_status == ValidationStatus.Passed:
+            msg_list.append(f"    Last failed / First passed sessions: {status_info.last_first_campaigns[1][0]} / {status_info.last_first_campaigns[1][1]}")
+        else:
+            msg_list.append(f"    Last passed / First failed sessions: {status_info.last_first_campaigns[0][0]} / {status_info.last_first_campaigns[0][1]}")
+
         step_error_message = ReportManager.StepTools.get_step_error_message(status_info.step_failed)
         if step_error_message:
             if "\n" in step_error_message:

{holado-0.18.22.dev2 → holado-0.18.23}/src/holado_report/report/builders/summary_report_builder.py

@@ -42,8 +42,7 @@ class ExecutionHistoricSummaryReportBuilder(ReportBuilder):
             features[status_name] += 1
             
             for eh_sce in eh_feat.scenarios:
-                status_name = eh_sce.status_info.validation_status
-                # status_name = eh_sce[0].status.name.lower()
+                status_name = eh_sce.status_info.validation_status_string
                 if status_name not in scenarios:
                     scenarios[status_name] = 0
                 scenarios[status_name] += 1
@@ -75,17 +74,14 @@ class SummaryReportBuilder(ReportBuilder):
         status_info = ReportManager.ScenarioTools.get_current_scenario_status_info(scenario)
         
         # Manage excluded scenarios
-        if self.__exclude_statuses and status_info.validation_status in self.__exclude_statuses:
+        if self.__exclude_statuses and (status_info.validation_status in self.__exclude_statuses or status_info.validation_status.value in self.__exclude_statuses):
             return
-        if status_info.validation_category is not None and self.__exclude_categories:
-            ind = status_info.validation_category.find(' (')
-            category = status_info.validation_category[:ind] if ind > 0 else status_info.validation_category
-            if category in self.__exclude_categories:
-                return
-        
-        if status_info.validation_status not in self.__scenarios:
-            self.__scenarios[status_info.validation_status] = 0
-        self.__scenarios[status_info.validation_status] += 1
+        if self.__exclude_categories and (status_info.validation_category in self.__exclude_categories or status_info.validation_category.value in self.__exclude_categories):
+            return
+
+        if status_info.validation_status.value not in self.__scenarios:
+            self.__scenarios[status_info.validation_status.value] = 0
+        self.__scenarios[status_info.validation_status.value] += 1
         
         self.__update_file()