scilens 0.3.7__py3-none-any.whl → 0.3.9__py3-none-any.whl

scilens/cli/main.py

@@ -1,6 +1,6 @@
 _B='green'
 _A=True
-import logging,os,coloredlogs,rich_click as click
+import logging,os,webbrowser,coloredlogs,rich_click as click
 from scilens.app import pkg_name,pkg_version
 from scilens.readers.reader_manager import ReaderManager
 from scilens.run.tasks_collector import TasksCollector
@@ -52,25 +52,31 @@ def config_json():config_print('envvars')
 @click.option('--export-json',is_flag=_A,help=f"Generate JSON report(s).")
 @click.option('--export-yaml',is_flag=_A,help=f"Generate YAML report(s).")
 @click.option('--export-html-add-index',is_flag=_A,help=f"Generate an index for generated HTML reports.")
-def run(path,config,collect_discover,collect_depth,processor,tag,collect_only,report_title,export_html,export_json,export_yaml,export_html_add_index):
-	R='datetime';K=processor;J=collect_discover;I=config;E=collect_depth;echo_separator('Info');echo_info();echo_separator('System Info');echo_system_info();S=list(tag);B=os.path.abspath(path)
+@click.option('--export-html-open',is_flag=_A,help=f"Open all generated HTML reports in the default browser.")
+def run(path,config,collect_discover,collect_depth,processor,tag,collect_only,report_title,export_html,export_json,export_yaml,export_html_add_index,export_html_open):
+	V='datetime';M=export_html_open;L=export_html_add_index;K=processor;J=collect_discover;I=config;E=collect_depth;echo_separator('Info');echo_info();echo_separator('System Info');echo_system_info();W=list(tag);B=os.path.abspath(path)
 	if not os.path.isdir(B):logging.error(f"Dir '{B}' does not exist.");exit(1)
 	if not bool(I)+J+(bool(E)or E==0)+bool(K)in[0,1]:logging.error(f"Options --config, --collect-discover, --collect-depth and --processor are mutually exclusive.");exit(1)
 	echo_separator('Collecting tasks');F=[]
-	try:F=TasksCollector(B,I,J,E,S,K).process(get_vars(report_title,export_html,export_json,export_yaml))
+	try:F=TasksCollector(B,I,J,E,W,K).process(get_vars(report_title,export_html,export_json,export_yaml))
 	except Exception as D:logging.error(D);exit(1)
 	if collect_only:echo_separator();logging.info('Collecting tasks only - End');echo_separator();exit(0)
 	else:
-		L=TimeTracker();A=len(F);M=0;N=0;O=0;P=[]
-		for(T,U)in enumerate(F):
-			echo_separator(f"Running task {T+1}/{A}")
-			try:C=U.process()
+		N=TimeTracker();A=len(F);O=0;P=0;Q=0;R=[]
+		for(X,Y)in enumerate(F):
+			echo_separator(f"Running task {X+1}/{A}")
+			try:C=Y.process()
 			except Exception as D:echo_task_error();logging.error(D);C=TaskResults(error=str(D))
-			if C.report_results:P+=C.report_results.files_created
-			if C.error:M+=1
+			if C.report_results:R+=C.report_results.files_created
+			if C.error:O+=1
 			G=C.processor_results
 			if G:
-				if G.warnings:O+=1
-				if G.errors:N+=1
-		if export_html_add_index:echo_separator(f"Post Actions");logging.info(f"Generate HTML Index for the HTML reports");V=[A for A in P if A.endswith('.html')];Q=os.path.join(B,'index.html');SearchAndIndex().create_html_index(SearchAndIndex().file_list_info_from_origin(V,B),Q,title='Index of Reports');logging.info(f"HTML Index generated at '{Q}'")
-		echo_separator(f"End Running tasks ({A}/{A})");L.stop();H=L.get_data();logging.info(f"Tasks with errors ............... {M}/{A}");logging.info(f"Tasks with processor errors ..... {N}/{A}");logging.info(f"Tasks with processor warnings ... {O}/{A}");logging.info(f"Start ........................... {H['start'][R]} utc");logging.info(f"End ............................. {H['end'][R]} utc");logging.info(f"Duration......................... {H['duration_seconds']} seconds");echo_separator()
+				if G.warnings:Q+=1
+				if G.errors:P+=1
+		if L or M:
+			echo_separator(f"Post Actions");S=[A for A in R if A.endswith('.html')]
+			if L:logging.info(f"Generate HTML Index for the HTML reports");T=os.path.join(B,'index.html');SearchAndIndex().create_html_index(SearchAndIndex().file_list_info_from_origin(S,B),T,title='Index of Reports');logging.info(f"HTML Index generated at '{T}'")
+			if M:
+				logging.info(f"Open HTML reports in the default browser")
+				for U in S:logging.info(f"Open '{U}'");Z=f"file://{U}";webbrowser.open(Z)
+		echo_separator(f"End Running tasks ({A}/{A})");N.stop();H=N.get_data();logging.info(f"Tasks with errors ............... {O}/{A}");logging.info(f"Tasks with processor errors ..... {P}/{A}");logging.info(f"Tasks with processor warnings ... {Q}/{A}");logging.info(f"Start ........................... {H['start'][V]} utc");logging.info(f"End ............................. {H['end'][V]} utc");logging.info(f"Duration......................... {H['duration_seconds']} seconds");echo_separator()

scilens/components/executor.py

@@ -1,3 +1,4 @@
+_A=None
 import logging,os,shutil,stat,subprocess,platform,tempfile,zipfile
 from scilens.config.models import ExecuteConfig
 from scilens.utils.file import dir_remove,dir_create
@@ -27,30 +28,36 @@ def find_command(command_path,working_dirs,guess_os_extension=False):
 				B=os.path.join(E,F)
 				if os.path.exists(B):return B
 class Executor:
-	def __init__(A,absolute_working_dir,config,alternative_working_dir=None):
-		D=alternative_working_dir;C=absolute_working_dir;B=config;A.config=B;A.working_dir=C;A.dirs=[C]+([D]if D else[]);A.command_path=None;A.temp_dir=None
+	def __init__(A,absolute_working_dir,config,config_file_path=_A,alternative_working_dir=_A):
+		D=alternative_working_dir;C=absolute_working_dir;B=config;A.config=B;A.config_file_path=config_file_path;A.working_dir=C;A.dirs=[C]+([D]if D else[]);A.command_path=_A;A.temp_dir=_A
 		if not bool(B.exe_url)+bool(B.exe_url)!=1:raise Exception('exe_url and exe_path are mutually exclusive.')
 		if not os.path.exists(A.working_dir):logging.info(f"Creating working directory {A.working_dir}");dir_create(A.working_dir)
 	def __enter__(A):return A
 	def __exit__(A,exc_type,exc_value,traceback):A._cleanup()
 	def _cleanup(A):0
 	def _pre_operations(A):
-		logging.info(f"Execute - Pre Operations");logging.info(f"Folders deletion")
-		for dir in A.config.pre_folder_delete or[]:dir_remove(os.path.join(A.working_dir,dir))
+		D=A.working_dir;logging.info(f"Execute - Pre Operations")
+		if A.config.pre_files_delete:
+			logging.info(f"Files deletion")
+			for F in os.listdir(D):
+				E=os.path.join(D,F)
+				if not F.startswith('.')and not os.path.isdir(E)and E!=A.config_file_path:logging.debug(f"Delete file {E}");os.remove(E)
+		logging.info(f"Folders deletion")
+		for dir in A.config.pre_folder_delete or[]:dir_remove(os.path.join(D,dir))
 		logging.info(f"Folders creation")
-		for dir in A.config.pre_folder_creation or[]:dir_create(os.path.join(A.working_dir,dir))
+		for dir in A.config.pre_folder_creation or[]:dir_create(os.path.join(D,dir))
 		if A.config.exe_url or A.config.exe_path:
 			logging.info(f"Executable file preparation")
 			if A.config.exe_url:
-				logging.info(f"Download executable {A.config.exe_url}");A.temp_dir=tempfile.mkdtemp();E='executable';B=os.path.join(A.temp_dir,E)
+				logging.info(f"Download executable {A.config.exe_url}");A.temp_dir=tempfile.mkdtemp();H='executable';B=os.path.join(A.temp_dir,H)
 				try:Web().download_progress(A.config.exe_url,B,headers=A.config.exe_url_headers,callback100=lambda percentage:logging.info(f"Downloaded {percentage}%"))
-				except Exception as F:raise ValueError(f"Error downloading executable: {F}")
+				except Exception as I:raise ValueError(f"Error downloading executable: {I}")
 				logging.info(f"Download completed")
 			elif A.config.exe_path:B=A.config.exe_path
-			if A.config.exe_unzip_and_use:logging.info(f"Unzip archive");D=os.path.dirname(B);unzip_file(B,D);B=os.path.join(D,A.config.exe_unzip_and_use);logging.info(f"Unzip completed")
+			if A.config.exe_unzip_and_use:logging.info(f"Unzip archive");G=os.path.dirname(B);unzip_file(B,G);B=os.path.join(G,A.config.exe_unzip_and_use);logging.info(f"Unzip completed")
 			C=find_command(B,A.dirs,guess_os_extension=A.config.exe_guess_os_extension)
 			if not C:raise FileNotFoundError(f"Command not found: {B}")
-			logging.info(f"Command path resolved: {C}");logging.info(f"Add executable permissions");G=os.stat(C).st_mode;os.chmod(C,G|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
+			logging.info(f"Command path resolved: {C}");logging.info(f"Add executable permissions");J=os.stat(C).st_mode;os.chmod(C,J|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
 		elif A.config.exe_command:logging.info(f"Command path: {A.config.exe_command}");C=A.config.exe_command
 		A.command_path=C
 	def _post_operations(A):logging.info(f"Execute - Post Operations")

scilens/config/models/execute.py

@@ -1,3 +1,3 @@
 _A=None
 from pydantic import BaseModel,Field
-class ExecuteConfig(BaseModel):pre_folder_delete:list[str]|_A=Field(default=_A,description='Liste de répertoire à supprimer avant l\'éxecution. Ex: `["DEBUG", "LOG", "OUT"]`');pre_folder_creation:list[str]|_A=Field(default=_A,description='Liste de répertoire à créeravant l\'éxecution. Ex : `["INI", "DAT"]`');exe_path:str|_A=Field(default=_A,description="Chemin de l'exécutable. Ex : `/absolute/path/executable` or `relative/path/executable`. Dans le cas, d'un chemin relatif, il testera le `working directory` et le `origin working directory` (exclusif avec `exe_url` et `exe_command`).");exe_url:str|_A=Field(default=_A,description="Url de l'exécutable à télécharger avant de l'exécuter. Ex : `https://github.com/org/app/releases/download/v3.31.5/app-2.12.2-linux-x86-64` (exclusif avec `exe_path` et `exe_command`).");exe_command:str|_A=Field(default=_A,description='Commande à exécuter sans résolution de chemin. Ex : `./app-2.12.2-linux-x86-64` ou `python3 app.py` (exclusif avec `exe_path` et `exe_url`).');exe_url_headers:dict[str,str]|_A=Field(default=_A,description='Si `exe_url` les en-têtes à ajouter à la requête de téléchargement de l\'exécutable. Ex : `{"Authorization":  "Bearer token"}`');exe_unzip_and_use:str|_A=Field(default=_A,description="Si l'exécutable (`exe_path` ou `exe_url`) est zippé, alors décompresse et utilise le fichier spécifié. Ex : `app-2.12.2-linux-x86-64`");exe_guess_os_extension:bool=Field(default=False,description="Si l'exécutable (`exe_path` ou `exe_url`) n'est pas trouvée, cherche avec des extensions en fonction de l'OS. Ex : `.exe`, `.bat` pour windows");command_suffix:str|_A=Field(default=_A,description='Suffixe à ajouter à la commande. Typiquemnt des secrets. Ex : ` --token DGDFGDFGDH`');working_dir:str|_A=Field(default=_A,description="Chemin relatif du répertoire de travail pour l'éxecution de la commande. Dans le contexte processeur `ExecuteAndCompare` si non défini, récupère respectivement la valeur de `compare.sources.test_folder_relative_path` ou `compare.sources.reference_folder_relative_path`")
+class ExecuteConfig(BaseModel):pre_files_delete:bool=Field(default=False,description="Si `true`, supprime les fichiers avant l'éxecution. (le fichier de configuration et les fichiers . ne seront pas supprimés)");pre_folder_delete:list[str]|_A=Field(default=_A,description='Liste de répertoire à supprimer avant l\'éxecution. Ex: `["DEBUG", "LOG", "OUT"]`');pre_folder_creation:list[str]|_A=Field(default=_A,description='Liste de répertoire à créeravant l\'éxecution. Ex : `["INI", "DAT"]`');exe_path:str|_A=Field(default=_A,description="Chemin de l'exécutable. Ex : `/absolute/path/executable` or `relative/path/executable`. Dans le cas, d'un chemin relatif, il testera le `working directory` et le `origin working directory` (exclusif avec `exe_url` et `exe_command`).");exe_url:str|_A=Field(default=_A,description="Url de l'exécutable à télécharger avant de l'exécuter. Ex : `https://github.com/org/app/releases/download/v3.31.5/app-2.12.2-linux-x86-64` (exclusif avec `exe_path` et `exe_command`).");exe_command:str|_A=Field(default=_A,description='Commande à exécuter sans résolution de chemin. Ex : `./app-2.12.2-linux-x86-64` ou `python3 app.py` (exclusif avec `exe_path` et `exe_url`).');exe_url_headers:dict[str,str]|_A=Field(default=_A,description='Si `exe_url` les en-têtes à ajouter à la requête de téléchargement de l\'exécutable. Ex : `{"Authorization":  "Bearer token"}`');exe_unzip_and_use:str|_A=Field(default=_A,description="Si l'exécutable (`exe_path` ou `exe_url`) est zippé, alors décompresse et utilise le fichier spécifié. Ex : `app-2.12.2-linux-x86-64`");exe_guess_os_extension:bool=Field(default=False,description="Si l'exécutable (`exe_path` ou `exe_url`) n'est pas trouvée, cherche avec des extensions en fonction de l'OS. Ex : `.exe`, `.bat` pour windows");command_suffix:str|_A=Field(default=_A,description='Suffixe à ajouter à la commande. Typiquemnt des secrets. Ex : ` --token DGDFGDFGDH`');working_dir:str|_A=Field(default=_A,description="Chemin relatif du répertoire de travail pour l'éxecution de la commande. Dans le contexte processeur `ExecuteAndCompare` si non défini, récupère respectivement la valeur de `compare.sources.test_folder_relative_path` ou `compare.sources.reference_folder_relative_path`")

scilens/config/models/reader_format_csv.py

@@ -2,5 +2,5 @@ _B=False
 _A=None
 from pydantic import BaseModel,Field
 from scilens.config.models.reader_format_cols_curve import ReaderColsCurveParserConfig
-class ReaderCsvMatrixConfig(BaseModel):x_value_line:int|_A=Field(default=_A,description="Indique la ligne des valeurs x si applicable. Peut être la ligne d'en-tête (=1).");has_y:bool=Field(default=_B,description='Indique si la première colonne est la colonne des valeurs y.');display_spectrogram:bool=Field(default=_B,description='Indique si la matrice doit être affichée en mode spectrogramme.');display_frameseries:bool=Field(default=_B,description='Indique si la matrice doit être affichée en mode frameseries.')
-class ReaderCsvConfig(BaseModel):delimiter:str|_A=Field(default=',',description='Délimiteur de colonnes.');quotechar:str|_A=Field(default='"',description='Délimiteur de texte.');has_header:bool|_A=Field(default=_A,description="Indique si la 1ère ligne est une ligne d'en-tête. Si non spécifié, il y aura une détection automatique.");is_matrix:bool=Field(default=_B,description='Indique si le fichier est une matrice.');ignore_columns:list[str]|_A=Field(default=_A,description='Liste des noms des colonnes à ignorer. (Valide seulement si la première ligne est une ligne en-têtes et non matrice)');curve_parser:ReaderColsCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.');matrix:ReaderCsvMatrixConfig|_A=Field(default=_A,description='Configuration de la matrice. (Valide seulement si `is_matrix` est vrai)')
+class ReaderCsvMatrixConfig(BaseModel):x_value_line:int|_A=Field(default=_A,description="Indique la ligne des valeurs x si applicable. Peut être la ligne d'en-tête (=1).");has_y:bool=Field(default=_B,description='Indique si la première colonne est la colonne des valeurs y.');x_name:str=Field(default='X',description='Nom de la colonne des valeurs x.');y_name:str=Field(default='Y',description='Nom de la colonne des valeurs y.');export_report:bool=Field(default=_B,description='Indique si les matrices doivent être exportées dans les rapports.')
+class ReaderCsvConfig(BaseModel):delimiter:str|_A=Field(default=',',description='Délimiteur de colonnes.');quotechar:str|_A=Field(default='"',description='Délimiteur de texte.');has_header:bool|_A=Field(default=_A,description="Indique si la 1ère ligne est une ligne d'en-tête. Si non spécifié, il y aura une détection automatique.");is_matrix:bool=Field(default=_B,description='Indique si le fichier est une matrice.');ignore_columns:list[str]|_A=Field(default=_A,description='Liste des noms des colonnes à ignorer. (Valide seulement si la première ligne est une ligne en-têtes et non matrice)');curve_parser:ReaderColsCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.');ignore_lines_patterns:list[str]|_A=Field(default=_A,description='Liste des patterns de lignes à ignorer. Ex: ["^#", "^//"]. Non applicable si `is_matrix` est vrai.');matrix:ReaderCsvMatrixConfig|_A=Field(default=_A,description='Configuration de la matrice. (Valide seulement si `is_matrix` est vrai)')

scilens/config/models/reader_format_txt_fixed_cols.py

@@ -1,4 +1,4 @@
 _A=None
 from pydantic import BaseModel,Field
 from scilens.config.models.reader_format_cols_curve import ReaderColsCurveParserConfig
-class ReaderTxtFixedColsConfig(BaseModel):ignore_lines_patterns:list[str]|_A=Field(default=_A,description='Liste des patterns de lignes à ignorer. Ex: ["^#", "^//"].');has_header:bool=Field(default=False,description="Indique si le dataset contient une ligne d'entête.");has_header_repetition:bool=Field(default=False,description="Indique si l'entête est répétée (pagination).");has_header_ignore:list[str]|_A=Field(default=_A,description="Chaînes de caractères à ignorer dans la ligne d'entête. eex: ['##', '|'].");column_widths:list[int]|_A=Field(default=_A,description='Liste des largeurs de colonnes. Ex: [9, 13, 12]. Exclusif avec `column_indexes`.');column_indexes:list[list[int]]|_A=Field(default=_A,description='Liste des index de début et fin de colonnes. Ex: [[0, 8], [9, 12], [13, 28]]. Exclusif avec `column_widths`.');curve_parser:ReaderColsCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.')
+class ReaderTxtFixedColsConfig(BaseModel):ignore_lines_patterns:list[str]|_A=Field(default=_A,description='Liste des patterns de lignes à ignorer. Ex: ["^#", "^//"].');has_header:bool=Field(default=False,description="Indique si le dataset contient une ligne d'entête.");has_header_line:int|_A=Field(default=_A,description="Numéro de la ligne d'entête. Si None, la première ligne non ignorée est considérée comme l'entête.");has_header_ignore:list[str]|_A=Field(default=_A,description="Chaînes de caractères à ignorer dans la ligne d'entête. eex: ['##', '|'].");column_widths:list[int]|_A=Field(default=_A,description='Liste des largeurs de colonnes. Ex: [9, 13, 12]. Exclusif avec `column_indexes`.');column_indexes:list[tuple[int,int]]|_A=Field(default=_A,description='Liste des index de début et fin de colonnes. Ex: [[0, 8], [9, 12], [13, 28]]. Exclusif avec `column_widths`.');curve_parser:ReaderColsCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.')

scilens/config/models/readers.py

@@ -1,17 +1,13 @@
-_B='netcdf'
-_A='txt_fixed_cols'
 from typing import Literal
-from pydantic import BaseModel,Field,model_validator
+from pydantic import BaseModel,Field
 from scilens.config.models.reader_format_txt import ReaderTxtConfig
 from scilens.config.models.reader_format_csv import ReaderCsvConfig
 from scilens.config.models.reader_format_txt_fixed_cols import ReaderTxtFixedColsConfig
 from scilens.config.models.reader_format_netcdf import ReaderNetcdfConfig
-TYPE_PARAMETERS_CLASS={'txt':ReaderTxtConfig,'csv':ReaderCsvConfig,_A:ReaderTxtFixedColsConfig,_B:ReaderNetcdfConfig}
-class ReaderConfig(BaseModel):
-	type:Literal['txt','csv',_A,_B]=Field(description='Type du reader. Les paramètres `parameters` dépendent de ce type.');parameters:ReaderTxtConfig|ReaderCsvConfig|ReaderTxtFixedColsConfig|ReaderNetcdfConfig=Field(description='Paramètres du reader')
-	@model_validator(mode='after')
-	def validate_model(cls,model):
-		A=model
-		if not isinstance(A.parameters,TYPE_PARAMETERS_CLASS[A.type]):raise ValueError(f"Reader Type {A.type} Parameters are not correct")
-		return A
-class ReadersConfig(BaseModel):txt:ReaderTxtConfig=Field(default=ReaderTxtConfig(),description='Configuration des readers txt.');csv:ReaderCsvConfig=Field(default=ReaderCsvConfig(),description='Configuration des readers csv.');txt_fixed_cols:ReaderTxtFixedColsConfig=Field(default=ReaderTxtFixedColsConfig(),description='Configuration des readers txt avec colonnes fixes.');netcdf:ReaderNetcdfConfig=Field(default=ReaderNetcdfConfig(),description='Configuration des readers NetCDF.');catalog:dict[str,ReaderConfig]|None=Field(default=None,description="Catalogue de configuration de readers par clé. Ex: `{'csv_comma': {'type': 'csv', 'parameters': {'delimiter': ','}}, 'csv_semicolon': {'type': 'csv', 'parameters': {'delimiter': ';'}}}`")
+class BaseCatalogItem(BaseModel):type:str
+class ReaderTxtConfigItem(BaseCatalogItem):type:Literal['txt'];parameters:ReaderTxtConfig
+class ReaderCsvConfigItem(BaseCatalogItem):type:Literal['csv'];parameters:ReaderCsvConfig
+class ReaderTxtFixedColsConfigItem(BaseCatalogItem):type:Literal['txt_fixed_cols'];parameters:ReaderTxtFixedColsConfig
+class ReaderNetcdfConfigItem(BaseCatalogItem):type:Literal['netcdf'];parameters:ReaderNetcdfConfig
+CATALOG_ITEM_TYPE=ReaderTxtConfigItem|ReaderCsvConfigItem|ReaderTxtFixedColsConfigItem|ReaderNetcdfConfigItem
+class ReadersConfig(BaseModel):txt:ReaderTxtConfig=Field(default=ReaderTxtConfig(),description='Configuration des readers txt.');csv:ReaderCsvConfig=Field(default=ReaderCsvConfig(),description='Configuration des readers csv.');txt_fixed_cols:ReaderTxtFixedColsConfig=Field(default=ReaderTxtFixedColsConfig(),description='Configuration des readers txt avec colonnes fixes.');netcdf:ReaderNetcdfConfig=Field(default=ReaderNetcdfConfig(),description='Configuration des readers NetCDF.');catalog:dict[str,CATALOG_ITEM_TYPE]|None=Field(default=None,description="Catalogue de configuration de readers par clé. Ex: `{'csv_comma': {'type': 'csv', 'parameters': {'delimiter': ','}}, 'csv_semicolon': {'type': 'csv', 'parameters': {'delimiter': ';'}}}`")

scilens/config/models/report.py

@@ -3,4 +3,4 @@ from pydantic import BaseModel,Field
 from scilens.app import product_name
 from scilens.config.models.report_html import ReportHtmlConfig
 from scilens.config.models.report_output import ReportOutputConfig
-class ReportConfig(BaseModel):debug:bool=Field(default=False,description='If `true` the report will be more verbose and displays template input data.');title:str=Field(default=_A,description='Titre du rapport');title_prefix:str=Field(default=f"{product_name} Report",description='Préfixe au Titre du rapport');logo:str|_A=Field(default=_A,description="Source d'une image logo. Peut être une url ou une url data image encodée base64 (exclusif avec `logo_file`).");logo_file:str|_A=Field(default=_A,description="Source fichier d'une image logo (exclusif avec `logo`).");output:ReportOutputConfig=ReportOutputConfig();html:ReportHtmlConfig=ReportHtmlConfig()
+class ReportConfig(BaseModel):debug:bool=Field(default=False,description='If `true` the report will be more verbose and displays template input data.');title:str=Field(default=_A,description='Titre du rapport');title_prefix:str=Field(default=f"{product_name} Report",description='Préfixe au Titre du rapport');description:str|_A=Field(default=_A,description='Description inclu dans une section spécifique description des rapports');logo:str|_A=Field(default=_A,description="Source d'une image logo. Peut être une url ou une url data image encodée base64 (exclusif avec `logo_file`).");logo_file:str|_A=Field(default=_A,description="Source fichier d'une image logo (exclusif avec `logo`).");output:ReportOutputConfig=ReportOutputConfig();html:ReportHtmlConfig=ReportHtmlConfig()

scilens/config/models/report_html.py

@@ -1,6 +1,11 @@
-_A="Paramètre modifiable par l'utilisateur"
+_D="Paramètre modifiable par l'utilisateur"
+_C=False
+_B=True
+_A=None
 from pydantic import BaseModel,Field
-class ReportParameterPageModeConfig(BaseModel):is_user_preference:bool=Field(default=True,description=_A);default_value:str=Field(default='onepage',description='`tabs` ou `onepage`')
-class ReportParameterOpenFileInConfig(BaseModel):is_user_preference:bool=Field(default=True,description=_A);default_value:str=Field(default='browser',description='`browser` ou `vscode`')
-class ReportHtmlCurvesConfig(BaseModel):display_on_load:bool=Field(default=False,description="Si `true`, affiche tous les graphiques courbes à l'ouverture du rapport.");init_width:int=Field(default=600,description='Largeur initiale des graphiques courbes.');init_height:int=Field(default=400,description='Hauteur initiale des graphiques courbes.')
-class ReportHtmlConfig(BaseModel):logo_height:int=Field(default=40,description='Hauteur du logo dans le titre.');compare_color_test:str=Field(default='1982c4',description='Couleur pour les données de test.');compare_color_reference:str=Field(default='6a4c93',description='Couleur pour les données de référence.');collapse_if_successful:bool=Field(default=True,description="N'affiche par défaut les sections de comparaison sans erreur.");parameter_page_mode:ReportParameterPageModeConfig=ReportParameterPageModeConfig();parameter_open_file_in:ReportParameterOpenFileInConfig=ReportParameterOpenFileInConfig();curves:ReportHtmlCurvesConfig=ReportHtmlCurvesConfig()
+class ReportParameterPageModeConfig(BaseModel):is_user_preference:bool=Field(default=_B,description=_D);default_value:str=Field(default='onepage',description='`tabs` ou `onepage`')
+class ReportParameterOpenFileInConfig(BaseModel):is_user_preference:bool=Field(default=_B,description=_D);default_value:str=Field(default='browser',description='`browser` ou `vscode`')
+class ReportHtmlCurvesConfig(BaseModel):display_on_load:bool=Field(default=_C,description="Si `true`, affiche tous les graphiques courbes à l'ouverture du rapport.");init_width:int=Field(default=600,description='Largeur initiale des graphiques courbes.');init_height:int=Field(default=400,description='Hauteur initiale des graphiques courbes.');compare_vs_values:bool=Field(default=_B,description='Dans le chart de comparaison, affiche les valeurs de référence et de test.');compare_vs_difference:bool=Field(default=_C,description='Dans le chart de comparaison, affiche la différence entre les valeurs de référence et de test.')
+class ReportHtmlSpectrogramsConfig(BaseModel):test_ref:bool=Field(default=_B,description='Indique si les spectrogrammes de test doivent être affichés.');differences:bool=Field(default=_B,description='Indique si les spectrogrammes de différence doivent être affichés.');init_width:int=Field(default=300,description='Largeur initiale des spectrogrammes.');init_height:int=Field(default=300,description='Hauteur initiale des spectrogrammes.')
+class ReportHtmlMatrixConfig(BaseModel):spectrograms:ReportHtmlSpectrogramsConfig|_A=_A;frameseries:bool=Field(default=_C,description='Indique si les matrices doivent être affichées en mode frameseries.')
+class ReportHtmlConfig(BaseModel):custom_style:str|_A=Field(default=_A,description='CSS personnalisé.');custom_script_head:str|_A=Field(default=_A,description='Script personnalisé dans le `<head>`.');custom_script_body:str|_A=Field(default=_A,description='Script personnalisé en fin de `<body>`.');extra_html_start:str|_A=Field(default=_A,description='HTML personnalisé en début de rapport.');extra_html_summary:str|_A=Field(default=_A,description='HTML personnalisé dans la section `Summary`.');extra_html_end:str|_A=Field(default=_A,description='HTML personnalisé en fin de rapport.');logo_height:int=Field(default=40,description='Hauteur du logo dans le titre.');compare_color_test:str=Field(default='1982c4',description='Couleur pour les données de test.');compare_color_reference:str=Field(default='6a4c93',description='Couleur pour les données de référence.');collapse_if_successful:bool=Field(default=_B,description="N'affiche par défaut les sections de comparaison sans erreur.");parameter_page_mode:ReportParameterPageModeConfig=ReportParameterPageModeConfig();parameter_open_file_in:ReportParameterOpenFileInConfig=ReportParameterOpenFileInConfig();curves:ReportHtmlCurvesConfig=ReportHtmlCurvesConfig();matrix:ReportHtmlMatrixConfig=ReportHtmlMatrixConfig()

scilens/processors/execute_and_compare.py

@@ -11,7 +11,7 @@ class ExecuteAndCompare:
 		if not F.test_only:G.append({I:'reference',J:N,B:F.reference})
 		for A in G:
 			if not A[B]:C=D
-			else:C=ExecuteConfig();C.pre_folder_delete=A[B].pre_folder_delete or D.pre_folder_delete;C.pre_folder_creation=A[B].pre_folder_creation or D.pre_folder_creation;C.exe_path=A[B].exe_path or D.exe_path;C.exe_url=A[B].exe_url or D.exe_url;C.exe_command=A[B].exe_command or D.exe_command;C.exe_url_headers=A[B].exe_url_headers or D.exe_url_headers;C.exe_unzip_and_use=A[B].exe_unzip_and_use or D.exe_unzip_and_use;C.exe_guess_os_extension=A[B].exe_guess_os_extension or D.exe_guess_os_extension;C.command_suffix=A[B].command_suffix or D.command_suffix
+			else:C=ExecuteConfig();C.pre_files_delete=A[B].pre_files_delete or D.pre_files_delete;C.pre_folder_delete=A[B].pre_folder_delete or D.pre_folder_delete;C.pre_folder_creation=A[B].pre_folder_creation or D.pre_folder_creation;C.exe_path=A[B].exe_path or D.exe_path;C.exe_url=A[B].exe_url or D.exe_url;C.exe_command=A[B].exe_command or D.exe_command;C.exe_url_headers=A[B].exe_url_headers or D.exe_url_headers;C.exe_unzip_and_use=A[B].exe_unzip_and_use or D.exe_unzip_and_use;C.exe_guess_os_extension=A[B].exe_guess_os_extension or D.exe_guess_os_extension;C.command_suffix=A[B].command_suffix or D.command_suffix
 			logging.info(f"Execute {A[I]} Command")
-			with Executor(A[J],C,alternative_working_dir=E.context.origin_working_dir)as O:O.process()
+			with Executor(A[J],C,E.context.config_file,alternative_working_dir=E.context.origin_working_dir)as O:O.process()
 		G=E.compare_folders.compute_list_filenames();logging.info(f"Number files to compare: {len(G)}");K=E.compare_folders.compute_comparison(G);H.warnings=[A[L]for A in K if A.get(L)];H.data=K;return H

scilens/readers/mat_dataset.py

@@ -1,4 +1,3 @@
-_B=False
 _A=None
 import csv
 from collections.abc import Iterator
@@ -6,8 +5,8 @@ from dataclasses import dataclass,field,asdict
 from scilens.components.compare_models import CompareGroup
 from scilens.components.compare_floats import CompareFloats
 @dataclass
-class MatDataset:nb_lines:int=0;nb_columns:int=0;data:list[list[float]]=field(default_factory=lambda:[]);x_values:list[float]|_A=_A;y_values:list[float]|_A=_A
-def from_reader(reader,x_value_line=_A,has_header=_B,has_y=_B):
+class MatDataset:x_name:str;y_name:str;nb_lines:int=0;nb_columns:int=0;data:list[list[float]]=field(default_factory=lambda:[]);x_values:list[float]|_A=_A;y_values:list[float]|_A=_A
+def from_iterator(x_name,y_name,reader,x_value_line=_A,has_header=False,has_y=False):
 	E=has_y;D=x_value_line;B=reader;H=_A;I=[]if E else _A;A=[];F=0
 	if D:
 		J=1 if E else 0
@@ -19,14 +18,9 @@ def from_reader(reader,x_value_line=_A,has_header=_B,has_y=_B):
 		for C in B:L=float(C[0]);G=[float(A)for A in C[1:]];I.append(L);A.append(G)
 	else:
 		for C in B:G=[float(A)for A in C];A.append(G)
-	return MatDataset(nb_lines=len(A),nb_columns=len(A[0])if len(A)>0 else 0,data=A,x_values=H,y_values=I)
+	return MatDataset(x_name=x_name,y_name=y_name,nb_lines=len(A),nb_columns=len(A[0])if len(A)>0 else 0,data=A,x_values=H,y_values=I)
 def compare(parent_group,compare_floats,test,ref,group_name=''):B=parent_group;A=test;D,C,E=compare_floats.add_group_and_compare_matrices(group_name,B,group_data=_A,test_mat=A.data,ref_mat=ref.data,x_vector=A.x_values,y_vector=A.y_values);B.error='Errors limit reached'if C else _A
-def get_data(datasets,names,display_spectrograms=_B,display_frameseries=_B,frameseries_steps_data=_A,frameseries_steps_name=_A):
-	F='frameseries';E='display';D=frameseries_steps_data;C=names;B=datasets
-	if len(B)!=len(C):raise ValueError('Datasets and names must have the same length')
-	A={'datasets':[asdict(A)for A in B],'names':C}
-	if display_spectrograms:A['spectrograms']={E:1}
-	if display_frameseries:
-		A[F]={E:1}
-		if D:A[F]['steps']={'name':frameseries_steps_name,'data':D}
-	return A
+def get_data(datasets,names,frameseries_steps_data=_A,frameseries_steps_name=_A):
+	B=names;A=datasets
+	if len(A)!=len(B):raise ValueError('Datasets and names must have the same length')
+	C={'datasets':[asdict(A)for A in A],'names':B};return C

scilens/readers/reader_csv.py

@@ -1,8 +1,8 @@
 _A=None
-import logging,csv
+import logging,csv,re
 from scilens.readers.reader_interface import ReaderInterface
 from scilens.readers.cols_dataset import ColsDataset,ColsCurves,cols_dataset_get_curves_col_x,compare as cols_compare
-from scilens.readers.mat_dataset import MatDataset,from_reader as mat_from_reader,compare as mat_compare,get_data
+from scilens.readers.mat_dataset import MatDataset,from_iterator as mat_from_iterator,compare as mat_compare,get_data
 from scilens.config.models.reader_format_csv import ReaderCsvConfig,ReaderCsvMatrixConfig
 from scilens.config.models.reader_format_cols_curve import ReaderCurveParserNameConfig
 from scilens.components.compare_models import CompareGroup
@@ -20,31 +20,37 @@ def csv_detect(path,delimiter,quotechar,encoding):
 class ReaderCsv(ReaderInterface):
 	configuration_type_code='csv';category='datalines';extensions=['CSV']
 	def read(A,reader_options):
-		B=reader_options;A.reader_options=B;A.raw_lines_number=_A;A.curves=_A;A.report_matrices=_A;D,F,N=csv_detect(A.origin.path,A.reader_options.delimiter,A.reader_options.quotechar,encoding=A.encoding);A.has_header=D;A.cols=F;A.numeric_col_indexes=N;J=open(A.origin.path,'r',encoding=A.encoding);K=csv.reader(J,delimiter=A.reader_options.delimiter,quotechar=A.reader_options.quotechar)
-		if B.is_matrix:
-			E=B.matrix or ReaderCsvMatrixConfig();G=mat_from_reader(K,has_header=D,x_value_line=E.x_value_line,has_y=E.has_y)
-			if E.display_spectrogram or E.display_frameseries:A.report_matrices=get_data([G],['csv'],E.display_spectrogram,E.display_frameseries)
-			A.mat_dataset=G;A.raw_lines_number=G.nb_lines+(1 if D else 0)
-		else:
-			if B.ignore_columns:
-				if not D:raise Exception('Ignore columns is not supported without header.')
-				A.numeric_col_indexes=[C for C in A.numeric_col_indexes if A.cols[C]not in B.ignore_columns]
-			L=len(F);C=ColsDataset(cols_count=L,names=F,numeric_col_indexes=A.numeric_col_indexes,data=[[]for A in range(L)]);H=0
-			for O in K:
-				H+=1
-				if D and H==1:continue
-				for(M,I)in enumerate(O):
-					if M in C.numeric_col_indexes:I=float(I)
-					C.data[M].append(I)
-				C.origin_line_nb.append(H)
-			C.rows_count=len(C.origin_line_nb);A.cols_dataset=C;A.raw_lines_number=C.rows_count+(1 if D else 0)
-			if B.curve_parser:
-				if B.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
-					A.curves,P=cols_dataset_get_curves_col_x(C,B.curve_parser.parameters.x)
-					if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=P,curves=A.curves)
-				elif B.curve_parser.name==ReaderCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
-				else:raise Exception('Curve parser not supported.')
-		J.close()
+		B=reader_options;A.reader_options=B;J=B.ignore_lines_patterns;A.raw_lines_number=_A;A.curves=_A;A.report_matrices=_A;D,F,P=csv_detect(A.origin.path,A.reader_options.delimiter,A.reader_options.quotechar,encoding=A.encoding);A.has_header=D;A.cols=F;A.numeric_col_indexes=P
+		with open(A.origin.path,'r',encoding=A.encoding)as Q:
+			K=Q.readlines();L=csv.reader(K,delimiter=A.reader_options.delimiter,quotechar=A.reader_options.quotechar)
+			if B.is_matrix:
+				E=B.matrix or ReaderCsvMatrixConfig();G=mat_from_iterator(x_name=E.x_name,y_name=E.y_name,reader=L,has_header=D,x_value_line=E.x_value_line,has_y=E.has_y)
+				if E.export_report:A.report_matrices=get_data([G],['csv'])
+				A.mat_dataset=G;A.raw_lines_number=G.nb_lines+(1 if D else 0)
+			else:
+				if B.ignore_columns:
+					if not D:raise Exception('Ignore columns is not supported without header.')
+					A.numeric_col_indexes=[C for C in A.numeric_col_indexes if A.cols[C]not in B.ignore_columns]
+				M=len(F);C=ColsDataset(cols_count=M,names=F,numeric_col_indexes=A.numeric_col_indexes,data=[[]for A in range(M)]);H=0
+				for(R,S)in zip(K,L):
+					H+=1
+					if D and H==1:continue
+					if J:
+						N=False
+						for T in J:
+							if bool(re.match(T,R)):N=True;break
+						if N:continue
+					for(O,I)in enumerate(S):
+						if O in C.numeric_col_indexes:I=float(I)
+						C.data[O].append(I)
+					C.origin_line_nb.append(H)
+				C.rows_count=len(C.origin_line_nb);A.cols_dataset=C;A.raw_lines_number=C.rows_count+(1 if D else 0)
+				if B.curve_parser:
+					if B.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
+						A.curves,U=cols_dataset_get_curves_col_x(C,B.curve_parser.parameters.x)
+						if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=U,curves=A.curves)
+					elif B.curve_parser.name==ReaderCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
+					else:raise Exception('Curve parser not supported.')
 	def compare(A,compare_floats,param_reader,param_is_ref=True):
 		H='node';D=param_is_ref;C=param_reader;B=compare_floats;I=A.reader_options
 		if I.is_matrix:E=A.mat_dataset if D else C.mat_dataset;F=A.mat_dataset if not D else C.mat_dataset;J,G=B.compare_errors.add_group(H,'csv matrix');mat_compare(G,B,E,F)

scilens/readers/reader_txt_fixed_cols.py

@@ -1,38 +1,81 @@
+_A=None
 import logging,re
+from dataclasses import dataclass
 from scilens.readers.transform import string_2_float
 from scilens.readers.reader_interface import ReaderInterface
 from scilens.readers.cols_dataset import ColsDataset,ColsCurves,cols_dataset_get_curves_col_x,compare
 from scilens.config.models import ReaderTxtFixedColsConfig
 from scilens.config.models.reader_format_cols_curve import ReaderCurveParserNameConfig
 from scilens.components.compare_floats import CompareFloats
+@dataclass
+class ParsedHeaders:raw:str;cleaned:str;data:list[str];ori_line_idx:int|_A=_A
 class ReaderTxtFixedCols(ReaderInterface):
 	configuration_type_code='txt_fixed_cols';category='datalines';extensions=[]
-	def read(B,reader_options):
-		A=reader_options;B.reader_options=A;J=open(B.origin.path,'r',encoding=B.encoding);K=A.column_widths;L=A.ignore_lines_patterns;E=len(K);C=ColsDataset(cols_count=E,names=[f"Column {A+1}"for A in range(E)],numeric_col_indexes=[A for A in range(E)],data=[[]for A in range(E)]);F=None;G=0
-		for D in J:
+	def _ignore_line(A,line):
+		if not line.strip():return True
+		if A.reader_options.ignore_lines_patterns:
+			for B in A.reader_options.ignore_lines_patterns:
+				if bool(re.match(B,line)):return True
+		return False
+	def _get_parsed_headers(A,path):
+		B=A.reader_options;C=_A
+		with open(A.origin.path,'r',encoding=A.encoding)as G:
+			D=-1
+			if B.has_header_line is not _A:
+				for E in G:
+					D+=1
+					if D+1==B.has_header_line:C=E;break
+			else:
+				for E in G:
+					D+=1
+					if not A._ignore_line(E):C=E;break
+		if C:
+			H=C.strip();F=H
+			if B.has_header_ignore:
+				for I in B.has_header_ignore:F=F.replace(I,'')
+			return ParsedHeaders(raw=H,cleaned=F,data=F.split(),ori_line_idx=D)
+	def _get_first_data_line(A,path):
+		D=A.reader_options;B=D.has_header
+		with open(A.origin.path,'r',encoding=A.encoding)as E:
+			for C in E:
+				if not A._ignore_line(C):
+					if B:B=False;continue
+					else:return C
+	def _discover_col_idx_ralgin_spaces(G,line):
+		A=line;A=A.rstrip();C=[];D=_A;B=0
+		for(E,F)in enumerate(A):
+			if D is not _A and D!=' 'and F==' ':C.append((B,E));B=E
+			D=F
+		if B<len(A):C.append((B,len(A)))
+		return C
+	def _derive_col_indexes(A,header_row=_A):0
+	def read(A,reader_options):
+		B=reader_options;A.reader_options=B;E=A._get_parsed_headers(A.origin.path)if B.has_header else _A;I=open(A.origin.path,'r',encoding=A.encoding);C=[]
+		if B.column_indexes or B.column_widths:
+			if B.column_indexes and B.column_widths:raise Exception('column_indexes and column_widths are exclusive.')
+			if B.column_widths:
+				logging.debug(f"Using column widths: {B.column_widths}");H=0
+				for J in B.column_widths:C+=[(H,H+J)];H+=J
+			else:logging.debug(f"Using column indexes: {B.column_indexes}");C=B.column_indexes
+		else:logging.debug(f"Using auto derived column indexes.");M=A._get_first_data_line(A.origin.path);C=A._discover_col_idx_ralgin_spaces(M)
+		logging.debug(f"Column indexes: {C}")
+		if not C:raise Exception('No column indexes or widths provided, and no headers found to derive column indexes.')
+		F=len(C);D=ColsDataset(cols_count=F,names=[f"Column {A+1}"for A in range(F)],numeric_col_indexes=[A for A in range(F)],data=[[]for A in range(F)])
+		if E:D.names=E.data
+		G=0
+		for K in I:
 			G+=1
-			if L:
-				M=False
-				for P in L:
-					if bool(re.match(P,D)):M=True;break
-				if M:continue
-			if A.has_header:
-				if not F:
-					F=D.strip();H=F
-					if A.has_header_ignore:
-						for Q in A.has_header_ignore:H=H.replace(Q,'')
-					C.names=H.split();continue
-				elif A.has_header_repetition and F==D.strip():continue
-			if not D.strip():continue
-			I=0;N=0
-			for O in K:R=D[I:I+O].strip();S=string_2_float(R);C.data[N].append(S);I+=O;N+=1
-			C.origin_line_nb.append(G)
-		C.rows_count=len(C.origin_line_nb);J.close();B.cols_dataset=C;B.raw_lines_number=G;B.curves=None
-		if A.curve_parser:
-			if A.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
-				B.curves,T=cols_dataset_get_curves_col_x(C,A.curve_parser.parameters.x)
-				if B.curves:B.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=T,curves=B.curves)
-			elif A.curve_parser.name==ReaderCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
+			if A._ignore_line(K):continue
+			if E:
+				if E.ori_line_idx==G-1:continue
+			for(N,L)in enumerate(C):O=K[L[0]:L[1]].strip();P=string_2_float(O);D.data[N].append(P)
+			D.origin_line_nb.append(G)
+		D.rows_count=len(D.origin_line_nb);I.close();A.cols_dataset=D;A.raw_lines_number=G;A.curves=_A;A.cols_curve=_A
+		if B.curve_parser:
+			if B.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
+				A.curves,Q=cols_dataset_get_curves_col_x(D,B.curve_parser.parameters.x)
+				if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=Q,curves=A.curves)
+			elif B.curve_parser.name==ReaderCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
 			else:raise Exception('Curve parser not supported.')
 	def compare(A,compare_floats,param_reader,param_is_ref=True):D=param_is_ref;C=param_reader;B=compare_floats;E=A.cols_dataset if D else C.cols_dataset;F=A.cols_dataset if not D else C.cols_dataset;G=A.cols_curve;I,H=B.compare_errors.add_group('node','txt cols');return compare(H,B,E,F,G)
 	def class_info(A):return{'cols':A.cols_dataset.names,'raw_lines_number':A.raw_lines_number,'curves':A.curves}

scilens/report/html_report.py

@@ -22,6 +22,6 @@ class HtmlReport:
 					E=os.path.join(L,D)
 					if os.path.isfile(E):C=E;break
 				if not C:raise FileNotFoundError(f"Logo file '{A.config.logo_file}' not found in {F}.")
-		M=A.config.title if A.config.title else A.config.title_prefix+' '+task_name;N={'app_name':product_name,'app_version':pkg_version,'app_homepage':pkg_homepage,'app_copyright':f"© {B[H][:4]} {powered_by['name']}. All rights reserved",'app_powered_by':powered_by,'execution_utc_datetime':B['datetime'],'execution_utc_date':B[H],'execution_utc_time':B['time'],'execution_dir':A.working_dir,'title':M,'image':K or get_logo_image_src(C),'config':A.config.html,'config_json':A.config.html.model_dump_json()};G=None
+		M=A.config.title if A.config.title else A.config.title_prefix+' '+task_name;N={'app_name':product_name,'app_version':pkg_version,'app_homepage':pkg_homepage,'app_copyright':f"© {B[H][:4]} {powered_by['name']}. All rights reserved",'app_powered_by':powered_by,'execution_utc_datetime':B['datetime'],'execution_utc_date':B[H],'execution_utc_time':B['time'],'execution_dir':A.working_dir,'title':M,'description':A.config.description,'image':K or get_logo_image_src(C),'config':A.config.html,'config_json':A.config.html.model_dump_json()};G=None
 		if A.config.debug:G=A.config.model_dump_json(indent=4)
 		return template_render_infolder('index.html',{I:N,'task':data.get(I),'data':{'files':data.get('processor_results')},'debug':G})

scilens/report/templates/body_01_title.html

@@ -47,15 +47,3 @@
   </table>
   
 </div>
-
-
-
-<div id="tabs" class="tabs noselect" style="display: none;">
-  <div class="tab active" onclick="actions.click_tab(event, 0)">Summary</div>
-  {% for file in data.files %}
-  {% if not file.skipped %}
-  <div class="tab {{ ns.statuses[loop.index] }}" onclick="actions.click_tab(event, {{ loop.index }})"><span class="">{{ file.name }}</span></div>
-  {% endif %}
-  {% endfor %}
-  <div class="tabend"></div>
-</div>    

scilens/report/templates/body_02_tabs.html

@@ -0,0 +1,9 @@
+<div id="tabs" class="tabs noselect" style="display: none;">
+  <div class="tab active" onclick="actions.click_tab(event, 0)">Summary</div>
+  {% for file in data.files %}
+  {% if not file.skipped %}
+  <div class="tab {{ ns.statuses[loop.index] }}" onclick="actions.click_tab(event, {{ loop.index }})"><span class="">{{ file.name }}</span></div>
+  {% endif %}
+  {% endfor %}
+  <div class="tabend"></div>
+</div>    

scilens/report/templates/compare_11_summary.html

@@ -2,7 +2,18 @@
 
   <h2>Summary</h2>
 
-  <!-- FILES -->
+  <!-- DESCRIPTION -->
+  {% if meta.description %}
+  <!-- <h3>Description</h3> -->
+  <div id="section_summary_description" class="description">
+    {{ meta.description }}
+  </div>
+  {% endif %}
+
+  <!-- EXTRA HTML -->
+  {% if meta.config.extra_html_summary %}{{ meta.config.extra_html_summary }}{% endif %}
+
+  <!-- DATASETS -->
   <h3>
     Datasets <action data-command="toogle" data-args="section_summary_datasets"></action>
   </h3>

scilens/report/templates/compare_12_sections.html

@@ -133,11 +133,16 @@
     <div id="framesseries_{{ file_index }}" ></div>
     {% endif %}
 
-    {% for item in [{"id": "spectrograms", "label": "Spectrograms"}, {"id": "frameseries", "label": "Frameseries"}] %}
     
+    <!-- MATRICES -->
+    {% if file.test.matrices %}
+    {% for item in [{"id": "spectrograms", "label": "Spectrograms"}, {"id": "frameseries", "label": "Frameseries"}] %}
+    {% if meta.config.matrix[item.id] %}
     <h3>{{ item.label }} <action data-command="toogle" data-args="{{ item.id }}_{{ file_index|string }}"></action></h3>
     <div id="{{ item.id }}_{{ file_index }}" ></div>
+    {% endif %}
     {% endfor %}
+    {% endif %}
 
 
     <!--COMPARISONS ERRORS AND WARNINGS-->

scilens/report/templates/index.html

@@ -13,8 +13,8 @@
     {% set ns.statuses = ns.statuses + ['SKIPPED' if file.skipped else ('ERROR' if file.error else ('WARNING' if file.comparison_errors and file.comparison_errors.error_nb > 0 else 'SUCCESS'))] %}
     {% if file.test.matrices %}
       {% set ns.has_matrices = true %}
-      {% if file.test.matrices.spectrograms %}{% set ns.has_spectrograms = true %}{% endif %}
-      {% if file.test.matrices.frameseries %}{% set ns.has_frameseries = true %}{% endif %}
+      {% if meta.config.matrix.spectrograms %}{% set ns.has_spectrograms = true %}{% endif %}
+      {% if meta.config.matrix.frameseries %}{% set ns.has_frameseries = true %}{% endif %}
     {% endif %}
 {% endfor %}
 <html>
@@ -26,19 +26,29 @@
     <script src="https://cdn.plot.ly/plotly-2.34.0.min.js" charset="utf-8"></script>
 
 <script>
-((w_1, undef) => { w_1.None = undef; })(window); // for Python None = undef when templating
+
+((w_1, undef) => { w_1.None = undef; w_1.True = true; ; w_1.False = false; })(window); // for Python None = undef when templating
 {% include 'js_dom.js' %}
 {% include 'js_palette.js' %}
-</script>
-<script>{% include 'js_com_page.js' with context %}</script>
-<script>{% include 'js_chartlibs_plotly.js' %}</script>
-<script>{% include 'js_chartlibs_echarts.js' %}</script>
-<script>{% include 'js_curvemgr.js' %}</script>
-<script>{% include 'utils_compare_report_anim.js' %}</script>
-<script>{% include 'utils_compare_report_framesseries.js' %}</script>
-<script>
-{% if ns.has_spectrograms %}{% include 'uti_spectrograms.js' %}{% endif %}
+
+{% include 'js_com_page.js' with context %}
+{% include 'js_chartlibs_plotly.js' %}
+{% include 'js_chartlibs_echarts.js' %}
+{% include 'js_curvemgr.js' %}
+{% include 'utils_compare_report_anim.js' %}
+{% include 'utils_compare_report_framesseries.js' %}
+
+{% if meta.config.matrix.spectrograms %}
+{% include 'uti_spectrograms.js' %}
+Spectrograms.config({
+  "DISPLAY_TESTREF": {{ meta.config.matrix.spectrograms.test_ref }},
+  "DISPLAY_DIFF": {{ meta.config.matrix.spectrograms.differences }},
+  "WIDTH": {{ meta.config.matrix.spectrograms.init_width }},
+  "HEIGHT": {{ meta.config.matrix.spectrograms.init_height }},
+});
+{% endif %}
 {% if ns.has_matrices %}{% include 'uti_matrix.js' %}{% endif %}
+
 </script>
 <script>
 function load_animations(){
@@ -89,13 +99,16 @@ function load_file_section(global_var, section_prefix, cls) {
   user-select: none; /* Standard syntax */
 }
 </style>
+{% if meta.config.custom_style %}<style type="text/css">{{ meta.config.custom_style }}</style>{% endif %}
+{% if meta.config.custom_script_head %}<script>{{ meta.config.custom_script_head }}</script>{% endif %}
   </head>
   <body>
     {% include 'body_01_title.html' with context %}
-
+    {% if meta.config.extra_html_start %}{{ meta.config.extra_html_start }}{% endif %}
+    {% include 'body_02_tabs.html' with context %}
     {% include 'compare_11_summary.html' with context %}
     {% include 'compare_12_sections.html' with context %}
-    
+    {% if meta.config.extra_html_end %}{{ meta.config.extra_html_end }}{% endif %}
     {% include 'body_99_footer.html' with context %}
     <script type="text/javascript">
       const GLOBAL_VARS = {};
@@ -122,8 +135,9 @@ function load_file_section(global_var, section_prefix, cls) {
         test :      [ {% for file in data.files %} {{ file.test.matrices or 'null' }} , {% endfor %} ],
         reference : [ {% for file in data.files %} {{ file.ref.matrices or 'null' }} , {% endfor %} ],
       };
-      MatrixMgmt.loadGlobal();
+      MatrixMgmt.loadGlobal({{ns.has_spectrograms}}, {{ns.has_frameseries}});
     </script>
     {% endif %}
+    {% if meta.config.custom_script_body %}<script>{{ meta.config.custom_script_body }}</script>{% endif %}
   </body>
 </html>