scilens 0.4.11__py3-none-any.whl → 0.5.0__py3-none-any.whl

scilens/components/compare_floats.py

@@ -6,82 +6,80 @@ import logging
 from scilens.components.compare_models import SEVERITY_ERROR,SEVERITY_WARNING,CompareGroup,CompareFloatsErr,Compare2ValuesResults
 from scilens.components.compare_errors import CompareErrors
 from scilens.config.models import CompareFloatThresholdsConfig
-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,_D:abs(max_val-min_val)}
+from scilens.components.num import vectors as CheckVectors
+def vector_get_amplitude(vector):A=vector;B=min(A);C=max(A);return{'min':B,'max':C,_D:abs(C-B)}
 class CompareFloats:
-	def __init__(self,compare_errors,config):self.compare_errors=compare_errors;self.thresholds=config
-	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=CompareFloatsErr(is_relative=True,value=sign*err,test=test,reference=reference)
-			if err<thr.relative_error_max:
-				if err>thr.relative_error_min:return Compare2ValuesResults(SEVERITY_WARNING,f"Rel. err. > {thr.relative_error_min} and < {thr.relative_error_max}",comp_err)
-			else:return Compare2ValuesResults(SEVERITY_ERROR,f"Rel. err. > {thr.relative_error_max}",comp_err)
+	def __init__(A,compare_errors,config):A.compare_errors=compare_errors;A.thresholds=config
+	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=CompareFloatsErr(is_relative=True,value=F*C,test=D,reference=B)
+			if C<A.relative_error_max:
+				if C>A.relative_error_min:return Compare2ValuesResults(SEVERITY_WARNING,f"Rel. err. > {A.relative_error_min} and < {A.relative_error_max}",E)
+			else:return Compare2ValuesResults(SEVERITY_ERROR,f"Rel. err. > {A.relative_error_max}",E)
 		else:
-			err=abs(test-reference);comp_err=CompareFloatsErr(is_relative=_B,value=sign*err,test=test,reference=reference)
-			if err<thr.absolute_error_max:
-				if err>thr.absolute_error_min:return Compare2ValuesResults(SEVERITY_WARNING,f"Abs. err. > {thr.absolute_error_min} and < {thr.absolute_error_max}",comp_err)
-			else:return Compare2ValuesResults(SEVERITY_ERROR,f"Abs. err. > {thr.absolute_error_max}",comp_err)
-	def compare_dicts(self,test_dict,reference_dict,group):
-		diffs_count=0;err_limit_reached=_B
-		if set(test_dict.keys())!=set(reference_dict.keys()):raise Exception('Dictionaries have different keys')
-		for key in test_dict:
-			test_value=test_dict[key];reference_value=reference_dict[key];res_compare=self.compare_2_values(test_value,reference_value)
-			if res_compare:err_limit_reached=self.compare_errors.add(group,res_compare,info={'key':key});diffs_count+=1;group.incr(_C)
-			if err_limit_reached:break
-		return err_limit_reached,diffs_count
-	def compare_vectors(self,test_vector,reference_vector,group,info_vector=_A):
-		B='ignore';A='RIAE_trapezoid'
-		if len(test_vector)!=len(reference_vector):raise Exception('Vectors have different lengths')
-		diffs_count=0;err_limit_reached=_B;ponderation_method=self.thresholds.vectors.ponderation_method if self.thresholds.vectors else _A
-		if ponderation_method=='RIAE':ponderation_method=A
-		if ponderation_method:logging.debug(f"Using ponderation method: {ponderation_method} with reduction_method {self.thresholds.vectors.reduction_method}")
-		amplitude_compare=_A
-		if self.thresholds.vectors and ponderation_method=='amplitude_moderation':amplitude=vector_get_amplitude(test_vector)[_D];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 ponderation_method in[A,'RIAE_midpoint']:
-			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)))if ponderation_method==A else CheckVectors.relative_integral_absolute_error_midpoint(reference_vector,test_vector,range(len(test_vector)))
-			if riae_error is _A:logging.warning('RIAE calculation returned None. This may indicate an issue with the vectors.')
+			C=abs(D-B);E=CompareFloatsErr(is_relative=_B,value=F*C,test=D,reference=B)
+			if C<A.absolute_error_max:
+				if C>A.absolute_error_min:return Compare2ValuesResults(SEVERITY_WARNING,f"Abs. err. > {A.absolute_error_min} and < {A.absolute_error_max}",E)
+			else:return Compare2ValuesResults(SEVERITY_ERROR,f"Abs. err. > {A.absolute_error_max}",E)
+	def compare_dicts(D,test_dict,reference_dict,group):
+		F=group;E=reference_dict;A=test_dict;G=0;B=_B
+		if set(A.keys())!=set(E.keys()):raise Exception('Dictionaries have different keys')
+		for C in A:
+			I=A[C];J=E[C];H=D.compare_2_values(I,J)
+			if H:B=D.compare_errors.add(F,H,info={'key':C});G+=1;F.incr(_C)
+			if B:break
+		return B,G
+	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}")
+		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
+		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 K is _A:logging.warning('RIAE calculation returned None. This may indicate an issue with the vectors.')
 			else:
-				RIAE_force_severity=self.thresholds.vectors.reduction_method
-				if riae_error>self.thresholds.vectors.riae_threshold:ee=CompareFloatsErr(is_relative=_B,value=riae_error);res_compare=Compare2ValuesResults(SEVERITY_ERROR,f"RIAE ({ponderation_method}) > {self.thresholds.vectors.riae_threshold}",ee);err_limit_reached=self.compare_errors.add(group,res_compare)
-		nb=len(test_vector)
-		for idx in range(nb):
-			diff=test_vector[idx]-reference_vector[idx]
-			if diff==0:continue
-			else:diffs_count+=1;group.incr(_C)
-			if err_limit_reached:continue
-			if RIAE_force_severity==B:continue
-			if amplitude_compare is not _A and abs(diff)<amplitude_compare:
-				if reduction_method==B:continue
-				elif reduction_method=='soften':
-					res_compare=self.compare_2_values(test_vector[idx],reference_vector[idx])
-					if res_compare:res_compare.severity=SEVERITY_WARNING
+				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)
+		U=len(B)
+		for E in range(U):
+			P=B[E]-F[E]
+			if P==0:continue
+			else:N+=1;H.incr(_C)
+			if G:continue
+			if J==R:continue
+			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
 			else:
-				res_compare=self.compare_2_values(test_vector[idx],reference_vector[idx])
-				if res_compare and RIAE_force_severity:res_compare.severity=SEVERITY_WARNING
-			if res_compare:
-				info={'index':idx}
-				if info_vector:info['info']=info_vector[idx]
-				err_limit_reached=self.compare_errors.add(group,res_compare,info=info)
-		return err_limit_reached,diffs_count
-	def add_group_and_compare_vectors(self,group_name,parent_group,group_data,test_vector,reference_vector,info_vector=_A):_,group=self.compare_errors.add_group('vectors',group_name,parent=parent_group,data=group_data);return(group,)+self.compare_vectors(test_vector,reference_vector,group,info_vector=info_vector)
-	def compare_matrices(self,test_mat,ref_mat,group,x_vector=_A,y_vector=_A):
-		diffs_count=0;err_limit_reached=_B;test_nb_lines=len(test_mat);test_nb_columns=len(test_mat[0])if test_nb_lines>0 else 0;ref_nb_lines=len(ref_mat);ref_nb_columns=len(ref_mat[0])if ref_nb_lines>0 else 0
-		if test_nb_lines!=ref_nb_lines or test_nb_columns!=ref_nb_columns:raise Exception('Matrices have different dimensions')
-		for i in range(test_nb_lines):
-			for j in range(test_nb_columns):
-				diff=test_mat[i][j]-ref_mat[i][j]
-				if diff==0:continue
-				else:diffs_count+=1;group.incr(_C)
-				if err_limit_reached:continue
-				res_compare=self.compare_2_values(test_mat[i][j],ref_mat[i][j])
-				if res_compare:
-					info={'i':i+1,'j':j+1}
-					if x_vector:info['x']=x_vector[j]
-					if y_vector:info['y']=y_vector[i]
-					err_limit_reached=self.compare_errors.add(group,res_compare,info=info)
-		return err_limit_reached,diffs_count
-	def add_group_and_compare_matrices(self,group_name,parent_group,group_data,test_mat,ref_mat,x_vector=_A,y_vector=_A):_,group=self.compare_errors.add_group('matrix',group_name,parent=parent_group,data=group_data);return(group,)+self.compare_matrices(test_mat,ref_mat,group,x_vector=x_vector,y_vector=y_vector)
+				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)
+		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):
+		K=y_vector;J=x_vector;I=group;D=ref_mat;C=test_mat;L=0;E=_B;F=len(C);M=len(C[0])if F>0 else 0;N=len(D);P=len(D[0])if N>0 else 0
+		if F!=N or M!=P:raise Exception('Matrices have different dimensions')
+		for A in range(F):
+			for B in range(M):
+				Q=C[A][B]-D[A][B]
+				if Q==0:continue
+				else:L+=1;I.incr(_C)
+				if E:continue
+				O=H.compare_2_values(C[A][B],D[A][B])
+				if O:
+					G={'i':A+1,'j':B+1}
+					if J:G['x']=J[B]
+					if K:G['y']=K[A]
+					E=H.compare_errors.add(I,O,info=G)
+		return E,L
+	def add_group_and_compare_matrices(A,group_name,parent_group,group_data,test_mat,ref_mat,x_vector=_A,y_vector=_A):C,B=A.compare_errors.add_group('matrix',group_name,parent=parent_group,data=group_data);return(B,)+A.compare_matrices(test_mat,ref_mat,B,x_vector=x_vector,y_vector=y_vector)

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/components/num/vectors.py

@@ -0,0 +1,3 @@
+import numpy as np
+def relative_integral_absolute_error_trapezoid(ref_array_like,test_array_like,x_array_like):C=x_array_like;B=test_array_like;A=ref_array_like;F=B if isinstance(B,np.ndarray)else np.array(B);G=A if isinstance(A,np.ndarray)else np.array(A);D=C if isinstance(C,np.ndarray)else np.array(C);H=np.abs(G-F);I=np.trapezoid(H,D);E=np.trapezoid(np.abs(A),D);return I/E if E!=0 else None
+def relative_integral_absolute_error_midpoint(ref_array_like,test_array_like,x_array_like):C=x_array_like;B=test_array_like;A=ref_array_like;G=B if isinstance(B,np.ndarray)else np.array(B);D=A if isinstance(A,np.ndarray)else np.array(A);H=C if isinstance(C,np.ndarray)else np.array(C);I=np.abs(D-G);E=np.diff(H);J=np.sum(I[:-1]*E);F=np.sum(np.abs(D[:-1])*E);return J/F if F!=0 else None

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
 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

@@ -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).");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.');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/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 ReaderJsonFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['json_fixed_cols'];parameters:ReaderTxtFixedColsConfig
+class ReaderXmlFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['xml_fixed_cols'];parameters:ReaderTxtFixedColsConfig
+class ReaderYamlFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['yaml_fixed_cols'];parameters:ReaderTxtFixedColsConfig
 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|ReaderJsonFixedColsConfigItem|ReaderXmlFixedColsConfigItem|ReaderYamlFixedColsConfigItem|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.');json:ReaderJsonConfig|_B=Field(default=_B,description='Configuration des readers json.');xml:ReaderXmlConfig|_B=Field(default=_B,description='Configuration des readers xml.');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/reader_json.py

@@ -0,0 +1,11 @@
+import logging
+from scilens.readers.reader_interface import ReaderInterface
+from scilens.config.models import ReaderJsonConfig
+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();A.floats_data=Tree.data_to_numeric_values(E,include_patterns=B.path_include_patterns if B else C,exclude_patterns=B.path_exclude_patterns if B else C);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.json
+		elif A.__name__=='ReaderXml':D=C.xml
+		elif A.__name__=='ReaderYaml':D=C.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

@@ -69,21 +69,24 @@ class ReaderTxtFixedCols(ReaderInterface):
 		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(R,O)in enumerate(E):S=N[O[0]:O[1]].strip();T=string_2_float(S);C.data[R].append(T)
+			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)
 		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,U=C.get_curves_col_x(B.cols.curve_parser.parameters.x)
-				if A.curves:A.cols_curve=ColsCurves(type=ReaderCurveParserNameConfig.COL_X,info=U,curves=A.curves)
+				A.curves,V=C.get_curves_col_x(B.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')
 			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)

scilens/readers/reader_xml.py

@@ -0,0 +1,12 @@
+import logging
+from scilens.readers.reader_interface import ReaderInterface
+from scilens.config.models import ReaderXmlConfig
+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):C=None;B=config;A.reader_options=B;D=open(A.origin.path,'r',encoding=A.encoding);E=ET.parse(D);F=E.getroot();G=etree_to_dict(F);D.close();A.floats_data=Tree.data_to_numeric_values(G,include_patterns=B.path_include_patterns if B else C,exclude_patterns=B.path_exclude_patterns if B else C);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_yaml.py

@@ -0,0 +1,11 @@
+import logging
+from scilens.readers.reader_interface import ReaderInterface
+from scilens.config.models import ReaderYamlConfig
+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();A.floats_data=Tree.data_to_numeric_values(E,include_patterns=B.path_include_patterns if B else C,exclude_patterns=B.path_exclude_patterns if B else C);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,69 @@
+_B=False
+_A=None
+import logging,fnmatch
+from scilens.components.compare_floats import CompareFloats
+from scilens.components.compare_models import SEVERITY_ERROR,Compare2ValuesResults
+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:
+	@classmethod
+	def data_to_numeric_values(F,data,include_patterns=_A,exclude_patterns=_A):
+		E=exclude_patterns;D=include_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 D or E:
+			logging.debug(f"Applying include/exclude patterns");A=filter_numeric_values_by_patterns(A,include_patterns=D,exclude_patterns=E);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.11.dist-info → scilens-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scilens
-Version: 0.4.11
+Version: 0.5.0
 Summary: A CesGensLaB framework for data collecting and deep analysis
 Home-page: https://scilens.dev
 License: Proprietary
@@ -14,11 +14,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: coloredlogs (>=15.0.1,<16.0.0)
-Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
-Requires-Dist: pydantic (>=2.10.2,<3.0.0)
+Requires-Dist: jinja2 (>=3.1.6,<4.0.0)
+Requires-Dist: numpy (>=2.2.6,<3.0.0)
+Requires-Dist: pydantic (>=2.11.7,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: rich-click (>=1.8.4,<2.0.0)
+Requires-Dist: requests (>=2.32.5,<3.0.0)
+Requires-Dist: rich-click (>=1.8.9,<2.0.0)
 Project-URL: Documentation, https://scilens.dev/docs
 Description-Content-Type: text/markdown
 

{scilens-0.4.11.dist-info → scilens-0.5.0.dist-info}/RECORD

@@ -10,30 +10,32 @@ 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=_FyB5UjFsmZ8tlg6w5dneSvkUeij4UjzXuQERDxFpW0,6465
+scilens/components/compare_floats.py,sha256=LPbA-l5NBoZ5WbLLU3b2R5XsHlQY9iwcc0BHjqcUhpw,4646
 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
 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=BO0WVq_VHjjhd7JqK3eiEdqTL6eAA3kdynt1oDcKzD8,755
 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=-nvPjZImao_RFVAlyvTZG1fCXa3hhkH9th4lOD3ZLT4,3382
+scilens/config/models/reader_format_cols.py,sha256=j1WbmmhigtVU5kE0yfojTji3zmTZZlZHJ1-cc-nTewM,3531
 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_trees.py,sha256=5T9YU0iG5e3bfi7DTjqomT6CCwQJiPhx0wBp3i_Asps,564
 scilens/config/models/reader_format_txt.py,sha256=35rvhg311DN9miE47QM9NN_gcZHglYG2lBZPLJy4iyg,1462
 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=gCviJLKWjulEDLic0cc_Vyi0pIEs5mkCtJJkslU8KFQ,2581
 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
@@ -54,10 +56,14 @@ scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI
 scilens/readers/mat_dataset.py,sha256=Z9TYDWaH2aqdniLNDjlpR6VVNHMSARjh52clhdMyOn4,1496
 scilens/readers/reader_csv.py,sha256=yq2MRHYk3C5NIkFbkl6gM-CFUUPTwgm8W-2-g_WaQ5M,5550
 scilens/readers/reader_interface.py,sha256=r1pu9LyweTGXU8YfI3FPZy1Em4stzmJb-6j90j1tPQQ,938
-scilens/readers/reader_manager.py,sha256=DFinxIk3IIIcB6JxybGcv-mXt3jhXgCwUtzR0TqhB2Q,2684
+scilens/readers/reader_json.py,sha256=V33m4eFWGd2ESIMvt8KPlOXs2OJMeJ7P9uf7MzdINS4,882
+scilens/readers/reader_manager.py,sha256=EaImzzOs4yIvZ6hgGfOf8GT8jwN3TmbxquUxqJbN5-c,2988
 scilens/readers/reader_txt.py,sha256=U3hGIorj-Nv-jq6zYtvbDv2LQBHTgW52PHbV8A5FMA8,4526
-scilens/readers/reader_txt_fixed_cols.py,sha256=uVzcblWlfsdBZzboPXtsWC9H3jSNjfMp87pUkqnW3sE,4617
+scilens/readers/reader_txt_fixed_cols.py,sha256=t7vdRwt7g6-PqGer-kBdtYu7Ou75m_nKpQarBJmKxnk,4921
+scilens/readers/reader_xml.py,sha256=Z8pYL6AEjqc1NkmLWCCZCLgl4spgI2u2qSdGCN-D0LQ,977
+scilens/readers/reader_yaml.py,sha256=yjRZ-wn3hb7d4wVv8nScBl_i1Mzv_XwegcQOTkCKtoc,887
 scilens/readers/transform.py,sha256=kppfgPkXymF0qtquFivuosLVfF66L9bE-wGx-3bMHv8,307
+scilens/readers/tree.py,sha256=47CtGDK-j09FgPJhKpqyQj4zKTmejErj2OYAHzfi2cg,2755
 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
@@ -78,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
@@ -115,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.11.dist-info/METADATA,sha256=podUjjzOmVM9UI_JwIGhiuqoLIOMmpVX3CuQZyKQ_Js,1368
-scilens-0.4.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.4.11.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.4.11.dist-info/RECORD,,
+scilens/utils/xml.py,sha256=HcB-ymJy8o4lsczHpXznGrbYahq_3cnnkPOdRfWdHfg,461
+scilens-0.5.0.dist-info/METADATA,sha256=vrmvvRPo0Sm6mXf3Yxl7bsf1RGeHyYlf5EQ3wp4zqA8,1405
+scilens-0.5.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.5.0.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.5.0.dist-info/RECORD,,