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

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_html.py

@@ -1,8 +1,11 @@
-_C="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=_B,description=_C);default_value:str=Field(default='onepage',description='`tabs` ou `onepage`')
-class ReportParameterOpenFileInConfig(BaseModel):is_user_preference:bool=Field(default=_B,description=_C);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.');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=_B,description='Dans le chart de comparaison, affiche la différence entre les valeurs de référence et de test.')
-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()
+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/templates/compare_12_sections.html

@@ -137,7 +137,7 @@
     <!-- MATRICES -->
     {% if file.test.matrices %}
     {% for item in [{"id": "spectrograms", "label": "Spectrograms"}, {"id": "frameseries", "label": "Frameseries"}] %}
-    {% if file.test.matrices[item.id] %}
+    {% 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 %}

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>
@@ -27,7 +27,7 @@
 
 <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' %}
 
@@ -38,7 +38,15 @@
 {% include 'utils_compare_report_anim.js' %}
 {% include 'utils_compare_report_framesseries.js' %}
 
-{% if ns.has_spectrograms %}{% include 'uti_spectrograms.js' %}{% endif %}
+{% 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>
@@ -127,7 +135,7 @@ 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 %}

scilens/report/templates/js_chartlibs_plotly.js

@@ -21,7 +21,7 @@
         if (item.special) {
           switch (item.special) {
             case 'diff':
-              yaxis2 = {title: 'Difference',overlaying: 'y',side: 'right'}
+              yaxis2 = {title: 'Difference',overlaying: 'y',side: 'right', color: 'rgba(255, 0, 0, 1)'}
               serie.line.color = 'rgba(255, 0, 0, 0.5)';
               serie.yaxis = 'y2';
               serie.fill = 'tozeroy';

scilens/report/templates/js_com_page.js

@@ -190,7 +190,7 @@
       }
     },
     init_page: function() {
-      console.log(parameters)
+      //console.log(parameters)
       build_parameters();
       action.init();
       this.render_page();

scilens/report/templates/js_curvemgr.js

@@ -346,7 +346,6 @@ w_1.curvemgr = {
     }
   },
   init(config) {
-    console.log(config)
     for (const k in CONFIG) {
       if (config[k] != undef) {CONFIG[k] = config[k];}
     }

scilens/report/templates/uti_matrix.js

@@ -21,13 +21,18 @@ function subtractMatrices(A, B) {
     row.map((v, j) => v - B[i][j])
   );
 }
+function absolueMatrice(A) {
+  return A.map(row => row.map(v => Math.abs(v)));
+}
 //
 class Matrix {
-  constructor(data, x, y, name, ref) {
+  constructor(data, x, y, name, x_name, y_name, ref) {
     this.data = data; // Matrix data array[array[float]]
     this.x = x; // X-axis values array[float]
     this.y = y; // Y-axis values array[float]
     this.name = name; // string
+    this.x_name = x_name; // X-axis Name
+    this.y_name = y_name; // Y-axis Name
     this.ref = ref; // Reference matrix data (optional) array[array[float]]
     // // Check if the matrix is valid (rectangular)
     // const rowLength = data[0].length;
@@ -45,31 +50,39 @@ class Matrix {
     // ) { throw new Error("Matrices must have the same dimensions."); }
     return new Matrix(subtractMatrices(this.data, other.data), this.x, this.y, name);
   }
-  ref_diff_data() {
-    return subtractMatrices(this.data, this.ref);
+  ref_diff_abs_data() {
+    return absolueMatrice(subtractMatrices(this.data, this.ref));
   }
+  absolueMatrice
 }
 class MatrixGroup {
   constructor(arr, is_spectro, is_frameseries, has_ref) {
     this.arr = arr; // array of Matrix objects
-    this.is_spectro = is_spectro;
-    this.is_frameseries = is_frameseries;
     this.has_ref = has_ref;
   }
 }
 const MatrixMgmt = {
   groups: [],
-  loadGlobal: function() {
+  loadGlobal: function(has_spectrograms, has_frameseries) {
     // load loop GLOBAL_VARS groups
     const g = GLOBAL_VARS.matrices;
     g.test.forEach((data, i) => {
       const group_data = [];
       const ref = g.reference[i];
       data.datasets.forEach((dataset, j) => {
-        const mat = new Matrix(dataset.data, dataset.x_values, dataset.y_values, data.names[j], ref.datasets[j].data);
+        console.log(dataset);
+        const mat = new Matrix(
+          dataset.data,
+          dataset.x_values,
+          dataset.y_values,
+          data.names[j],
+          dataset.x_name,
+          dataset.y_name,
+          ref.datasets[j].data,
+        );
         group_data.push(mat);
       });
-      const group = new MatrixGroup(group_data, Boolean(data.spectrograms), Boolean(data.frameseries), true);
+      const group = new MatrixGroup(group_data, true);
       this.groups.push(group);
     });
     // IMPORTANT
@@ -78,7 +91,7 @@ const MatrixMgmt = {
     // Init
     this.groups.forEach((group, i) => {
       // Init Spectrograms
-      if (group.is_spectro) {
+      if (has_spectrograms) {
         const spec = new Spectrograms(i, group.arr);
       }
       // Init Frameseries

scilens/report/templates/uti_spectrograms.js

@@ -4,14 +4,15 @@
 //
 function resize22(obj, parent, dir) { // ASSUMPTIONS : obj.size int, "js-plotly-plot"
   // size
-  const size = obj.size + (dir * obj.size * 0.1); // new size
-  obj.size = obj.size + (dir * obj.size * 0.1); // save
+  const w = obj.size[0] + (dir * obj.size[0] * 0.1);
+  const h = obj.size[0] + (dir * obj.size[0] * 0.1);
+  obj.size = [w, h];
   // update widgets
-  const update = { width: size, height: size };
+  const update = { width: w, height: h };
   const nodes = dom.q(parent, ".js-plotly-plot");
   nodes.forEach((node) => {
-    node.style.width  = size + "px";
-    node.style.height = size + "px";
+    node.style.width  = w + "px";
+    node.style.height = h + "px";
     Plotly.relayout(node, update); // update plotly
   });
 }
@@ -19,15 +20,21 @@ function resize22(obj, parent, dir) { // ASSUMPTIONS : obj.size int, "js-plotly-
 //
 //
 const PREFIX = "spectrograms_"; // section prefix
-const DEFAULT_SIZE = 300;
 const COLORSCALE = "Viridis"; // plotly
 const COLORSCALE_DIFF = "RdBu"; // plotly
+const CFG = {
+  "DISPLAY_TESTREF": true, // display test reference
+  "DISPLAY_DIFF": true, // display diff
+  "WIDTH": 300, // default width
+  "HEIGHT": 300, // default height
+}
+
 //
 class Spectrograms {
   constructor(index, arr_mat) {
-    console.log("index data", index);
+    //console.log("index data", index);
     // data
-    this.size = DEFAULT_SIZE;
+    this.size = [CFG.WIDTH, CFG.HEIGHT]; // default size
     this.arr_mat = arr_mat;
     this.elt = dom.get(PREFIX+(1+index));
     // init
@@ -64,13 +71,14 @@ class Spectrograms {
   var_add(idx) {
     const mat = this.arr_mat[idx];
     //
-    const style = "width:"+this.size+"px;height:"+this.size+"px;";
+    const style = "width:"+this.size[0]+"px;height:"+this.size[1]+"px;";
     const attrs = { class: "m-1 shadow-lg" };
     //
-    const templs = [{out:"var", tag:"div", attrs: attrs, style:style} ];
+    const templs = [];
+    if (CFG.DISPLAY_TESTREF) templs.push({out:"var", tag:"div", attrs: attrs, style:style});
     if (mat.ref) {
-      templs.push({out:"ref", tag:"div", attrs: attrs, style:style});
-      templs.push({out:"dif", tag:"div", attrs: attrs, style:style});
+      if (CFG.DISPLAY_TESTREF) templs.push({out:"ref", tag:"div", attrs: attrs, style:style});
+      if (CFG.DISPLAY_DIFF) templs.push({out:"dif", tag:"div", attrs: attrs, style:style});
     }
     const e = {};
     dom.tree(
@@ -81,30 +89,31 @@ class Spectrograms {
       e
     );
 
-    this.add_widget(e["var"], mat.data);
+    if (CFG.DISPLAY_TESTREF) this.add_widget(e["var"], mat, mat.data);
     if (mat.ref) {
-      this.add_widget(e["ref"], mat.ref);
-      this.add_widget(e["dif"], mat.ref_diff_data(), COLORSCALE_DIFF);
+      if (CFG.DISPLAY_TESTREF) this.add_widget(e["ref"], mat, mat.ref, " - Ref.");
+      if (CFG.DISPLAY_DIFF) this.add_widget(e["dif"], mat, mat.ref_diff_abs_data(), " - Diff.", COLORSCALE_DIFF);
     }
   }
   var_rmv(idx) {
     dom.get(this.var_get_id(idx)).remove();
   }
-  add_widget(elt, mat, colorscale=COLORSCALE) {
+  add_widget(elt, mat, matdata, suffix="", colorscale=COLORSCALE) {
     const data = [{
-        z: mat,
+        z: matdata,
         type: 'heatmap',
         colorscale: colorscale,
     }];
 
     const layout = {
-        // title: mat.name,
-        xaxis: { title: 'X' },
-        yaxis: { title: 'Y' }
+        title: mat.name + suffix,
+        xaxis: { title: mat.x_name || 'X' },
+        yaxis: { title: mat.y_name || 'Y' },
     };
 
     Plotly.newPlot(elt, data, layout);        
   }
 }
+Spectrograms.config = function(cfg) {for (k in cfg) {CFG[k] = cfg[k];}};
 w_1.Spectrograms = Spectrograms;
 })(window);

scilens/report/templates/utils_compare_report_anim.js

@@ -1,3 +1,4 @@
+((w_1, undef) => {
 const Anim = function (elt, options, options_2) {
     const that = this;
     // options
@@ -70,4 +71,6 @@ update: function () {
 };
 Anim.create = function(parent, options, options_2) {
     new Anim(parent, options, options_2)
-}
+}
+w_1.Anim = Anim;
+})(window);

scilens/report/templates/utils_compare_report_framesseries.js

@@ -1,3 +1,4 @@
+((w_1, undef) => {
 const Framesseries = function (elt, data, data_ref) {
     const that = this;
     // data
@@ -21,7 +22,7 @@ const Framesseries = function (elt, data, data_ref) {
         // steps
         const steps = []
         data.frames_steps_variable.data.forEach((e,i) => {
-            console.log(e)
+            // console.log(e)
             steps.push({
                 start: e,
                 color: palette.get(i),
@@ -131,7 +132,7 @@ Framesseries.prototype = {
             labels.push({label: "Step", val: step, max: steps.length, color: color, val2: val2})
         }   
         // labels
-        console.log(labels)
+        // console.log(labels)
         this.lab.innerHTML =  labels.map(x => '<span style="padding:3px 5px;background-color:'+x.color+';"><b> ' + x.label + "</b> " + x.val + "/" + x.max + ( x.val2 ? " (" + x.val2 + ")" : "") +"</span>").join(" - ");
 
 
@@ -140,3 +141,5 @@ Framesseries.prototype = {
 Framesseries.create = function(parent, options, options_2) {
     new Framesseries(parent, options, options_2)
 }
+w_1.Framesseries = Framesseries;
+})(window);

{scilens-0.3.8.dist-info → scilens-0.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scilens
-Version: 0.3.8
+Version: 0.3.9
 Summary: A CesGensLaB framework for data collecting and deep analysis
 Home-page: https://scilens.dev
 License: Proprietary

{scilens-0.3.8.dist-info → scilens-0.3.9.dist-info}/RECORD

@@ -13,7 +13,7 @@ scilens/components/compare_errors.py,sha256=vGb4DWP89HMIeBm0dZU2nt-ksppAs_37xtCH
 scilens/components/compare_floats.py,sha256=yYJZ_QpAZUhP1uwNtGshXQLIzKtki9ifCN3hd9AFj2U,5916
 scilens/components/compare_folders.py,sha256=LZ1AuYxLVHMNbtXWXQrdms4vZgOQthvDy-8NFD_EFjc,2617
 scilens/components/compare_models.py,sha256=SCPd747h_nd4ewZsqLB6CFr27v6q99NELJb-gpkdj0o,918
-scilens/components/executor.py,sha256=j5xejkCaaPyl3V38Q4HxxXcAx4Tnj8CILAjSJ1G7OIE,3417
+scilens/components/executor.py,sha256=PLeKolzPd4wPX8e6DdfOb0uHGky3DxTcKN9QtB6oe3Q,3712
 scilens/components/file_reader.py,sha256=7SbKCqb4Co_pqAKX3wweYhqAcVkU7BDlT903sLd76Kc,1407
 scilens/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/config/cli_run_options.py,sha256=Ls7yK5QDUPFbk73nbjGuPvuRbBRYw4Miag5ISpu3prg,281
@@ -23,17 +23,17 @@ scilens/config/models/__init__.py,sha256=eLCW1OLVINewGFy5GXSrOk8Rab_QsgKAuoErBjp
 scilens/config/models/app.py,sha256=JltWRjjqXYkH6rg3OHYhMfkBqHFhZEZdthqES3LxvzY,1453
 scilens/config/models/compare.py,sha256=esRqW3PNVOqkA_mt4_qbS7dVCLulUrZTBUhANQOHoqE,1847
 scilens/config/models/compare_float_thresholds.py,sha256=mHu48-70i3o_qUw6x-1A7XeRwFUNAO6WP6qNPGwAew0,2097
-scilens/config/models/execute.py,sha256=8issd_hg49SdVkDq2TLDB1vBJY4M1t279XERNUd3VVs,2142
+scilens/config/models/execute.py,sha256=Hx3DoDJ0fq7bZruqwtPtSKL6PVOF_LpsaDCLrn5klLk,2325
 scilens/config/models/execute_and_compare.py,sha256=TWL6yXGvQSaaV6nhHqWLvtr3v396APIoDNt0U1TbMro,582
 scilens/config/models/file_reader.py,sha256=c18vKhVcBX4ufpbnCBJyVyAsQtlxpwx0lGVuf1i8EGA,1176
 scilens/config/models/reader_format_cols_curve.py,sha256=eKLvifq1xuN8sPds9ijfru3vgMZ3Odv5tGfeiK4Sfk4,1860
-scilens/config/models/reader_format_csv.py,sha256=si422pyd3kwxXWb4u_L-0dsBxTouHDu2AWdh2a5OfD4,1512
+scilens/config/models/reader_format_csv.py,sha256=EQ1nCYsv6Cf4rtK3AUW5LbJakRcutdaNSl4UN634evs,1708
 scilens/config/models/reader_format_netcdf.py,sha256=k-AMdm239T6I42R8jzyRlPKKJ8zkRrN8XS8yU6ZkFu0,1256
 scilens/config/models/reader_format_txt.py,sha256=eHg90gwEI_VpqwqEjMRhwlS8dHcl5G4ow-37HjQq_zY,1168
-scilens/config/models/reader_format_txt_fixed_cols.py,sha256=xHD1_JOoRZow8lSNaDSYFeNckojctkT4C61mbBcjeKg,1079
-scilens/config/models/readers.py,sha256=Pq5kOGW3b6g1x5cp_BbwUF7LUB_P3m9bHDYLSTVXNBY,1769
+scilens/config/models/reader_format_txt_fixed_cols.py,sha256=SQ84OW9BLc5mr_TC6gQuYzzHJvrU-sVz223WOtAQMc0,1133
+scilens/config/models/readers.py,sha256=oWdE4AkckvwN6boln55orq3hUeAt6S9IdQAZkGROR6E,1657
 scilens/config/models/report.py,sha256=6mzqZMJnS_z5Rs01ISo8L8HRcWvmiQrK0dYqu8a58vM,993
-scilens/config/models/report_html.py,sha256=W4ATubdtxnW-vSOPXBZ6PNKMPcexpB9jeFi7c6b5VOc,2327
+scilens/config/models/report_html.py,sha256=EqP42x6dupXzHzP4Ar7sP7mmZp1TqpUzgOYV-8FSoOk,3040
 scilens/config/models/report_output.py,sha256=XoqUe-t-y8GRbUR3_bDwwaWf6hif-rZ-5pKDGdCMugw,875
 scilens/helpers/assets.py,sha256=XphDA3-yE1PPKw4XFZhDrlLQjMZfGMlpOBXa8uy_xX0,1552
 scilens/helpers/search_and_index.py,sha256=kXZ7124ra_SGAdKUZ7msy55UOWQ9dCSuPuNoU-NdUyM,1522
@@ -42,19 +42,19 @@ scilens/helpers/templates/style.css,sha256=2_IndKW2qtGhuoU9T3Sru4NkHR5CXTTs5_nc9
 scilens/processors/__init__.py,sha256=x6bmqQVCcdJ7R2oG-_xTVtvl9qRleliEZlZR-Hq9Yc0,105
 scilens/processors/analyse.py,sha256=hG2jALUqtoEwTPiLxDGV9Nbv6TU_SrfzwV_-1RkuiKw,828
 scilens/processors/compare.py,sha256=wCdtDC8nJUeG9dolu2B6rTg4-jW0MYllPbvXFBX64nU,529
-scilens/processors/execute_and_compare.py,sha256=KX0bVSLzsc2VvxivTksGoLg8612WRjPkFAMWqB0hfYg,1784
+scilens/processors/execute_and_compare.py,sha256=-JXnZewkza29L3TAsvaAuHTHRNG8biaKMFwpwdeCCbQ,1869
 scilens/processors/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/processors/models/results.py,sha256=KoWxh13Zgi7PuPql8hkf4VjCis42ZxAuzIgJxBWVaX8,119
 scilens/processors/processor_interface.py,sha256=jzMp1529JXnMGTJijVy6b_1zmARAMNv70f2lgys7vn4,452
 scilens/readers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/readers/cols_dataset.py,sha256=C4N030_Iqq5KZVpQ0NVjAw4DctALuz_YBb6f6yi35Jk,2452
 scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI,32
-scilens/readers/mat_dataset.py,sha256=6hmXIdGCfQrd4Y2_v-p65VmrO4I2J8ZddGBy-AgYLX0,1683
-scilens/readers/reader_csv.py,sha256=LFjbTv2CLungV8UwXzob5o_9G2c4cLEUCMoRXAyErKQ,3739
+scilens/readers/mat_dataset.py,sha256=Z9TYDWaH2aqdniLNDjlpR6VVNHMSARjh52clhdMyOn4,1496
+scilens/readers/reader_csv.py,sha256=MXjGdNHm1i9phhYLeMuNFjCvxuIeZH_KNs6ni3a4nS8,3893
 scilens/readers/reader_interface.py,sha256=nnttHL7wt4MOXpi-SBkk8DYxVWscOPG8JFl_z12mIAo,922
 scilens/readers/reader_manager.py,sha256=DFinxIk3IIIcB6JxybGcv-mXt3jhXgCwUtzR0TqhB2Q,2684
 scilens/readers/reader_txt.py,sha256=WPsFunEA_idzAKkD3UJQbLnaOzG2U03P3gY4gphuIw0,3868
-scilens/readers/reader_txt_fixed_cols.py,sha256=vIA6e38_3nkFeCT835eSyCufCXQNGav8Iy7VgHlT_EE,2314
+scilens/readers/reader_txt_fixed_cols.py,sha256=B7toE3G9KGcgD_p15jzGHOLGIKZ7KMmEQoTt6-4UtHo,4064
 scilens/readers/transform.py,sha256=kppfgPkXymF0qtquFivuosLVfF66L9bE-wGx-3bMHv8,307
 scilens/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/report/assets/logo.svg,sha256=W-1OVqcvdBjf-1AHHcV6WciIUqBoVFUh52Tc3o_jqtA,4519
@@ -67,22 +67,22 @@ scilens/report/templates/body_01_title.html,sha256=LJOWO6ImNPW9cg3tCDlgdllVTwnFG
 scilens/report/templates/body_02_tabs.html,sha256=oOFslWcfNsWpCX12GECZDzdR5uAHE54HPP6IYUf7y0U,412
 scilens/report/templates/body_99_footer.html,sha256=8cWebeWfZwZ-9bYAMZkZj8rbCWq3BLIMjKQThWQxoQM,362
 scilens/report/templates/compare_11_summary.html,sha256=qVvFydtAvAYyVOOTqjTN3LUj5Lh_Cl680EYL5SCZkd4,4086
-scilens/report/templates/compare_12_sections.html,sha256=8hCQRvdD_xhv8PGqT3WcfKxakWdCfGUFbv9HPBrNCro,6431
+scilens/report/templates/compare_12_sections.html,sha256=EYYMqF2HeRXnWRke2vn9O2JCm8oKbx-r1NL7FJvYFDg,6431
 scilens/report/templates/compare_13_section_numbers copy.html,sha256=0PWK_I2kNX3LjPLkkY4eSYIeB7YFkA28nk-PPLDhnaY,1753
 scilens/report/templates/compare_13_section_numbers.html,sha256=9etEMSqwrDyJIn_nMbKEVaDgnFL_hBxSjPR-hU2wgDI,851
 scilens/report/templates/compare_13_section_numbers_table.html,sha256=sJy6ZYtjl80vM1b3oqZSXawZWp7KNIwLI_wCnvBwYPE,3270
-scilens/report/templates/index.html,sha256=NwIjcv_h_xu2tY7y2DNZup5UwohmSuejz2AF1EmgPxI,5370
+scilens/report/templates/index.html,sha256=fcC1jrG2nhmCSzXUV6fe14pRlNQ6CAgGRHMHhlx6nNg,5757
 scilens/report/templates/js_chartlibs_echarts.js,sha256=6YicVhTNIBmmBpV31XCVN5oBeiD0t29JIosJZRUv01M,907
-scilens/report/templates/js_chartlibs_plotly.js,sha256=mDf4O1pHqK69IqwGe6Irw8xLV-cnL7WZZ5ZEfUI2DZ4,2082
-scilens/report/templates/js_com_page.js,sha256=ZxYHR-KGQRH726rPOXrEgyzBKM9NtGH3_APvcawKxQw,6862
-scilens/report/templates/js_curvemgr.js,sha256=9t5ZDogVJTiI0oullrZ2IT7_qXG73CH_m2gNUpuY4oY,12199
+scilens/report/templates/js_chartlibs_plotly.js,sha256=3uiQfbd95NMN-3N2NX3c4CC7zFb0JRtH-ZzezDVGeO8,2111
+scilens/report/templates/js_com_page.js,sha256=Q-_Smn77IYIAdlrS1zJtsVIYBOL1t-J1AYYJKji4eL0,6864
+scilens/report/templates/js_curvemgr.js,sha256=gnRLO6HbZOMLIBQKjVhV2PciqXtuNKxpGx4boijV2Qc,12175
 scilens/report/templates/js_dom.js,sha256=XnxgdB0x-Xtt0eQFrwjcFO1cb_KPsTImpJBB6m_y8FI,1229
 scilens/report/templates/js_palette.js,sha256=HeewAmkR67QiqXSanJS3cCgp6IPKomlULUTKt55F6es,218
 scilens/report/templates/style.css,sha256=SOKxdCqoj0yBt2zt3g1RkYx4ZV0_9PhGtO-TDWjmSHE,4217
-scilens/report/templates/uti_matrix.js,sha256=L2NqR9fu1075JGStWy6yS7EX4pHGAcBrhfR_cAL4VYw,2675
-scilens/report/templates/uti_spectrograms.js,sha256=EoZtBUYbup0KOvmcZRpnUGNrIZVbveqQK0aoIqkq94E,3066
-scilens/report/templates/utils_compare_report_anim.js,sha256=a7FHRco17BmgOAHb9kiDsFcSoxbmTGqjBbXBprf3hnU,2923
-scilens/report/templates/utils_compare_report_framesseries.js,sha256=su4zy29yZMqBlL213B1oLFpzBrmwta5jlc96fN_pphc,5697
+scilens/report/templates/uti_matrix.js,sha256=N2fNH_E3Km6H60IOW-BjL0LIKTuJ2eGIHnJV_O354es,2936
+scilens/report/templates/uti_spectrograms.js,sha256=WYnNt5d8aGIeUCXy8q3MWRtpJzr4htMiH-mlxXpBeug,3586
+scilens/report/templates/utils_compare_report_anim.js,sha256=6Yg1nQDrmAQSJzHtsmA0CO2Ng1ddiLIhrbKXSZAB-Ms,2971
+scilens/report/templates/utils_compare_report_framesseries.js,sha256=kg5NDVJYL0dF2cwdunD4WpnckvfGOsxXuO1ttmEV8hw,5766
 scilens/report/vendors/tailwindcss_3_4_15.js,sha256=niHw6Rf0uS2pE5_8h-E18NI24o1urZL5Ac31_n9htKE,407279
 scilens/report/vendors/tailwindcss_min_4.0.0-beta.4.js,sha256=fy2LOvMX7m4b1V9WdtWC0dCPNIYhE2cLkFiD3JNcYhI,177617
 scilens/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -101,7 +101,7 @@ scilens/utils/template.py,sha256=9dlXX3nmfzDRUwzPJOkoxk15UXivZ2SW-McdCwokFa4,443
 scilens/utils/time_tracker.py,sha256=DdVBoMpVLXrX0qZZXyLm4g38EwDVLlRcBqcpNex1mYY,545
 scilens/utils/vectors.py,sha256=4N2BZSC5n3HgZqPujDGF5NdjVmSL1rOHb_qw4OoABQY,103
 scilens/utils/web.py,sha256=MAFWpIFOKz7QhqDoFh-Qwstvc76KpcxstSgHFT8FOL4,901
-scilens-0.3.8.dist-info/METADATA,sha256=RTctyV618MmgiLWuaf1NfysYdqN1CC6SZKpCEFTpTzY,1367
-scilens-0.3.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.3.8.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.3.8.dist-info/RECORD,,
+scilens-0.3.9.dist-info/METADATA,sha256=ylBI_UDX3OeXxMTpfxODknkBUEFLGyE-_YU88jb6mn8,1367
+scilens-0.3.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.3.9.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.3.9.dist-info/RECORD,,