scilens 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

scilens/cli/main.py

@@ -1,6 +1,6 @@
 _B='green'
 _A=True
-import logging,os,coloredlogs,rich_click as click
+import logging,os,webbrowser,coloredlogs,rich_click as click
 from scilens.app import pkg_name,pkg_version
 from scilens.readers.reader_manager import ReaderManager
 from scilens.run.tasks_collector import TasksCollector
@@ -52,25 +52,31 @@ def config_json():config_print('envvars')
 @click.option('--export-json',is_flag=_A,help=f"Generate JSON report(s).")
 @click.option('--export-yaml',is_flag=_A,help=f"Generate YAML report(s).")
 @click.option('--export-html-add-index',is_flag=_A,help=f"Generate an index for generated HTML reports.")
-def run(path,config,collect_discover,collect_depth,processor,tag,collect_only,report_title,export_html,export_json,export_yaml,export_html_add_index):
-	R='datetime';K=processor;J=collect_discover;I=config;E=collect_depth;echo_separator('Info');echo_info();echo_separator('System Info');echo_system_info();S=list(tag);B=os.path.abspath(path)
+@click.option('--export-html-open',is_flag=_A,help=f"Open all generated HTML reports in the default browser.")
+def run(path,config,collect_discover,collect_depth,processor,tag,collect_only,report_title,export_html,export_json,export_yaml,export_html_add_index,export_html_open):
+	V='datetime';M=export_html_open;L=export_html_add_index;K=processor;J=collect_discover;I=config;E=collect_depth;echo_separator('Info');echo_info();echo_separator('System Info');echo_system_info();W=list(tag);B=os.path.abspath(path)
 	if not os.path.isdir(B):logging.error(f"Dir '{B}' does not exist.");exit(1)
 	if not bool(I)+J+(bool(E)or E==0)+bool(K)in[0,1]:logging.error(f"Options --config, --collect-discover, --collect-depth and --processor are mutually exclusive.");exit(1)
 	echo_separator('Collecting tasks');F=[]
-	try:F=TasksCollector(B,I,J,E,S,K).process(get_vars(report_title,export_html,export_json,export_yaml))
+	try:F=TasksCollector(B,I,J,E,W,K).process(get_vars(report_title,export_html,export_json,export_yaml))
 	except Exception as D:logging.error(D);exit(1)
 	if collect_only:echo_separator();logging.info('Collecting tasks only - End');echo_separator();exit(0)
 	else:
-		L=TimeTracker();A=len(F);M=0;N=0;O=0;P=[]
-		for(T,U)in enumerate(F):
-			echo_separator(f"Running task {T+1}/{A}")
-			try:C=U.process()
+		N=TimeTracker();A=len(F);O=0;P=0;Q=0;R=[]
+		for(X,Y)in enumerate(F):
+			echo_separator(f"Running task {X+1}/{A}")
+			try:C=Y.process()
 			except Exception as D:echo_task_error();logging.error(D);C=TaskResults(error=str(D))
-			if C.report_results:P+=C.report_results.files_created
-			if C.error:M+=1
+			if C.report_results:R+=C.report_results.files_created
+			if C.error:O+=1
 			G=C.processor_results
 			if G:
-				if G.warnings:O+=1
-				if G.errors:N+=1
-		if export_html_add_index:echo_separator(f"Post Actions");logging.info(f"Generate HTML Index for the HTML reports");V=[A for A in P if A.endswith('.html')];Q=os.path.join(B,'index.html');SearchAndIndex().create_html_index(SearchAndIndex().file_list_info_from_origin(V,B),Q,title='Index of Reports');logging.info(f"HTML Index generated at '{Q}'")
-		echo_separator(f"End Running tasks ({A}/{A})");L.stop();H=L.get_data();logging.info(f"Tasks with errors ............... {M}/{A}");logging.info(f"Tasks with processor errors ..... {N}/{A}");logging.info(f"Tasks with processor warnings ... {O}/{A}");logging.info(f"Start ........................... {H['start'][R]} utc");logging.info(f"End ............................. {H['end'][R]} utc");logging.info(f"Duration......................... {H['duration_seconds']} seconds");echo_separator()
+				if G.warnings:Q+=1
+				if G.errors:P+=1
+		if L or M:
+			echo_separator(f"Post Actions");S=[A for A in R if A.endswith('.html')]
+			if L:logging.info(f"Generate HTML Index for the HTML reports");T=os.path.join(B,'index.html');SearchAndIndex().create_html_index(SearchAndIndex().file_list_info_from_origin(S,B),T,title='Index of Reports');logging.info(f"HTML Index generated at '{T}'")
+			if M:
+				logging.info(f"Open HTML reports in the default browser")
+				for U in S:logging.info(f"Open '{U}'");Z=f"file://{U}";webbrowser.open(Z)
+		echo_separator(f"End Running tasks ({A}/{A})");N.stop();H=N.get_data();logging.info(f"Tasks with errors ............... {O}/{A}");logging.info(f"Tasks with processor errors ..... {P}/{A}");logging.info(f"Tasks with processor warnings ... {Q}/{A}");logging.info(f"Start ........................... {H['start'][V]} utc");logging.info(f"End ............................. {H['end'][V]} utc");logging.info(f"Duration......................... {H['duration_seconds']} seconds");echo_separator()

scilens/components/compare_floats.py

@@ -1,6 +1,7 @@
 _C='amplitude'
 _B=False
 _A=None
+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
@@ -26,14 +27,17 @@ class CompareFloats:
 		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)[_C];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']:
-			RIAE_force_severity=self.thresholds.vectors.reduction_method
 			if'CheckVectors'not in globals():raise Exception('scilens_compare not found. Please install scilens-compare package with `pip install scilens-compare`.')
 			riae_error=CheckVectors.relative_integral_absolute_error_trapezoid(reference_vector,test_vector,range(len(test_vector)))if ponderation_method==A else CheckVectors.relative_integral_absolute_error_midpoint(reference_vector,test_vector,range(len(test_vector)))
-			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)
+			if riae_error 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]

scilens/config/models/compare_float_thresholds.py

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

scilens/config/models/report.py

@@ -3,4 +3,4 @@ from pydantic import BaseModel,Field
 from scilens.app import product_name
 from scilens.config.models.report_html import ReportHtmlConfig
 from scilens.config.models.report_output import ReportOutputConfig
-class ReportConfig(BaseModel):debug:bool=Field(default=False,description='If `true` the report will be more verbose and displays template input data.');title:str=Field(default=_A,description='Titre du rapport');title_prefix:str=Field(default=f"{product_name} Report",description='Préfixe au Titre du rapport');logo:str|_A=Field(default=_A,description="Source d'une image logo. Peut être une url ou une url data image encodée base64 (exclusif avec `logo_file`).");logo_file:str|_A=Field(default=_A,description="Source fichier d'une image logo (exclusif avec `logo`).");output:ReportOutputConfig=ReportOutputConfig();html:ReportHtmlConfig=ReportHtmlConfig()
+class ReportConfig(BaseModel):debug:bool=Field(default=False,description='If `true` the report will be more verbose and displays template input data.');title:str=Field(default=_A,description='Titre du rapport');title_prefix:str=Field(default=f"{product_name} Report",description='Préfixe au Titre du rapport');description:str|_A=Field(default=_A,description='Description inclu dans une section spécifique description des rapports');logo:str|_A=Field(default=_A,description="Source d'une image logo. Peut être une url ou une url data image encodée base64 (exclusif avec `logo_file`).");logo_file:str|_A=Field(default=_A,description="Source fichier d'une image logo (exclusif avec `logo`).");output:ReportOutputConfig=ReportOutputConfig();html:ReportHtmlConfig=ReportHtmlConfig()

scilens/config/models/report_html.py

@@ -1,6 +1,8 @@
-_A="Paramètre modifiable par l'utilisateur"
+_C="Paramètre modifiable par l'utilisateur"
+_B=True
+_A=None
 from pydantic import BaseModel,Field
-class ReportParameterPageModeConfig(BaseModel):is_user_preference:bool=Field(default=True,description=_A);default_value:str=Field(default='onepage',description='`tabs` ou `onepage`')
-class ReportParameterOpenFileInConfig(BaseModel):is_user_preference:bool=Field(default=True,description=_A);default_value:str=Field(default='browser',description='`browser` ou `vscode`')
-class ReportHtmlCurvesConfig(BaseModel):display_on_load:bool=Field(default=False,description="Si `true`, affiche tous les graphiques courbes à l'ouverture du rapport.");init_width:int=Field(default=600,description='Largeur initiale des graphiques courbes.');init_height:int=Field(default=400,description='Hauteur initiale des graphiques courbes.')
-class ReportHtmlConfig(BaseModel):logo_height:int=Field(default=40,description='Hauteur du logo dans le titre.');compare_color_test:str=Field(default='1982c4',description='Couleur pour les données de test.');compare_color_reference:str=Field(default='6a4c93',description='Couleur pour les données de référence.');collapse_if_successful:bool=Field(default=True,description="N'affiche par défaut les sections de comparaison sans erreur.");parameter_page_mode:ReportParameterPageModeConfig=ReportParameterPageModeConfig();parameter_open_file_in:ReportParameterOpenFileInConfig=ReportParameterOpenFileInConfig();curves:ReportHtmlCurvesConfig=ReportHtmlCurvesConfig()
+class ReportParameterPageModeConfig(BaseModel):is_user_preference:bool=Field(default=_B,description=_C);default_value:str=Field(default='onepage',description='`tabs` ou `onepage`')
+class ReportParameterOpenFileInConfig(BaseModel):is_user_preference:bool=Field(default=_B,description=_C);default_value:str=Field(default='browser',description='`browser` ou `vscode`')
+class ReportHtmlCurvesConfig(BaseModel):display_on_load:bool=Field(default=False,description="Si `true`, affiche tous les graphiques courbes à l'ouverture du rapport.");init_width:int=Field(default=600,description='Largeur initiale des graphiques courbes.');init_height:int=Field(default=400,description='Hauteur initiale des graphiques courbes.');compare_vs_values:bool=Field(default=_B,description='Dans le chart de comparaison, affiche les valeurs de référence et de test.');compare_vs_difference:bool=Field(default=_B,description='Dans le chart de comparaison, affiche la différence entre les valeurs de référence et de test.')
+class ReportHtmlConfig(BaseModel):custom_style:str|_A=Field(default=_A,description='CSS personnalisé.');custom_script_head:str|_A=Field(default=_A,description='Script personnalisé dans le `<head>`.');custom_script_body:str|_A=Field(default=_A,description='Script personnalisé en fin de `<body>`.');extra_html_start:str|_A=Field(default=_A,description='HTML personnalisé en début de rapport.');extra_html_summary:str|_A=Field(default=_A,description='HTML personnalisé dans la section `Summary`.');extra_html_end:str|_A=Field(default=_A,description='HTML personnalisé en fin de rapport.');logo_height:int=Field(default=40,description='Hauteur du logo dans le titre.');compare_color_test:str=Field(default='1982c4',description='Couleur pour les données de test.');compare_color_reference:str=Field(default='6a4c93',description='Couleur pour les données de référence.');collapse_if_successful:bool=Field(default=_B,description="N'affiche par défaut les sections de comparaison sans erreur.");parameter_page_mode:ReportParameterPageModeConfig=ReportParameterPageModeConfig();parameter_open_file_in:ReportParameterOpenFileInConfig=ReportParameterOpenFileInConfig();curves:ReportHtmlCurvesConfig=ReportHtmlCurvesConfig()

scilens/report/html_report.py

@@ -22,6 +22,6 @@ class HtmlReport:
 					E=os.path.join(L,D)
 					if os.path.isfile(E):C=E;break
 				if not C:raise FileNotFoundError(f"Logo file '{A.config.logo_file}' not found in {F}.")
-		M=A.config.title if A.config.title else A.config.title_prefix+' '+task_name;N={'app_name':product_name,'app_version':pkg_version,'app_homepage':pkg_homepage,'app_copyright':f"© {B[H][:4]} {powered_by['name']}. All rights reserved",'app_powered_by':powered_by,'execution_utc_datetime':B['datetime'],'execution_utc_date':B[H],'execution_utc_time':B['time'],'execution_dir':A.working_dir,'title':M,'image':K or get_logo_image_src(C),'config':A.config.html,'config_json':A.config.html.model_dump_json()};G=None
+		M=A.config.title if A.config.title else A.config.title_prefix+' '+task_name;N={'app_name':product_name,'app_version':pkg_version,'app_homepage':pkg_homepage,'app_copyright':f"© {B[H][:4]} {powered_by['name']}. All rights reserved",'app_powered_by':powered_by,'execution_utc_datetime':B['datetime'],'execution_utc_date':B[H],'execution_utc_time':B['time'],'execution_dir':A.working_dir,'title':M,'description':A.config.description,'image':K or get_logo_image_src(C),'config':A.config.html,'config_json':A.config.html.model_dump_json()};G=None
 		if A.config.debug:G=A.config.model_dump_json(indent=4)
 		return template_render_infolder('index.html',{I:N,'task':data.get(I),'data':{'files':data.get('processor_results')},'debug':G})

scilens/report/templates/body_01_title.html

@@ -47,15 +47,3 @@
   </table>
   
 </div>
-
-
-
-<div id="tabs" class="tabs noselect" style="display: none;">
-  <div class="tab active" onclick="actions.click_tab(event, 0)">Summary</div>
-  {% for file in data.files %}
-  {% if not file.skipped %}
-  <div class="tab {{ ns.statuses[loop.index] }}" onclick="actions.click_tab(event, {{ loop.index }})"><span class="">{{ file.name }}</span></div>
-  {% endif %}
-  {% endfor %}
-  <div class="tabend"></div>
-</div>    

scilens/report/templates/body_02_tabs.html

@@ -0,0 +1,9 @@
+<div id="tabs" class="tabs noselect" style="display: none;">
+  <div class="tab active" onclick="actions.click_tab(event, 0)">Summary</div>
+  {% for file in data.files %}
+  {% if not file.skipped %}
+  <div class="tab {{ ns.statuses[loop.index] }}" onclick="actions.click_tab(event, {{ loop.index }})"><span class="">{{ file.name }}</span></div>
+  {% endif %}
+  {% endfor %}
+  <div class="tabend"></div>
+</div>    

scilens/report/templates/compare_11_summary.html

@@ -2,7 +2,18 @@
 
   <h2>Summary</h2>
 
-  <!-- FILES -->
+  <!-- DESCRIPTION -->
+  {% if meta.description %}
+  <!-- <h3>Description</h3> -->
+  <div id="section_summary_description" class="description">
+    {{ meta.description }}
+  </div>
+  {% endif %}
+
+  <!-- EXTRA HTML -->
+  {% if meta.config.extra_html_summary %}{{ meta.config.extra_html_summary }}{% endif %}
+
+  <!-- DATASETS -->
   <h3>
     Datasets <action data-command="toogle" data-args="section_summary_datasets"></action>
   </h3>

scilens/report/templates/compare_12_sections.html

@@ -133,11 +133,16 @@
     <div id="framesseries_{{ file_index }}" ></div>
     {% endif %}
 
-    {% for item in [{"id": "spectrograms", "label": "Spectrograms"}, {"id": "frameseries", "label": "Frameseries"}] %}
     
+    <!-- MATRICES -->
+    {% if file.test.matrices %}
+    {% for item in [{"id": "spectrograms", "label": "Spectrograms"}, {"id": "frameseries", "label": "Frameseries"}] %}
+    {% if file.test.matrices[item.id] %}
     <h3>{{ item.label }} <action data-command="toogle" data-args="{{ item.id }}_{{ file_index|string }}"></action></h3>
     <div id="{{ item.id }}_{{ file_index }}" ></div>
+    {% endif %}
     {% endfor %}
+    {% endif %}
 
 
     <!--COMPARISONS ERRORS AND WARNINGS-->

scilens/report/templates/index.html

@@ -26,19 +26,21 @@
     <script src="https://cdn.plot.ly/plotly-2.34.0.min.js" charset="utf-8"></script>
 
 <script>
+
 ((w_1, undef) => { w_1.None = undef; })(window); // for Python None = undef when templating
 {% include 'js_dom.js' %}
 {% include 'js_palette.js' %}
-</script>
-<script>{% include 'js_com_page.js' with context %}</script>
-<script>{% include 'js_chartlibs_plotly.js' %}</script>
-<script>{% include 'js_chartlibs_echarts.js' %}</script>
-<script>{% include 'js_curvemgr.js' %}</script>
-<script>{% include 'utils_compare_report_anim.js' %}</script>
-<script>{% include 'utils_compare_report_framesseries.js' %}</script>
-<script>
+
+{% include 'js_com_page.js' with context %}
+{% include 'js_chartlibs_plotly.js' %}
+{% include 'js_chartlibs_echarts.js' %}
+{% include 'js_curvemgr.js' %}
+{% include 'utils_compare_report_anim.js' %}
+{% include 'utils_compare_report_framesseries.js' %}
+
 {% if ns.has_spectrograms %}{% include 'uti_spectrograms.js' %}{% endif %}
 {% if ns.has_matrices %}{% include 'uti_matrix.js' %}{% endif %}
+
 </script>
 <script>
 function load_animations(){
@@ -89,13 +91,16 @@ function load_file_section(global_var, section_prefix, cls) {
   user-select: none; /* Standard syntax */
 }
 </style>
+{% if meta.config.custom_style %}<style type="text/css">{{ meta.config.custom_style }}</style>{% endif %}
+{% if meta.config.custom_script_head %}<script>{{ meta.config.custom_script_head }}</script>{% endif %}
   </head>
   <body>
     {% include 'body_01_title.html' with context %}
-
+    {% if meta.config.extra_html_start %}{{ meta.config.extra_html_start }}{% endif %}
+    {% include 'body_02_tabs.html' with context %}
     {% include 'compare_11_summary.html' with context %}
     {% include 'compare_12_sections.html' with context %}
-    
+    {% if meta.config.extra_html_end %}{{ meta.config.extra_html_end }}{% endif %}
     {% include 'body_99_footer.html' with context %}
     <script type="text/javascript">
       const GLOBAL_VARS = {};
@@ -125,5 +130,6 @@ function load_file_section(global_var, section_prefix, cls) {
       MatrixMgmt.loadGlobal();
     </script>
     {% endif %}
+    {% if meta.config.custom_script_body %}<script>{{ meta.config.custom_script_body }}</script>{% endif %}
   </body>
 </html>

scilens/report/templates/js_chartlibs_plotly.js

@@ -3,40 +3,58 @@
   const plotly = {
     add: function(elt, meta, items) {
       const series = []
+      let yaxis2 = null;
+      
+      // 
+
       items.forEach(item => {
-        series.push({
+        const serie = {
           name: item.name,
           x:    item.x_data,
           y:    item.y_data,
+          // yaxis : 'y1', // required if there are multiple y axes
           // mode: 'lines+markers',
           mode: 'lines',
           line:   { color: item.color, width: 3 },
-          marker: { color: item.color, size: 6 },
-        })
-      });
-      Plotly.newPlot(
-        elt,
-        series,
-        {
-          title: { text: meta.title, font: { weight: 800 } },
-          xaxis: { title: meta.xaxis },
-          yaxis: { title: meta.yaxis },
-          autosize: true,
-          // showlegend: false,
-          // legend: {
-          //   x: 1,
-          //   xanchor: 'right',
-          //   y: 1
-          // }
-          // margin: {
-          //   l: 10,
-          //   r: 10,
-          //   b: 10,
-          //   t: 10,
-          //   pad: 0,
-          // },          
+          // marker: { color: item.color, size: 6 },
+        }
+        if (item.special) {
+          switch (item.special) {
+            case 'diff':
+              yaxis2 = {title: 'Difference',overlaying: 'y',side: 'right'}
+              serie.line.color = 'rgba(255, 0, 0, 0.5)';
+              serie.yaxis = 'y2';
+              serie.fill = 'tozeroy';
+              serie.fillcolor = 'rgba(255, 0, 0, 0.2)';
+              break;
+          }
         }
-      );
+        // item.special
+        series.push(serie)
+      });
+
+      const layout = {
+        title: { text: meta.title, font: { weight: 800 } },
+        xaxis: { title: meta.xaxis },
+        yaxis: { title: meta.yaxis },
+        autosize: true,
+        // showlegend: false,
+        // legend: {
+        //   x: 1,
+        //   xanchor: 'right',
+        //   y: 1
+        // }
+        // margin: {
+        //   l: 10,
+        //   r: 10,
+        //   b: 10,
+        //   t: 10,
+        //   pad: 0,
+        // },          
+      };
+      if (yaxis2) {layout.yaxis2 = yaxis2;}
+
+      Plotly.newPlot(elt,series,layout);
     },
     add_ys: function(elt, meta, x_data, y_items) {
       this.add(elt, meta, y_items.map((item) => {return {name: item.name, color: item.color, x_data: x_data, y_data: item.data} } ))

scilens/report/templates/js_curvemgr.js

@@ -60,6 +60,8 @@ const CONFIG = {
   display_on_load: false,
   init_width: 600,
   init_height: 400,
+  compare_vs_values: true, 
+  compare_vs_difference: true,
 }
 
 
@@ -79,10 +81,11 @@ const curve_add_chart = function(element_parent, data, zoom) {
     div,
     { title: data.title, xaxis: data.xaxis , yaxis: data.yaxis },
     data.series.map((item) => {return {
-      name:   item.name,
-      color:  item.color,
-      x_data: item.data.map((e) => e[0]),
-      y_data: item.data.map((e) => e[1]),
+      name:    item.name,
+      color:   item.color,
+      x_data:  item.data.map((e) => e[0]),
+      y_data:  item.data.map((e) => e[1]),
+      special: item.special,
     }}),
   )
 };
@@ -198,29 +201,63 @@ CurvesChart.prototype = {
 
       }
       // display each curve test vs reference
-      for (index_curve in chart.curves) {
-        real_index = chart.curves[index_curve]
+      if (CONFIG.compare_vs_values || CONFIG.compare_vs_difference) {
+        for (index_curve in chart.curves) {
+          real_index = chart.curves[index_curve]
 
-        const series = [
-          {
-            name:  "Test",
-            data:  this.curves["test"].curves[real_index].series,
-            color: '#1982c4',
-          },
-          {
-            name:  "Reference",
-            data:  this.curves["reference"].curves[real_index].series,
-            color: '#6a4c93',
-          },
-        ]
-        const data = {
-          title: this.curves["test"].curves[real_index].title + " [Test vs Reference]",
-          xaxis: chart.xaxis,
-          yaxis: chart.yaxis,
-          series : series,
+          const series = [];
+          if (CONFIG.compare_vs_values) {
+            series.push({
+              name:  "Test",
+              data:  this.curves["test"].curves[real_index].series,
+              color: '#1982c4',
+            });
+            series.push({
+              name:  "Reference",
+              data:  this.curves["reference"].curves[real_index].series,
+              color: '#6a4c93',
+            });
+          }
+          if (CONFIG.compare_vs_difference) {
+            series.push({
+              name:  "Difference",
+              data:  this.curves["test"].curves[real_index].series.map((e, i) => {
+                return [e[0], e[1] - this.curves["reference"].curves[real_index].series[i][1]]
+              }),
+              color: '#ffcc00',
+              special: 'diff',
+            });
+          }
+
+          // {
+          //   name:  "Test",
+          //   data:  this.curves["test"].curves[real_index].series,
+          //   color: '#1982c4',
+          // },
+          // {
+          //   name:  "Reference",
+          //   data:  this.curves["reference"].curves[real_index].series,
+          //   color: '#6a4c93',
+          // },
+          // {
+          //   name:  "Difference",
+          //   data:  this.curves["test"].curves[real_index].series.map((e, i) => {
+          //     return [e[0], e[1] - this.curves["reference"].curves[real_index].series[i][1]]
+          //   }),
+          //   color: '#ffcc00',
+          //   special: 'diff',
+          // },          
+          // 
+          const data = {
+            title: this.curves["test"].curves[real_index].title + " [Test vs Reference]",
+            xaxis: chart.xaxis,
+            yaxis: chart.yaxis,
+            series : series,
+          }
+          curve_add_chart((chart.curves.length > 1) ? out.row_2 : out.row_1, data, this.curve_block.zoom);
         }
-        curve_add_chart((chart.curves.length > 1) ? out.row_2 : out.row_1, data, this.curve_block.zoom);
       }
+      
     }
   },
 }
@@ -309,6 +346,7 @@ w_1.curvemgr = {
     }
   },
   init(config) {
+    console.log(config)
     for (const k in CONFIG) {
       if (config[k] != undef) {CONFIG[k] = config[k];}
     }

scilens/report/templates/style.css

@@ -37,6 +37,15 @@ padding:15px;
 background-color: #fafafa;
 }
 
+.description {
+  background-color: #eef2f7;
+  border-left: 6px solid #4a90e2;
+  padding: 20px;
+  margin-bottom: 30px;
+  border-radius: 8px;
+  
+}
+
 
 .ERROR    { background-color:#c52a0f20;color:#c52a0f; }
 .WARNING  { background-color:#bcbc0620;color:#bcbc06; }

scilens/run/standalone_task_runner.py

@@ -4,6 +4,6 @@ from scilens.run.task_context import TaskContext
 from scilens.run.run_task import RunTask
 from scilens.config.models import AppConfig
 class StandaloneTaskRunner:
-	config_path=None
+	config:AppConfig;config_path=None
 	def __init__(A,config):A.config=config_load(config)
 	def process(A,working_dir,origin_working_dir=None):B=TaskContext(config=A.config,config_file=A.config_path,working_dir=working_dir,origin_working_dir=origin_working_dir);C=RunTask(B);D=C.process();return D

scilens/utils/file.py

@@ -26,6 +26,8 @@ def json_load(path):
 	with open(path)as A:return json.load(A)
 def yaml_write(path,data):
 	with open(path,'w')as A:yaml.dump(data,A,default_flow_style=False)
+def yaml_load(path):
+	with open(path)as A:return yaml.safe_load(A)
 def move(source,target):shutil.move(source,target)
 def list_paths_at_depth(root_dir,depth):
 	B=depth;A=root_dir;C=[]

scilens/utils/load_model_from_file.py

@@ -0,0 +1,16 @@
+from pathlib import Path
+from scilens.utils.file import json_load,yaml_load
+def load_model_from_file(cls,path,json=True,yaml=True):
+	C=yaml;B=json;A=path
+	if isinstance(A,str):A=Path(A)
+	if not A.exists():raise FileNotFoundError(f"File {A} does not exist.")
+	if B:
+		try:D=json_load(A)
+		except Exception:
+			if not C:raise ValueError(f"Error during loading JSON file: {A}.")
+	if C:
+		try:D=yaml_load(A)
+		except Exception:
+			if not B:raise ValueError(f"Error during loading YAML file: {A}.")
+	if B and C and not D:raise ValueError(f"Unsupported file format: Supported formats are YAML and JSON.")
+	E=cls(**D);return E

{scilens-0.3.6.dist-info → scilens-0.3.8.dist-info}/METADATA

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

{scilens-0.3.6.dist-info → scilens-0.3.8.dist-info}/RECORD

@@ -5,12 +5,12 @@ scilens/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/cli/cglb.py,sha256=R0377H5H193DJ_h4hj32m6qvrZrMnSFOxSGVl2FItiU,443
 scilens/cli/config.py,sha256=XVY6q5E9fb6MZzPct4-X7m6e45erpt5MCIuzKTBKPAI,965
 scilens/cli/info.py,sha256=xE7q9epjrCQRL6Agi3nhKsG6Mr3B8HSUFMti-epMoXA,1929
-scilens/cli/main.py,sha256=LljcS0s2E35y4YZpV01GhMhMK9HyRRHYmxc_q_kSurI,6004
+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=jbZNLbRj3x8TxUADM5QC2u_TGl4I7u5OdaEMh-gMBUk,1713
 scilens/components/compare_errors.py,sha256=vGb4DWP89HMIeBm0dZU2nt-ksppAs_37xtCHaPd0w5Y,1640
-scilens/components/compare_floats.py,sha256=p1lnnwkGJXIsb6Y5psQc_5FcOuB2vP_cIQHXhZjWPXc,5617
+scilens/components/compare_floats.py,sha256=yYJZ_QpAZUhP1uwNtGshXQLIzKtki9ifCN3hd9AFj2U,5916
 scilens/components/compare_folders.py,sha256=LZ1AuYxLVHMNbtXWXQrdms4vZgOQthvDy-8NFD_EFjc,2617
 scilens/components/compare_models.py,sha256=SCPd747h_nd4ewZsqLB6CFr27v6q99NELJb-gpkdj0o,918
 scilens/components/executor.py,sha256=j5xejkCaaPyl3V38Q4HxxXcAx4Tnj8CILAjSJ1G7OIE,3417
@@ -22,7 +22,7 @@ scilens/config/load.py,sha256=4U51o4cJfqhSuRIHKUDIsDQA0C4wv6SzTkVmInGDJdI,1647
 scilens/config/models/__init__.py,sha256=eLCW1OLVINewGFy5GXSrOk8Rab_QsgKAuoErBjphHRs,673
 scilens/config/models/app.py,sha256=JltWRjjqXYkH6rg3OHYhMfkBqHFhZEZdthqES3LxvzY,1453
 scilens/config/models/compare.py,sha256=esRqW3PNVOqkA_mt4_qbS7dVCLulUrZTBUhANQOHoqE,1847
-scilens/config/models/compare_float_thresholds.py,sha256=J5XBK1dAnmU-i2uA2bsaHnTM_m07_i17wsO8UiCw46o,1844
+scilens/config/models/compare_float_thresholds.py,sha256=mHu48-70i3o_qUw6x-1A7XeRwFUNAO6WP6qNPGwAew0,2097
 scilens/config/models/execute.py,sha256=8issd_hg49SdVkDq2TLDB1vBJY4M1t279XERNUd3VVs,2142
 scilens/config/models/execute_and_compare.py,sha256=TWL6yXGvQSaaV6nhHqWLvtr3v396APIoDNt0U1TbMro,582
 scilens/config/models/file_reader.py,sha256=c18vKhVcBX4ufpbnCBJyVyAsQtlxpwx0lGVuf1i8EGA,1176
@@ -32,8 +32,8 @@ scilens/config/models/reader_format_netcdf.py,sha256=k-AMdm239T6I42R8jzyRlPKKJ8z
 scilens/config/models/reader_format_txt.py,sha256=eHg90gwEI_VpqwqEjMRhwlS8dHcl5G4ow-37HjQq_zY,1168
 scilens/config/models/reader_format_txt_fixed_cols.py,sha256=xHD1_JOoRZow8lSNaDSYFeNckojctkT4C61mbBcjeKg,1079
 scilens/config/models/readers.py,sha256=Pq5kOGW3b6g1x5cp_BbwUF7LUB_P3m9bHDYLSTVXNBY,1769
-scilens/config/models/report.py,sha256=nTmP2nIwL2Ku5IH9QMwYLPKmfsK2ttu9UK0GnzPUHeM,870
-scilens/config/models/report_html.py,sha256=WiUPD38NCmBYHQdYyMb1-713kVNq7dm5pe8chlhuoyM,1468
+scilens/config/models/report.py,sha256=6mzqZMJnS_z5Rs01ISo8L8HRcWvmiQrK0dYqu8a58vM,993
+scilens/config/models/report_html.py,sha256=W4ATubdtxnW-vSOPXBZ6PNKMPcexpB9jeFi7c6b5VOc,2327
 scilens/config/models/report_output.py,sha256=XoqUe-t-y8GRbUR3_bDwwaWf6hif-rZ-5pKDGdCMugw,875
 scilens/helpers/assets.py,sha256=XphDA3-yE1PPKw4XFZhDrlLQjMZfGMlpOBXa8uy_xX0,1552
 scilens/helpers/search_and_index.py,sha256=kXZ7124ra_SGAdKUZ7msy55UOWQ9dCSuPuNoU-NdUyM,1522
@@ -60,24 +60,25 @@ 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
 scilens/report/assets.py,sha256=CcfGc9NNGnPVinkHZkEyN2S_BGKNIyMFvVdA__-M6-0,532
-scilens/report/html_report.py,sha256=ajNDTfEu06fs2h1SF4nTP1MvZmYwMcLieeSngyuH-qE,1905
+scilens/report/html_report.py,sha256=ml_paRkzI81irpeWNtEkBOHkK0W7veNU6RbVM6RLM6E,1940
 scilens/report/report.py,sha256=aS7ktJ2u0IAMMk-HwqqSsRkr77ZBQyYT4wXJ7djQvAk,1811
 scilens/report/template.py,sha256=cPs5gd3uEwb-6JgitGQD_i4IiUxigBTlZLNRS9KVuos,581
-scilens/report/templates/body_01_title.html,sha256=0mrMM62TSBdPOpPNCcam0bZsZtM0GjoMQ-jrSqI8HCw,2173
+scilens/report/templates/body_01_title.html,sha256=LJOWO6ImNPW9cg3tCDlgdllVTwnFGWcb2qvA3yv6wNk,1758
+scilens/report/templates/body_02_tabs.html,sha256=oOFslWcfNsWpCX12GECZDzdR5uAHE54HPP6IYUf7y0U,412
 scilens/report/templates/body_99_footer.html,sha256=8cWebeWfZwZ-9bYAMZkZj8rbCWq3BLIMjKQThWQxoQM,362
-scilens/report/templates/compare_11_summary.html,sha256=4rxBlOxTcn59ztYtqDbi6SRQXlaz30HkVl7dJpzCmZE,3776
-scilens/report/templates/compare_12_sections.html,sha256=Sm5NtOkGhkm0Eo-H2R-97mNDjuuw84NLdcZntevzEVQ,6304
+scilens/report/templates/compare_11_summary.html,sha256=qVvFydtAvAYyVOOTqjTN3LUj5Lh_Cl680EYL5SCZkd4,4086
+scilens/report/templates/compare_12_sections.html,sha256=8hCQRvdD_xhv8PGqT3WcfKxakWdCfGUFbv9HPBrNCro,6431
 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=sJy6ZYtjl80vM1b3oqZSXawZWp7KNIwLI_wCnvBwYPE,3270
-scilens/report/templates/index.html,sha256=2xR6htGfpYwCxRDzXzQJflrnl9lp7r0AkJRnm16liM8,4954
+scilens/report/templates/index.html,sha256=NwIjcv_h_xu2tY7y2DNZup5UwohmSuejz2AF1EmgPxI,5370
 scilens/report/templates/js_chartlibs_echarts.js,sha256=6YicVhTNIBmmBpV31XCVN5oBeiD0t29JIosJZRUv01M,907
-scilens/report/templates/js_chartlibs_plotly.js,sha256=uVAOKUB5XE33-r04phR-LlRkFoaHEIXyQ3jXT5r97Rc,1521
+scilens/report/templates/js_chartlibs_plotly.js,sha256=mDf4O1pHqK69IqwGe6Irw8xLV-cnL7WZZ5ZEfUI2DZ4,2082
 scilens/report/templates/js_com_page.js,sha256=ZxYHR-KGQRH726rPOXrEgyzBKM9NtGH3_APvcawKxQw,6862
-scilens/report/templates/js_curvemgr.js,sha256=Kmn2o9mKctKEXkIYOzWxqh2IVRtrpKcZvdBl8QmzdJ0,10798
+scilens/report/templates/js_curvemgr.js,sha256=9t5ZDogVJTiI0oullrZ2IT7_qXG73CH_m2gNUpuY4oY,12199
 scilens/report/templates/js_dom.js,sha256=XnxgdB0x-Xtt0eQFrwjcFO1cb_KPsTImpJBB6m_y8FI,1229
 scilens/report/templates/js_palette.js,sha256=HeewAmkR67QiqXSanJS3cCgp6IPKomlULUTKt55F6es,218
-scilens/report/templates/style.css,sha256=thZ_LZonmY9qH9oBie1BcK2H2FPPqik11YFr1hyo6ng,4071
+scilens/report/templates/style.css,sha256=SOKxdCqoj0yBt2zt3g1RkYx4ZV0_9PhGtO-TDWjmSHE,4217
 scilens/report/templates/uti_matrix.js,sha256=L2NqR9fu1075JGStWy6yS7EX4pHGAcBrhfR_cAL4VYw,2675
 scilens/report/templates/uti_spectrograms.js,sha256=EoZtBUYbup0KOvmcZRpnUGNrIZVbveqQK0aoIqkq94E,3066
 scilens/report/templates/utils_compare_report_anim.js,sha256=a7FHRco17BmgOAHb9kiDsFcSoxbmTGqjBbXBprf3hnU,2923
@@ -88,18 +89,19 @@ scilens/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/run/models/task_results.py,sha256=hdr_QEwMnjdfdawpfuBRMGqCHWQvsF61G39CVEMXKl8,284
 scilens/run/models/task_runtime.py,sha256=VNbMPS1ocl6WUDG5ipUxp3RSAST2OZ5DqGcfJWFEed8,114
 scilens/run/run_task.py,sha256=suCnACK2RmcwGdmOUAxnb0UD3LC_VT8RH9S525rsr14,2828
-scilens/run/standalone_task_runner.py,sha256=XhbwoUdjdfM2m2CfWHym05HyvPB5xK2A9M-o5zMu8dA,498
+scilens/run/standalone_task_runner.py,sha256=D3SUgVzoYtFvfDRacX286gXswuyN4z37et_qxfly4Rs,515
 scilens/run/task_context.py,sha256=NnujvpwnxY-YEzivYPYWaX-YChcZlEXt9y0_DXLqZkk,659
 scilens/run/tasks_collector.py,sha256=m_FQaJdQRi4fCLW17ryJxU0TvGNJN54JTw2Mg6XPojY,3174
 scilens/utils/dict.py,sha256=1MVQc8vZCs8_gQJMBkBSXO828wMe2eIWFiraLVmcjqk,214
-scilens/utils/file.py,sha256=3JkynZORUWah-dwaVpUDzyOSlOQkub1d9R3QqCkNYXE,1597
+scilens/utils/file.py,sha256=ljtTHCvT7vfDSbHA-5aKDl9885SVce3TBXWRIA-aRx0,1664
+scilens/utils/load_model_from_file.py,sha256=k5I-B6s5nVZu90MgzKSM0_IRj9oNL-4oJJRTwEvOyw8,619
 scilens/utils/php.py,sha256=VBJxpzwwRPNcr3379f6ViwhpTzjGc4BKlSXHv4lnor8,444
 scilens/utils/system.py,sha256=drXp_Vdv2dP9wFQoEQZIhxyCJhFliBLFPylGwv89FF4,182
 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.3.6.dist-info/METADATA,sha256=m6niWTXoKAI_Ean-zkDhQmYvGQvSEM_mI3K7Le22tBM,1367
-scilens-0.3.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.3.6.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.3.6.dist-info/RECORD,,
+scilens-0.3.8.dist-info/METADATA,sha256=RTctyV618MmgiLWuaf1NfysYdqN1CC6SZKpCEFTpTzY,1367
+scilens-0.3.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.3.8.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.3.8.dist-info/RECORD,,