scilens 0.1.3__py3-none-any.whl → 0.2.1__py3-none-any.whl

scilens/cli/main.py

@@ -1,3 +1,4 @@
+_B='green'
 _A=True
 import logging,os,coloredlogs,rich_click as click
 from scilens.app import pkg_name,pkg_version
@@ -11,9 +12,9 @@ from scilens.cli.info import echo_info,echo_system_info,echo_draw
 from scilens.config.cli_run_options import get_vars
 from scilens.helpers.search_and_index import SearchAndIndex
 def echo_separator(msg=None):
-	B='green';A=msg
-	if A:A=f" {A}";click.echo(click.style(A.rjust(80,'='),fg=B))
-	else:click.echo(click.style('='*80,fg=B))
+	A=msg
+	if A:A=f" {A}";click.echo(click.style(A.rjust(80,'='),fg=_B))
+	else:click.echo(click.style('='*80,fg=_B))
 def echo_task_error():click.echo(click.style('='*80,fg='red'))
 @click.group()
 @click.option('--log-level',default='INFO',help='Log level. Default is INFO. Available levels are DEBUG, INFO, WARNING, ERROR, CRITICAL.')
@@ -27,8 +28,9 @@ def info():echo_draw();echo_info()
 @cli.command(short_help='Show system informations. (Useful for dynamic context configuration)')
 def sysinfo():echo_system_info()
 @cli.command(short_help='Show the reader plugins')
-def reader():
-	for A in ReaderManager()._get_plugin_names():click.echo(click.style(A,fg='yellow'))
+def readers():
+	J='configuration_type_code';I='class';D='yellow';A=' ';C=ReaderManager()._get_plugin_info();E='Class';F='Configuration Type Code';B=max([len(A[I])for A in C]+[len(E)]);G=max([len(A[J])for A in C]+[len(F)]);click.echo(click.style((E+A).ljust(B,A),fg=_B)+A+click.style(F,fg=D));click.echo(click.style(('-'*B).ljust(B,A),fg=_B)+A+click.style('-'*G,fg=D))
+	for H in C:click.echo(click.style(H[I].ljust(B,A),fg=_B)+A+click.style(H[J].ljust(G,A),fg=D))
 @cli.group()
 def config():0
 @config.command(name='default',short_help='Example of default config')

scilens/components/compare_floats.py

@@ -1,39 +1,50 @@
-_C='amplitude'
-_B=False
+_B='amplitude'
 _A=None
 from scilens.components.compare_errors import CompareErrors,SEVERITY_ERROR,SEVERITY_WARNING,CompareErrFloats
 from scilens.config.models import CompareFloatThresholdsConfig
-def vector_get_amplitude(vector):A=vector;B=min(A);C=max(A);return{'min':B,'max':C,_C:abs(C-B)}
+try:from scilens_compare import vectors as CheckVectors
+except ModuleNotFoundError:pass
+def vector_get_amplitude(vector):min_val=min(vector);max_val=max(vector);return{'min':min_val,'max':max_val,_B:abs(max_val-min_val)}
 class CompareFloats:
-	def __init__(A,compare_errors,config):A.compare_errors=compare_errors;A.thresholds=config
-	def compare_vectors(B,test_vector,reference_vector,group_idx=_A,info_vector=_A):
-		H=info_vector;E=reference_vector;C=test_vector;I=0;J={SEVERITY_ERROR:0,SEVERITY_WARNING:0};K=_B;F=_A
-		if B.thresholds.vectors.amplitude_moderation:P=vector_get_amplitude(C)[_C];F=P*B.thresholds.vectors.amplitude_moderation.multiplier;L=B.thresholds.vectors.amplitude_moderation.method
-		Q=len(C)
-		for A in range(Q):
-			M=C[A]-E[A]
-			if M==0:continue
-			else:I+=1
-			if K:continue
-			if F is not _A and abs(M)<F:
-				if L=='ignore':continue
-				elif L=='soften':D,N,G=B.compare_2_values(C[A],E[A]);D=SEVERITY_WARNING
-			else:D,N,G=B.compare_2_values(C[A],E[A])
-			if G:
-				J[D]+=1;O={'index':A}
-				if H:O['info']=H[A]
-				K=B.compare_errors.add(D,N,G,group_idx=group_idx,info=O)
-		return _B,I,J
-	def compare_2_values(G,test,reference):
-		D=test;B=reference;A=G.thresholds;F=-1 if D-B<0 else 1
-		if abs(D)>A.relative_vs_absolute_min and B!=0:
-			C=abs(D-B)/abs(B);E=CompareErrFloats(is_relative=True,value=F*C,test=D,reference=B)
-			if C<A.relative_error_max:
-				if C>A.relative_error_min:return SEVERITY_WARNING,f"Rel. err. > {A.relative_error_min} and < {A.relative_error_max}",E
-			else:return SEVERITY_ERROR,f"Rel. err. > {A.relative_error_max}",E
+	def __init__(self,compare_errors,config):self.compare_errors=compare_errors;self.thresholds=config
+	def compare_vectors(self,test_vector,reference_vector,group_idx=_A,info_vector=_A):
+		A='ignore';diffs_count=0;counts={SEVERITY_ERROR:0,SEVERITY_WARNING:0};err_limit_reached=False;amplitude_compare=_A
+		if self.thresholds.vectors and self.thresholds.vectors.ponderation_method=='amplitude_moderation':amplitude=vector_get_amplitude(test_vector)[_B];amplitude_compare=amplitude*self.thresholds.vectors.amplitude_moderation_multiplier;reduction_method=self.thresholds.vectors.reduction_method
+		RIAE_force_severity=_A
+		if self.thresholds.vectors and self.thresholds.vectors.ponderation_method in['RIAE','RIAE_trapezoid','RIAE_midpoint']:
+			RIAE_force_severity=self.thresholds.vectors.reduction_method
+			if'CheckVectors'not in globals():raise Exception('scilens_compare not found. Please install scilens-compare package with `pip install scilens-compare`.')
+			riae_error=CheckVectors.relative_integral_absolute_error_trapezoid(reference_vector,test_vector,range(len(test_vector)));riae_error=CheckVectors.relative_integral_absolute_error_midpoint(reference_vector,test_vector,range(len(test_vector)));print('riae_error');print(riae_error)
+			if riae_error<self.thresholds.vectors.riae_threshold:RIAE_force_severity=self.thresholds.vectors.reduction_method
+			else:0
+		nb=len(test_vector)
+		for idx in range(nb):
+			diff=test_vector[idx]-reference_vector[idx]
+			if diff==0:continue
+			else:diffs_count+=1
+			if err_limit_reached:continue
+			if RIAE_force_severity==A:continue
+			if amplitude_compare is not _A and abs(diff)<amplitude_compare:
+				if reduction_method==A:continue
+				elif reduction_method=='soften':severity,message,comp_err=self.compare_2_values(test_vector[idx],reference_vector[idx]);severity=SEVERITY_WARNING
+			else:
+				severity,message,comp_err=self.compare_2_values(test_vector[idx],reference_vector[idx])
+				if RIAE_force_severity:severity=SEVERITY_WARNING
+			if comp_err:
+				counts[severity]+=1;info={'index':idx}
+				if info_vector:info['info']=info_vector[idx]
+				err_limit_reached=self.compare_errors.add(severity,message,comp_err,group_idx=group_idx,info=info)
+		return err_limit_reached,diffs_count,counts
+	def compare_2_values(self,test,reference):
+		thr=self.thresholds;sign=-1 if test-reference<0 else 1
+		if abs(test)>thr.relative_vs_absolute_min and reference!=0:
+			err=abs(test-reference)/abs(reference);comp_err=CompareErrFloats(is_relative=True,value=sign*err,test=test,reference=reference)
+			if err<thr.relative_error_max:
+				if err>thr.relative_error_min:return SEVERITY_WARNING,f"Rel. err. > {thr.relative_error_min} and < {thr.relative_error_max}",comp_err
+			else:return SEVERITY_ERROR,f"Rel. err. > {thr.relative_error_max}",comp_err
 		else:
-			C=abs(D-B);E=CompareErrFloats(is_relative=_B,value=F*C,test=D,reference=B)
-			if C<A.absolute_error_max:
-				if C>A.absolute_error_min:return SEVERITY_WARNING,f"Abs. err. > {A.absolute_error_min} and < {A.absolute_error_max}",E
-			else:return SEVERITY_ERROR,f"Abs. err. > {A.absolute_error_max}",E
+			err=abs(test-reference);comp_err=CompareErrFloats(is_relative=False,value=sign*err,test=test,reference=reference)
+			if err<thr.absolute_error_max:
+				if err>thr.absolute_error_min:return SEVERITY_WARNING,f"Abs. err. > {thr.absolute_error_min} and < {thr.absolute_error_max}",comp_err
+			else:return SEVERITY_ERROR,f"Abs. err. > {thr.absolute_error_max}",comp_err
 		return _A,_A,_A

scilens/components/file_reader.py

@@ -15,16 +15,11 @@ class FileReader:
 		if not B:raise Exception(f"Custom curve parser not found: {A}")
 		J=C.split('/')[-1].replace('.py','');F=importlib.util.spec_from_file_location(J,B);G=importlib.util.module_from_spec(F);F.loader.exec_module(G);return getattr(G,H)
 	def read(A,path):
-		logging.info(f"Reading file: {path}");E=_A;D=A.config.custom_curve_parser
-		if D:
-			if isinstance(D,str):E=A._get_custom_parser(D)
-		try:
-			B=A.reader_mgmr.get_reader_from_file(path,encoding=A.config.encoding,curve_parser=E,extension_mapping=A.config.extension_mapping,extension_fallback=A.config.extension_fallback);C=_A
-			if B.__class__.__name__=='ReaderTxt':C=A.readers_config.txt
-			elif B.__class__.__name__=='ReaderCsv':C=A.readers_config.csv
-			elif B.__class__.__name__=='ReaderNetcdf':C=A.readers_config.netcdf
-			B.read(C)
+		logging.info(f"Reading file: {path}");D=_A;B=A.config.custom_curve_parser
+		if B:
+			if isinstance(B,str):D=A._get_custom_parser(B)
+		try:C,E=A.reader_mgmr.get_reader_from_file(path,config=A.config,readers_config=A.readers_config,curve_parser=D);C.read(E)
 		except NoReaderFound:
-			if A.config.extension_unknown_ignore:0
+			if A.config.extension_unknown_ignore:C=_A
 			else:raise Exception(f"No reader found")
-		return B
+		return C

scilens/config/models/__init__.py

@@ -5,6 +5,7 @@ from.execute_and_compare import ExecuteAndCompareConfig
 from.execute import ExecuteConfig
 from.reader_format_txt import ReaderTxtIgnoreConfig,ReaderTxtConfig
 from.reader_format_csv import ReaderCsvConfig
+from.reader_format_txt_fixed_cols import ReaderTxtFixedColsConfig
 from.readers import ReadersConfig
 from.file_reader import FileReaderConfig
 from.report_html import ReportHtmlConfig,ReportHtmlCurvesConfig,ReportParameterOpenFileInConfig,ReportParameterPageModeConfig

scilens/config/models/compare_float_thresholds.py

@@ -1,4 +1,4 @@
+_A=None
 from pydantic import BaseModel,Field
-class CompareFloatVectorsAmplitudeConfig(BaseModel):method:str=Field(default='soften',description="Si `soften`, réduit la sévérité de l'erreur. Si `ignore`, ne lève pas d'erreur.");multiplier:float=Field(description='Processe la méthode si `|Test-Reference|` (Erreur Absolue) est inférieure à `multiplier * |Max(Vector)-Min(Vector)|` (Amplitude pondérée).  Ex: `0.1`.')
-class CompareFloatVectorsConfig(BaseModel):amplitude_moderation:CompareFloatVectorsAmplitudeConfig|None=Field(default=None,description="Pondére la gestion d'erreur avec l'amplitude.")
-class CompareFloatThresholdsConfig(BaseModel):relative_vs_absolute_min:float=Field(default=1e-12,description="Si la valeur de test est inférieure à ce seuil, calcul de l'erreur absolue.");relative_error_min:float=Field(default=.001,description="Si l'erreur relative est supérieure à ce seuil, génère une erreur de sévérité `warning`.");relative_error_max:float=Field(default=.01,description="Si l'erreur relative est supérieure à ce seuil, génère une erreur de sévérité `error`.");absolute_error_min:float=Field(default=1e-07,description="Si l'erreur absolue est supérieure à ce seuil, génère une erreur de sévérité `warning`.");absolute_error_max:float=Field(default=1e-06,description="Si l'erreur absolue est supérieure à ce seuil, génère une erreur de sévérité `error`.");vectors:CompareFloatVectorsConfig=Field(default=CompareFloatVectorsConfig(),description='Paramètres pour la comparaison de vecteurs de flottants (csv, nc, ...).')
+class CompareFloatVectorsConfig(BaseModel):reduction_method:str=Field(default='soften',description="Méthode de réduction de sévérité des erreurs. Peut être `soften` ou `ignore`. Si `soften`, réduit la sévérité de l'erreur. Si `ignore`, ne lève pas d'erreur.");ponderation_method:str=Field(description='Méthode de calcul de reduction de sévérité. Peut être`amplitude_moderation`, `RIAE`, `RIAE_trapezoid` ou `RIAE_midpoint`.');amplitude_moderation_multiplier:float|_A=Field(default=_A,description="Multipler utilisé dans l'amplitude pondérée `multiplier * |Max(Vector)-Min(Vector)|` qui sera comparée à l'erreur absolue `|Test-Reference|`.");riae_threshold:float|_A=Field(default=_A,description="Seuil de l'erreur relative intégrale absolue. Si l'erreur est supérieure à ce seuil, on appliquera la reduction_method globalement.")
+class CompareFloatThresholdsConfig(BaseModel):relative_vs_absolute_min:float=Field(default=1e-12,description="Si la valeur de test est inférieure à ce seuil, calcul de l'erreur absolue.");relative_error_min:float=Field(default=.001,description="Si l'erreur relative est supérieure à ce seuil, génère une erreur de sévérité `warning`.");relative_error_max:float=Field(default=.01,description="Si l'erreur relative est supérieure à ce seuil, génère une erreur de sévérité `error`.");absolute_error_min:float=Field(default=1e-07,description="Si l'erreur absolue est supérieure à ce seuil, génère une erreur de sévérité `warning`.");absolute_error_max:float=Field(default=1e-06,description="Si l'erreur absolue est supérieure à ce seuil, génère une erreur de sévérité `error`.");vectors:CompareFloatVectorsConfig|_A=Field(default=_A,description='Paramètres pour la comparaison de vecteurs de flottants (csv, nc, ...).')

scilens/config/models/file_reader.py

@@ -1,3 +1,3 @@
 _A=None
 from pydantic import BaseModel,Field
-class FileReaderConfig(BaseModel):extension_unknown_ignore:bool=Field(default=False,description="Si aucun reader n'est trouvé pour une extension, passe au suivant sans générer d'erreur.");extension_mapping:dict|_A=Field(default=_A,description='Mapping d\'extensions source - cible. Ex `{"txt": "csv"}`.');extension_fallback:str|_A=Field(default=_A,description="Si aucun reader n'est trouvé pour une extension, utilise cette extension pour déterminer le reader.");encoding:str=Field(default='utf-8',description='Encodage utilisé pour lire les fichiers.');custom_curve_parser:str|dict[str,str]|_A=Field(default=_A,description="Représente le chemin d'un fichier/module python suivi par :: suivi par le nom d'une fonction à appeller pour parser les courbes d'un fichier. Le chemin peut être absolu ou relatif. Dans le cas, d'un chemin relatif, il testera le `working directory` et le `origin working directory`. Ex: `custom_parser.py::parse_curves`")
+class FileReaderConfig(BaseModel):encoding:str=Field(default='utf-8',description='Encodage utilisé pour lire les fichiers.');extension_unknown_ignore:bool=Field(default=False,description="Si aucun reader n'est trouvé pour une extension, passe au suivant sans générer d'erreur.");extension_mapping:dict|_A=Field(default=_A,description='Mapping d\'extensions source - cible. Ex `{"txt": "csv"}`.');extension_fallback:str|_A=Field(default=_A,description="Si aucun reader n'est trouvé pour une extension, utilise cette extension pour déterminer le reader.");extension_readers_catalog:dict[str,str]|_A=Field(default=_A,description="Mapping extension clé du catalogue de readers. Ex: `{'dat1': 'csv_comma', 'dat2': 'csv_semicolon'}`");custom_curve_parser:str|dict[str,str]|_A=Field(default=_A,description="Représente le chemin d'un fichier/module python suivi par :: suivi par le nom d'une fonction à appeller pour parser les courbes d'un fichier. Le chemin peut être absolu ou relatif. Dans le cas, d'un chemin relatif, il testera le `working directory` et le `origin working directory`. Ex: `custom_parser.py::parse_curves`")

scilens/config/models/reader_format_cols_curve.py

@@ -0,0 +1,16 @@
+_A='(Valide seulement si la première ligne est les en-têtes)'
+from pydantic import BaseModel,Field,model_validator
+from enum import Enum
+class ReaderCurveParserNameConfig(str,Enum):COL_X='col_x';COLS_COUPLE='cols_couple'
+class ReaderCurveParserColXConfig(BaseModel):x:int|str|list[str]=Field(default=1,description="Si `integer`, index de la colonne pour l'axe x (index `1` pour la première colonne)."+"Si `String`, nom de la colonne pour l'axe x. Si la colonne n'existe pas, il n'y aura pas de parsing."+_A+"Si `List[String] (utiles dans un contexte multi dataset), noms de la colonne pour l'axe x, noms des colonnes pour l'axe x , si plusieurs colonnes correspondent, la première trouvée sera utilisée. Si aucune colonne ne correspond, il n'y aura pas de parsing."+_A)
+class ReaderCurveParserColsCoupleConfig(BaseModel):x_index:int=Field(description='NOT IMPLEMENTED - Index Col x');y_index:int=Field(description='NOT IMPLEMENTED - Index Col y')
+class ReaderColsCurveParserConfig(BaseModel):
+	name:ReaderCurveParserNameConfig=Field(description='Le type de `paramètres` dépend de cette valeur');parameters:ReaderCurveParserColXConfig|ReaderCurveParserColsCoupleConfig=Field(description='Paramètres du parser de courbes')
+	@model_validator(mode='after')
+	def validate_model(cls,model):
+		A=model
+		if isinstance(A.parameters,ReaderCurveParserColXConfig)and A.name!=ReaderCurveParserNameConfig.COL_X or isinstance(A.parameters,ReaderCurveParserColsCoupleConfig)and A.name!=ReaderCurveParserNameConfig.COLS_COUPLE:raise ValueError(f"Curve Parser {A.name} Parameters are not correct")
+		if isinstance(A.parameters,dict):
+			if A.name==ReaderCurveParserNameConfig.COL_X:A.parameters=ReaderCurveParserColXConfig(**A.parameters)
+			elif A.name==ReaderCurveParserNameConfig.COLS_COUPLE:A.parameters=ReaderCurveParserColsCoupleConfig(**A.parameters)
+		return A

scilens/config/models/reader_format_csv.py

@@ -1,18 +1,4 @@
-_B='(Valide seulement si la première ligne est les en-têtes)'
 _A=None
-from pydantic import BaseModel,Field,model_validator
-from enum import Enum
-class ReaderCsvCurveParserNameConfig(str,Enum):COL_X='col_x';COLS_COUPLE='cols_couple'
-class ReaderCsvCurveParserColXConfig(BaseModel):x:int|str|list[str]=Field(default=1,description="Si `integer`, index de la colonne pour l'axe x (index `1` pour la première colonne)."+"Si `String`, nom de la colonne pour l'axe x. Si la colonne n'existe pas, il n'y aura pas de parsing."+_B+"Si `List[String] (utiles dans un contexte multi dataset), noms de la colonne pour l'axe x, noms des colonnes pour l'axe x , si plusieurs colonnes correspondent, la première trouvée sera utilisée. Si aucune colonne ne correspond, il n'y aura pas de parsing."+_B)
-class ReaderCsvCurveParserColsCoupleConfig(BaseModel):x_index:int=Field(description='NOT IMPLEMENTED - Index Col x');y_index:int=Field(description='NOT IMPLEMENTED - Index Col y')
-class ReaderCsvCurveParserConfig(BaseModel):
-	name:ReaderCsvCurveParserNameConfig=Field(description='Le type de `paramètres` dépend de cette valeur');parameters:ReaderCsvCurveParserColXConfig|ReaderCsvCurveParserColsCoupleConfig=Field(description='Paramètres du parser de courbes')
-	@model_validator(mode='after')
-	def validate_model(cls,model):
-		A=model
-		if isinstance(A.parameters,ReaderCsvCurveParserColXConfig)and A.name!=ReaderCsvCurveParserNameConfig.COL_X or isinstance(A.parameters,ReaderCsvCurveParserColsCoupleConfig)and A.name!=ReaderCsvCurveParserNameConfig.COLS_COUPLE:raise ValueError(f"Curve Parser {A.name} Parameters are not correct")
-		if isinstance(A.parameters,dict):
-			if A.name==ReaderCsvCurveParserNameConfig.COL_X:A.parameters=ReaderCsvCurveParserColXConfig(**A.parameters)
-			elif A.name==ReaderCsvCurveParserNameConfig.COLS_COUPLE:A.parameters=ReaderCsvCurveParserColsCoupleConfig(**A.parameters)
-		return A
-class ReaderCsvConfig(BaseModel):ignore_colunmns:list[str]|_A=Field(default=_A,description='Liste des noms des colonnes à ignorer. (Valide seulement si la première ligne est les en-têtes)');curve_parser:ReaderCsvCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.')
+from pydantic import BaseModel,Field
+from scilens.config.models.reader_format_cols_curve import ReaderColsCurveParserConfig
+class ReaderCsvConfig(BaseModel):ignore_columns:list[str]|_A=Field(default=_A,description='Liste des noms des colonnes à ignorer. (Valide seulement si la première ligne est les en-têtes)');delimiter:str|_A=Field(default=',',description='Délimiteur de colonnes.');quotechar:str|_A=Field(default='"',description='Délimiteur de texte.');curve_parser:ReaderColsCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.')

scilens/config/models/reader_format_txt_fixed_cols.py

@@ -0,0 +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.')

scilens/config/models/readers.py

@@ -1,5 +1,17 @@
-from pydantic import BaseModel,Field
-from scilens.config.models.reader_format_txt import ReaderTxtIgnoreConfig,ReaderTxtConfig
+_B='netcdf'
+_A='txt_fixed_cols'
+from typing import Literal
+from pydantic import BaseModel,Field,model_validator
+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
-class ReadersConfig(BaseModel):txt:ReaderTxtConfig=Field(default=ReaderTxtConfig(),description='Configuration des readers txt.');csv:ReaderCsvConfig=Field(default=ReaderCsvConfig(),description='Configuration des readers csv.');netcdf:ReaderNetcdfConfig=Field(default=ReaderNetcdfConfig(),description='Configuration des readers NetCDF.')
+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': ';'}}}`")

scilens/readers/cols_dataset.py

@@ -0,0 +1,45 @@
+_E='charts'
+_D='x_index'
+_C='csv_col_index'
+_B='curves'
+_A=None
+from dataclasses import dataclass,field
+from scilens.components.compare_floats import CompareFloats
+from scilens.config.models.reader_format_cols_curve import ReaderCurveParserNameConfig
+@dataclass
+class ColsDataset:cols_count:int=0;rows_count:int=0;names:list[str]=field(default_factory=lambda:[]);numeric_col_indexes:list[int]=field(default_factory=lambda:[]);data:list[list[float]]=field(default_factory=lambda:[]);origin_line_nb:list[int]=field(default_factory=lambda:[])
+@dataclass
+class ColsCurves:type:str;info:dict;curves:dict
+def cols_dataset_get_curves_col_x(cols_dataset,col_x):
+	I='title';B=col_x;A=cols_dataset;E={}
+	if isinstance(B,int):
+		C=B-1
+		if C<0 or C>=A.cols_count:raise Exception('curve parser col_x: col_index is out of range.')
+	if isinstance(B,str):B=[B]
+	if isinstance(B,list):
+		G=[A for(A,C)in enumerate(A.names)if C in B]
+		if len(G)==0:return _A,E
+		C=G[0]
+	E[_D]=C;J=[B for(A,B)in enumerate(A.numeric_col_indexes)if A!=C];F=[];H=[]
+	for D in J:B=A.data[C];K=A.data[D];L={I:A.names[D],'short_title':A.names[D],'series':[[B[A],K[A]]for A in range(A.rows_count)],_C:D};F+=[L];M={I:A.names[D],'type':'simple','xaxis':A.names[C],'yaxis':A.names[D],_B:[len(F)-1]};H+=[M]
+	return{_B:F,_E:H},E
+def compare(compare_floats,reader_test,reader_ref,cols_curve):
+	Q='error';J=compare_floats;I='Errors limit reached';E=reader_ref;C=cols_curve;A=reader_test
+	if len(A.numeric_col_indexes)!=len(E.numeric_col_indexes):R=f"Number Float columns indexes are different: {len(A.numeric_col_indexes)} != {len(E.numeric_col_indexes)}";return R,_A
+	K=0;D=[''for A in range(A.cols_count)];L=_A;F=_A
+	if C and C.type==ReaderCurveParserNameConfig.COL_X:M=C.info[_D];L=A.data[M];F=A.names[M]
+	G=False
+	for B in range(A.cols_count):
+		if B not in A.numeric_col_indexes:continue
+		if G:D[B]=I;continue
+		S=A.data[B];T=E.data[B];U=J.compare_errors.add_group(A.names[B],data={'info_prefix':F}if F else _A);V,W,N=J.compare_vectors(S,T,group_idx=U,info_vector=L);K+=W
+		if V:G=True;D[B]=I;continue
+		if N[Q]>0:D[B]=f"{N[Q]} comparison errors"
+	if C:
+		for O in C.curves[_E]:
+			P=0
+			for X in O[_B]:
+				H=C.curves[_B][X]
+				if D[H[_C]]:H['comparison_error']=D[H[_C]];P+=1
+			O['comparison']={'curves_nb_with_error':P}
+	Y=I if G else _A;return Y,{'type':'vectors','total_diffs':K,'cols_has_error':D}

scilens/readers/reader_csv copy.py

@@ -0,0 +1,74 @@
+_E='charts'
+_D='x_index'
+_C='csv_col_index'
+_B='curves'
+_A=None
+import logging,csv
+from scilens.readers.reader_interface import ReaderInterface
+from scilens.config.models import ReaderCsvConfig
+from scilens.config.models.reader_format_cols_curve import ReaderCurveParserNameConfig
+from scilens.components.compare_floats import CompareFloats
+def is_num(x):
+	try:return float(x)
+	except ValueError:return
+def csv_row_detect_header(first_row):
+	A=first_row
+	if all(not A.isdigit()for A in A):return True,A
+	else:return False,[f"Column {A}"for(A,B)in enumerate(A)]
+def csv_row_detect_cols_num(row):return[A for(A,B)in enumerate(row)if is_num(B)!=_A]
+def csv_detect(path,delimiter,quotechar):
+	with open(path,'r')as B:A=csv.reader(B,delimiter=delimiter,quotechar=quotechar);C=next(A);D,E=csv_row_detect_header(C);F=next(A);G=csv_row_detect_cols_num(F);return D,E,G
+class ReaderCsv(ReaderInterface):
+	category='datalines';extensions=['CSV']
+	def read(A,reader_options):
+		B=reader_options;A.reader_options=B;C,G,H=csv_detect(A.origin.path,A.reader_options.delimiter,A.reader_options.quotechar);A.has_header=C;A.cols=G;A.numeric_col_indexes=H
+		if B.ignore_columns:
+			if not C: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]
+		E=open(A.origin.path,'r',encoding=A.encoding);I=csv.reader(E,delimiter=A.reader_options.delimiter,quotechar=A.reader_options.quotechar);D=[]
+		for J in I:D+=[J]
+		if C:D.pop(0)
+		E.close();A.data_rows=D;A.raw_lines_number=len(A.data_rows)+(1 if C else 0);A.curves=_A
+		if B.curve_parser:
+			if B.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
+				A.curves,K=A._get_curves_col_x(B.curve_parser.parameters.x)
+				if A.curves:A.curves_parser_type=B.curve_parser.name;A.curves_info=K
+			elif B.curve_parser.name==ReaderCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
+			else:raise Exception('Curve parser not supported.')
+		A.cols_data=[_A]*len(A.cols)
+		for F in A.numeric_col_indexes:A.cols_data[F]=[float(A[F])for A in D]
+	def compare(A,compare_floats,param_reader,param_is_ref=True):
+		U='error';M=param_is_ref;L=param_reader;K=compare_floats;J='Errors limit reached';C=A if M else L;E=A if not M else L
+		if len(C.numeric_col_indexes)!=len(E.numeric_col_indexes):V=f"Number Float columns indexes are different: {len(C.numeric_col_indexes)} != {len(E.numeric_col_indexes)}";return V,_A
+		N=0;D=[''for A in C.cols];O=_A;F=_A
+		if A.curves and A.curves_parser_type==ReaderCurveParserNameConfig.COL_X:P=A.curves_info[_D];O=C.cols_data[P];F=A.cols[P]
+		G=False
+		for B in range(len(C.cols_data)):
+			if C.cols_data[B]==_A:continue
+			logging.debug(f"Comparing {A.cols[B]}")
+			if G:D[B]=J;continue
+			W=C.cols_data[B];X=E.cols_data[B];Y=K.compare_errors.add_group(A.cols[B],data={'info_prefix':F}if F else _A);Q,R,H=K.compare_vectors(W,X,group_idx=Y,info_vector=O);N+=R;logging.debug(f"limit_reached, diffs_count, counts: {Q}, {R}, {H}")
+			if Q:G=True;D[B]=J;continue
+			if H[U]>0:D[B]=f"{H[U]} comparison errors"
+		if A.curves:
+			for S in A.curves[_E]:
+				T=0
+				for Z in S[_B]:
+					I=A.curves[_B][Z]
+					if D[I[_C]]:I['comparison_error']=D[I[_C]];T+=1
+				S['comparison']={'curves_nb_with_error':T}
+		a=J if G else _A;return a,{'type':'vectors','total_diffs':N,'cols_has_error':D}
+	def class_info(A):return{'cols':A.cols,'raw_lines_number':A.raw_lines_number,_B:A.curves}
+	def _get_curves_col_x(E,col_x):
+		J='title';A=col_x;F={};B=E.cols
+		if isinstance(A,int):
+			C=A-1
+			if C<0 or C>=len(B):raise Exception('curve parser col_x: col_index is out of range.')
+		if isinstance(A,str):A=[A]
+		if isinstance(A,list):
+			H=[B for(B,C)in enumerate(B)if C in A]
+			if len(H)==0:return _A,F
+			C=H[0]
+		F[_D]=C;K=[B for(A,B)in enumerate(E.numeric_col_indexes)if A!=C];G=[];I=[]
+		for D in K:L={J:B[D],'short_title':B[D],'series':[[float(A[C]),float(A[D])]for A in E.data_rows],_C:D};G+=[L];M={J:B[D],'type':'simple','xaxis':B[C],'yaxis':B[D],_B:[len(G)-1]};I+=[M]
+		return{_B:G,_E:I},F

scilens/readers/reader_csv.py

@@ -1,12 +1,8 @@
-_E='charts'
-_D='x_index'
-_C='csv_col_index'
-_B='curves'
-_A=None
-import csv
+import logging,csv
 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 ReaderCsvConfig
-from scilens.config.models.reader_format_csv import ReaderCsvCurveParserNameConfig
+from scilens.config.models.reader_format_cols_curve import ReaderCurveParserNameConfig
 from scilens.components.compare_floats import CompareFloats
 def is_num(x):
 	try:return float(x)
@@ -15,59 +11,30 @@ def csv_row_detect_header(first_row):
 	A=first_row
 	if all(not A.isdigit()for A in A):return True,A
 	else:return False,[f"Column {A}"for(A,B)in enumerate(A)]
-def csv_row_detect_cols_num(row):return[A for(A,B)in enumerate(row)if is_num(B)!=_A]
-def csv_detect(path):
-	with open(path,'r')as B:A=csv.reader(B);C=next(A);D,E=csv_row_detect_header(C);F=next(A);G=csv_row_detect_cols_num(F);return D,E,G
+def csv_row_detect_cols_num(row):return[A for(A,B)in enumerate(row)if is_num(B)!=None]
+def csv_detect(path,delimiter,quotechar):
+	with open(path,'r')as B:A=csv.reader(B,delimiter=delimiter,quotechar=quotechar);C=next(A);D,E=csv_row_detect_header(C);F=next(A);G=csv_row_detect_cols_num(F);return D,E,G
 class ReaderCsv(ReaderInterface):
-	category='datalines';extensions=['CSV']
+	configuration_type_code='csv';category='datalines';extensions=['CSV']
 	def read(A,reader_options):
-		B=reader_options;A.reader_options=B;C,G,H=csv_detect(A.origin.path);A.has_header=C;A.cols=G;A.numeric_col_indexes=H
-		if B.ignore_colunmns:
-			if not C: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_colunmns]
-		E=open(A.origin.path,'r',encoding=A.encoding);I=csv.reader(E);D=[]
-		for J in I:D+=[J]
-		if C:D.pop(0)
-		E.close();A.data_rows=D;A.raw_lines_number=len(A.data_rows)+(1 if C else 0);A.curves=_A
-		if B.curve_parser:
-			if B.curve_parser.name==ReaderCsvCurveParserNameConfig.COL_X:
-				A.curves,K=A._get_curves_col_x(B.curve_parser.parameters.x)
-				if A.curves:A.curves_parser_type=B.curve_parser.name;A.curves_info=K
-			elif B.curve_parser.name==ReaderCsvCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
+		C=reader_options;A.reader_options=C;D,E,K=csv_detect(A.origin.path,A.reader_options.delimiter,A.reader_options.quotechar);A.has_header=D;A.cols=E;A.numeric_col_indexes=K
+		if C.ignore_columns:
+			if not D:raise Exception('Ignore columns is not supported without header.')
+			A.numeric_col_indexes=[B for B in A.numeric_col_indexes if A.cols[B]not in C.ignore_columns]
+		H=len(E);B=ColsDataset(cols_count=H,names=E,numeric_col_indexes=A.numeric_col_indexes,data=[[]for A in range(H)]);I=open(A.origin.path,'r',encoding=A.encoding);L=csv.reader(I,delimiter=A.reader_options.delimiter,quotechar=A.reader_options.quotechar);F=0
+		for M in L:
+			F+=1
+			if D and F==1:continue
+			for(J,G)in enumerate(M):
+				if J in B.numeric_col_indexes:G=float(G)
+				B.data[J].append(G)
+			B.origin_line_nb.append(F)
+		B.rows_count=len(B.origin_line_nb);I.close();A.cols_dataset=B;A.raw_lines_number=B.rows_count+(1 if D else 0);A.curves=None
+		if C.curve_parser:
+			if C.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
+				A.curves,N=cols_dataset_get_curves_col_x(B,C.curve_parser.parameters.x)
+				if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=N,curves=A.curves)
+			elif C.curve_parser.name==ReaderCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
 			else:raise Exception('Curve parser not supported.')
-		A.cols_data=[_A]*len(A.cols)
-		for F in A.numeric_col_indexes:A.cols_data[F]=[float(A[F])for A in D]
-	def compare(A,compare_floats,param_reader,param_is_ref=True):
-		S='error';R='Errors limit reached';J=param_is_ref;I=param_reader;H=compare_floats;B=A if J else I;E=A if not J else I
-		if len(B.numeric_col_indexes)!=len(E.numeric_col_indexes):T=f"Number Float columns indexes are different: {len(B.numeric_col_indexes)} != {len(E.numeric_col_indexes)}";return T,_A
-		K=0;D=[''for A in B.cols];L=_A;F=_A
-		if A.curves and A.curves_parser_type==ReaderCsvCurveParserNameConfig.COL_X:M=A.curves_info[_D];L=B.cols_data[M];F=A.cols[M]
-		N=False
-		for C in range(len(B.cols_data)):
-			if B.cols_data[C]==_A:continue
-			if N:D[C]=R;continue
-			U=B.cols_data[C];V=E.cols_data[C];W=H.compare_errors.add_group(A.cols[C],data={'info_prefix':F}if F else _A);X,Y,O=H.compare_vectors(U,V,group_idx=W,info_vector=L);K+=Y
-			if X:N=True;D[C]=R;continue
-			if O[S]>0:D[C]=f"{O[S]} comparison errors"
-		if A.curves:
-			for P in A.curves[_E]:
-				Q=0
-				for Z in P[_B]:
-					G=A.curves[_B][Z]
-					if D[G[_C]]:G['comparison_error']=D[G[_C]];Q+=1
-				P['comparison']={'curves_nb_with_error':Q}
-		return _A,{'type':'vectors','total_diffs':K,'cols_has_error':D}
-	def class_info(A):return{'cols':A.cols,'raw_lines_number':A.raw_lines_number,_B:A.curves}
-	def _get_curves_col_x(E,col_x):
-		J='title';A=col_x;F={};B=E.cols
-		if isinstance(A,int):
-			C=A-1
-			if C<0 or C>=len(B):raise Exception('curve parser col_x: col_index is out of range.')
-		if isinstance(A,str):A=[A]
-		if isinstance(A,list):
-			H=[B for(B,C)in enumerate(B)if C in A]
-			if len(H)==0:return _A,F
-			C=H[0]
-		F[_D]=C;K=[B for(A,B)in enumerate(E.numeric_col_indexes)if A!=C];G=[];I=[]
-		for D in K:L={J:B[D],'short_title':B[D],'series':[[float(A[C]),float(A[D])]for A in E.data_rows],_C:D};G+=[L];M={J:B[D],'type':'simple','xaxis':B[C],'yaxis':B[D],_B:[len(G)-1]};I+=[M]
-		return{_B:G,_E:I},F
+	def compare(A,compare_floats,param_reader,param_is_ref=True):C=param_is_ref;B=param_reader;D=A.cols_dataset if C else B.cols_dataset;E=A.cols_dataset if not C else B.cols_dataset;F=A.cols_curve;return compare(compare_floats,D,E,F)
+	def class_info(A):return{'cols':A.cols,'raw_lines_number':A.raw_lines_number,'curves':A.curves}

scilens/readers/reader_manager.py

@@ -1,30 +1,50 @@
+_A=None
 import os,sys
 from importlib.metadata import entry_points
 from scilens.readers.exceptions import NoReaderFound
 from scilens.readers.reader_interface import ReaderOrigin
+from scilens.config.models import FileReaderConfig
+from scilens.config.models.readers import ReadersConfig
 def extension_format(extension):
 	A=extension
 	if A.startswith('.'):A=A[1:]
 	return A.upper()
 from scilens.readers.reader_txt import ReaderTxt
 from scilens.readers.reader_csv import ReaderCsv
-BUILTIN_PLUGINS=[ReaderTxt,ReaderCsv]
+from scilens.readers.reader_txt_fixed_cols import ReaderTxtFixedCols
+BUILTIN_PLUGINS=[ReaderTxt,ReaderCsv,ReaderTxtFixedCols]
 LIB_PLUGINS_ENTRY_POINT='scilens.reader_plugins'
 class ReaderManager:
 	def __init__(A):
 		A.plugins=[]+BUILTIN_PLUGINS;B=entry_points(group=LIB_PLUGINS_ENTRY_POINT)if sys.version_info.minor>=12 else entry_points().get(LIB_PLUGINS_ENTRY_POINT,[])
 		for C in B:A.plugins+=C.load()()
 	def _get_plugin_names(A):return[A.__name__ for A in A.plugins]
+	def _get_plugin_info(A):return[{'class':A.__name__,'configuration_type_code':A.configuration_type_code}for A in A.plugins]
 	def __str__(A):return f"plugins: {A._get_plugin_names()}"
 	def _get_reader_from_extension(B,extension):
 		for A in B.plugins:
 			if extension_format(extension)in A.extensions:return A
-	def get_reader_from_file(D,path,name='',encoding='',curve_parser=None,extension_mapping=None,extension_fallback=None):
-		F=extension_fallback;E=extension_mapping;C=path;J,A=os.path.splitext(C);A=extension_format(A)
-		if E:
-			for(G,H)in E.items():
-				if extension_format(G)==A:A=extension_format(H);break
-		B=D._get_reader_from_extension(A)
-		if not B and F:B=D._get_reader_from_extension(F)
+	def _get_reader_from_configuration_type_code(B,code):
+		for A in B.plugins:
+			if code==A.configuration_type_code:return A
+	def get_reader_from_file(F,path,name='',config=_A,readers_config=_A,curve_parser=_A):
+		I=curve_parser;G=path;C=readers_config;A=config;J=ReaderOrigin(type='file',path=G,short_name=os.path.basename(G));K=A.encoding if A else'utf-8';Q,D=os.path.splitext(G);D=extension_format(D)
+		if A and A.extension_readers_catalog:
+			for(M,L)in A.extension_readers_catalog.items():
+				if extension_format(M)==D:
+					if not C.catalog or L not in C.catalog.keys():raise NoReaderFound(f"Reader config not found for {D}")
+					H=C.catalog[L];B=F._get_reader_from_configuration_type_code(H.type)
+					if not B:raise Exception(f"Reader not found for contiguration type code {H.type}")
+					N=H.parameters;return B(J,name=name,encoding=K,curve_parser=I),N
+		if A and A.extension_mapping:
+			for(O,P)in A.extension_mapping.items():
+				if extension_format(O)==D:D=extension_format(P);break
+		B=F._get_reader_from_extension(D)
+		if not B and A and A.extension_fallback:B=F._get_reader_from_extension(A.extension_fallback)
 		if not B:raise NoReaderFound(f"Reader cound not be derived")
-		I=ReaderOrigin(type='file',path=C,short_name=os.path.basename(C));return B(I,name=name,encoding=encoding,curve_parser=curve_parser)
+		E=_A
+		if B.__name__=='ReaderTxt':E=C.txt
+		elif B.__name__=='ReaderCsv':E=C.csv
+		elif B.__name__=='ReaderTxtFixedCols':E=C.txt_fixed_cols
+		elif B.__name__=='ReaderNetcdf':E=C.netcdf
+		return B(J,name=name,encoding=K,curve_parser=I),E

scilens/readers/reader_txt.py

@@ -10,7 +10,7 @@ from scilens.config.models import ReaderTxtConfig
 from scilens.components.compare_errors import SEVERITY_ERROR
 from scilens.components.compare_floats import CompareFloats
 class ReaderTxt(ReaderInterface):
-	category='datalines';extensions=['TXT']
+	configuration_type_code='txt';category='datalines';extensions=['TXT']
 	def read(A,config):
 		F='_';B=config;A.reader_options=B;A.get_lines_pre=1;A.get_lines_post=1
 		if B.report_lines:

scilens/readers/reader_txt_fixed_cols.py

@@ -0,0 +1,38 @@
+import logging,re
+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
+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:
+			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')
+			else:raise Exception('Curve parser not supported.')
+	def compare(A,compare_floats,param_reader,param_is_ref=True):C=param_is_ref;B=param_reader;D=A.cols_dataset if C else B.cols_dataset;E=A.cols_dataset if not C else B.cols_dataset;F=A.cols_curve;return compare(compare_floats,D,E,F)
+	def class_info(A):return{'cols':A.cols_dataset.names,'raw_lines_number':A.raw_lines_number,'curves':A.curves}

scilens/readers/transform.py

@@ -1,3 +1,8 @@
+def string_2_float(text):
+	try:
+		A=float(text)
+		if A!=float('inf')and A!=float('-inf'):return A
+	except ValueError:pass
 def string_2_floats(text):
 	B=[];C=text.split()
 	for D in range(len(C)):

scilens/report/templates/compare_11_summary.html

@@ -49,9 +49,19 @@
         <td class="{{ 'ERROR' if file.error else '' }}">
           {% if file.error %}<span>{{ file.error }}</span>{% endif %}
         </td>
+        {% if file.comparison_errors and file.comparison %}
         <td class="number {{ 'ERROR' if file.comparison_errors.error_nb else '' }}">{{ file.comparison_errors.error_nb }}</td>
         <td class="number {{ 'WARNING' if file.comparison_errors.warning_nb else '' }}">{{ file.comparison_errors.warning_nb }}</td>
         <td class="number">{{ file.comparison.total_diffs }}</td>
+        {% elif not file.skipped %}
+        <td class="ERROR">ERROR</td>
+        <td class="ERROR">ERROR</td>
+        <td class="ERROR">ERROR</td>
+        {% else %}
+        <td></td>
+        <td></td>
+        <td></td>
+        {% endif %}
         <td class="number test-bg-20">{{ file.test.raw_lines_number }}</td>
         <td class="number refe-bg-20">{{ file.ref.raw_lines_number }}</td>
         <td class="number test-bg-20">{{ file.test.ignore_lines_number }}</td>

scilens/report/templates/compare_12_sections.html

@@ -131,7 +131,7 @@
     {% endif %}
 
     <!--COMPARISONS ERRORS AND WARNINGS-->
-    {% if file.comparison_errors.error_nb or file.comparison_errors.warning_nb %}
+    {% if file.comparison_errors and (file.comparison_errors.error_nb or file.comparison_errors.warning_nb) %}
     <h3>Number Comparison Errors or Warnings <action data-command="toogle" data-args="numbers_errors_{{ loop.index|string }}"></action></h3>
     <div id="numbers_errors_{{ loop.index }}" >
       {% with file=file %}

scilens/report/templates/compare_13_section_numbers.html

@@ -1,3 +1,4 @@
+{% if file.comparison_errors %}
 {% set errs = file.comparison_errors %}
 {% set c_type = file.comparison.type %}
 <table>
@@ -89,3 +90,4 @@
   {% endfor %}
   
 </table>
+{% endif %}

scilens/report/templates/index.html

@@ -10,7 +10,7 @@
 {% endmacro %}
 {% set ns = namespace(statuses=['']) %}
 {% for file in data.files %}
-    {% set ns.statuses = ns.statuses + ['SKIPPED' if file.skipped else ('ERROR' if file.error else ('WARNING' if file.comparison_errors.error_nb > 0 else 'SUCCESS'))] %}
+    {% 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'))] %}
 {% endfor %}
 <html>
   <head>

{scilens-0.1.3.dist-info → scilens-0.2.1.dist-info}/METADATA

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

{scilens-0.1.3.dist-info → scilens-0.2.1.dist-info}/RECORD

@@ -5,29 +5,32 @@ scilens/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/cli/cglb.py,sha256=R0377H5H193DJ_h4hj32m6qvrZrMnSFOxSGVl2FItiU,443
 scilens/cli/config.py,sha256=XVY6q5E9fb6MZzPct4-X7m6e45erpt5MCIuzKTBKPAI,965
 scilens/cli/info.py,sha256=xE7q9epjrCQRL6Agi3nhKsG6Mr3B8HSUFMti-epMoXA,1929
-scilens/cli/main.py,sha256=ozGeSEANZx1FKpq9v55GvCZkXk3cazgLa0gtpjbMImg,5637
+scilens/cli/main.py,sha256=LljcS0s2E35y4YZpV01GhMhMK9HyRRHYmxc_q_kSurI,6004
+scilens/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/components/analyse_folder.py,sha256=yqc-dscKaHLZJCYeXGak2v0c3F2aeX0E11AFPfya6r0,208
 scilens/components/compare_2_files.py,sha256=oQ5p9JwB1r_HhfCb29mv1kkkrUd0EdrVug9T-1fQshY,1286
 scilens/components/compare_errors.py,sha256=_n9uWwLVZyPn99mwsAF8WBfcYppVQCsMwj0xuOrlhkU,1241
-scilens/components/compare_floats.py,sha256=T461VNiwVXtYWqrIr5LMiUwBkHsPmhv6LjzIVfkQOI8,1978
+scilens/components/compare_floats.py,sha256=UGUJF-WEZJSCpHZUAvVhkWY-mWiQZ8RqYnkTjFdRp1Y,3617
 scilens/components/compare_folders.py,sha256=LZ1AuYxLVHMNbtXWXQrdms4vZgOQthvDy-8NFD_EFjc,2617
 scilens/components/executor.py,sha256=8ZZq9wwoiMr7ys9LXv1pEg5Zc06QatT9PGIigMsDAB8,3620
-scilens/components/file_reader.py,sha256=tfRbmPu4pB7lNLUHNl8XVryx_Gy_huxe9ZrJ2OkR3b4,1623
+scilens/components/file_reader.py,sha256=2xvBoiJSb0KUihLzRK_o-DdGSRqEBu0-QwT1i9CCWRM,1346
 scilens/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/config/cli_run_options.py,sha256=Ls7yK5QDUPFbk73nbjGuPvuRbBRYw4Miag5ISpu3prg,281
 scilens/config/env_var.py,sha256=NqNBoIfngJEXaGEm7jGqre5pmkJ9eUjiWzbDrTVfi2c,292
 scilens/config/load.py,sha256=4U51o4cJfqhSuRIHKUDIsDQA0C4wv6SzTkVmInGDJdI,1647
-scilens/config/models/__init__.py,sha256=B3D5sAUfms8urbWPKQ-OgsU1Hm9p6hRHU1dAGAcJbOo,607
+scilens/config/models/__init__.py,sha256=eLCW1OLVINewGFy5GXSrOk8Rab_QsgKAuoErBjphHRs,673
 scilens/config/models/app.py,sha256=JltWRjjqXYkH6rg3OHYhMfkBqHFhZEZdthqES3LxvzY,1453
 scilens/config/models/compare.py,sha256=_SLMxf81fpuod8izZm72Jn12euRPxB0wHJSfUuIANbE,1639
-scilens/config/models/compare_float_thresholds.py,sha256=wvXJ_ewmjp8ro_aiq_9AS2eo4wnW26GI6swN3zw5drs,1570
+scilens/config/models/compare_float_thresholds.py,sha256=J5XBK1dAnmU-i2uA2bsaHnTM_m07_i17wsO8UiCw46o,1844
 scilens/config/models/execute.py,sha256=pFY-gZuBvLbcjTEcoNhPPO7FMFmKa6_TU5IXyKaf81A,1706
 scilens/config/models/execute_and_compare.py,sha256=TWL6yXGvQSaaV6nhHqWLvtr3v396APIoDNt0U1TbMro,582
-scilens/config/models/file_reader.py,sha256=sDIh1z_q4B5c7PhNC1WvQWLNGR4NMbXr-WhT6zDyLB4,1000
-scilens/config/models/reader_format_csv.py,sha256=r2ERmC_dWoESr9sCJ_T3dF2F00ypttZfSH8ZFG-PKnw,2208
+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=XWZTr6s0PPfcOMRrsNeOZGtExC1uyXb67A158MMWzC4,577
 scilens/config/models/reader_format_netcdf.py,sha256=nbfTB3avO0DidbNa1dCZGFZmmQvzTYhpe6mqfAanaOA,1025
 scilens/config/models/reader_format_txt.py,sha256=eHg90gwEI_VpqwqEjMRhwlS8dHcl5G4ow-37HjQq_zY,1168
-scilens/config/models/readers.py,sha256=dK_d02jqsrYTe42HO3SHQ6Fyw3SC_jleMafJpelAhdY,605
+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/report.py,sha256=nTmP2nIwL2Ku5IH9QMwYLPKmfsK2ttu9UK0GnzPUHeM,870
 scilens/config/models/report_html.py,sha256=9I9iKRDOoLMZRBY0lQV4UFtg5-D-VDfYiFGF1VFAnQ8,1389
 scilens/config/models/report_output.py,sha256=XoqUe-t-y8GRbUR3_bDwwaWf6hif-rZ-5pKDGdCMugw,875
@@ -43,13 +46,16 @@ scilens/processors/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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=suEttRHfj9UhHndchAKazLD2z_YY9dFEVLjlodRJS44,2363
 scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI,32
 scilens/readers/reader_com_txt_lines.py,sha256=zsCumTD0sv06OQNvRKPMuv94De_6KGMvN904-E1Uqeg,91
-scilens/readers/reader_csv.py,sha256=6im4FdkCFQXz2nVQlrKzwViQUh6yBZ0Vw8zpKKwzesw,3753
+scilens/readers/reader_csv copy.py,sha256=eFWQvMt4Ot7KgUIDsed1QymMbPblgboUclvQj6viVGs,4069
+scilens/readers/reader_csv.py,sha256=oLbA4wU6rlzL1cIrW-AzWifP-RvmG3yHKWQQqITYQ1U,2732
 scilens/readers/reader_interface.py,sha256=nnttHL7wt4MOXpi-SBkk8DYxVWscOPG8JFl_z12mIAo,922
-scilens/readers/reader_manager.py,sha256=1ULW0cPOtgep2JhS-KmvvW1bSfrjGHkpwSUfIi41vyg,1519
-scilens/readers/reader_txt.py,sha256=IpIA_qfdL70wrDnOotUtFjt7Yt0lEenYv93E63mQwZw,3744
-scilens/readers/transform.py,sha256=5OAcexHf2vj4obKsltWpwc_iNdsN7qgZNZEQJ18v3D0,185
+scilens/readers/reader_manager.py,sha256=DFinxIk3IIIcB6JxybGcv-mXt3jhXgCwUtzR0TqhB2Q,2684
+scilens/readers/reader_txt.py,sha256=xeiQNrWSr-jRnb0KoYya8Y_gdjT-0L_iXS4TW_bfqQc,3774
+scilens/readers/reader_txt_fixed_cols.py,sha256=KuZd62_cmV9vHRlar2K-acFVVLf28bAqRSbpRRNjblI,2258
+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
 scilens/report/assets/logo_cglb.svg,sha256=tEpkSr2h-jjQMecqiHef98Mxod4GD5j5nCQaFloTYso,2411
@@ -59,11 +65,11 @@ scilens/report/report.py,sha256=aS7ktJ2u0IAMMk-HwqqSsRkr77ZBQyYT4wXJ7djQvAk,1811
 scilens/report/template.py,sha256=cPs5gd3uEwb-6JgitGQD_i4IiUxigBTlZLNRS9KVuos,581
 scilens/report/templates/body_01_title.html,sha256=59BmETKHqRO1T_xYp0XLKx3Vha9hU9bu7yaUTVt2p9Y,2146
 scilens/report/templates/body_99_footer.html,sha256=8cWebeWfZwZ-9bYAMZkZj8rbCWq3BLIMjKQThWQxoQM,362
-scilens/report/templates/compare_11_summary.html,sha256=wskX861ISVQKFyEf3cF5mD53XNP1DhsCt6gQ-ebL9Cw,3476
-scilens/report/templates/compare_12_sections.html,sha256=m6HK-BL4Sb8VKNbCl-48Kmu9rh-IFkdp-Hckdedp7Gg,5923
+scilens/report/templates/compare_11_summary.html,sha256=4rxBlOxTcn59ztYtqDbi6SRQXlaz30HkVl7dJpzCmZE,3776
+scilens/report/templates/compare_12_sections.html,sha256=HWsfCmfdleyRK6IHJeMEheenOuyA0mLzOZ-0qLcuzJU,5952
 scilens/report/templates/compare_13_section_numbers copy.html,sha256=0PWK_I2kNX3LjPLkkY4eSYIeB7YFkA28nk-PPLDhnaY,1753
-scilens/report/templates/compare_13_section_numbers.html,sha256=ocPnazj2YsoroZUaBMNLqluejr7s8Kp71egceDxjzOI,2776
-scilens/report/templates/index.html,sha256=1kN-omesa_ns7uJz25KIFHrOONvNcoBg0lhXDmAesDA,3643
+scilens/report/templates/compare_13_section_numbers.html,sha256=JjD20F6X2RjzJIgAAF431JOdmUyNNOHJOufdH21iUsM,2820
+scilens/report/templates/index.html,sha256=mNTu-CAzEJ2rhz81cHAdmT_KcQeOQ3b_FSC73NPEi0U,3670
 scilens/report/templates/js_chartlibs_echarts.js,sha256=6YicVhTNIBmmBpV31XCVN5oBeiD0t29JIosJZRUv01M,907
 scilens/report/templates/js_chartlibs_plotly.js,sha256=uVAOKUB5XE33-r04phR-LlRkFoaHEIXyQ3jXT5r97Rc,1521
 scilens/report/templates/js_com_dom.js,sha256=YAJNGmgq2YbF9D3TqB7YSms67-xB88Molp9cKhWlqsI,1228
@@ -90,7 +96,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=E4T8Fra65u9g_BpcFANPk4ORvsYavAeiSgWA3vRca2E,804
-scilens-0.1.3.dist-info/METADATA,sha256=jqg_M9TD7uwLyZRKSnDjmHKe3aNfJOsxqjyy42gD8A8,1367
-scilens-0.1.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.1.3.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.1.3.dist-info/RECORD,,
+scilens-0.2.1.dist-info/METADATA,sha256=QYXvNkOg3U3JDqKslGVMo1OCq3bCM6yT7eCzAS4onX4,1367
+scilens-0.2.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.2.1.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.2.1.dist-info/RECORD,,