scilens 0.4.13__py3-none-any.whl → 0.5.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- scilens/components/compare_models.py +1 -1
- scilens/config/models/__init__.py +1 -0
- scilens/config/models/compare_float_thresholds.py +1 -1
- scilens/config/models/reader_format_trees.py +7 -0
- scilens/config/models/readers.py +8 -3
- scilens/readers/reader_json.py +11 -0
- scilens/readers/reader_manager.py +27 -21
- scilens/readers/reader_xml.py +12 -0
- scilens/readers/reader_yaml.py +11 -0
- scilens/readers/tree.py +69 -0
- scilens/report/templates/compare_13_section_numbers_table.html +7 -0
- scilens/utils/xml.py +19 -0
- {scilens-0.4.13.dist-info → scilens-0.5.0.dist-info}/METADATA +1 -1
- {scilens-0.4.13.dist-info → scilens-0.5.0.dist-info}/RECORD +16 -10
- {scilens-0.4.13.dist-info → scilens-0.5.0.dist-info}/WHEEL +0 -0
- {scilens-0.4.13.dist-info → scilens-0.5.0.dist-info}/entry_points.txt +0 -0
|
@@ -8,7 +8,7 @@ SEVERITY_WARNING='warning'
|
|
|
8
8
|
class CompareFloatsErr:is_relative:bool;value:float;test:float|_A=_A;reference:float|_A=_A
|
|
9
9
|
@dataclass
|
|
10
10
|
class Compare2ValuesResults:severity:str;message:str;comp_err:CompareFloatsErr|_A=_A
|
|
11
|
-
class CompareErr(BaseModel):err:CompareFloatsErr|_A;msg:int;group:int|_A=_A;info:dict|_A=_A
|
|
11
|
+
class CompareErr(BaseModel):err:CompareFloatsErr|_A;msg:int;group:int|_A=_A;info:dict|str|_A=_A
|
|
12
12
|
COMPARE_GROUP_TYPE=Literal['node','lines','vectors',' matrix','metrics','pixels']
|
|
13
13
|
@dataclass
|
|
14
14
|
class CompareGroup:
|
|
@@ -6,6 +6,7 @@ from.execute import ExecuteConfig
|
|
|
6
6
|
from.reader_format_txt import ReaderTxtIgnoreConfig,ReaderTxtConfig
|
|
7
7
|
from.reader_format_csv import ReaderCsvConfig
|
|
8
8
|
from.reader_format_txt_fixed_cols import ReaderTxtFixedColsConfig
|
|
9
|
+
from.reader_format_trees import ReaderJsonConfig,ReaderXmlConfig,ReaderYamlConfig
|
|
9
10
|
from.readers import ReadersConfig
|
|
10
11
|
from.file_reader import FileReaderConfig
|
|
11
12
|
from.report_html import ReportHtmlConfig,ReportHtmlCurvesConfig,ReportParameterOpenFileInConfig,ReportParameterPageModeConfig
|
|
@@ -2,7 +2,7 @@ _B='forbid'
|
|
|
2
2
|
_A=None
|
|
3
3
|
from pydantic import BaseModel,Field,model_validator
|
|
4
4
|
class CompareFloatVectorsConfig(BaseModel,extra=_B):
|
|
5
|
-
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
|
|
5
|
+
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.")
|
|
6
6
|
@model_validator(mode='after')
|
|
7
7
|
def check_value_required(self):
|
|
8
8
|
A=self
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
_B=None
|
|
2
|
+
_A='forbid'
|
|
3
|
+
from pydantic import BaseModel,Field
|
|
4
|
+
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.')
|
|
5
|
+
class ReaderJsonConfig(ReaderTreeBaseConfig,extra=_A):0
|
|
6
|
+
class ReaderXmlConfig(ReaderTreeBaseConfig,extra=_A):0
|
|
7
|
+
class ReaderYamlConfig(ReaderTreeBaseConfig,extra=_A):0
|
scilens/config/models/readers.py
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
|
+
_B=None
|
|
1
2
|
_A='forbid'
|
|
2
|
-
from typing import Literal
|
|
3
|
+
from typing import Literal,Optional
|
|
3
4
|
from pydantic import BaseModel,Field
|
|
4
5
|
from scilens.config.models.reader_format_txt import ReaderTxtConfig
|
|
5
6
|
from scilens.config.models.reader_format_csv import ReaderCsvConfig
|
|
6
7
|
from scilens.config.models.reader_format_txt_fixed_cols import ReaderTxtFixedColsConfig
|
|
8
|
+
from scilens.config.models.reader_format_trees import ReaderJsonConfig,ReaderXmlConfig,ReaderYamlConfig
|
|
7
9
|
from scilens.config.models.reader_format_netcdf import ReaderNetcdfConfig
|
|
8
10
|
class BaseCatalogItem(BaseModel,extra=_A):type:str
|
|
9
11
|
class ReaderTxtConfigItem(BaseCatalogItem,extra=_A):type:Literal['txt'];parameters:ReaderTxtConfig
|
|
10
12
|
class ReaderCsvConfigItem(BaseCatalogItem,extra=_A):type:Literal['csv'];parameters:ReaderCsvConfig
|
|
11
13
|
class ReaderTxtFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['txt_fixed_cols'];parameters:ReaderTxtFixedColsConfig
|
|
14
|
+
class ReaderJsonFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['json_fixed_cols'];parameters:ReaderTxtFixedColsConfig
|
|
15
|
+
class ReaderXmlFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['xml_fixed_cols'];parameters:ReaderTxtFixedColsConfig
|
|
16
|
+
class ReaderYamlFixedColsConfigItem(BaseCatalogItem,extra=_A):type:Literal['yaml_fixed_cols'];parameters:ReaderTxtFixedColsConfig
|
|
12
17
|
class ReaderNetcdfConfigItem(BaseCatalogItem,extra=_A):type:Literal['netcdf'];parameters:ReaderNetcdfConfig
|
|
13
|
-
CATALOG_ITEM_TYPE=ReaderTxtConfigItem|ReaderCsvConfigItem|ReaderTxtFixedColsConfigItem|ReaderNetcdfConfigItem
|
|
14
|
-
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
|
|
18
|
+
CATALOG_ITEM_TYPE=ReaderTxtConfigItem|ReaderCsvConfigItem|ReaderTxtFixedColsConfigItem|ReaderJsonFixedColsConfigItem|ReaderXmlFixedColsConfigItem|ReaderYamlFixedColsConfigItem|ReaderNetcdfConfigItem
|
|
19
|
+
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': ';'}}}`")
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import logging
|
|
2
|
+
from scilens.readers.reader_interface import ReaderInterface
|
|
3
|
+
from scilens.config.models import ReaderJsonConfig
|
|
4
|
+
from scilens.components.compare_floats import CompareFloats
|
|
5
|
+
import json
|
|
6
|
+
from.tree import Tree
|
|
7
|
+
class ReaderJson(ReaderInterface):
|
|
8
|
+
configuration_type_code='json';category='datalines';extensions=['JSON']
|
|
9
|
+
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
|
|
10
|
+
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)
|
|
11
|
+
def class_info(A):return{'metrics':A.metrics}
|
|
@@ -12,7 +12,10 @@ def extension_format(extension):
|
|
|
12
12
|
from scilens.readers.reader_txt import ReaderTxt
|
|
13
13
|
from scilens.readers.reader_csv import ReaderCsv
|
|
14
14
|
from scilens.readers.reader_txt_fixed_cols import ReaderTxtFixedCols
|
|
15
|
-
|
|
15
|
+
from scilens.readers.reader_json import ReaderJson
|
|
16
|
+
from scilens.readers.reader_yaml import ReaderYaml
|
|
17
|
+
from scilens.readers.reader_xml import ReaderXml
|
|
18
|
+
BUILTIN_PLUGINS=[ReaderTxt,ReaderCsv,ReaderTxtFixedCols,ReaderJson,ReaderYaml,ReaderXml]
|
|
16
19
|
LIB_PLUGINS_ENTRY_POINT='scilens.reader_plugins'
|
|
17
20
|
class ReaderManager:
|
|
18
21
|
def __init__(A):
|
|
@@ -28,23 +31,26 @@ class ReaderManager:
|
|
|
28
31
|
for A in B.plugins:
|
|
29
32
|
if code==A.configuration_type_code:return A
|
|
30
33
|
def get_reader_from_file(F,path,name='',config=_A,readers_config=_A,curve_parser=_A):
|
|
31
|
-
I=curve_parser;G=path;C=readers_config;
|
|
32
|
-
if
|
|
33
|
-
for(M,L)in
|
|
34
|
-
if extension_format(M)==
|
|
35
|
-
if not C.catalog or L not in C.catalog.keys():raise NoReaderFound(f"Reader config not found for {
|
|
36
|
-
H=C.catalog[L];
|
|
37
|
-
if not
|
|
38
|
-
N=H.parameters;return
|
|
39
|
-
if
|
|
40
|
-
for(O,P)in
|
|
41
|
-
if extension_format(O)==
|
|
42
|
-
|
|
43
|
-
if not
|
|
44
|
-
if not
|
|
45
|
-
|
|
46
|
-
if
|
|
47
|
-
elif
|
|
48
|
-
elif
|
|
49
|
-
elif
|
|
50
|
-
|
|
34
|
+
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)
|
|
35
|
+
if B and B.extension_readers_catalog:
|
|
36
|
+
for(M,L)in B.extension_readers_catalog.items():
|
|
37
|
+
if extension_format(M)==E:
|
|
38
|
+
if not C.catalog or L not in C.catalog.keys():raise NoReaderFound(f"Reader config not found for {E}")
|
|
39
|
+
H=C.catalog[L];A=F._get_reader_from_configuration_type_code(H.type)
|
|
40
|
+
if not A:raise Exception(f"Reader not found for contiguration type code {H.type}")
|
|
41
|
+
N=H.parameters;return A(J,name=name,encoding=K,curve_parser=I),N
|
|
42
|
+
if B and B.extension_mapping:
|
|
43
|
+
for(O,P)in B.extension_mapping.items():
|
|
44
|
+
if extension_format(O)==E:E=extension_format(P);break
|
|
45
|
+
A=F._get_reader_from_extension(E)
|
|
46
|
+
if not A and B and B.extension_fallback:A=F._get_reader_from_extension(B.extension_fallback)
|
|
47
|
+
if not A:raise NoReaderFound(f"Reader cound not be derived")
|
|
48
|
+
D=_A
|
|
49
|
+
if A.__name__=='ReaderTxt':D=C.txt
|
|
50
|
+
elif A.__name__=='ReaderCsv':D=C.csv
|
|
51
|
+
elif A.__name__=='ReaderTxtFixedCols':D=C.txt_fixed_cols
|
|
52
|
+
elif A.__name__=='ReaderJson':D=C.json
|
|
53
|
+
elif A.__name__=='ReaderXml':D=C.xml
|
|
54
|
+
elif A.__name__=='ReaderYaml':D=C.yaml
|
|
55
|
+
elif A.__name__=='ReaderNetcdf':D=C.netcdf
|
|
56
|
+
return A(J,name=name,encoding=K,curve_parser=I),D
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import logging
|
|
2
|
+
from scilens.readers.reader_interface import ReaderInterface
|
|
3
|
+
from scilens.config.models import ReaderXmlConfig
|
|
4
|
+
from scilens.components.compare_floats import CompareFloats
|
|
5
|
+
from.tree import Tree
|
|
6
|
+
from scilens.utils.xml import etree_to_dict
|
|
7
|
+
import xml.etree.ElementTree as ET
|
|
8
|
+
class ReaderXml(ReaderInterface):
|
|
9
|
+
configuration_type_code='xml';category='datalines';extensions=['XML']
|
|
10
|
+
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
|
|
11
|
+
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)
|
|
12
|
+
def class_info(A):return{'metrics':A.metrics}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import logging
|
|
2
|
+
from scilens.readers.reader_interface import ReaderInterface
|
|
3
|
+
from scilens.config.models import ReaderYamlConfig
|
|
4
|
+
from scilens.components.compare_floats import CompareFloats
|
|
5
|
+
import yaml
|
|
6
|
+
from.tree import Tree
|
|
7
|
+
class ReaderYaml(ReaderInterface):
|
|
8
|
+
configuration_type_code='yaml';category='datalines';extensions=['YAML']
|
|
9
|
+
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
|
|
10
|
+
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)
|
|
11
|
+
def class_info(A):return{'metrics':A.metrics}
|
scilens/readers/tree.py
ADDED
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
_B=False
|
|
2
|
+
_A=None
|
|
3
|
+
import logging,fnmatch
|
|
4
|
+
from scilens.components.compare_floats import CompareFloats
|
|
5
|
+
from scilens.components.compare_models import SEVERITY_ERROR,Compare2ValuesResults
|
|
6
|
+
NumericPathValues=list[tuple[str,float]]
|
|
7
|
+
def find_numeric_values_and_keys(k,v):
|
|
8
|
+
A=[]
|
|
9
|
+
if isinstance(v,dict):
|
|
10
|
+
for(B,C)in v.items():A.extend(find_numeric_values_and_keys(f"{k}/{B}",C))
|
|
11
|
+
elif isinstance(v,list):
|
|
12
|
+
for(B,C)in enumerate(v):A.extend(find_numeric_values_and_keys(f"{k}[{B}]",C))
|
|
13
|
+
elif isinstance(v,(int,float)):A.append((k,v))
|
|
14
|
+
elif isinstance(v,str):
|
|
15
|
+
try:D=float(v);A.append((k,D))
|
|
16
|
+
except ValueError:pass
|
|
17
|
+
return A
|
|
18
|
+
def find_numeric_values(v):
|
|
19
|
+
A=[]
|
|
20
|
+
if isinstance(v,dict):
|
|
21
|
+
for B in v.values():A.extend(find_numeric_values(B))
|
|
22
|
+
elif isinstance(v,list):
|
|
23
|
+
for C in v:A.extend(find_numeric_values(C))
|
|
24
|
+
elif isinstance(v,(int,float)):A.append(v)
|
|
25
|
+
elif isinstance(v,str):
|
|
26
|
+
try:D=float(v);A.append(D)
|
|
27
|
+
except ValueError:pass
|
|
28
|
+
return A
|
|
29
|
+
def filter_numeric_values_by_patterns(numeric_values_with_keys,include_patterns=_A,exclude_patterns=_A):
|
|
30
|
+
E=exclude_patterns;D=include_patterns;F=[]
|
|
31
|
+
for(B,G)in numeric_values_with_keys:
|
|
32
|
+
A=True
|
|
33
|
+
if E:
|
|
34
|
+
for C in E:
|
|
35
|
+
if fnmatch.fnmatch(B,C):A=_B;break
|
|
36
|
+
if A and D:
|
|
37
|
+
A=_B
|
|
38
|
+
for C in D:
|
|
39
|
+
if fnmatch.fnmatch(B,C):A=True;break
|
|
40
|
+
if A:F.append((B,G))
|
|
41
|
+
return F
|
|
42
|
+
class Tree:
|
|
43
|
+
@classmethod
|
|
44
|
+
def data_to_numeric_values(F,data,include_patterns=_A,exclude_patterns=_A):
|
|
45
|
+
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:")
|
|
46
|
+
for(B,C)in A[:10]:logging.debug(f" {B}: {C}")
|
|
47
|
+
if D or E:
|
|
48
|
+
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:")
|
|
49
|
+
for(B,C)in A[:10]:logging.debug(f" {B}: {C}")
|
|
50
|
+
return A
|
|
51
|
+
@classmethod
|
|
52
|
+
def compare(V,compare_floats,test_floats_data,ref_floats_data):
|
|
53
|
+
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
|
|
54
|
+
for W in range(T):
|
|
55
|
+
H,M=B[F]if F<K else(_A,_A);J,N=C[G]if G<L else(_A,_A)
|
|
56
|
+
if H!=J:
|
|
57
|
+
D.incr(Q)
|
|
58
|
+
if not E:
|
|
59
|
+
if J>H:F+=1;I=f"Test: {H}"
|
|
60
|
+
else:G+=1;I=f"Ref.: {J}"
|
|
61
|
+
E=A.compare_errors.add(D,Compare2ValuesResults(SEVERITY_ERROR,'Different keys for numeric values'),info=I)
|
|
62
|
+
continue
|
|
63
|
+
F+=1;G+=1;I=H;U=M-N
|
|
64
|
+
if U==0:continue
|
|
65
|
+
else:
|
|
66
|
+
D.incr(Q)
|
|
67
|
+
if not E:
|
|
68
|
+
O=A.compare_2_values(M,N)
|
|
69
|
+
if O:E=A.compare_errors.add(D,O,info=I)
|
|
@@ -26,6 +26,9 @@
|
|
|
26
26
|
<th class="p-2" rowspan="2">x</th>
|
|
27
27
|
<th class="p-2" rowspan="2">y</th>
|
|
28
28
|
{% endif %}
|
|
29
|
+
{% if group.type == "tree" %}
|
|
30
|
+
<th class="p-2" colspan="2" rowspan="2">Key</th>
|
|
31
|
+
{% endif %}
|
|
29
32
|
</tr>
|
|
30
33
|
<tr>
|
|
31
34
|
<th class="p-2 test-bg-50">Test</th>
|
|
@@ -86,6 +89,10 @@
|
|
|
86
89
|
<td class="number">{{ item.info.y }}</td>
|
|
87
90
|
{% endif %}
|
|
88
91
|
|
|
92
|
+
{% if group.type == "tree" %}
|
|
93
|
+
<td>{{ item.info }}</td>
|
|
94
|
+
{% endif %}
|
|
95
|
+
|
|
89
96
|
</tr>
|
|
90
97
|
{% endfor %}
|
|
91
98
|
{% endfor %}
|
scilens/utils/xml.py
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import xml.etree.ElementTree as ET
|
|
2
|
+
def etree_to_dict(t):
|
|
3
|
+
C={t.tag:{}if t.attrib else None};D=list(t)
|
|
4
|
+
if D:
|
|
5
|
+
A={}
|
|
6
|
+
for G in map(etree_to_dict,D):
|
|
7
|
+
for(B,E)in G.items():
|
|
8
|
+
if B in A:
|
|
9
|
+
if isinstance(A[B],list):A[B].append(E)
|
|
10
|
+
else:A[B]=[A[B],E]
|
|
11
|
+
else:A[B]=E
|
|
12
|
+
C={t.tag:A}
|
|
13
|
+
if t.attrib:C[t.tag].update(('@'+A,B)for(A,B)in t.attrib.items())
|
|
14
|
+
if t.text:
|
|
15
|
+
F=t.text.strip()
|
|
16
|
+
if D or t.attrib:
|
|
17
|
+
if F:C[t.tag]['#text']=F
|
|
18
|
+
else:C[t.tag]=F
|
|
19
|
+
return C
|
|
@@ -12,7 +12,7 @@ scilens/components/compare_2_files.py,sha256=IlgfAi9GTAa9TlCXXjCkSZut_yJoCoXh31c
|
|
|
12
12
|
scilens/components/compare_errors.py,sha256=vGb4DWP89HMIeBm0dZU2nt-ksppAs_37xtCHaPd0w5Y,1640
|
|
13
13
|
scilens/components/compare_floats.py,sha256=LPbA-l5NBoZ5WbLLU3b2R5XsHlQY9iwcc0BHjqcUhpw,4646
|
|
14
14
|
scilens/components/compare_folders.py,sha256=s7cgo2JhZi8F7tt3lGbPhkaO2726Lz3c4LYGP2HbWtA,2773
|
|
15
|
-
scilens/components/compare_models.py,sha256=
|
|
15
|
+
scilens/components/compare_models.py,sha256=EvxBZ1hPhqViCiTx7pfVIcwllkHjCjuc0mNEVa0Yqw0,941
|
|
16
16
|
scilens/components/executor.py,sha256=PLeKolzPd4wPX8e6DdfOb0uHGky3DxTcKN9QtB6oe3Q,3712
|
|
17
17
|
scilens/components/file_reader.py,sha256=7SbKCqb4Co_pqAKX3wweYhqAcVkU7BDlT903sLd76Kc,1407
|
|
18
18
|
scilens/components/num/vectors.py,sha256=r2FBOzGfAFkLiLRShIp72V3chDvIR0ZJ3f4_p4m7gzY,782
|
|
@@ -20,21 +20,22 @@ scilens/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
|
20
20
|
scilens/config/cli_run_options.py,sha256=Ls7yK5QDUPFbk73nbjGuPvuRbBRYw4Miag5ISpu3prg,281
|
|
21
21
|
scilens/config/env_var.py,sha256=NqNBoIfngJEXaGEm7jGqre5pmkJ9eUjiWzbDrTVfi2c,292
|
|
22
22
|
scilens/config/load.py,sha256=ltcv90GlsMJR2FE2ZL_jDscL7k5aGoHoMatWw61lrTw,1672
|
|
23
|
-
scilens/config/models/__init__.py,sha256=
|
|
23
|
+
scilens/config/models/__init__.py,sha256=BO0WVq_VHjjhd7JqK3eiEdqTL6eAA3kdynt1oDcKzD8,755
|
|
24
24
|
scilens/config/models/app.py,sha256=UCC7Be6gOwvxQpM5Wl1HIf2Xb61CmslFzXvj_50eqsQ,1558
|
|
25
25
|
scilens/config/models/base.py,sha256=k92CR8TA5L8dZJtg28c8albk16AK9-3umdosA7aYsxw,499
|
|
26
26
|
scilens/config/models/compare.py,sha256=IiH1wJWYVnPnUJ3BiMeGDy8CFHwPOw1nQS2wfk-0p44,2152
|
|
27
|
-
scilens/config/models/compare_float_thresholds.py,sha256=
|
|
27
|
+
scilens/config/models/compare_float_thresholds.py,sha256=4l-AMfzpOUnBYU9hsSFAmIL-B6OyfQeVnsiAhRZSYsQ,2153
|
|
28
28
|
scilens/config/models/execute.py,sha256=yF_q8swd4-s2KyT_RwtSzOW41AY5GiEZaLhGUGJBU0Y,2340
|
|
29
29
|
scilens/config/models/execute_and_compare.py,sha256=aIWF1NIgdq5USS9ZVWOKgpEyMagCvqYYWYSXWvBBgjg,597
|
|
30
30
|
scilens/config/models/file_reader.py,sha256=0-ldLt4YVmb2IwdfEHiIqDsioyXwqSkxrlfuEOmcyrA,1191
|
|
31
31
|
scilens/config/models/reader_format_cols.py,sha256=j1WbmmhigtVU5kE0yfojTji3zmTZZlZHJ1-cc-nTewM,3531
|
|
32
32
|
scilens/config/models/reader_format_csv.py,sha256=KWEH0c12n6hdaWAKdHXYMT5SvH4UqBFvP7d3ZkJr7r8,1620
|
|
33
33
|
scilens/config/models/reader_format_netcdf.py,sha256=Skr5lZACqVRrrlvs7R1RVFBpMTDthLJN-Fbs24jtb7o,1271
|
|
34
|
+
scilens/config/models/reader_format_trees.py,sha256=5T9YU0iG5e3bfi7DTjqomT6CCwQJiPhx0wBp3i_Asps,564
|
|
34
35
|
scilens/config/models/reader_format_txt.py,sha256=35rvhg311DN9miE47QM9NN_gcZHglYG2lBZPLJy4iyg,1462
|
|
35
36
|
scilens/config/models/reader_format_txt_fixed_cols.py,sha256=XmmFS0LdGR81XCjJIyW4cngivFo_8drckqe_k8fhqJk,1385
|
|
36
37
|
scilens/config/models/reader_metrics.py,sha256=uLwyd2vE4GRHbArYRv1BRH_acTL1hbFB7HgZRDJiAJg,965
|
|
37
|
-
scilens/config/models/readers.py,sha256=
|
|
38
|
+
scilens/config/models/readers.py,sha256=gCviJLKWjulEDLic0cc_Vyi0pIEs5mkCtJJkslU8KFQ,2581
|
|
38
39
|
scilens/config/models/report.py,sha256=_4W96v5izWCC_CrMzh3PM0mZIUAa3L26ZQqjV0Mv0f4,1008
|
|
39
40
|
scilens/config/models/report_html.py,sha256=IsKlmE7QbSTiPrOaxPc48Ne7xPE5yqTcLjxqN_i-unY,3803
|
|
40
41
|
scilens/config/models/report_output.py,sha256=XfzTsd1G3QjbZFer9dkWa1pa3HKbmK85UcHg6A7loOQ,890
|
|
@@ -55,10 +56,14 @@ scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI
|
|
|
55
56
|
scilens/readers/mat_dataset.py,sha256=Z9TYDWaH2aqdniLNDjlpR6VVNHMSARjh52clhdMyOn4,1496
|
|
56
57
|
scilens/readers/reader_csv.py,sha256=yq2MRHYk3C5NIkFbkl6gM-CFUUPTwgm8W-2-g_WaQ5M,5550
|
|
57
58
|
scilens/readers/reader_interface.py,sha256=r1pu9LyweTGXU8YfI3FPZy1Em4stzmJb-6j90j1tPQQ,938
|
|
58
|
-
scilens/readers/
|
|
59
|
+
scilens/readers/reader_json.py,sha256=V33m4eFWGd2ESIMvt8KPlOXs2OJMeJ7P9uf7MzdINS4,882
|
|
60
|
+
scilens/readers/reader_manager.py,sha256=EaImzzOs4yIvZ6hgGfOf8GT8jwN3TmbxquUxqJbN5-c,2988
|
|
59
61
|
scilens/readers/reader_txt.py,sha256=U3hGIorj-Nv-jq6zYtvbDv2LQBHTgW52PHbV8A5FMA8,4526
|
|
60
62
|
scilens/readers/reader_txt_fixed_cols.py,sha256=t7vdRwt7g6-PqGer-kBdtYu7Ou75m_nKpQarBJmKxnk,4921
|
|
63
|
+
scilens/readers/reader_xml.py,sha256=Z8pYL6AEjqc1NkmLWCCZCLgl4spgI2u2qSdGCN-D0LQ,977
|
|
64
|
+
scilens/readers/reader_yaml.py,sha256=yjRZ-wn3hb7d4wVv8nScBl_i1Mzv_XwegcQOTkCKtoc,887
|
|
61
65
|
scilens/readers/transform.py,sha256=kppfgPkXymF0qtquFivuosLVfF66L9bE-wGx-3bMHv8,307
|
|
66
|
+
scilens/readers/tree.py,sha256=47CtGDK-j09FgPJhKpqyQj4zKTmejErj2OYAHzfi2cg,2755
|
|
62
67
|
scilens/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
63
68
|
scilens/report/assets/logo.svg,sha256=W-1OVqcvdBjf-1AHHcV6WciIUqBoVFUh52Tc3o_jqtA,4519
|
|
64
69
|
scilens/report/assets/logo_cglb.svg,sha256=tEpkSr2h-jjQMecqiHef98Mxod4GD5j5nCQaFloTYso,2411
|
|
@@ -79,7 +84,7 @@ scilens/report/templates/compare_12_sections.html,sha256=X0YP_LgpzdIoM2rqEip9uoR
|
|
|
79
84
|
scilens/report/templates/compare_13_section_images.html,sha256=RZ2WGpbuW9eCgmY8szNNVPCTtllm8KczfticBIWxZhA,935
|
|
80
85
|
scilens/report/templates/compare_13_section_numbers copy.html,sha256=0PWK_I2kNX3LjPLkkY4eSYIeB7YFkA28nk-PPLDhnaY,1753
|
|
81
86
|
scilens/report/templates/compare_13_section_numbers.html,sha256=9etEMSqwrDyJIn_nMbKEVaDgnFL_hBxSjPR-hU2wgDI,851
|
|
82
|
-
scilens/report/templates/compare_13_section_numbers_table.html,sha256=
|
|
87
|
+
scilens/report/templates/compare_13_section_numbers_table.html,sha256=bLh0hBp8lj7iehd0wrgPi_owsX_Aft-aciwWXfQSJhw,3110
|
|
83
88
|
scilens/report/templates/html_macros.html,sha256=jKatNSn4nX_72_wHl0-0dhxZZZBoGDGpOg7E7TMZSGs,1185
|
|
84
89
|
scilens/report/templates/html_widget_err.html,sha256=sjbtooSh7RGFs8kcct4_tMi_n8FQiaoqRhUjBzHduZM,336
|
|
85
90
|
scilens/report/templates/index.html,sha256=02nQg3yqGX69g4W7Zy0EKU_SOrskMd3N4hZhg4uAzu8,6089
|
|
@@ -116,7 +121,8 @@ scilens/utils/template.py,sha256=KXBfzeCRQyBT0KNzWvGEVNVqTlRStyx4V3c_N4H29sc,402
|
|
|
116
121
|
scilens/utils/time_tracker.py,sha256=DdVBoMpVLXrX0qZZXyLm4g38EwDVLlRcBqcpNex1mYY,545
|
|
117
122
|
scilens/utils/vectors.py,sha256=4N2BZSC5n3HgZqPujDGF5NdjVmSL1rOHb_qw4OoABQY,103
|
|
118
123
|
scilens/utils/web.py,sha256=MAFWpIFOKz7QhqDoFh-Qwstvc76KpcxstSgHFT8FOL4,901
|
|
119
|
-
scilens
|
|
120
|
-
scilens-0.
|
|
121
|
-
scilens-0.
|
|
122
|
-
scilens-0.
|
|
124
|
+
scilens/utils/xml.py,sha256=HcB-ymJy8o4lsczHpXznGrbYahq_3cnnkPOdRfWdHfg,461
|
|
125
|
+
scilens-0.5.0.dist-info/METADATA,sha256=vrmvvRPo0Sm6mXf3Yxl7bsf1RGeHyYlf5EQ3wp4zqA8,1405
|
|
126
|
+
scilens-0.5.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
|
|
127
|
+
scilens-0.5.0.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
|
|
128
|
+
scilens-0.5.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|