Merge branch 'master' into 'final_pipeline_tested'

added models for fy676a and fy664g

See merge request !2

app.py

@@ -200,7 +200,8 @@ def start_prediction(raw_path, viscosity_path, index_no, raw_skip_rows, viscosit
     logger.info(f"Shape of raw df is {df.shape}")
 
     logger.info("Starting preprocessing material section")
-    viscosity_df, raw_viscosity_df = preprocess_viscosity_section(viscosity_path, index_no, viscosity_skip_rows)
+    visc_df = pd.read_excel(viscosity_path, skiprows=viscosity_skip_rows)
+    viscosity_df, raw_viscosity_df = preprocess_viscosity_section(visc_df, index_no)
     # viscosity_df.to_csv('viscosity-agg.csv')
     logger.info(f"The shape of the viscosity df is {viscosity_df.shape}")
     logger.info("Completed material section preprocessing")

scripts/section_utils/material_section.py

@@ -6,8 +6,7 @@ from scripts.constants.constants import ViscosityConstants
 warnings.filterwarnings("ignore")
 
 
-def preprocess_viscosity_section(path, index_number,viscosity_skip_rows):
-    viscosity_df = pd.read_excel(path, skiprows=viscosity_skip_rows)
+def preprocess_viscosity_section(viscosity_df, index_number):
     # adding date col to the viscosity df
     viscosity_df = viscosity_df.sort_values(by='Mixing date')
     raw_viscosity_df = viscosity_df.sort_values(by='Mixing date')