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

scilens/config/models/app.py

@@ -1,9 +1,11 @@
 _A='Configuration utile au processeur `ExecuteAndCompare`.'
 from pydantic import BaseModel,Field
+from typing import Literal
 from scilens.config.models.compare import CompareConfig
 from scilens.config.models.execute import ExecuteConfig
 from scilens.config.models.execute_and_compare import ExecuteAndCompareConfig
 from scilens.config.models.file_reader import FileReaderConfig
 from scilens.config.models.readers import ReadersConfig
 from scilens.config.models.report import ReportConfig
-class AppConfig(BaseModel,extra='forbid'):processor:str=Field(description='Nom du processeur à utiliser. `Compare` ou `ExecuteAndCompare`.');variables:dict[str,str]=Field(default={},description='Variables Utilisateur.');tags:list[str]|None=Field(default=None,description="Utilisé dans un contexte ligne de commande, utilisé en conjonction avec l'option `--discover` pour filtrer les cas à éxécuter.");execute:ExecuteConfig=Field(default=ExecuteConfig(),description=_A);execute_and_compare:ExecuteAndCompareConfig=Field(default=ExecuteAndCompareConfig(),description=_A);file_reader:FileReaderConfig=Field(default=FileReaderConfig(),description='Configuration des readers fichiers.');readers:ReadersConfig=Field(default=ReadersConfig(),description='Configuration des readers.');compare:CompareConfig=Field(default=CompareConfig(),description='Configuration utile aux processeurs `Compare` et `ExecuteAndCompare`');report:ReportConfig=Field(default=ReportConfig(),description='Configuration des Reports.')
+ProcessorType=Literal['Compare','ExecuteAndCompare']
+class AppConfig(BaseModel,extra='forbid'):processor:ProcessorType=Field(description='Nom du processeur à utiliser. `Compare` ou `ExecuteAndCompare`.');variables:dict[str,str]=Field(default={},description='Variables Utilisateur.');tags:list[str]|None=Field(default=None,description="Utilisé dans un contexte ligne de commande, utilisé en conjonction avec l'option `--discover` pour filtrer les cas à éxécuter.");execute:ExecuteConfig=Field(default=ExecuteConfig(),description=_A);execute_and_compare:ExecuteAndCompareConfig=Field(default=ExecuteAndCompareConfig(),description=_A);file_reader:FileReaderConfig=Field(default=FileReaderConfig(),description='Configuration des readers fichiers.');readers:ReadersConfig=Field(default=ReadersConfig(),description='Configuration des readers.');compare:CompareConfig=Field(default=CompareConfig(),description='Configuration utile aux processeurs `Compare` et `ExecuteAndCompare`');report:ReportConfig=Field(default=ReportConfig(),description='Configuration des Reports.')

scilens/helpers/search_and_index.py

@@ -2,7 +2,7 @@ _A=None
 import os
 from pydantic import BaseModel
 from scilens.utils.file import list_paths_for_file_recursive,text_write
-from scilens.report.template import template_render_infolder
+from scilens.utils.template import template_render_infolder
 from scilens.report.assets import get_logo_image_src
 class PathSearchInfo(BaseModel):path:str;dir:str;relative_path:str;relative_dir:str
 CURRENT_DIR=os.path.dirname(os.path.realpath(__file__))

scilens/readers/cols_dataset.py

@@ -34,32 +34,34 @@ class ColsDataset:
 	def compute_metrics(K,config):
 		C=K;L={}
 		for(H,F)in enumerate(config):
-			I=F.name;B=F.col;J=F.function;D=F.aggregation
-			if not B and not J:raise ValueError(f"Metric #{H} must have either a column or a function.")
-			if B and J:raise ValueError(f"Metric #{H} cannot have both a column and a function.")
-			if B:
-				E=_A
-				if isinstance(B,int):E=C.numeric_col_indexes.index(B-1)
-				if isinstance(B,str):E=C.names.index(B)
-				if E is _A or E<0 or E>=C.cols_count:raise ValueError(f"Metric #{H} has an invalid column: {B}.")
-				if not I:I=f"{C.names[E]} {D}"
-				A=C.data[E]
+			I=F.name;A=F.col;J=F.function;E=F.aggregation
+			if not A and not J:raise ValueError(f"Metric #{H} must have either a column or a function.")
+			if A and J:raise ValueError(f"Metric #{H} cannot have both a column and a function.")
+			if A:
+				D=_A
+				if isinstance(A,int):D=C.numeric_col_indexes.index(A-1)
+				if isinstance(A,str):
+					D=C.names.index(A)if A in C.names else _A
+					if D is _A:continue
+				if D is _A or D<0 or D>=C.cols_count:raise ValueError(f"Metric #{H} has an invalid column: {A}.")
+				if not I:I=f"{C.names[D]} {E}"
+				B=C.data[D]
 			elif J:
-				A=[0 for A in range(C.rows_count)]
+				B=[0 for A in range(C.rows_count)]
 				if J=='euclidean_norm':
-					if not I:I=f"Euclidean Norm {F.components} {D}"
+					if not I:I=f"Euclidean Norm {F.components} {E}"
 					M=K.get_col_indexes(F.components)
 					if not M:continue
 					for N in M:
-						for(O,P)in enumerate(C.data[N]):A[O]+=P**2
-					A=[math.sqrt(A)for A in A]
+						for(O,P)in enumerate(C.data[N]):B[O]+=P**2
+					B=[math.sqrt(A)for A in B]
 				else:raise ValueError(f"Metric #{H} has an invalid function: {J}.")
 			G=_A
-			if D=='mean':G=sum(A)/len(A)
-			elif D=='sum':G=sum(A)
-			elif D=='min':G=min(A)
-			elif D=='max':G=max(A)
-			if G is _A:raise ValueError(f"Metric #{H} has an invalid aggregation: {D}.")
+			if E=='mean':G=sum(B)/len(B)
+			elif E=='sum':G=sum(B)
+			elif E=='min':G=min(B)
+			elif E=='max':G=max(B)
+			if G is _A:raise ValueError(f"Metric #{H} has an invalid aggregation: {E}.")
 			L[I]=G
 		return L
 @dataclass

scilens/readers/reader_csv.py

@@ -38,7 +38,7 @@ class ReaderCsv(ReaderInterface):
 					if A.index_col_index is _A:raise ValueError('Index column must be defined to use index min/max values.')
 					I=B.rows.index_min_value;J=B.rows.index_max_value
 					if I and J and I>J:raise ValueError(f"Index min value {I} cannot be greater than index max value {J}.")
-		A.raw_lines_number=_A;A.curves=_A;A.report_matrices=_A
+		A.raw_lines_number=_A;A.curves=_A;A.report_matrices=_A;A.metrics=_A
 		with open(A.origin.path,'r',encoding=A.encoding)as W:
 			S=W.readlines();M=csv.reader(S,delimiter=A.reader_options.delimiter,quotechar=A.reader_options.quotechar)
 			if C.is_matrix:
@@ -70,7 +70,7 @@ class ReaderCsv(ReaderInterface):
 							D.data[U].append(Q)
 						D.origin_line_nb.append(E)
 				except StopIteration:pass
-				D.rows_count=len(D.origin_line_nb);A.cols_dataset=D;A.raw_lines_number=D.rows_count+(1 if F else 0);A.metrics=_A
+				D.rows_count=len(D.origin_line_nb);A.cols_dataset=D;A.raw_lines_number=D.rows_count+(1 if F else 0)
 				if C.metrics:A.metrics=D.compute_metrics(C.metrics)
 				if B and B.curve_parser:
 					if B.curve_parser.name==ReaderCurveParserNameConfig.COL_X:

scilens/report/html_report.py

@@ -1,27 +1,24 @@
 import logging,os
-from mimetypes import MimeTypes
-from scilens.app import pkg_name,pkg_version,pkg_homepage,product_name,powered_by
 from scilens.config.models import ReportConfig
-from scilens.report.template import template_render_infolder
+from scilens.utils.template import template_render_infolder
 from scilens.report.assets import get_image_base64,get_image_base64_local,get_logo_image_src
-from scilens.utils.time_tracker import TimeTracker
 class HtmlReport:
 	def __init__(A,config,alt_config_dirs,working_dir=None):A.config=config;A.alt_config_dirs=alt_config_dirs;A.working_dir=working_dir
-	def process(A,processor,data,task_name):
-		I='meta';H='date';logging.info(f"Processing html report");J=TimeTracker();B=J.get_data()['start']
+	def process(A,data):
+		G='meta';logging.info(f"Processing html report")
 		if A.config.logo and A.config.logo_file:raise ValueError('logo and logo_file are exclusive.')
-		K=A.config.logo;C=None
+		H=A.config.logo;B=None
 		if A.config.logo_file:
-			D=A.config.logo_file
-			if os.path.isabs(D):
-				C=D
-				if not os.path.isfile(E):raise FileNotFoundError(f"Logo file '{A.config.logo_file}' not found.")
+			C=A.config.logo_file
+			if os.path.isabs(C):
+				B=C
+				if not os.path.isfile(D):raise FileNotFoundError(f"Logo file '{A.config.logo_file}' not found.")
 			else:
-				F=list(set([A.working_dir]+A.alt_config_dirs))
-				for L in F:
-					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,'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})
+				E=list(set([A.working_dir]+A.alt_config_dirs))
+				for I in E:
+					D=os.path.join(I,C)
+					if os.path.isfile(D):B=D;break
+				if not B:raise FileNotFoundError(f"Logo file '{A.config.logo_file}' not found in {E}.")
+		F=None
+		if A.config.debug:F=A.config.model_dump_json(indent=4)
+		return template_render_infolder('index.html',{'image':H or get_logo_image_src(B),'execution_dir':A.working_dir,'config_html':A.config.html,'config_html_json':A.config.html.model_dump_json(),G:data.get(G),'data':{'files':data.get('processor_results')},'debug':F},template_dir=os.path.join(os.path.dirname(os.path.realpath(__file__)),'templates'))

scilens/report/report.py

@@ -9,22 +9,22 @@ class ReportProcessResults(BaseModel):files_created:list[str]=[]
 class Report:
 	def __init__(B,working_dir,alt_config_dirs,config,task_name):A=config;B.path=working_dir;B.alt_config_dirs=alt_config_dirs;B.config=A;B.task_name=task_name;B.extensions={'txt':A.output.export_txt,'json':A.output.export_json,'yaml':A.output.export_yaml,_A:A.output.export_html,'py':A.output.export_py,'js':A.output.export_js,'ts':A.output.export_ts,'php':A.output.export_php}
 	def _get_file(A,ext):return os.path.join(A.path,f"{A.config.output.filename}.{ext}")
-	def process(B,data,processor=None):
-		I=False;D=data;E=ReportProcessResults();logging.info(f"Processing report");J=B.config;F=B.extensions;logging.info(f"Cleaning reports")
+	def process(B,data):
+		J='utf-8';I=False;D=data;E=ReportProcessResults();logging.info(f"Processing report");K=B.config;F=B.extensions;logging.info(f"Cleaning reports")
 		for A in F:file_remove(B._get_file(A))
 		G=I
-		for(A,K)in F.items():
-			if K:
+		for(A,L)in F.items():
+			if L:
 				logging.info(f"Creating report {A}");G=True;C=B._get_file(A);H=True
 				if A=='txt':text_write(C,str(D))
-				elif A=='json':json_write(C,D)
+				elif A=='json':json_write(C,D,encoding=J)
 				elif A=='yaml':yaml_write(C,D)
 				elif A=='py':text_write(C,'DATA = '+format(D))
 				elif A in['js','ts']:text_write(C,'export default '+json.dumps(D))
 				elif A=='php':text_write(C,'<?php\nreturn '+dict_to_php_array(D)+';\n')
-				elif A==_A:text_write(C,HtmlReport(B.config,B.alt_config_dirs,B.path).process(processor,D,B.task_name),encoding='utf-8')
+				elif A==_A:text_write(C,HtmlReport(B.config,B.alt_config_dirs,B.path).process(D),encoding=J)
 				else:H=I;logging.error(f"Extension {A} not implemented")
 				if H:E.files_created.append(C)
-		if J.output.export_html:logging.info(f"Report generated at file://{B._get_file(_A)}")
+		if K.output.export_html:logging.info(f"Report generated at file://{B._get_file(_A)}")
 		if not G:logging.warning(f"No report to process")
 		return E

scilens/report/report_app_info.py

@@ -0,0 +1,4 @@
+import datetime as dt
+from scilens.app import pkg_name,pkg_version,pkg_homepage,product_name,powered_by
+class ReportAppInfo:
+	def info(C):A='name';B=dt.datetime.now(dt.timezone.utc).strftime('%Y');return{A:product_name,'version':pkg_version,'homepage':pkg_homepage,'copyright':f"© {B} {powered_by[A]}. All rights reserved",'powered_by':powered_by}

scilens/report/report_attributes_info.py

@@ -0,0 +1,4 @@
+from scilens.config.models import ReportConfig
+from scilens.utils.time_tracker import TimeTracker
+class ReportAttributesInfo:
+	def info(E,config,task_name):A=config;C=A.title if A.title else A.title_prefix+' '+task_name;D=TimeTracker();B=D.get_data()['start'];return{'title':C,'description':A.description,'execution_utc_date':B['date'],'execution_utc_time':B['time']}

scilens/report/report_processor_info.py

@@ -0,0 +1,9 @@
+class ReportProcessorInfo:
+	def info(G,processor,data):
+		E='comparison';B=processor;A={'name':B};F=B in['Compare','ExecuteAndCompare'];A['has_multiple_datasets']=len(data)>1
+		if F:
+			A['is_compare']=True;C=0
+			for D in data:
+				if D.get(E)and D[E].get('metrics'):C+=1
+			A['datasets_metrics']=C
+		return A

scilens/report/templates/body_01_title.html

@@ -1,7 +1,7 @@
 <!-- TITLE -->
 <h1>
-  {% if meta.image %}<img height="{{ meta.config.logo_height }}" src="{{ meta.image }}"/>{% endif %}
-  {{ meta.title }}
+  {% if image %}<img height="{{ config_html.logo_height }}" src="{{ image }}"/>{% endif %}
+  {{ meta.report_info.title }}
   {{ data.name }}
 </h1>
 {% if debug %}
@@ -12,8 +12,8 @@
 <!-- INFO -->
 <div class="muted">
   Report generated
-  on {{ meta.execution_utc_date }} at {{ meta.execution_utc_time }} UTC
-  by <a href="{{ meta.app_homepage }}" target="_blank">{{ meta.app_name }} v{{ meta.app_version }}</a>
+  on {{ meta.report_info.execution_utc_date }} at {{ meta.report_info.execution_utc_time }} UTC
+  by <a href="{{ meta.app_info.homepage }}" target="_blank">{{ meta.app_info.name }} v{{ meta.app_info.version }}</a>
 </div>
 <!-- DIAGNOSE -->
 <!-- PARAMETERS -->
@@ -26,21 +26,35 @@
   <div>Info</div>
   <table style="border:none;">
     <tr>
+      <td style="vertical-align: top;border:none;">
+        <strong>Application</strong>
+        <table>
+          <tr><th>name</th><td>{{ meta.app_info.name }}</td></tr>
+          <tr><th>version</th><td>{{ meta.app_info.version }}</td></tr>
+        </table>
+      </td>
       <td style="vertical-align: top;border:none;">
         <strong>System</strong>
         <table>
-          <tr><th>os</th><td>{{ task.system_info.os }}</td></tr>
-          <tr><th>arch</th><td>{{ task.system_info.arch }}</td></tr>
-          <tr><th>python</th><td>{{ task.system_info.python }}</td></tr>
-          <tr><th>python_info</th><td>{{ task.system_info.python_info }}</td></tr>
+          <tr><th>os</th><td>{{ meta.system_info.os }}</td></tr>
+          <tr><th>arch</th><td>{{ meta.system_info.arch }}</td></tr>
+          <tr><th>python</th><td>{{ meta.system_info.python }}</td></tr>
+          <tr><th>python_info</th><td>{{ meta.system_info.python_info }}</td></tr>
+        </table>
+      </td>
+      <td style="vertical-align: top;border:none;">
+        <strong>Task</strong>
+        <table>
+          <tr><th>Name</th><td>{{ meta.task_info.name }}</td></tr>
+          <tr><th>Start</th><td>{{ meta.task_info.process_time.start.datetime }}</td></tr>
+          <tr><th>End</th><td>{{ meta.task_info.process_time.end.datetime }}</td></tr>
+          <tr><th>Duration</th><td>{{ meta.task_info.process_time.duration_seconds }}s</td></tr>
         </table>
       </td>
       <td style="vertical-align: top;border:none;">
-        <strong>Task Process</strong>
+        <strong>Processor</strong>
         <table>
-          <tr><th>Processor</th><td>{{ task.task_info.processor }}</td></tr>
-          <tr><th>Start</th><td>{{ task.task_info.process_time.start.datetime }}</td></tr>
-          <tr><th>End</th><td>{{ task.task_info.process_time.end.datetime }}</td></tr>
+          <tr><th>Processor</th><td>{{ meta.processor_info.name }}</td></tr>
         </table>
       </td>
     </tr>

scilens/report/templates/body_99_footer.html

@@ -1,11 +1,11 @@
 <div class="footer muted">
   <div class="py-1">
-    <a href="{{ meta.app_homepage }}" target="_blank">{{ meta.app_name }} - {{ meta.app_version }}</a>
+    <a href="{{ meta.app_info.homepage }}" target="_blank">{{ meta.app_info.name }} - {{ meta.app_info.version }}</a>
   </div>
   <div class="py-1">
-    Powered by <a href="{{ meta.app_powered_by.url }}" target="_blank">{{ meta.app_powered_by.name }}</a>
+    Powered by <a href="{{ meta.app_info.powered_by.url }}" target="_blank">{{ meta.app_info.powered_by.name }}</a>
   </div>
   <div class="py-1">
-    {{ meta.app_copyright }}
+    {{ meta.app_info.copyright }}
   </div>
 </div>

scilens/report/templates/compare_11_summary.html

@@ -3,15 +3,15 @@
   <h2>Summary</h2>
 
   <!-- DESCRIPTION -->
-  {% if meta.description %}
+  {% if meta.report_info.description %}
   <!-- <h3>Description</h3> -->
   <div id="section_summary_description" class="description">
-    {{ meta.description }}
+    {{ meta.report_info.description }}
   </div>
   {% endif %}
 
   <!-- EXTRA HTML -->
-  {% if meta.config.extra_html_summary %}{{ meta.config.extra_html_summary }}{% endif %}
+  {% if config_html.extra_html_summary %}{{ config_html.extra_html_summary }}{% endif %}
 
   <!-- METRICS -->
   {% include 'compare_11_summary_metrics.html' %}

scilens/report/templates/compare_11_summary_datasets.html

@@ -37,10 +37,10 @@
         <td>{{ file.name }}</td>
         <td class="center">{% if not file.skipped %}<button onclick="actions.see_details({{ loop.index }})">[...]</button>{% endif %}</td>
         <td class="center test-bg-20">
-          {% if file.test.origin and file.test.origin.path %}<action data-command="open_file" data-args="{{ file.test.origin.path.replace(meta.execution_dir, "") }}" data-label="[...]"></action>{% endif %}
+          {% if file.test.origin and file.test.origin.path %}<action data-command="open_file" data-args="{{ file.test.origin.path.replace(execution_dir, "") }}" data-label="[...]"></action>{% endif %}
         </td>
         <td class="center refe-bg-20">
-          {% if file.ref.origin and file.ref.origin.path %}<action data-command="open_file" data-args="{{ file.ref.origin.path.replace(meta.execution_dir, "") }}" data-label="[...]"></action>{% endif %}
+          {% if file.ref.origin and file.ref.origin.path %}<action data-command="open_file" data-args="{{ file.ref.origin.path.replace(execution_dir, "") }}" data-label="[...]"></action>{% endif %}
         </td>
         <td class="{{ 'ERROR' if file.error else '' }}">
           {% if file.error %}<span>{{ file.error }}</span>{% endif %}

scilens/report/templates/compare_11_summary_metrics.html

@@ -1,9 +1,13 @@
-{% for file in data.files %}
-  {% if file.test.metrics %}
-    <h3>Metrics <action data-command="toogle" data-args="section_summary_metrics"></action></h3>
-    <div id="section_summary_metrics">
-      <div style="display: flex; flex-wrap: wrap;">
-      <!-- <div class="kpi-container"> -->
+{% if meta.processor_info.datasets_metrics %}
+  <h3>Metrics <action data-command="toogle" data-args="section_summary_metrics"></action></h3>
+  <div id="section_summary_metrics">
+    
+    {% for file in data.files %}
+      {% if file.test.metrics %}
+        {% if meta.processor_info.has_multiple_datasets and meta.processor_info.datasets_metrics > 1 %}
+          <h4>{{ file.name }}</h4>
+        {% endif %}
+        <div style="display: flex; flex-wrap: wrap;">
         {% for metric_k, metric_test in file.test.metrics.items() %}
           {% set metric_status = file.comparison.metrics[metric_k].status if file.comparison.metrics else None %}
           {% set metric_err_index = file.comparison.metrics[metric_k].err_index if metric_status else None %}
@@ -16,10 +20,12 @@
             metric_err
           ) }}
         {% endfor %}
-      </div>
-    </div>
-  {% endif %}
-{% endfor %}
+        </div>
+      {% endif %}
+    {% endfor %}
+    
+  </div>
+{% endif %}
 
 
 

scilens/report/templates/compare_12_sections.html

@@ -13,11 +13,11 @@
     <span style="font-size:0.9rem;color:#666;">(#{{ file_index }})</span>
     <!-- actions -->
     <action data-command="toogle" data-args="file_content_{{ file_index|string }}"></action>
-    {% if file.test.origin and file.test.origin.path %}<action data-command="open_file" data-args="{{ file.test.origin.path.replace(meta.execution_dir, "") }}" data-label="Open Test"></action>{% endif %}
-    {% if file.ref.origin and file.ref.origin.path  %}<action data-command="open_file" data-args="{{ file.ref.origin.path.replace(meta.execution_dir, "") }}" data-label="Open Ref."></action>{% endif %}
+    {% if file.test.origin and file.test.origin.path %}<action data-command="open_file" data-args="{{ file.test.origin.path.replace(execution_dir, "") }}" data-label="Open Test"></action>{% endif %}
+    {% if file.ref.origin and file.ref.origin.path  %}<action data-command="open_file" data-args="{{ file.ref.origin.path.replace(execution_dir, "") }}" data-label="Open Ref."></action>{% endif %}
   </h2>
   <!-- CONTENT -->
-  <div id="file_content_{{ file_index }}" style="{% if not file.error and meta.config.collapse_if_successful %} display:none;{% endif %}">
+  <div id="file_content_{{ file_index }}" style="{% if not file.error and config_html.collapse_if_successful %} display:none;{% endif %}">
     
     <!--GENERAL ERROR-->
     {% if file.error %}
@@ -131,7 +131,7 @@
     <!-- MATRICES -->
     {% if file.test.matrices %}
     {% for item in [{"id": "spectrograms", "label": "Spectrograms"}, {"id": "frameseries", "label": "Frameseries"}] %}
-    {% if meta.config.matrix[item.id] %}
+    {% if config_html.matrix[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 %}

scilens/report/templates/compare_13_section_images.html

@@ -1,5 +1,5 @@
-{% set img_test = file.test.origin.path.replace(meta.execution_dir, "") %}
-{% set img_ref = file.ref.origin.path.replace(meta.execution_dir, "") %}
+{% set img_test = file.test.origin.path.replace(execution_dir, "") %}
+{% set img_ref = file.ref.origin.path.replace(execution_dir, "") %}
 {% set img_w = file.test.reader_info.width %}
 {% set img_h = file.test.reader_info.height %}
 {% set style = "width: 200px; height: 80px;" %}

scilens/report/templates/index.html

@@ -14,14 +14,14 @@
     {% set ns.statuses = ns.statuses + ['SKIPPED' if file.skipped else ('ERROR' if file.error else ('WARNING' if file.comparison_errors and file.comparison_errors.error_nb > 0 else 'SUCCESS'))] %}
     {% if file.test.matrices %}
       {% set ns.has_matrices = true %}
-      {% if meta.config.matrix.spectrograms %}{% set ns.has_spectrograms = true %}{% endif %}
-      {% if meta.config.matrix.frameseries %}{% set ns.has_frameseries = true %}{% endif %}
+      {% if config_html.matrix.spectrograms %}{% set ns.has_spectrograms = true %}{% endif %}
+      {% if config_html.matrix.frameseries %}{% set ns.has_frameseries = true %}{% endif %}
     {% endif %}
 {% endfor %}
 <html>
   <head>
     <meta charset="utf-8"/>
-    <title id="head-title">{{ meta.title }} {{ data.name }}</title>
+    <title id="head-title">{{ meta.report_info.title }} {{ data.name }}</title>
     <!-- <script src="https://cdn.jsdelivr.net/npm/resemblejs@5.0.0/resemble.min.js"></script> -->
     <script src="https://cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js"></script>
     <script src="https://cdn.plot.ly/plotly-2.34.0.min.js" charset="utf-8"></script>
@@ -42,17 +42,17 @@
 {% include 'utils_compare_report_anim.js' %}
 {% include 'utils_compare_report_framesseries.js' %}
 
-{% if meta.config.matrix.spectrograms %}
+{% if config_html.matrix.spectrograms %}
 {% include 'uti_spectrograms.js' %}
 Spectrograms.config({
-  "DISPLAY_TESTREF": {{ meta.config.matrix.spectrograms.test_ref }},
-  "DISPLAY_DIFF": {{ meta.config.matrix.spectrograms.differences }},
-  "WIDTH": {{ meta.config.matrix.spectrograms.init_width }},
-  "HEIGHT": {{ meta.config.matrix.spectrograms.init_height }},
-  "IS_3D": {{ meta.config.matrix.spectrograms.is_3D }},
+  "DISPLAY_TESTREF": {{ config_html.matrix.spectrograms.test_ref }},
+  "DISPLAY_DIFF": {{ config_html.matrix.spectrograms.differences }},
+  "WIDTH": {{ config_html.matrix.spectrograms.init_width }},
+  "HEIGHT": {{ config_html.matrix.spectrograms.init_height }},
+  "IS_3D": {{ config_html.matrix.spectrograms.is_3D }},
 });
 {% endif %}
-{% if meta.config.matrix.frameseries %}
+{% if config_html.matrix.frameseries %}
 {% include 'uti_frameseries.js' %}
 {% endif %}
 {% if ns.has_matrices %}{% include 'uti_matrix.js' %}{% endif %}
@@ -107,20 +107,20 @@ 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 %}
+{% if config_html.custom_style %}<style type="text/css">{{ config_html.custom_style }}</style>{% endif %}
+{% if config_html.custom_script_head %}<script>{{ config_html.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 %}
+    {% if config_html.extra_html_start %}{{ config_html.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 %}
+    {% if config_html.extra_html_end %}{{ config_html.extra_html_end }}{% endif %}
     {% include 'body_99_footer.html' with context %}
     <script type="text/javascript">
       const GLOBAL_VARS = {};
-      const GLOBAL_CONFIG = {{ meta.config_json }};
+      const GLOBAL_CONFIG = {{ config_html_json }};
       actions.init_page();
       if (SLImages) SLImages.init();
     </script>
@@ -147,6 +147,6 @@ function load_file_section(global_var, section_prefix, cls) {
       MatrixMgmt.loadGlobal({{ns.has_spectrograms}}, {{ns.has_frameseries}});
     </script>
     {% endif %}
-    {% if meta.config.custom_script_body %}<script>{{ meta.config.custom_script_body }}</script>{% endif %}
+    {% if config_html.custom_script_body %}<script>{{ config_html.custom_script_body }}</script>{% endif %}
   </body>
 </html>

scilens/report/templates/js_com_page.js

@@ -10,16 +10,16 @@
     {
       id: 'page_mode',
       label: 'Display Mode', 
-      is_user: {{ 'true' if meta.config.parameter_page_mode.is_user_preference else 'false' }},
+      is_user: {{ 'true' if config_html.parameter_page_mode.is_user_preference else 'false' }},
       values: ['onepage', 'tabs'],
       action: "actions.render_page()",
-      default: '{{ meta.config.parameter_page_mode.default_value}}',
+      default: '{{ config_html.parameter_page_mode.default_value}}',
     },{
       id: 'open_file_in',
       label: 'Open File in',
-      is_user: {{ 'true' if meta.config.parameter_open_file_in.is_user_preference else 'false' }},
+      is_user: {{ 'true' if config_html.parameter_open_file_in.is_user_preference else 'false' }},
       values: ['browser', 'vscode'],
-      default: '{{ meta.config.parameter_open_file_in.default_value}}',
+      default: '{{ config_html.parameter_open_file_in.default_value}}',
     },{
       id: 'js_lib',
       label: 'Chart Lib',

scilens/report/templates/style.css

@@ -54,12 +54,12 @@ background-color: #fafafa;
 .ERROR    { background-color:#c52a0f20;color:#c52a0f; }
 .WARNING  { background-color:#bcbc0620;color:#bcbc06; }
 .SUCCESS  { background-color:#16840020;color:#168400; }
-.test-bg-80 { background-color:#{{ meta.config.compare_color_test }}80; }
-.test-bg-50 { background-color:#{{ meta.config.compare_color_test }}50; }
-.test-bg-20 { background-color:#{{ meta.config.compare_color_test }}20; }
-.refe-bg-80 { background-color:#{{ meta.config.compare_color_reference }}80; }
-.refe-bg-50 { background-color:#{{ meta.config.compare_color_reference }}50; }
-.refe-bg-20 { background-color:#{{ meta.config.compare_color_reference }}20; }
+.test-bg-80 { background-color:#{{ config_html.compare_color_test }}80; }
+.test-bg-50 { background-color:#{{ config_html.compare_color_test }}50; }
+.test-bg-20 { background-color:#{{ config_html.compare_color_test }}20; }
+.refe-bg-80 { background-color:#{{ config_html.compare_color_reference }}80; }
+.refe-bg-50 { background-color:#{{ config_html.compare_color_reference }}50; }
+.refe-bg-20 { background-color:#{{ config_html.compare_color_reference }}20; }
 th {
 background-color:#eee;color:#333;
 }

scilens/run/run_task.py

@@ -8,6 +8,9 @@ from scilens.run.task_context import TaskContext
 from scilens.processors.models.results import ProcessorResults
 from scilens.processors import Analyse,Compare,ExecuteAndCompare
 from scilens.report.report import Report
+from scilens.report.report_app_info import ReportAppInfo
+from scilens.report.report_processor_info import ReportProcessorInfo
+from scilens.report.report_attributes_info import ReportAttributesInfo
 from scilens.utils.system import info as system_info
 from scilens.utils.time_tracker import TimeTracker
 from scilens.utils.template import template_render_string
@@ -35,14 +38,14 @@ class RunTask:
 	def __init__(A,context):A.context=context
 	def _get_processors(A):return{A.__name__:A for A in[Analyse,Compare,ExecuteAndCompare]}
 	def process(A):
-		logging.info(f"Running task");logging.info(f"Prepare runtime variables");H=runtime_process_vars(A.context.config);logging.info(f"Apply runtime variables to config");runtime_apply_to_config(H,A.context.config,A.context.working_dir);logging.debug(f"on working_dir '{A.context.working_dir}'");logging.debug(f"with origin_working_dir '{A.context.origin_working_dir}'");logging.debug(f"with config {A.context.config.model_dump_json(indent=4)}");C=A.context.config.processor
-		if not C:raise Exception('Processor not defined in config.')
-		D=A._get_processors().get(C)
-		if not D:raise Exception('Processor not found.')
-		logging.info(f"Processor '{D.__name__}'")
-		try:F=TimeTracker();G=D(A.context);E=G.process();F.stop();I=F.get_data()
+		logging.info(f"Running task");logging.info(f"Prepare runtime variables");H=runtime_process_vars(A.context.config);logging.info(f"Apply runtime variables to config");runtime_apply_to_config(H,A.context.config,A.context.working_dir);logging.debug(f"on working_dir '{A.context.working_dir}'");logging.debug(f"with origin_working_dir '{A.context.origin_working_dir}'");logging.debug(f"with config {A.context.config.model_dump_json(indent=4)}");D=A.context.config.processor
+		if not D:raise Exception('Processor not defined in config.')
+		E=A._get_processors().get(D)
+		if not E:raise Exception('Processor not found.')
+		logging.info(f"Processor '{E.__name__}'")
+		try:F=TimeTracker();G=E(A.context);C=G.process();F.stop();I=F.get_data()
 		except Exception as B:logging.error(B);return TaskResults(error=str(B))
 		finally:G=None
-		try:J=Report(A.context.working_dir,[A.context.origin_working_dir],A.context.config.report,A.context.task_name).process({'meta':{'system_info':system_info(),'task_info':{'processor':C,'process_time':I}},'processor_results':E.data},C)
-		except Exception as B:logging.error(B);return TaskResults(error=str(B),processor_results=E)
-		return TaskResults(processor_results=E,report_results=J)
+		try:J=ReportAttributesInfo().info(A.context.config.report,A.context.task_name);K=ReportAppInfo().info();L=ReportProcessorInfo().info(D,C.data);M=Report(A.context.working_dir,[A.context.origin_working_dir],A.context.config.report,A.context.task_name).process({'meta':{'report_info':J,'app_info':K,'system_info':system_info(),'task_info':{'name':A.context.task_name,'process_time':I},'processor_info':L},'processor_results':C.data})
+		except Exception as B:logging.error(B);return TaskResults(error=str(B),processor_results=C)
+		return TaskResults(processor_results=C,report_results=M)

scilens/utils/template.py

@@ -1,5 +1,4 @@
 from jinja2 import Template,Environment,FileSystemLoader
+def none_to_empty(value):A=value;return''if A is None else A
 def template_render_string(template_str,context):return Template(template_str).render(context)
-def template_render_path(filepath,context):
-	with open(filepath,'r')as A:B=A.read();return template_render_string(B,context)
-def template_render_infolder(filename,context,template_dir):A=FileSystemLoader([template_dir]);B=Environment(loader=A);return B.get_template(filename).render(context)
+def template_render_infolder(filename,context,template_dir):A=FileSystemLoader([template_dir]);B=Environment(loader=A,finalize=none_to_empty);return B.get_template(filename).render(context)

{scilens-0.4.9.dist-info → scilens-0.4.11.dist-info}/METADATA

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

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

@@ -20,7 +20,7 @@ scilens/config/cli_run_options.py,sha256=Ls7yK5QDUPFbk73nbjGuPvuRbBRYw4Miag5ISpu
 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/app.py,sha256=T3zCqJKmRw8jwtmAdIogOfmuds1EI6hzhxGix-q5hRA,1468
+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
@@ -38,7 +38,7 @@ scilens/config/models/report.py,sha256=_4W96v5izWCC_CrMzh3PM0mZIUAa3L26ZQqjV0Mv0
 scilens/config/models/report_html.py,sha256=IsKlmE7QbSTiPrOaxPc48Ne7xPE5yqTcLjxqN_i-unY,3803
 scilens/config/models/report_output.py,sha256=XfzTsd1G3QjbZFer9dkWa1pa3HKbmK85UcHg6A7loOQ,890
 scilens/helpers/assets.py,sha256=XphDA3-yE1PPKw4XFZhDrlLQjMZfGMlpOBXa8uy_xX0,1552
-scilens/helpers/search_and_index.py,sha256=kXZ7124ra_SGAdKUZ7msy55UOWQ9dCSuPuNoU-NdUyM,1522
+scilens/helpers/search_and_index.py,sha256=ceqKP0xM7EA4U0OMnsRK7xTG5txJbg_iYNP_cWV_TiU,1521
 scilens/helpers/templates/index.html,sha256=hwoABZ7mWbN92VZhAMrloTdm_-leW8aQRbRfyafXl3Q,490
 scilens/helpers/templates/style.css,sha256=2_IndKW2qtGhuoU9T3Sru4NkHR5CXTTs5_nc9byktVI,3185
 scilens/processors/__init__.py,sha256=x6bmqQVCcdJ7R2oG-_xTVtvl9qRleliEZlZR-Hq9Yc0,105
@@ -49,10 +49,10 @@ scilens/processors/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 scilens/processors/models/results.py,sha256=KoWxh13Zgi7PuPql8hkf4VjCis42ZxAuzIgJxBWVaX8,119
 scilens/processors/processor_interface.py,sha256=jzMp1529JXnMGTJijVy6b_1zmARAMNv70f2lgys7vn4,452
 scilens/readers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scilens/readers/cols_dataset.py,sha256=6Cq9aIG4UMOdam_zx64lf2f0e2f0lI2VZDNZklccBaI,3964
+scilens/readers/cols_dataset.py,sha256=r8-torONsaXzYUvKRjguCu_d36MSv1ceWxNoRP2-9xk,4018
 scilens/readers/exceptions.py,sha256=JzmxcjnR5sH-IOWVeCC5A1bSwxv-jCAtIJvDjzx1CTI,32
 scilens/readers/mat_dataset.py,sha256=Z9TYDWaH2aqdniLNDjlpR6VVNHMSARjh52clhdMyOn4,1496
-scilens/readers/reader_csv.py,sha256=FKxx26Vzf_h25cFX37DwFXy_-toUGw3481iMbyRa-vg,5550
+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_txt.py,sha256=U3hGIorj-Nv-jq6zYtvbDv2LQBHTgW52PHbV8A5FMA8,4526
@@ -62,33 +62,35 @@ 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=ml_paRkzI81irpeWNtEkBOHkK0W7veNU6RbVM6RLM6E,1940
-scilens/report/report.py,sha256=E8C4tyMSQd8JbOQU0xC3R0bwPMRc4DS0o3QAq-PvXho,1828
-scilens/report/template.py,sha256=cPs5gd3uEwb-6JgitGQD_i4IiUxigBTlZLNRS9KVuos,581
-scilens/report/templates/body_01_title.html,sha256=LJOWO6ImNPW9cg3tCDlgdllVTwnFGWcb2qvA3yv6wNk,1758
+scilens/report/html_report.py,sha256=75bSG6KAm6G3rFiTiZjH_mBtXQeS8tqp3b5kMllkqVw,1387
+scilens/report/report.py,sha256=tgtpP4gCN0gKUx-6Owtmb18sOFjFCKuk9pWM30jaWS8,1806
+scilens/report/report_app_info.py,sha256=r3umU64EDKilxxQha0SC2dupt33fBen-dKA44McseTU,348
+scilens/report/report_attributes_info.py,sha256=OjPjXpTvQJvu1-iHBhnGcPuaniG56fcZ7wpH4ZZ3L5w,367
+scilens/report/report_processor_info.py,sha256=2A1bGqLYPPIzCHkNlfw--FGoS_HeYRh-oonBlSRmrgs,310
+scilens/report/templates/body_01_title.html,sha256=jjWspY_B2w_QA49Ag9U6-Yrzz4ohl728nytDxyHXlnw,2359
 scilens/report/templates/body_02_tabs.html,sha256=hooRO_OJPwAQSa6GBsPLca-OnpiHkr3wZ_0NoXGKGR0,465
-scilens/report/templates/body_99_footer.html,sha256=8cWebeWfZwZ-9bYAMZkZj8rbCWq3BLIMjKQThWQxoQM,362
-scilens/report/templates/compare_11_summary.html,sha256=Goknx4slzt8JX2rq05hf31HTXjkOHUX8u2jYazaUkmc,751
-scilens/report/templates/compare_11_summary_datasets.html,sha256=iUhOhZpAc4yLsHqDinx30xQDjLcbXRXU72Ud6n29GBQ,3495
+scilens/report/templates/body_99_footer.html,sha256=KGTKa_DF0dMsX9K4vEbPxy0gY0Kcj0HSEHh0M3sx5TA,392
+scilens/report/templates/compare_11_summary.html,sha256=pT10Id_Rzkk5Z6l1WM3E8JtuD7etuDg8XU5aMwMZ2d8,775
+scilens/report/templates/compare_11_summary_datasets.html,sha256=tP1JmkYjmxyEOx8fX07MrEoE7XKvmgG7kx7-_3h2PL4,3485
 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=D2_T0GVy2ntRl92ih2ZrRCduHDzuprq5v6i6Ey5MYXA,6311
-scilens/report/templates/compare_13_section_images.html,sha256=8z6gwsw6-eCFGb0quEq2WRFfykg-8b1msvTA1vftxS4,945
+scilens/report/templates/compare_11_summary_metrics.html,sha256=1bbRENZYi_HOHFGDLmV_HvLYirSqKBPCJWnVsJVGuFo,1164
+scilens/report/templates/compare_12_sections.html,sha256=X0YP_LgpzdIoM2rqEip9uoR9cng4qQ1ruPTSh4TEQ7Y,6301
+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/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=lb02RQXDOrigieeFBBJewqRUTw_mwcmVgsibM1eUN_I,6077
+scilens/report/templates/index.html,sha256=02nQg3yqGX69g4W7Zy0EKU_SOrskMd3N4hZhg4uAzu8,6089
 scilens/report/templates/js_chartlibs_echarts.js,sha256=6YicVhTNIBmmBpV31XCVN5oBeiD0t29JIosJZRUv01M,907
 scilens/report/templates/js_chartlibs_plotly.js,sha256=MQGpYtBc1gKtu98BcfVOx_W0TktABqanxDjK9YaVqNE,2649
-scilens/report/templates/js_com_page.js,sha256=miSPJuzb5hD6sX7b5RYMWoCv9pg2CraHuIfXVFYmUU8,6922
+scilens/report/templates/js_com_page.js,sha256=C4CfGlcv31xVFdfuIje9nMeCD8u_1kaJofNPoJQX2As,6922
 scilens/report/templates/js_curvemgr.js,sha256=gnRLO6HbZOMLIBQKjVhV2PciqXtuNKxpGx4boijV2Qc,12175
 scilens/report/templates/js_dom.js,sha256=r5fNSEdeHopMUjSaYtuAIBNRhvSIPoQ9HzAtxvLZcuk,1363
 scilens/report/templates/js_images.js,sha256=Welcp1ouZdyhE6EyJiiRdPE0VCZjh5dRwgfjMMHmx18,1624
 scilens/report/templates/js_palette.js,sha256=HeewAmkR67QiqXSanJS3cCgp6IPKomlULUTKt55F6es,218
 scilens/report/templates/models.js,sha256=MrgnVxPnoimLbR_Eb7Rq3OoNlT89m4PYk6vqt-D7KyY,715
-scilens/report/templates/style.css,sha256=_p5wrk-xeIC7-STthrS6OxViYUvJdVE3CKudepCU4Z8,5577
+scilens/report/templates/style.css,sha256=32sC6XVzBpTDtPlzeA4oW6UmZxZ4VKzSn0Dma6VL1Nw,5577
 scilens/report/templates/uti_frameseries.js,sha256=2edOgmgEfD9F7wYvcB1ZAELnLRq43tcxYMhERnNC5NY,6282
 scilens/report/templates/uti_matrix.js,sha256=wD9vZ9aMq897XupXDmGYkiUQl8behMAYDjcfDvxGwQ0,3441
 scilens/report/templates/uti_spectrograms.js,sha256=qE2wdit6Zq8AxShtV9FdA2pRTk4KY9zZUZ58ccYj_Ow,4311
@@ -100,7 +102,7 @@ scilens/report/vendors/tailwindcss_min_4.0.0-beta.4.js,sha256=fy2LOvMX7m4b1V9Wdt
 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=EDi9Lk69DC5ik9ArWF47hZ5j9Z_TTAES7liTXzuUZEg,3183
+scilens/run/run_task.py,sha256=4wR4ptsDOlDyYPYHbKPbE1wkJsl5STAjxlUWRHZTqas,3578
 scilens/run/standalone_task_runner.py,sha256=QYUZ22YPV8hlUFANRcfxy_RXAmwKSfb7glPqPdcgdMA,568
 scilens/run/task_context.py,sha256=NnujvpwnxY-YEzivYPYWaX-YChcZlEXt9y0_DXLqZkk,659
 scilens/run/tasks_collector.py,sha256=m_FQaJdQRi4fCLW17ryJxU0TvGNJN54JTw2Mg6XPojY,3174
@@ -109,11 +111,11 @@ scilens/utils/file.py,sha256=nzO7Hb4Xuhi75u43F-LbHESw3YsAnV59nJ23Fq3-7e4,1920
 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/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.9.dist-info/METADATA,sha256=pz6dHk21Xl_u0bwZeCj6clWQivZddEpxCJ2KsLVW2Xk,1367
-scilens-0.4.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.4.9.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.4.9.dist-info/RECORD,,
+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/report/template.py

@@ -1,8 +0,0 @@
-import os
-from jinja2 import Template,Environment,FileSystemLoader
-CURRENT_DIR=os.path.dirname(os.path.realpath(__file__))
-TEMPLATE_DIR=os.path.join(CURRENT_DIR,'templates')
-def template_render_path(filepath,data):
-	with open(filepath,'r')as A:B=A.read();C=Template(B);return C.render(data)
-def template_render(filename,data):return template_render_path(os.path.join(TEMPLATE_DIR,filename),data)
-def template_render_infolder(filename,data,template_dir=None):A=FileSystemLoader([template_dir or TEMPLATE_DIR]);B=Environment(loader=A);C=B.get_template(filename);return C.render(data)