scilens 0.4.13__py3-none-any.whl → 0.5.1__py3-none-any.whl

scilens/components/compare_floats.py

@@ -33,21 +33,22 @@ class CompareFloats:
 	def compare_vectors(A,test_vector,reference_vector,group,info_vector=_A):
 		R='ignore';M=info_vector;L='RIAE_trapezoid';H=group;F=reference_vector;B=test_vector
 		if len(B)!=len(F):raise Exception('Vectors have different lengths')
-		N=0;G=_B;D=A.thresholds.vectors.ponderation_method if A.thresholds.vectors else _A
-		if D=='RIAE':D=L
-		if D:logging.debug(f"Using ponderation method: {D} with reduction_method {A.thresholds.vectors.reduction_method}")
+		N=0;G=_B;E=A.thresholds.vectors.ponderation_method if A.thresholds.vectors else _A
+		if E=='RIAE':E=L
+		if E:logging.debug(f"Using ponderation method: {E} with reduction_method {A.thresholds.vectors.reduction_method}")
 		I=_A
-		if A.thresholds.vectors and D=='amplitude_moderation':S=vector_get_amplitude(B)[_D];I=S*A.thresholds.vectors.amplitude_moderation_multiplier;O=A.thresholds.vectors.reduction_method
+		if A.thresholds.vectors and E=='amplitude_moderation':S=vector_get_amplitude(B)[_D];I=S*A.thresholds.vectors.amplitude_moderation_multiplier;O=A.thresholds.vectors.reduction_method
 		J=_A
-		if A.thresholds.vectors and D in[L,'RIAE_midpoint']:
-			K=CheckVectors.relative_integral_absolute_error_trapezoid(F,B,range(len(B)))if D==L else CheckVectors.relative_integral_absolute_error_midpoint(F,B,range(len(B)))
+		if A.thresholds.vectors and E in[L,'RIAE_midpoint']:
+			K=CheckVectors.relative_integral_absolute_error_trapezoid(F,B,range(len(B)))if E==L else CheckVectors.relative_integral_absolute_error_midpoint(F,B,range(len(B)))
 			if K is _A:logging.warning('RIAE calculation returned None. This may indicate an issue with the vectors.')
 			else:
 				J=A.thresholds.vectors.reduction_method
-				if K>A.thresholds.vectors.riae_threshold:T=CompareFloatsErr(is_relative=_B,value=K);C=Compare2ValuesResults(SEVERITY_ERROR,f"RIAE ({D}) > {A.thresholds.vectors.riae_threshold}",T);G=A.compare_errors.add(H,C)
+				if K>A.thresholds.vectors.riae_threshold:T=CompareFloatsErr(is_relative=_B,value=K);D=Compare2ValuesResults(SEVERITY_ERROR,f"RIAE ({E}) > {A.thresholds.vectors.riae_threshold}",T);G=A.compare_errors.add(H,D)
 		U=len(B)
-		for E in range(U):
-			P=B[E]-F[E]
+		for C in range(U):
+			if B[C]is _A and F[C]is _A:continue
+			P=B[C]-F[C]
 			if P==0:continue
 			else:N+=1;H.incr(_C)
 			if G:continue
@@ -55,15 +56,15 @@ class CompareFloats:
 			if I is not _A and abs(P)<I:
 				if O==R:continue
 				elif O=='soften':
-					C=A.compare_2_values(B[E],F[E])
-					if C:C.severity=SEVERITY_WARNING
+					D=A.compare_2_values(B[C],F[C])
+					if D:D.severity=SEVERITY_WARNING
 			else:
-				C=A.compare_2_values(B[E],F[E])
-				if C and J:C.severity=SEVERITY_WARNING
-			if C:
-				Q={'index':E}
-				if M:Q['info']=M[E]
-				G=A.compare_errors.add(H,C,info=Q)
+				D=A.compare_2_values(B[C],F[C])
+				if D and J:D.severity=SEVERITY_WARNING
+			if D:
+				Q={'index':C}
+				if M:Q['info']=M[C]
+				G=A.compare_errors.add(H,D,info=Q)
 		return G,N
 	def add_group_and_compare_vectors(A,group_name,parent_group,group_data,test_vector,reference_vector,info_vector=_A):C,B=A.compare_errors.add_group('vectors',group_name,parent=parent_group,data=group_data);return(B,)+A.compare_vectors(test_vector,reference_vector,B,info_vector=info_vector)
 	def compare_matrices(H,test_mat,ref_mat,group,x_vector=_A,y_vector=_A):

scilens/components/compare_models.py

@@ -8,7 +8,7 @@ SEVERITY_WARNING='warning'
 class CompareFloatsErr:is_relative:bool;value:float;test:float|_A=_A;reference:float|_A=_A
 @dataclass
 class Compare2ValuesResults:severity:str;message:str;comp_err:CompareFloatsErr|_A=_A
-class CompareErr(BaseModel):err:CompareFloatsErr|_A;msg:int;group:int|_A=_A;info:dict|_A=_A
+class CompareErr(BaseModel):err:CompareFloatsErr|_A;msg:int;group:int|_A=_A;info:dict|str|_A=_A
 COMPARE_GROUP_TYPE=Literal['node','lines','vectors',' matrix','metrics','pixels']
 @dataclass
 class CompareGroup:

scilens/config/models/__init__.py

@@ -6,6 +6,7 @@ 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.reader_format_trees import ReaderJsonConfig,ReaderXmlConfig,ReaderYamlConfig,ReaderTreeBaseConfig
 from.readers import ReadersConfig
 from.file_reader import FileReaderConfig
 from.report_html import ReportHtmlConfig,ReportHtmlCurvesConfig,ReportParameterOpenFileInConfig,ReportParameterPageModeConfig

scilens/config/models/compare_float_thresholds.py

@@ -2,7 +2,7 @@ _B='forbid'
 _A=None
 from pydantic import BaseModel,Field,model_validator
 class CompareFloatVectorsConfig(BaseModel,extra=_B):
-	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.")
+	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` (`RIAE`=`RIAE_trapezoid`).');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.")
 	@model_validator(mode='after')
 	def check_value_required(self):
 		A=self

scilens/config/models/reader_format_cols.py

@@ -4,7 +4,7 @@ _A=None
 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,extra=_B):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."+_C+"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."+_C)
+class ReaderCurveParserColXConfig(BaseModel,extra=_B):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."+_C+"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."+_C);x_not_found_skip:bool=Field(default=True,description="Si aucune colonne n'est trouvée correspondant au parammètre `x`, ne parse pas de courbes.")
 class ReaderCurveParserColsCoupleConfig(BaseModel,extra=_B):x_index:int=Field(description='NOT IMPLEMENTED - Index Col x');y_index:int=Field(description='NOT IMPLEMENTED - Index Col y')
 class ReaderColsCurveParserConfig(BaseModel,extra=_B):
 	name:ReaderCurveParserNameConfig=Field(description='Le type de `paramètres` dépend de cette valeur');parameters:ReaderCurveParserColXConfig|ReaderCurveParserColsCoupleConfig|_A=Field(default=_A,description='Paramètres du parser de courbes')
@@ -17,4 +17,4 @@ class ReaderColsCurveParserConfig(BaseModel,extra=_B):
 			elif A.name==ReaderCurveParserNameConfig.COLS_COUPLE:A.parameters=ReaderCurveParserColsCoupleConfig(**A.parameters)
 		return A
 class ReaderColsRowsConfig(BaseModel,extra=_B):ignore_patterns:list[str]|_A=Field(default=_A,description='Liste des patterns de lignes à ignorer. Ex: ["^#", "^//"]. Non applicable si `is_matrix` est vrai.');line_start:int|_A=Field(default=_A,description='Ligne de début pour lire le fichier (les en-têtes sont comptées comme une ligne). Si non défini, commence à la première ligne.');line_end:int|_A=Field(default=_A,description="Ligne de fin pour lire le fichier (les en-têtes sont comptées comme une ligne). Si non défini, lit jusqu'à la dernière ligne.");index_min_value:float|_A=Field(default=_A,description="Valeur minimale de l'index pour les lignes à lire (valeur incluses).");index_max_value:float|_A=Field(default=_A,description="Valeur maximale de l'index pour les lignes à lire (valeur incluses).")
-class ReaderColsConfig(BaseModel,extra=_B):ignore_columns:list[str]|list[int]|_A=Field(default=_A,description="Liste des colonnes à ignorer (nom de l'en tête ou numéro de colonne).");select_columns:list[str]|list[int]|_A=Field(default=_A,description="Liste des colonnes à sélectionner (nom de l'en tête ou numéro de colonne).");index_col:int|str|list[str]|_A=Field(default=_A,description='Colonne(s) à utiliser comme index (date/heure, itération, étape, ...) (Utilisé dans différentes règles). Numéro de colonne ou nom(s) de colonne. (Valide seulement si non matrice)');rows:ReaderColsRowsConfig|_A=Field(default=_A,description='Configuration des lignes à lire.');curve_parser:ReaderColsCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.')
+class ReaderColsConfig(BaseModel,extra=_B):ignore_columns:list[str]|list[int]|_A=Field(default=_A,description="Liste des colonnes à ignorer (nom de l'en tête ou numéro de colonne).");select_columns:list[str]|list[int]|_A=Field(default=_A,description="Liste des colonnes à sélectionner (nom de l'en tête ou numéro de colonne).");index_col:int|str|list[str]|_A=Field(default=_A,description='Colonne(s) à utiliser comme index (date/heure, itération, étape, ...) (Utilisé dans différentes règles). Numéro de colonne ou nom(s) de colonne. (Valide seulement si non matrice)');rows:ReaderColsRowsConfig|_A=Field(default=_A,description='Configuration des lignes à lire.');nulls_allowed:bool=Field(default=True,description='Accepte les valeurs vides si True.');nulls_strings:list[str]|_A=Field(default=_A,description='Chaines de caracters à considérer comme vides.');curve_parser:ReaderColsCurveParserConfig|_A=Field(default=_A,description='Parseur de courbe à utiliser.')

scilens/config/models/reader_format_trees.py

@@ -0,0 +1,7 @@
+_B=None
+_A='forbid'
+from pydantic import BaseModel,Field
+class ReaderTreeBaseConfig(BaseModel,extra=_A):path_exclude_patterns:list[str]|_B=Field(default=_B,description='Patterns (Unix shell-style wildcards) to exclude certain paths from processing.');path_include_patterns:list[str]|_B=Field(default=_B,description='Patterns (Unix shell-style wildcards) to include certain paths from processing.')
+class ReaderJsonConfig(ReaderTreeBaseConfig,extra=_A):0
+class ReaderXmlConfig(ReaderTreeBaseConfig,extra=_A):0
+class ReaderYamlConfig(ReaderTreeBaseConfig,extra=_A):0

scilens/config/models/reader_format_txt.py

@@ -2,7 +2,6 @@ _B='forbid'
 _A=None
 from pydantic import BaseModel,Field
 from scilens.config.models.reader_metrics import ReaderTxtMetricsConfig
-from scilens.config.models.compare_float_thresholds import CompareFloatThresholdsConfig
 class ReaderTxtReportLines(BaseModel,extra=_B):pre:int=Field(default=0,description="Nombre de ligne avant l'erreur à présenter avec le message d'erreur.");post:int=Field(default=0,description="Nombre de ligne après l'erreur à présenter avec le message d'erreur.")
 class ReaderTxtIgnoreConfig(BaseModel,extra=_B):pattern:str=Field(default='',description='Motif de chaîne à ignorer.');pre:int=Field(default=0,description='Nombre de ligne supplémentaires à ignorer avant.');post:int=Field(default=0,description='Nombre de ligne supplémentaires à ignorer après.')
 class ReaderTxtConfig(BaseModel,extra=_B):error_rule_patterns:list[str]|_A=Field(default=_A,description='Liste de motifs de chaîne à vérifier. Si un motif est trouvé, génère une erreur. Ex: `["NaN", "infinity"]`');ignore:dict[str,list[ReaderTxtIgnoreConfig]]|_A=Field(default=_A,description='Ignore les lignes d\'un fichier selon un motif. Ex: `{"path": [{"pattern": "NaN", "pre": 0, "post": 0}]}`');report_lines:dict[str,ReaderTxtReportLines]|_A=Field(default=_A,description='Nombre de lignes à reporter avant et après une erreur. Ex: `{"path": {"pre": 0, "post": 0}`');metrics:list['ReaderTxtMetricsConfig']|_A=Field(default=_A,description='Liste des métriques')

scilens/config/models/readers.py

@@ -1,14 +1,19 @@
+_B=None
 _A='forbid'
-from typing import Literal
+from typing import Literal,Optional
 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_trees import ReaderJsonConfig,ReaderXmlConfig,ReaderYamlConfig
 from scilens.config.models.reader_format_netcdf import ReaderNetcdfConfig
 class BaseCatalogItem(BaseModel,extra=_A):type:str
 class ReaderTxtConfigItem(BaseCatalogItem,extra=_A):type:Literal['txt'];parameters:ReaderTxtConfig
 class ReaderCsvConfigItem(BaseCatalogItem,extra=_A):type:Literal['csv'];parameters:ReaderCsvConfig
 class ReaderTxtFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['txt_fixed_cols'];parameters:ReaderTxtFixedColsConfig
+class ReaderJsonConfigItem(BaseCatalogItem,extra=_A):type:Literal['json'];parameters:ReaderJsonConfig
+class ReaderXmlConfigItem(BaseCatalogItem,extra=_A):type:Literal['xml'];parameters:ReaderXmlConfig
+class ReaderYamlConfigItem(BaseCatalogItem,extra=_A):type:Literal['yaml'];parameters:ReaderYamlConfig
 class ReaderNetcdfConfigItem(BaseCatalogItem,extra=_A):type:Literal['netcdf'];parameters:ReaderNetcdfConfig
-CATALOG_ITEM_TYPE=ReaderTxtConfigItem|ReaderCsvConfigItem|ReaderTxtFixedColsConfigItem|ReaderNetcdfConfigItem
-class ReadersConfig(BaseModel,extra=_A):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': ';'}}}`")
+CATALOG_ITEM_TYPE=ReaderTxtConfigItem|ReaderCsvConfigItem|ReaderTxtFixedColsConfigItem|ReaderJsonConfigItem|ReaderXmlConfigItem|ReaderYamlConfigItem|ReaderNetcdfConfigItem
+class ReadersConfig(BaseModel,extra=_A):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.');default_config_json:ReaderJsonConfig|_B=Field(default=_B,description='Configuration des readers json.');default_config_xml:ReaderXmlConfig|_B=Field(default=_B,description='Configuration des readers xml.');default_config_yaml:ReaderYamlConfig|_B=Field(default=_B,description='Configuration des readers yaml.');netcdf:ReaderNetcdfConfig=Field(default=ReaderNetcdfConfig(),description='Configuration des readers netcdf.');catalog:dict[str,CATALOG_ITEM_TYPE]|_B=Field(default=_B,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

@@ -25,9 +25,11 @@ def get_col_indexes(source,numeric_col_indexes,names):
 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:[])
 	def get_col_indexes(A,col_x):return get_col_indexes(col_x,A.numeric_col_indexes,A.names)
-	def get_curves_col_x(F,col_x):
+	def get_curves_col_x(F,col_x,x_not_found_skip=True):
 		J='title';C=col_x;A=F;G={};H=F.get_col_indexes(C)
-		if not H:raise ValueError(f"get_curves_col_x Column {C} not found in numeric columns.")
+		if not H:
+			if x_not_found_skip:return{},{}
+			else:raise ValueError(f"get_curves_col_x Column {C} not found in numeric columns.")
 		D=H[0];G[_D]=D;K=[B for(A,B)in enumerate(A.numeric_col_indexes)if A!=D];E=[];I=[]
 		for B in K:C=A.data[D];L=A.data[B];M={J:A.names[B],'short_title':A.names[B],'series':[[C[A],L[A]]for A in range(A.rows_count)],_C:B};E+=[M];N={J:A.names[B],'type':'simple','xaxis':A.names[D],'yaxis':A.names[B],_B:[len(E)-1]};I+=[N]
 		return{_B:E,_E:I},G

scilens/readers/reader_csv.py

@@ -27,7 +27,7 @@ class ReaderCsv(ReaderInterface):
 				if bool(re.match(B,line)):return _B
 		return False
 	def read(A,reader_options):
-		C=reader_options;A.reader_options=C;F,L,V=csv_detect(A.origin.path,A.reader_options.delimiter,A.reader_options.quotechar,encoding=A.encoding);A.has_header=F;A.cols=L;A.numeric_col_indexes=V;A.index_col_index=_A;A.ignore_lines_patterns=_A;G=_A;H=_A;I=_A;J=_A;B=C.cols
+		C=reader_options;A.reader_options=C;F,L,W=csv_detect(A.origin.path,A.reader_options.delimiter,A.reader_options.quotechar,encoding=A.encoding);A.has_header=F;A.cols=L;A.numeric_col_indexes=W;A.index_col_index=_A;A.ignore_lines_patterns=_A;G=_A;H=_A;I=_A;J=_A;B=C.cols
 		if B:
 			if B.index_col:
 				if B.index_col:R=get_col_indexes(B.index_col,A.numeric_col_indexes,L);A.index_col_index=R[0]if R else _A
@@ -39,8 +39,8 @@ class ReaderCsv(ReaderInterface):
 					I=B.rows.index_min_value;J=B.rows.index_max_value
 					if I and J and I>J:raise ValueError(f"Index min value {I} cannot be greater than index max value {J}.")
 		A.raw_lines_number=_A;A.curves=_A;A.report_matrices=_A;A.metrics=_A
-		with open(A.origin.path,'r',encoding=A.encoding)as W:
-			S=W.readlines();M=csv.reader(S,delimiter=A.reader_options.delimiter,quotechar=A.reader_options.quotechar)
+		with open(A.origin.path,'r',encoding=A.encoding)as X:
+			S=X.readlines();M=csv.reader(S,delimiter=A.reader_options.delimiter,quotechar=A.reader_options.quotechar)
 			if C.is_matrix:
 				K=C.matrix or ReaderCsvMatrixConfig();P=mat_from_iterator(x_name=K.x_name,y_name=K.y_name,reader=M,has_header=F,x_value_line=K.x_value_line,has_y=K.has_y)
 				if K.export_report:A.report_matrices=get_data([P],['csv'])
@@ -49,7 +49,7 @@ class ReaderCsv(ReaderInterface):
 				if C.cols and C.cols.ignore_columns:
 					if not F:raise Exception('Ignore columns is not supported without header.')
 					if isinstance(C.cols.ignore_columns[0],str):A.numeric_col_indexes=[B for B in A.numeric_col_indexes if A.cols[B]not in C.cols.ignore_columns]
-					if isinstance(C.cols.ignore_columns[0],int):X=[A-1 for A in B.ignore_columns];A.numeric_col_indexes=[A for A in A.numeric_col_indexes if A not in X]
+					if isinstance(C.cols.ignore_columns[0],int):Y=[A-1 for A in B.ignore_columns];A.numeric_col_indexes=[A for A in A.numeric_col_indexes if A not in Y]
 				T=len(L);D=ColsDataset(cols_count=T,names=L,numeric_col_indexes=A.numeric_col_indexes,data=[[]for A in range(T)]);E=0
 				if F and E==0:next(M);E+=1
 				if G:
@@ -75,11 +75,11 @@ class ReaderCsv(ReaderInterface):
 				if B and B.curve_parser:
 					if B.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
 						O=_A
-						if B.curve_parser.parameters:O=B.curve_parser.parameters.x
-						elif B.index_col:O=B.index_col
+						if B.curve_parser.parameters:O=B.curve_parser.parameters.x;V=B.curve_parser.parameters.x_not_found_skip
+						elif B.index_col:O=B.index_col;V=_B
 						if not O:raise ValueError('Curve parser COL_X requires a parameter x, or index_col to be defined.')
-						A.curves,Y=D.get_curves_col_x(O)
-						if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=Y,curves=A.curves)
+						A.curves,Z=D.get_curves_col_x(O,x_not_found_skip=V)
+						if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=Z,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=_B):

scilens/readers/reader_json.py

@@ -0,0 +1,11 @@
+import logging
+from scilens.readers.reader_interface import ReaderInterface
+from scilens.config.models import ReaderJsonConfig,ReaderTreeBaseConfig
+from scilens.components.compare_floats import CompareFloats
+import json
+from.tree import Tree
+class ReaderJson(ReaderInterface):
+	configuration_type_code='json';category='datalines';extensions=['JSON']
+	def read(A,config):C=None;B=config;A.reader_options=B;D=open(A.origin.path,'r',encoding=A.encoding);E=json.load(D);D.close();F=Tree(ReaderTreeBaseConfig(path_include_patterns=B.path_include_patterns if B else C,path_exclude_patterns=B.path_exclude_patterns if B else C));A.floats_data=F.data_to_numeric_values(E);A.metrics=C
+	def compare(A,compare_floats,param_reader,param_is_ref=True):C=param_is_ref;B=param_reader;D=A if C else B;E=A if not C else B;Tree.compare(compare_floats,test_floats_data=D.floats_data,ref_floats_data=E.floats_data)
+	def class_info(A):return{'metrics':A.metrics}

scilens/readers/reader_manager.py

@@ -12,7 +12,10 @@ def extension_format(extension):
 from scilens.readers.reader_txt import ReaderTxt
 from scilens.readers.reader_csv import ReaderCsv
 from scilens.readers.reader_txt_fixed_cols import ReaderTxtFixedCols
-BUILTIN_PLUGINS=[ReaderTxt,ReaderCsv,ReaderTxtFixedCols]
+from scilens.readers.reader_json import ReaderJson
+from scilens.readers.reader_yaml import ReaderYaml
+from scilens.readers.reader_xml import ReaderXml
+BUILTIN_PLUGINS=[ReaderTxt,ReaderCsv,ReaderTxtFixedCols,ReaderJson,ReaderYaml,ReaderXml]
 LIB_PLUGINS_ENTRY_POINT='scilens.reader_plugins'
 class ReaderManager:
 	def __init__(A):
@@ -28,23 +31,26 @@ class ReaderManager:
 		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")
-		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
+		I=curve_parser;G=path;C=readers_config;B=config;J=ReaderOrigin(type='file',path=G,short_name=os.path.basename(G));K=B.encoding if B else'utf-8';Q,E=os.path.splitext(G);E=extension_format(E)
+		if B and B.extension_readers_catalog:
+			for(M,L)in B.extension_readers_catalog.items():
+				if extension_format(M)==E:
+					if not C.catalog or L not in C.catalog.keys():raise NoReaderFound(f"Reader config not found for {E}")
+					H=C.catalog[L];A=F._get_reader_from_configuration_type_code(H.type)
+					if not A:raise Exception(f"Reader not found for contiguration type code {H.type}")
+					N=H.parameters;return A(J,name=name,encoding=K,curve_parser=I),N
+		if B and B.extension_mapping:
+			for(O,P)in B.extension_mapping.items():
+				if extension_format(O)==E:E=extension_format(P);break
+		A=F._get_reader_from_extension(E)
+		if not A and B and B.extension_fallback:A=F._get_reader_from_extension(B.extension_fallback)
+		if not A:raise NoReaderFound(f"Reader cound not be derived")
+		D=_A
+		if A.__name__=='ReaderTxt':D=C.txt
+		elif A.__name__=='ReaderCsv':D=C.csv
+		elif A.__name__=='ReaderTxtFixedCols':D=C.txt_fixed_cols
+		elif A.__name__=='ReaderJson':D=C.default_config_json
+		elif A.__name__=='ReaderXml':D=C.default_config_xml
+		elif A.__name__=='ReaderYaml':D=C.default_config_yaml
+		elif A.__name__=='ReaderNetcdf':D=C.netcdf
+		return A(J,name=name,encoding=K,curve_parser=I),D

scilens/readers/reader_txt_fixed_cols.py

@@ -51,43 +51,49 @@ class ReaderTxtFixedCols(ReaderInterface):
 		return C
 	def _derive_col_indexes(A,header_row=_A):0
 	def read(A,reader_options):
-		B=reader_options;A.reader_options=B;A.ignore_lines_patterns=_A;I=_A;K=_A;D=B.cols
-		if D:
-			if D.rows:A.ignore_lines_patterns=D.rows.ignore_patterns;I=D.rows.line_start;K=D.rows.line_end
-		F=A._get_parsed_headers(A.origin.path)if B.has_header else _A;L=open(A.origin.path,'r',encoding=A.encoding);E=[]
-		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}");J=0
-				for M in B.column_widths:E+=[(J,J+M)];J+=M
-			else:logging.debug(f"Using column indexes: {B.column_indexes}");E=B.column_indexes
-		else:logging.debug(f"Using auto derived column indexes.");P=A._get_first_data_line(A.origin.path);E=A._discover_col_idx_ralgin_spaces(P)
+		C=reader_options;A.reader_options=C;A.ignore_lines_patterns=_A;I=_A;M=_A;B=C.cols
+		if B:
+			if B.rows:A.ignore_lines_patterns=B.rows.ignore_patterns;I=B.rows.line_start;M=B.rows.line_end
+		G=A._get_parsed_headers(A.origin.path)if C.has_header else _A;N=open(A.origin.path,'r',encoding=A.encoding);E=[]
+		if C.column_indexes or C.column_widths:
+			if C.column_indexes and C.column_widths:raise Exception('column_indexes and column_widths are exclusive.')
+			if C.column_widths:
+				logging.debug(f"Using column widths: {C.column_widths}");J=0
+				for O in C.column_widths:E+=[(J,J+O)];J+=O
+			else:logging.debug(f"Using column indexes: {C.column_indexes}");E=C.column_indexes
+		else:logging.debug(f"Using auto derived column indexes.");S=A._get_first_data_line(A.origin.path);E=A._discover_col_idx_ralgin_spaces(S)
 		logging.debug(f"Column indexes: {E}")
 		if not E:raise Exception('No column indexes or widths provided, and no headers found to derive column indexes.')
-		G=len(E);C=ColsDataset(cols_count=G,names=[f"Column {A+1}"for A in range(G)],numeric_col_indexes=[A for A in range(G)],data=[[]for A in range(G)])
-		if F:C.names=F.data
-		if D and D.ignore_columns:
-			if isinstance(D.ignore_columns[0],str):C.numeric_col_indexes=[A for A in C.numeric_col_indexes if C.names[A]not in D.ignore_columns]
-			if isinstance(D.ignore_columns[0],int):Q=[A-1 for A in D.ignore_columns];C.numeric_col_indexes=[A for A in C.numeric_col_indexes if A not in Q]
-		if D and D.select_columns:
-			if isinstance(D.select_columns[0],str):C.numeric_col_indexes=[A for A in C.numeric_col_indexes if C.names[A]in D.select_columns]
-			if isinstance(D.select_columns[0],int):R=[A-1 for A in D.select_columns];C.numeric_col_indexes=[A for A in C.numeric_col_indexes if A in R]
-		H=I or 0
-		for N in islice(L,I,K):
-			H+=1
-			if A._ignore_line(N):continue
-			if F:
-				if F.ori_line_idx==H-1:continue
-			for(S,O)in enumerate(E):T=N[O[0]:O[1]].strip();U=string_2_float(T);C.data[S].append(U)
-			C.origin_line_nb.append(H)
-		C.rows_count=len(C.origin_line_nb);L.close();A.cols_dataset=C;A.raw_lines_number=H;A.metrics=_A
-		if B.metrics:A.metrics=C.compute_metrics(B.metrics)
+		H=len(E);D=ColsDataset(cols_count=H,names=[f"Column {A+1}"for A in range(H)],numeric_col_indexes=[A for A in range(H)],data=[[]for A in range(H)])
+		if G:D.names=G.data
+		if B and B.ignore_columns:
+			if isinstance(B.ignore_columns[0],str):D.numeric_col_indexes=[A for A in D.numeric_col_indexes if D.names[A]not in B.ignore_columns]
+			if isinstance(B.ignore_columns[0],int):T=[A-1 for A in B.ignore_columns];D.numeric_col_indexes=[A for A in D.numeric_col_indexes if A not in T]
+		if B and B.select_columns:
+			if isinstance(B.select_columns[0],str):D.numeric_col_indexes=[A for A in D.numeric_col_indexes if D.names[A]in B.select_columns]
+			if isinstance(B.select_columns[0],int):U=[A-1 for A in B.select_columns];D.numeric_col_indexes=[A for A in D.numeric_col_indexes if A in U]
+		F=I or 0
+		for P in islice(N,I,M):
+			F+=1
+			if A._ignore_line(P):continue
+			if G:
+				if G.ori_line_idx==F-1:continue
+			for(K,Q)in enumerate(E):
+				L=P[Q[0]:Q[1]].strip();R=string_2_float(L)
+				if R is _A:
+					if not B.nulls_allowed:raise Exception(f"line_nb {F} col_index {K} value is empty not allowed, or not a float")
+					elif L and B.nulls_strings:
+						if L not in B.nulls_strings:raise Exception(f"line_nb {F} col_index {K} value is not a float")
+				D.data[K].append(R)
+			D.origin_line_nb.append(F)
+		D.rows_count=len(D.origin_line_nb);N.close();A.cols_dataset=D;A.raw_lines_number=F;A.metrics=_A
+		if C.metrics:A.metrics=D.compute_metrics(C.metrics)
 		A.curves=_A;A.cols_curve=_A
-		if B.cols and B.cols.curve_parser:
-			if B.cols.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
-				A.curves,V=C.get_curves_col_x(B.cols.curve_parser.parameters.x)
+		if C.cols and C.cols.curve_parser:
+			if C.cols.curve_parser.name==ReaderCurveParserNameConfig.COL_X:
+				A.curves,V=D.get_curves_col_x(C.cols.curve_parser.parameters.x)
 				if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=V,curves=A.curves)
-			elif B.cols.curve_parser.name==ReaderCurveParserNameConfig.COLS_COUPLE:raise NotImplementedError('cols_couple not implemented')
+			elif C.cols.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,'metrics':A.metrics}

scilens/readers/reader_xml.py

@@ -0,0 +1,12 @@
+import logging
+from scilens.readers.reader_interface import ReaderInterface
+from scilens.config.models import ReaderXmlConfig,ReaderTreeBaseConfig
+from scilens.components.compare_floats import CompareFloats
+from.tree import Tree
+from scilens.utils.xml import etree_to_dict
+import xml.etree.ElementTree as ET
+class ReaderXml(ReaderInterface):
+	configuration_type_code='xml';category='datalines';extensions=['XML']
+	def read(A,config):D=None;B=config;A.reader_options=B;E=open(A.origin.path,'r',encoding=A.encoding);C=ET.parse(E);F=C.getroot();G=etree_to_dict(F);E.close();C=Tree(ReaderTreeBaseConfig(path_include_patterns=B.path_include_patterns if B else D,path_exclude_patterns=B.path_exclude_patterns if B else D));A.floats_data=C.data_to_numeric_values(G);A.metrics=D
+	def compare(A,compare_floats,param_reader,param_is_ref=True):C=param_is_ref;B=param_reader;D=A if C else B;E=A if not C else B;Tree.compare(compare_floats,test_floats_data=D.floats_data,ref_floats_data=E.floats_data)
+	def class_info(A):return{'metrics':A.metrics}

scilens/readers/reader_yaml.py

@@ -0,0 +1,11 @@
+import logging
+from scilens.readers.reader_interface import ReaderInterface
+from scilens.config.models import ReaderYamlConfig,ReaderTreeBaseConfig
+from scilens.components.compare_floats import CompareFloats
+import yaml
+from.tree import Tree
+class ReaderYaml(ReaderInterface):
+	configuration_type_code='yaml';category='datalines';extensions=['YAML']
+	def read(A,config):C=None;B=config;A.reader_options=B;D=open(A.origin.path,'r',encoding=A.encoding);E=yaml.safe_load(D);D.close();F=Tree(ReaderTreeBaseConfig(path_include_patterns=B.path_include_patterns if B else C,path_exclude_patterns=B.path_exclude_patterns if B else C));A.floats_data=F.data_to_numeric_values(E);A.metrics=C
+	def compare(A,compare_floats,param_reader,param_is_ref=True):C=param_is_ref;B=param_reader;D=A if C else B;E=A if not C else B;Tree.compare(compare_floats,test_floats_data=D.floats_data,ref_floats_data=E.floats_data)
+	def class_info(A):return{'metrics':A.metrics}

scilens/readers/tree.py

@@ -0,0 +1,70 @@
+_B=False
+_A=None
+import logging,fnmatch
+from scilens.components.compare_floats import CompareFloats
+from scilens.components.compare_models import SEVERITY_ERROR,Compare2ValuesResults
+from scilens.config.models.reader_format_trees import ReaderTreeBaseConfig
+NumericPathValues=list[tuple[str,float]]
+def find_numeric_values_and_keys(k,v):
+	A=[]
+	if isinstance(v,dict):
+		for(B,C)in v.items():A.extend(find_numeric_values_and_keys(f"{k}/{B}",C))
+	elif isinstance(v,list):
+		for(B,C)in enumerate(v):A.extend(find_numeric_values_and_keys(f"{k}[{B}]",C))
+	elif isinstance(v,(int,float)):A.append((k,v))
+	elif isinstance(v,str):
+		try:D=float(v);A.append((k,D))
+		except ValueError:pass
+	return A
+def find_numeric_values(v):
+	A=[]
+	if isinstance(v,dict):
+		for B in v.values():A.extend(find_numeric_values(B))
+	elif isinstance(v,list):
+		for C in v:A.extend(find_numeric_values(C))
+	elif isinstance(v,(int,float)):A.append(v)
+	elif isinstance(v,str):
+		try:D=float(v);A.append(D)
+		except ValueError:pass
+	return A
+def filter_numeric_values_by_patterns(numeric_values_with_keys,include_patterns=_A,exclude_patterns=_A):
+	E=exclude_patterns;D=include_patterns;F=[]
+	for(B,G)in numeric_values_with_keys:
+		A=True
+		if E:
+			for C in E:
+				if fnmatch.fnmatch(B,C):A=_B;break
+		if A and D:
+			A=_B
+			for C in D:
+				if fnmatch.fnmatch(B,C):A=True;break
+		if A:F.append((B,G))
+	return F
+class Tree:
+	def __init__(A,config):A.config=config
+	def data_to_numeric_values(D,data):
+		E=D.config.path_include_patterns;F=D.config.path_exclude_patterns;logging.debug(f"Extracting numeric values from tree data");A=find_numeric_values_and_keys('',data);logging.debug(f"Found {len(A)} numeric values in tree data, 10 first:")
+		for(B,C)in A[:10]:logging.debug(f"  {B}: {C}")
+		if E or F:
+			logging.debug(f"Applying include/exclude patterns");A=filter_numeric_values_by_patterns(A,include_patterns=E,exclude_patterns=F);logging.debug(f"After filtering, {len(A)} numeric values remain, 10 first:")
+			for(B,C)in A[:10]:logging.debug(f"  {B}: {C}")
+		return A
+	@classmethod
+	def compare(V,compare_floats,test_floats_data,ref_floats_data):
+		Q='diff';P='tree';C=ref_floats_data;B=test_floats_data;A=compare_floats;R,S=A.compare_errors.add_group('node','json');R,D=A.compare_errors.add_group(P,P,parent=S);B=sorted(B,key=lambda x:x[0]);C=sorted(C,key=lambda x:x[0]);E=_B;K=len(B);L=len(C);T=max(K,L);F=0;G=0
+		for W in range(T):
+			H,M=B[F]if F<K else(_A,_A);J,N=C[G]if G<L else(_A,_A)
+			if H!=J:
+				D.incr(Q)
+				if not E:
+					if J>H:F+=1;I=f"Test: {H}"
+					else:G+=1;I=f"Ref.: {J}"
+					E=A.compare_errors.add(D,Compare2ValuesResults(SEVERITY_ERROR,'Different keys for numeric values'),info=I)
+				continue
+			F+=1;G+=1;I=H;U=M-N
+			if U==0:continue
+			else:
+				D.incr(Q)
+				if not E:
+					O=A.compare_2_values(M,N)
+					if O:E=A.compare_errors.add(D,O,info=I)

scilens/report/templates/compare_13_section_numbers_table.html

@@ -26,6 +26,9 @@
     <th class="p-2" rowspan="2">x</th>
     <th class="p-2" rowspan="2">y</th>
     {% endif %}
+    {% if group.type == "tree" %}
+    <th class="p-2" colspan="2" rowspan="2">Key</th>
+    {% endif %}
   </tr>
   <tr>
     <th class="p-2 test-bg-50">Test</th>
@@ -86,6 +89,10 @@
     <td class="number">{{ item.info.y }}</td>
     {% endif %}
 
+    {% if group.type == "tree" %}
+    <td>{{ item.info }}</td>
+    {% endif %}
+
   </tr>
   {% endfor %}
   {% endfor %}

scilens/utils/xml.py

@@ -0,0 +1,19 @@
+import xml.etree.ElementTree as ET
+def etree_to_dict(t):
+	C={t.tag:{}if t.attrib else None};D=list(t)
+	if D:
+		A={}
+		for G in map(etree_to_dict,D):
+			for(B,E)in G.items():
+				if B in A:
+					if isinstance(A[B],list):A[B].append(E)
+					else:A[B]=[A[B],E]
+				else:A[B]=E
+		C={t.tag:A}
+	if t.attrib:C[t.tag].update(('@'+A,B)for(A,B)in t.attrib.items())
+	if t.text:
+		F=t.text.strip()
+		if D or t.attrib:
+			if F:C[t.tag]['#text']=F
+		else:C[t.tag]=F
+	return C

{scilens-0.4.13.dist-info → scilens-0.5.1.dist-info}/METADATA

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

{scilens-0.4.13.dist-info → scilens-0.5.1.dist-info}/RECORD

@@ -10,9 +10,9 @@ scilens/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 scilens/components/analyse_folder.py,sha256=yqc-dscKaHLZJCYeXGak2v0c3F2aeX0E11AFPfya6r0,208
 scilens/components/compare_2_files.py,sha256=IlgfAi9GTAa9TlCXXjCkSZut_yJoCoXh31ctEokAjjE,2330
 scilens/components/compare_errors.py,sha256=vGb4DWP89HMIeBm0dZU2nt-ksppAs_37xtCHaPd0w5Y,1640
-scilens/components/compare_floats.py,sha256=LPbA-l5NBoZ5WbLLU3b2R5XsHlQY9iwcc0BHjqcUhpw,4646
+scilens/components/compare_floats.py,sha256=g6tD8QodXdz3kcgMW1-ccZp6A4bFia3xll8mPQ0rlg8,4685
 scilens/components/compare_folders.py,sha256=s7cgo2JhZi8F7tt3lGbPhkaO2726Lz3c4LYGP2HbWtA,2773
-scilens/components/compare_models.py,sha256=zSoH0E7vuvcu3i4vbNTyJvqgzHZh_hfO3mZ6UvBzfAo,937
+scilens/components/compare_models.py,sha256=EvxBZ1hPhqViCiTx7pfVIcwllkHjCjuc0mNEVa0Yqw0,941
 scilens/components/executor.py,sha256=PLeKolzPd4wPX8e6DdfOb0uHGky3DxTcKN9QtB6oe3Q,3712
 scilens/components/file_reader.py,sha256=7SbKCqb4Co_pqAKX3wweYhqAcVkU7BDlT903sLd76Kc,1407
 scilens/components/num/vectors.py,sha256=r2FBOzGfAFkLiLRShIp72V3chDvIR0ZJ3f4_p4m7gzY,782
@@ -20,21 +20,22 @@ 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=ltcv90GlsMJR2FE2ZL_jDscL7k5aGoHoMatWw61lrTw,1672
-scilens/config/models/__init__.py,sha256=eLCW1OLVINewGFy5GXSrOk8Rab_QsgKAuoErBjphHRs,673
+scilens/config/models/__init__.py,sha256=lTpDxeSVAGOJtH9MFg25yh0vwwf3VdMFlhdbrhgkk6o,776
 scilens/config/models/app.py,sha256=UCC7Be6gOwvxQpM5Wl1HIf2Xb61CmslFzXvj_50eqsQ,1558
 scilens/config/models/base.py,sha256=k92CR8TA5L8dZJtg28c8albk16AK9-3umdosA7aYsxw,499
 scilens/config/models/compare.py,sha256=IiH1wJWYVnPnUJ3BiMeGDy8CFHwPOw1nQS2wfk-0p44,2152
-scilens/config/models/compare_float_thresholds.py,sha256=M8flQmu5B-Lc-RStn-kcQJZum_kZxj591w8myyQQuEY,2127
+scilens/config/models/compare_float_thresholds.py,sha256=4l-AMfzpOUnBYU9hsSFAmIL-B6OyfQeVnsiAhRZSYsQ,2153
 scilens/config/models/execute.py,sha256=yF_q8swd4-s2KyT_RwtSzOW41AY5GiEZaLhGUGJBU0Y,2340
 scilens/config/models/execute_and_compare.py,sha256=aIWF1NIgdq5USS9ZVWOKgpEyMagCvqYYWYSXWvBBgjg,597
 scilens/config/models/file_reader.py,sha256=0-ldLt4YVmb2IwdfEHiIqDsioyXwqSkxrlfuEOmcyrA,1191
-scilens/config/models/reader_format_cols.py,sha256=j1WbmmhigtVU5kE0yfojTji3zmTZZlZHJ1-cc-nTewM,3531
+scilens/config/models/reader_format_cols.py,sha256=1SbSqBdwwrc516N3xz80S8jiQQrqQ5zWnRT0Zfa1iEc,3875
 scilens/config/models/reader_format_csv.py,sha256=KWEH0c12n6hdaWAKdHXYMT5SvH4UqBFvP7d3ZkJr7r8,1620
 scilens/config/models/reader_format_netcdf.py,sha256=Skr5lZACqVRrrlvs7R1RVFBpMTDthLJN-Fbs24jtb7o,1271
-scilens/config/models/reader_format_txt.py,sha256=35rvhg311DN9miE47QM9NN_gcZHglYG2lBZPLJy4iyg,1462
+scilens/config/models/reader_format_trees.py,sha256=5T9YU0iG5e3bfi7DTjqomT6CCwQJiPhx0wBp3i_Asps,564
+scilens/config/models/reader_format_txt.py,sha256=wE4wHJlP1Q9DMyhIkSJ2Je3CSvk2p_S46sUbmYNHUh0,1374
 scilens/config/models/reader_format_txt_fixed_cols.py,sha256=XmmFS0LdGR81XCjJIyW4cngivFo_8drckqe_k8fhqJk,1385
 scilens/config/models/reader_metrics.py,sha256=uLwyd2vE4GRHbArYRv1BRH_acTL1hbFB7HgZRDJiAJg,965
-scilens/config/models/readers.py,sha256=NpEjXbLv11k9N8UsnuS55KEYlRijF9C3eOrI0SB9dqM,1723
+scilens/config/models/readers.py,sha256=x3-I_TvFrR5_lS6Po_ns9hRjXqMKGqFygo8UUlwxTJ4,2514
 scilens/config/models/report.py,sha256=_4W96v5izWCC_CrMzh3PM0mZIUAa3L26ZQqjV0Mv0f4,1008
 scilens/config/models/report_html.py,sha256=IsKlmE7QbSTiPrOaxPc48Ne7xPE5yqTcLjxqN_i-unY,3803
 scilens/config/models/report_output.py,sha256=XfzTsd1G3QjbZFer9dkWa1pa3HKbmK85UcHg6A7loOQ,890
@@ -50,15 +51,19 @@ 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=r8-torONsaXzYUvKRjguCu_d36MSv1ceWxNoRP2-9xk,4018
+scilens/readers/cols_dataset.py,sha256=Gqb_uE3bUOJKBs3LpEWghhT6bBB0I0BIKT0mUQCDpf4,4084
 scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI,32
 scilens/readers/mat_dataset.py,sha256=Z9TYDWaH2aqdniLNDjlpR6VVNHMSARjh52clhdMyOn4,1496
-scilens/readers/reader_csv.py,sha256=yq2MRHYk3C5NIkFbkl6gM-CFUUPTwgm8W-2-g_WaQ5M,5550
+scilens/readers/reader_csv.py,sha256=ISEjLjMFcRziryZTYyH-Jg4vOtgPVwAH1kgfEQBHVAA,5619
 scilens/readers/reader_interface.py,sha256=r1pu9LyweTGXU8YfI3FPZy1Em4stzmJb-6j90j1tPQQ,938
-scilens/readers/reader_manager.py,sha256=DFinxIk3IIIcB6JxybGcv-mXt3jhXgCwUtzR0TqhB2Q,2684
+scilens/readers/reader_json.py,sha256=WVztvb00vnJvvt9btnmlbLV3ImknGOy-1ACDlbf3llg,940
+scilens/readers/reader_manager.py,sha256=oBCBaDKPzgV4CtT9RgxppDbrvjf7XiRXJ5q35q2cSds,3033
 scilens/readers/reader_txt.py,sha256=U3hGIorj-Nv-jq6zYtvbDv2LQBHTgW52PHbV8A5FMA8,4526
-scilens/readers/reader_txt_fixed_cols.py,sha256=t7vdRwt7g6-PqGer-kBdtYu7Ou75m_nKpQarBJmKxnk,4921
+scilens/readers/reader_txt_fixed_cols.py,sha256=_XaWkPEuuGy7p2A2VS0UHFS2RX1dWidYogzRWK022dg,5197
+scilens/readers/reader_xml.py,sha256=iGn_O8GDEBR8owNKYHS3r1KlAfT9oJuanZeRDuYrgnQ,1035
+scilens/readers/reader_yaml.py,sha256=6lZ77ls327r8T743OFCTg9doQNZQoa4L6O3sLu7LaLg,945
 scilens/readers/transform.py,sha256=kppfgPkXymF0qtquFivuosLVfF66L9bE-wGx-3bMHv8,307
+scilens/readers/tree.py,sha256=GDDFUfjcJaooz_2WTajAumSIsB9aCX8CizWvMFAaCGE,2844
 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
@@ -79,7 +84,7 @@ scilens/report/templates/compare_12_sections.html,sha256=X0YP_LgpzdIoM2rqEip9uoR
 scilens/report/templates/compare_13_section_images.html,sha256=RZ2WGpbuW9eCgmY8szNNVPCTtllm8KczfticBIWxZhA,935
 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=pME7vkcPpP2YF0X_jPeD8hEyjA4i-11slfwuQkfUNNI,2927
+scilens/report/templates/compare_13_section_numbers_table.html,sha256=bLh0hBp8lj7iehd0wrgPi_owsX_Aft-aciwWXfQSJhw,3110
 scilens/report/templates/html_macros.html,sha256=jKatNSn4nX_72_wHl0-0dhxZZZBoGDGpOg7E7TMZSGs,1185
 scilens/report/templates/html_widget_err.html,sha256=sjbtooSh7RGFs8kcct4_tMi_n8FQiaoqRhUjBzHduZM,336
 scilens/report/templates/index.html,sha256=02nQg3yqGX69g4W7Zy0EKU_SOrskMd3N4hZhg4uAzu8,6089
@@ -116,7 +121,8 @@ scilens/utils/template.py,sha256=KXBfzeCRQyBT0KNzWvGEVNVqTlRStyx4V3c_N4H29sc,402
 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.4.13.dist-info/METADATA,sha256=eX8VzQR_dBFyAUOm3viEMp74sGMdexYhsl04XMlM3Vw,1406
-scilens-0.4.13.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.4.13.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.4.13.dist-info/RECORD,,
+scilens/utils/xml.py,sha256=HcB-ymJy8o4lsczHpXznGrbYahq_3cnnkPOdRfWdHfg,461
+scilens-0.5.1.dist-info/METADATA,sha256=DOsseDeHbJk5qKFuuvkZGdNkTOc4BiJb_nGfmsxa_qw,1405
+scilens-0.5.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.5.1.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.5.1.dist-info/RECORD,,