scilens 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

scilens/components/compare_floats.py

@@ -24,7 +24,7 @@ class CompareFloats:
 	def compare_vectors(self,test_vector,reference_vector,group_id,info_vector=_A):
 		B='ignore';A='RIAE_trapezoid';group=self.compare_errors.groups[group_id]
 		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
+		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
 		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

scilens/components/executor.py

@@ -5,23 +5,30 @@ from scilens.utils.web import Web
 def unzip_file(zip_file_path,extract_to_path):
 	with zipfile.ZipFile(zip_file_path,'r')as A:A.extractall(extract_to_path)
 def find_command(command_path,working_dirs,guess_os_extension=False):
-	F='.bash';E='.sh';A=[]
+	J='.bash';I='.sh';G=working_dirs;A=command_path;H=os.path.isabs(A);C=[]
 	if guess_os_extension:
-		B=platform.system().lower()
-		if B=='windows':A=['.exe','.bat','.cmd']
-		elif B=='linux':A=[E,F,'.bin']
-		elif B=='darwin':A=[E,F]
-		else:logging.warning(f"Unknown system {B}")
-	for G in working_dirs:
-		C=os.path.join(G,command_path)
-		if os.path.exists(C):return C
+		D=platform.system().lower()
+		if D=='windows':C=['.exe','.bat','.cmd']
+		elif D=='linux':C=[I,J,'.bin']
+		elif D=='darwin':C=[I,J]
+		else:logging.warning(f"Unknown system {D}")
+	if H:
+		if os.path.exists(A):return A
+	else:
+		for E in G:
+			B=os.path.join(E,A)
+			if os.path.exists(B):return B
+	for K in C:
+		F=A+K
+		if H:
+			if os.path.exists(F):return F
 		else:
-			for H in A:
-				D=C+H
-				if os.path.exists(D):return D
+			for E in G:
+				B=os.path.join(E,F)
+				if os.path.exists(B):return B
 class Executor:
 	def __init__(A,absolute_working_dir,config,alternative_working_dir=None):
-		B=config;A.working_dir=absolute_working_dir;A.config=B;A.alternative_working_dir=alternative_working_dir;A.command_path=None;A.temp_dir=None
+		D=alternative_working_dir;C=absolute_working_dir;B=config;A.config=B;A.working_dir=C;A.dirs=[C]+([D]if D else[]);A.command_path=None;A.temp_dir=None
 		if B.exe_url and B.exe_path:raise ValueError('Executable URL and Path are defined. Only one can be defined.')
 		if not B.exe_url and not B.exe_path:raise ValueError('Executable URL and Path are not defined. One must be defined.')
 		if not os.path.exists(A.working_dir):logging.info(f"Creating working directory {A.working_dir}");dir_create(A.working_dir)
@@ -33,26 +40,16 @@ class Executor:
 		for dir in A.config.pre_folder_delete or[]:dir_remove(os.path.join(A.working_dir,dir))
 		logging.info(f"Folders creation")
 		for dir in A.config.pre_folder_creation or[]:dir_create(os.path.join(A.working_dir,dir))
-		if A.config.exe_url:logging.info(f"Download executable {A.config.exe_url}");A.temp_dir=tempfile.mkdtemp();E='executable';B=os.path.join(A.temp_dir,E);Web().download_progress(A.config.exe_url,B,headers=A.config.exe_url_headers,callback100=lambda percentage:logging.info(f"Downloaded {percentage}%"));logging.info(f"Download completed")
+		if A.config.exe_url:
+			logging.info(f"Download executable {A.config.exe_url}");A.temp_dir=tempfile.mkdtemp();E='executable';B=os.path.join(A.temp_dir,E)
+			try:Web().download_progress(A.config.exe_url,B,headers=A.config.exe_url_headers,callback100=lambda percentage:logging.info(f"Downloaded {percentage}%"))
+			except Exception as F:raise ValueError(f"Error downloading executable: {F}")
+			logging.info(f"Download completed")
 		else:B=A.config.exe_path
-		if A.config.exe_unzip_and_use:logging.info(f"Unzip archive");C=os.path.dirname(B);unzip_file(B,C);B=os.path.join(C,A.config.exe_unzip_and_use);print(f"executable_path {B}");logging.info(f"Unzip completed")
-		if not os.path.exists(B):
-			if not A.config.exe_guess_os_extension:raise FileNotFoundError(f"Command not found: {B}")
-			else:
-				logging.info(f"Guess OS extension");D=[A.working_dir]
-				if A.alternative_working_dir:D.append(A.alternative_working_dir)
-				B=find_command(B,D,guess_os_extension=True)
-				if not B:raise FileNotFoundError(f"Command not found: {B}")
-		logging.info(f"Add executable permissions");F=os.stat(B).st_mode;os.chmod(B,F|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH);A.command_path=B
+		if A.config.exe_unzip_and_use:logging.info(f"Unzip archive");D=os.path.dirname(B);unzip_file(B,D);B=os.path.join(D,A.config.exe_unzip_and_use);logging.info(f"Unzip completed")
+		C=find_command(B,A.dirs,guess_os_extension=A.config.exe_guess_os_extension)
+		if not C:raise FileNotFoundError(f"Command not found: {B}")
+		logging.info(f"Command path resolved: {C}");logging.info(f"Add executable permissions");G=os.stat(C).st_mode;os.chmod(C,G|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH);A.command_path=C
 	def _post_operations(A):logging.info(f"Execute - Post Operations")
-	def _run_command(A):
-		logging.info(f"Execute - Run Command");C=A.command_path;B=C
-		if os.path.isabs(B):
-			if not os.path.exists(B):raise FileNotFoundError(f"Command not found: {B}")
-		else:
-			D=[A.working_dir]
-			if A.alternative_working_dir:D.append(A.alternative_working_dir)
-			B=find_command(C,D,guess_os_extension=A.config.exe_guess_os_extension)
-			if not B:raise FileNotFoundError(f"Command not found: {C}")
-		E=f"{B}{A.config.command_suffix or''}";logging.info(f"RUN COMMAND {E} in {A.working_dir}");subprocess.run(E,shell=True,check=True,cwd=A.working_dir)
+	def _run_command(A):logging.info(f"Execute - Run Command");C=A.command_path;B=f"{C}{A.config.command_suffix or''}";logging.info(f"RUN COMMAND {B} in {A.working_dir}");subprocess.run(B,shell=True,check=True,cwd=A.working_dir)
 	def process(A):logging.info(f"Execute");A._pre_operations();A._run_command();A._post_operations();A._cleanup()

scilens/config/models/report_html.py

@@ -3,4 +3,4 @@ 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):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 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()

scilens/report/html_report.py

@@ -8,19 +8,20 @@ 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):
-		G='meta';F='date';logging.info(f"Processing html report");H=TimeTracker();C=H.get_data()['start']
+		I='meta';H='date';logging.info(f"Processing html report");J=TimeTracker();B=J.get_data()['start']
 		if A.config.logo and A.config.logo_file:raise ValueError('logo and logo_file are exclusive.')
-		I=A.config.logo;B=None
+		K=A.config.logo;C=None
 		if A.config.logo_file:
 			D=A.config.logo_file
-			if os.path.isabs(D):B=D
+			if os.path.isabs(D):
+				C=D
+				if not os.path.isfile(E):raise FileNotFoundError(f"Logo file '{A.config.logo_file}' not found.")
 			else:
-				B=os.path.join(A.working_dir,D)
-				if not os.path.isfile(B):
-					for J in A.alt_config_dirs:
-						B=os.path.join(J,D)
-						if os.path.isfile(B):break
-			if not os.path.isfile(B):raise FileNotFoundError(f"Derived Logo file '{A.config.logo_file}' not found.")
-		K=A.config.title if A.config.title else A.config.title_prefix+' '+task_name;L={'app_name':product_name,'app_version':pkg_version,'app_homepage':pkg_homepage,'app_copyright':f"© {C[F][:4]} {powered_by['name']}. All rights reserved",'app_powered_by':powered_by,'execution_utc_datetime':C['datetime'],'execution_utc_date':C[F],'execution_utc_time':C['time'],'execution_dir':A.working_dir,'title':K,'image':I or get_logo_image_src(B),'config':A.config.html,'config_json':A.config.html.model_dump_json()};E=None
-		if A.config.debug:E=A.config.model_dump_json(indent=4)
-		return template_render_infolder('index.html',{G:L,'task':data.get(G),'data':{'files':data.get('processor_results')},'debug':E})
+				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,'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

@@ -1,6 +1,6 @@
 <!-- TITLE -->
 <h1>
-  {% if meta.image %}<img height="40" src="{{ meta.image }}"/>{% endif %}
+  {% if meta.image %}<img height="{{ meta.config.logo_height }}" src="{{ meta.image }}"/>{% endif %}
   {{ meta.title }}
   {{ data.name }}
 </h1>

scilens/utils/web.py

@@ -8,13 +8,15 @@ class Web:
 		C=requests.get(url,headers=B);C.raise_for_status()
 		with open(filename,'wb')as D:D.write(C.content)
 	def download_progress(L,url,filename,headers=None,callback100=None):
-		D=callback100;C=headers;E=BASE_HEADERS.copy()
-		if C:E.update(C)
-		F=requests.get(url,headers=E,stream=True);I=int(F.headers.get('Content-Length',0));G=0;J=I//100;A=0
+		E=callback100;D=headers;F=BASE_HEADERS.copy()
+		if D:F.update(D)
+		A=requests.get(url,headers=F,stream=True)
+		if A.status_code>299:raise ValueError(f"Error downloading file: {A.status_code} - {A.text}")
+		I=int(A.headers.get('Content-Length',0));G=0;J=I//100;B=0
 		with open(filename,'wb')as K:
-			for B in F.iter_content(chunk_size=1024):
-				if B:
-					K.write(B);G+=len(B);H=G//J
-					if H>A:
-						A=H
-						if D:D(A)
+			for C in A.iter_content(chunk_size=1024):
+				if C:
+					K.write(C);G+=len(C);H=G//J
+					if H>B:
+						B=H
+						if E:E(B)

{scilens-0.3.0.dist-info → scilens-0.3.1.dist-info}/METADATA

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

{scilens-0.3.0.dist-info → scilens-0.3.1.dist-info}/RECORD

@@ -10,10 +10,10 @@ scilens/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 scilens/components/analyse_folder.py,sha256=yqc-dscKaHLZJCYeXGak2v0c3F2aeX0E11AFPfya6r0,208
 scilens/components/compare_2_files.py,sha256=U4xumE28ijFbnrTPH8FgRyR_b5f04jOjaCmegJvCvSE,1483
 scilens/components/compare_errors.py,sha256=Kw_zpVmA3Fb7yVDXog2poLaTsV_K81eLqv-z-b73Nlw,1495
-scilens/components/compare_floats.py,sha256=GF4kKvkSKqCLLrx-BnmGi7yWTEBkYZjlCim7B9NBWxc,5028
+scilens/components/compare_floats.py,sha256=tmHwS4ivzdA9iJBePHDQrDlnA9zxqjLhIjxuvwPxIKc,5063
 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=8ZZq9wwoiMr7ys9LXv1pEg5Zc06QatT9PGIigMsDAB8,3620
+scilens/components/executor.py,sha256=LaT6QnWk8Xf2qdFqBSa58iDh-cUfu_uMIvllpLHmLCk,3314
 scilens/components/file_reader.py,sha256=7SbKCqb4Co_pqAKX3wweYhqAcVkU7BDlT903sLd76Kc,1407
 scilens/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scilens/config/cli_run_options.py,sha256=Ls7yK5QDUPFbk73nbjGuPvuRbBRYw4Miag5ISpu3prg,281
@@ -33,7 +33,7 @@ scilens/config/models/reader_format_txt.py,sha256=eHg90gwEI_VpqwqEjMRhwlS8dHcl5G
 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=9I9iKRDOoLMZRBY0lQV4UFtg5-D-VDfYiFGF1VFAnQ8,1389
+scilens/config/models/report_html.py,sha256=WiUPD38NCmBYHQdYyMb1-713kVNq7dm5pe8chlhuoyM,1468
 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,10 +60,10 @@ 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=PGbaar0UTUsHrH9HxSibLi7lEv6cean0-yKEhmSAKzQ,1845
+scilens/report/html_report.py,sha256=ajNDTfEu06fs2h1SF4nTP1MvZmYwMcLieeSngyuH-qE,1905
 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=59BmETKHqRO1T_xYp0XLKx3Vha9hU9bu7yaUTVt2p9Y,2146
+scilens/report/templates/body_01_title.html,sha256=0mrMM62TSBdPOpPNCcam0bZsZtM0GjoMQ-jrSqI8HCw,2173
 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=HWsfCmfdleyRK6IHJeMEheenOuyA0mLzOZ-0qLcuzJU,5952
@@ -96,8 +96,8 @@ 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=E4T8Fra65u9g_BpcFANPk4ORvsYavAeiSgWA3vRca2E,804
-scilens-0.3.0.dist-info/METADATA,sha256=zvMTkfew0QXwM9EzvFc4bu1oeo4XZCAo1GonbGZ4LtI,1367
-scilens-0.3.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-scilens-0.3.0.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
-scilens-0.3.0.dist-info/RECORD,,
+scilens/utils/web.py,sha256=MAFWpIFOKz7QhqDoFh-Qwstvc76KpcxstSgHFT8FOL4,901
+scilens-0.3.1.dist-info/METADATA,sha256=AmSUTNHDOlrHTmC0Qp60jHaju--5SiGbDR-EG-uNKm4,1367
+scilens-0.3.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+scilens-0.3.1.dist-info/entry_points.txt,sha256=DaKGgxUEUv34GJAoXtta6ecL37ercejep9sCSSRQK2s,48
+scilens-0.3.1.dist-info/RECORD,,