scilens 0.4.4__py3-none-any.whl → 0.4.5__py3-none-any.whl

scilens/components/compare_2_files.py

@@ -8,38 +8,39 @@ from scilens.components.compare_floats import CompareFloats
 class Compare2Files:
 	def __init__(A,context):A.context=context
 	def compare(B,path_test,path_ref):
-		h='status';g='severity';f='comparison_errors';e='comparison';Y=path_ref;X=path_test;W='err_index';V='reader';U='skipped';T=None;R='metrics';Q='error';P=True;O='ref';J='path';I='test';A={I:{},O:{},e:T,f:T};H={I:{J:X},O:{J:Y}};S=B.context.config.compare.sources.not_matching_source_ignore_pattern
-		for(C,K)in H.items():
-			if not K.get(J)or not os.path.exists(K[J]):
+		i='status';h='severity';g='comparison_errors';f='comparison';Y=path_ref;X=path_test;W='err_index';V='reader';U='skipped';T=None;R='metrics';Q='error';P=True;O='ref';K='path';J='test';A={J:{},O:{},f:T,g:T};H={J:{K:X},O:{K:Y}};S=B.context.config.compare.sources.not_matching_source_ignore_pattern
+		for(C,L)in H.items():
+			if not L.get(K)or not os.path.exists(L[K]):
 				if S:
 					if S=='*':A[U]=P;return A
 					else:
-						i=os.path.basename(Y if C==I else X);j=re.search(S,i)
-						if j:A[U]=P;return A
+						j=os.path.basename(Y if C==J else X);k=re.search(S,j)
+						if k:A[U]=P;return A
 				A[Q]=f"file {C} does not exist";return A
-		k=FileReader(B.context.working_dir,B.context.config.file_reader,B.context.config.readers,config_alternate_path=B.context.origin_working_dir)
-		for(C,K)in H.items():H[C][V]=k.read(K[J])
-		D=H[I][V];F=H[O][V]
+		l=FileReader(B.context.working_dir,B.context.config.file_reader,B.context.config.readers,config_alternate_path=B.context.origin_working_dir)
+		for(C,L)in H.items():H[C][V]=l.read(L[K])
+		D=H[J][V];F=H[O][V]
 		if not D or not F:A[U]=P;return A
-		A[I]=D.info();A[O]=F.info()
+		A[J]=D.info();A[O]=F.info()
 		if D.read_error:A[Q]=D.read_error;return A
-		E=CompareErrors(B.context.config.compare.errors_limit,B.context.config.compare.ignore_warnings);Z=CompareFloats(E,B.context.config.compare.float_thresholds);D.compare(Z,F,param_is_ref=P);G=E.root_group;L=T
+		E=CompareErrors(B.context.config.compare.errors_limit,B.context.config.compare.ignore_warnings);Z=CompareFloats(E,B.context.config.compare.float_thresholds);a=D.compare(Z,F,param_is_ref=P);G=E.root_group;M=T
 		if B.context.config.compare.metrics_compare and(D.metrics or F.metrics):
-			n,L=E.add_group(R,R,parent=G)
-			if B.context.config.compare.metrics_thresholds:a=CompareFloats(E,B.context.config.compare.metrics_thresholds)
-			else:a=Z
-			a.compare_dicts(D.metrics,F.metrics,L)
-		M={'total_diffs':G.total_diffs}
-		if G.info:M.update(G.info)
-		if L:
+			o,M=E.add_group(R,R,parent=G)
+			if B.context.config.compare.metrics_thresholds:b=CompareFloats(E,B.context.config.compare.metrics_thresholds)
+			else:b=Z
+			b.compare_dicts(D.metrics,F.metrics,M)
+		I={'total_diffs':G.total_diffs}
+		if G.info:I.update(G.info)
+		if a:I.update(a)
+		if M:
 			N={}
-			for b in[SEVERITY_ERROR,SEVERITY_WARNING]:
-				for(l,c)in enumerate(E.errors[b]):
-					if c.group==L.id:N[c.info['key']]={g:b,W:l}
-			M[R]={}
-			for C in D.metrics.keys():M[R][C]={h:N[C][g],W:N[C][W]}if C in N else{h:'success'}
-		A[e]=M;A[f]=E.get_data()
+			for c in[SEVERITY_ERROR,SEVERITY_WARNING]:
+				for(m,d)in enumerate(E.errors[c]):
+					if d.group==M.id:N[d.info['key']]={h:c,W:m}
+			I[R]={}
+			for C in D.metrics.keys():I[R][C]={i:N[C][h],W:N[C][W]}if C in N else{i:'success'}
+		A[f]=I;A[g]=E.get_data()
 		if G.error:A[Q]=G.error;return A
-		D.close();F.close();d=len(E.errors[SEVERITY_ERROR])
-		if d>0:m=f"{d} comparison errors";A[Q]=m
+		D.close();F.close();e=len(E.errors[SEVERITY_ERROR])
+		if e>0:n=f"{e} comparison errors";A[Q]=n
 		return A

scilens/components/compare_models.py

@@ -9,7 +9,7 @@ class CompareFloatsErr:is_relative:bool;value:float;test:float|_A=_A;reference:f
 @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
-COMPARE_GROUP_TYPE=Literal['node','lines','vectors',' matrix','metrics']
+COMPARE_GROUP_TYPE=Literal['node','lines','vectors',' matrix','metrics','pixels']
 @dataclass
 class CompareGroup:
 	id:int;type:COMPARE_GROUP_TYPE;name:str;parent:Optional['CompareGroup']=_A;error:str|_A=_A;total_diffs:int=0;total_warnings:int=0;total_errors:int=0;data:dict|_A=_A;info:dict|_A=_A

scilens/readers/reader_interface.py

@@ -6,10 +6,10 @@ class ReaderInterface(ABC):
 	@property
 	@abstractmethod
 	def category(self):0
-	def __init__(A,origin,name='',encoding='',curve_parser=None):A.origin=origin;A.name=name;A.encoding=encoding or'utf-8';A.curve_parser=curve_parser;A.read_error=None;A.read_data={}
+	def __init__(A,origin,name='',encoding='',curve_parser=None):A.origin=origin;A.name=name;A.encoding=encoding or'utf-8';A.curve_parser=curve_parser;A.read_error=None;A.read_data={};A.reader_info={}
 	def read(A,reader_options=None):raise NotImplementedError(_A)
 	def compare(A,reader,param_is_ref=True):raise NotImplementedError(_A)
 	def get_raw_lines(A,line_nb,pre=0,post=0):raise NotImplementedError(_A)
 	def class_info(A):raise NotImplementedError(_A)
 	def close(A):0
-	def info(A):B={'reader':A.__class__.__name__,'reader_category':A.category,'name':A.name,'origin':A.origin.dict(),'encoding':A.encoding,'read_error':A.read_error,'read_data':A.read_data};B.update(A.class_info());return B
+	def info(A):B={'reader':A.__class__.__name__,'reader_info':A.reader_info,'name':A.name,'origin':A.origin.dict(),'encoding':A.encoding,'read_error':A.read_error,'read_data':A.read_data};B.update(A.class_info());return B

scilens/report/templates/compare_12_sections.html

@@ -28,7 +28,16 @@
     {% endif %}
 
 
+    {% if file.test.reader == 'ReaderImg' %}
+    {% set img_test = file.test.origin.path.replace(meta.execution_dir, "") %}
+    {% set img_ref = file.ref.origin.path.replace(meta.execution_dir, "") %}
     
+      <div>
+        <h3>Images</h3>
+        <img class="img_reader" src="{{ img_test[1:] if img_test.startswith('/') else img_test }}">
+        <img class="img_reader" src="{{ img_ref[1:] if img_ref.startswith('/') else img_ref }}">
+      </div>
+    {% endif %}
 
     <h3>Informations <action data-command="toogle" data-args="info_{{ (file_index-1)|string }}"></action></h3>
     <div id="info_{{ file_index-1 }}">
@@ -118,14 +127,6 @@
     <div id="animations_{{ file_index }}" ></div>
     {% endif %}
 
-    <!--img-->
-    {% if file.test.reader_category == "img" %}
-    
-    <img class="img_reader" src="{{ file.name }}">
-    <img class="img_reader" src="../reference/{{ file.name }}">
-    
-    {% endif %}
-    
 
     <!--FRAMESSERIES-->
     {% if file.test.framesseries %}

{scilens-0.4.4.dist-info → scilens-0.4.5.dist-info}/METADATA

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

{scilens-0.4.4.dist-info → scilens-0.4.5.dist-info}/RECORD

@@ -8,11 +8,11 @@ scilens/cli/info.py,sha256=xE7q9epjrCQRL6Agi3nhKsG6Mr3B8HSUFMti-epMoXA,1929
 scilens/cli/main.py,sha256=C8EWm6JfTBBH74pR3J-O2ZuPX78VcQ5MWC5iqNUFN6Y,6332
 scilens/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/components/analyse_folder.py,sha256=yqc-dscKaHLZJCYeXGak2v0c3F2aeX0E11AFPfya6r0,208
-scilens/components/compare_2_files.py,sha256=rxP4EgbaWryQxtsFLoSI0D68PuXCKOHM3C-NGu7WiKU,2309
+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_folders.py,sha256=s7cgo2JhZi8F7tt3lGbPhkaO2726Lz3c4LYGP2HbWtA,2773
-scilens/components/compare_models.py,sha256=pQSM-gXv4zNH_xA1xlJU1jeYDG_3HJ9vYnlDGbvsM4g,928
+scilens/components/compare_models.py,sha256=zSoH0E7vuvcu3i4vbNTyJvqgzHZh_hfO3mZ6UvBzfAo,937
 scilens/components/executor.py,sha256=PLeKolzPd4wPX8e6DdfOb0uHGky3DxTcKN9QtB6oe3Q,3712
 scilens/components/file_reader.py,sha256=7SbKCqb4Co_pqAKX3wweYhqAcVkU7BDlT903sLd76Kc,1407
 scilens/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,7 +53,7 @@ scilens/readers/cols_dataset.py,sha256=OpCTS9FmJxCHLoCrrD56sHY3f9dxwTsw2Xyxf_vNv
 scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI,32
 scilens/readers/mat_dataset.py,sha256=Z9TYDWaH2aqdniLNDjlpR6VVNHMSARjh52clhdMyOn4,1496
 scilens/readers/reader_csv.py,sha256=5TQ9TAVSNUje7Mbqy9T1SfJ1f4Ic_bFBTD9S5OuMrGU,5539
-scilens/readers/reader_interface.py,sha256=nnttHL7wt4MOXpi-SBkk8DYxVWscOPG8JFl_z12mIAo,922
+scilens/readers/reader_interface.py,sha256=r1pu9LyweTGXU8YfI3FPZy1Em4stzmJb-6j90j1tPQQ,938
 scilens/readers/reader_manager.py,sha256=DFinxIk3IIIcB6JxybGcv-mXt3jhXgCwUtzR0TqhB2Q,2684
 scilens/readers/reader_txt.py,sha256=U3hGIorj-Nv-jq6zYtvbDv2LQBHTgW52PHbV8A5FMA8,4526
 scilens/readers/reader_txt_fixed_cols.py,sha256=Ec4J34M770akw8i07BC2zahVuS8pezP31BsHoS4NyNE,4528
@@ -72,7 +72,7 @@ scilens/report/templates/compare_11_summary.html,sha256=Goknx4slzt8JX2rq05hf31HT
 scilens/report/templates/compare_11_summary_datasets.html,sha256=iUhOhZpAc4yLsHqDinx30xQDjLcbXRXU72Ud6n29GBQ,3495
 scilens/report/templates/compare_11_summary_metrics copy.html,sha256=y8hfw8W5GXR7CRDEmlgk_IN100gfF3-67UqvAIMrxPA,623
 scilens/report/templates/compare_11_summary_metrics.html,sha256=2qi2ME6VrV68mxnTZq3zS-GEPc5vwhFgswswXEpt_34,966
-scilens/report/templates/compare_12_sections.html,sha256=mHO8efJ2YOV-dC4B4E0VlcAnLbdIvgx5D-RlYRk8idY,6411
+scilens/report/templates/compare_12_sections.html,sha256=jYR-aW4qMQoRwGUQwFP-Eulz42lW4OXQj7Bfqh1F3mA,6665
 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
@@ -111,7 +111,7 @@ scilens/utils/template.py,sha256=9dlXX3nmfzDRUwzPJOkoxk15UXivZ2SW-McdCwokFa4,443
 scilens/utils/time_tracker.py,sha256=DdVBoMpVLXrX0qZZXyLm4g38EwDVLlRcBqcpNex1mYY,545
 scilens/utils/vectors.py,sha256=4N2BZSC5n3HgZqPujDGF5NdjVmSL1rOHb_qw4OoABQY,103
 scilens/utils/web.py,sha256=MAFWpIFOKz7QhqDoFh-Qwstvc76KpcxstSgHFT8FOL4,901
-scilens-0.4.4.dist-info/METADATA,sha256=cDh5banWrNt3b15baIxTmsgE6uE5-mhWfxl6JR1l9Nk,1367
-scilens-0.4.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.4.4.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.4.4.dist-info/RECORD,,
+scilens-0.4.5.dist-info/METADATA,sha256=bJI2HXys2vhstgH2EhNbj9-sulm76KUXk3qMMNHUARE,1367
+scilens-0.4.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.4.5.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.4.5.dist-info/RECORD,,