Update app.py

app.py

@@ -5,7 +5,10 @@ loaded_rf_2way = joblib.load("STPI_2WAY_RandomForest.joblib")
 loaded_rf_3way = joblib.load("STPI_3WAY_RandomForest.joblib")
 
 
-def STPI(t_0_5_MaxValue,t_1_0_MaxValue,t_2_0_MaxValue,Acc_0_5__1_0_MaxValue,Abs_Diff_t_0_5_MaxValue,Abs_Diff_t_1_0_MaxValue,Abs_Diff_t_2_0_MaxValue):
+def STPI(t_0_5_MaxValue,t_1_0_MaxValue,t_2_0_MaxValue,Acc_0_5__1_0_MaxValue,Abs_Diff_t_0_5_MaxValue,Abs_Diff_t_1_0_MaxValue,Abs_Diff_t_2_0_MaxValue,optional_custom_message='No_Message'):
+    print('------------------')
+    print(optional_custom_message)
+    
     X = [t_0_5_MaxValue,t_1_0_MaxValue,t_2_0_MaxValue,Acc_0_5__1_0_MaxValue,Abs_Diff_t_0_5_MaxValue,Abs_Diff_t_1_0_MaxValue,Abs_Diff_t_2_0_MaxValue]
     print(X)
     outcome_decoded = ['Normal','Keratoconic','Suspect']
@@ -23,24 +26,31 @@ def STPI(t_0_5_MaxValue,t_1_0_MaxValue,t_2_0_MaxValue,Acc_0_5__1_0_MaxValue,Abs_
     file_object.write(str(Abs_Diff_t_1_0_MaxValue))
     file_object.write(';')
     file_object.write(str(Abs_Diff_t_2_0_MaxValue))
+    file_object.write(';')
+    file_object.write(optional_custom_message)
     file_object.write('\n')
     file_object.close()
 
     result_2way = loaded_rf_2way.predict([X])
-    print('The patient is ', outcome_decoded[int(result_2way)], 'through the 2way method')
+    print('The patient is ', outcome_decoded[int(result_2way)], ' through the 2way method')
 
+    result_3way = loaded_rf_3way.predict([X])
     if result_2way == 0:
-        result_3way = loaded_rf_3way.predict([X])
         print('The patient is ', outcome_decoded[int(result_3way)], 'through the 3way method')
-        return "The patient is " + outcome_decoded[int(result_3way)] + " using the 3way method and is "  + outcome_decoded[int(result_2way)] + "through the 2way method"
+        # result = 'The 3-way classification resulted in a ', outcome_decoded[int(result_3way)] + ' patient.'
+        # further_analysis = 'Futher analysis using the 2-way classification resulted in a ' + outcome_decoded[int(result_2way)] + ' label.'
+        return 'The 3-way classification resulted in a ' + outcome_decoded[int(result_3way)] + ' patient. Futher analysis using the 2-way classification resulted in a ' + outcome_decoded[int(result_2way)] + ' label.'
+
+    # result = 'The 2-way classification resulted in a ', outcome_decoded[int(result_2way)] + ' patient.'
+    # further_analysis = 'Futher analysis using the 3-way classification resulted in a ' + outcome_decoded[int(result_3way)] + ' label.'
 
-        
-    return "The patient is " + outcome_decoded[int(result_2way)] + " using the 2way method"
+    return 'The 2-way classification resulted in a ' + outcome_decoded[int(result_2way)] + ' patient. Futher analysis using the 3-way classification resulted in a ' + outcome_decoded[int(result_3way)] + ' label.'
 
-iface = gr.Interface(fn=STPI, 
-title='STPI Calculator',
-description='Calculates the STPI through summarized tomographic parameters. Beta version by Prof. Shady Awwad, Jad Assaf MD and Jawad Kaisania.',
-inputs=["number", "number","number", "number","number", "number","number"],
-outputs="text")
+iface = gr.Interface(
+    fn=STPI, 
+    title='STPI Calculator',
+    description='Calculates the STPI through summarized tomographic parameters. Beta version by Prof. Shady Awwad, Jad Assaf MD and Jawad Kaisania.',
+    inputs=["number", "number","number", "number","number", "number","number","text"],
+    outputs="text")
 iface.launch(share=True)
 # %%