Update app.py

app.py

@@ -197,7 +197,14 @@ def load_counts(count_file_path):
 
 def save_counts(count_file_path, counts):
     with open(count_file_path, 'w') as f:
-        json.dump(counts, f)   
+        json.dump(counts, f)  
+        
+def increment_counts(count_file_path):
+    counts = load_counts(count_file_path)
+    counts["count"] += 1
+    save_counts(count_file_path, counts)
+    return counts["count"]
+    
 def pred(user_name, image_path, audio, user_input):
     
     if user_name.strip() == "":
@@ -215,10 +222,8 @@ def pred(user_name, image_path, audio, user_input):
         
         if not os.path.exists(new_image_path):
           shutil.copy(image_path, new_image_path)
-          counts = load_counts(count_file_path)
-          counts["count"] += 1
-          save_counts(count_file_path, counts)
-          output = get_prompt(new_image_path, counts["count"], None, user_name)
+          iter = increment_counts(count_file_path)
+          output = get_prompt(new_image_path, iter, None, user_name)
           res = output["description"]
           with open(input_filepath, 'w') as f:
             f.write("Studs Terkel: " + res)
@@ -231,40 +236,35 @@ def pred(user_name, image_path, audio, user_input):
             
 
           if user_input.strip() != "":
-            counts = load_counts(count_file_path)
-            counts["count"] += 1
-            save_counts(count_file_path, counts)
-            with open(input_filepath, 'a') as f:
-              f.write("\n" + user_name + ": " + user_input)
-            with open(input_filepath, 'r') as f:
-              content = f.read()  
-            output = get_prompt(new_image_path, counts["count"], content, user_name) 
-            res = output["question"]
-            with open(input_filepath, 'a') as f:
-              f.write("\n" + "Studs Terkel: "+ res)  
-            return None, "", user_input, res, transform_text_to_speech(res, user_name)   
-
-        # decide the path from the contents of the conversation memory.    
-        if  os.path.exists(input_filepath):
-          res = retrieve_memory(input_filepath, user_name)
-          if res["speaker"] == "Studs Terkel":
-            message = "Please supply text input or wait atleast 5 seconds after finishing your recording before submitting it to ensure it is fully captured. Thank you!"
-            return  None, "", "" ,  res["reply"], transform_text_to_speech(message, user_name) 
-          else:
-            with open(input_filepath, 'a') as f:
-              f.write("\n" + user_name + ": " + "I want to talk more about this photo")
-            with open(input_filepath, 'r') as f:
-              content = f.read()
-            counts = load_counts(count_file_path)
-            counts["count"] += 1
-            save_counts(count_file_path, counts)    
-            output = get_prompt(new_image_path, counts["count"], content, user_name)
-            res = output["question"]
-            with open(input_filepath, 'a') as f:
-              f.write("\n" + "Studs Terkel: "+ res)  
-            return None, "", "", res, transform_text_to_speech(res, user_name)   
+              iter = increment_counts(count_file_path)
+              with open(input_filepath, 'a') as f:
+                  f.write("\n" + user_name + ": " + user_input)
+              with open(input_filepath, 'r') as f:
+                  content = f.read()  
+              output = get_prompt(new_image_path, iter, content, user_name) 
+              res = output["question"]
+              with open(input_filepath, 'a') as f:
+                  f.write("\n" + "Studs Terkel: "+ res)  
+              return None, "", user_input, res, transform_text_to_speech(res, user_name) 
+              
+          # decide the path from the contents of the conversation memory.    
+          if  os.path.exists(input_filepath):
+              res = retrieve_memory(input_filepath, user_name)
+              if res["speaker"] == "Studs Terkel":
+                  message = "Please supply text input or wait atleast 5 seconds after finishing your recording before submitting it to ensure it is fully captured. Thank you!"
+                  return  None, "", "" ,  res["reply"], transform_text_to_speech(message, user_name) 
+              else:
+                  with open(input_filepath, 'a') as f:
+                      f.write("\n" + user_name + ": " + "I'd like to continue our conversation about this photograph.")
+                  with open(input_filepath, 'r') as f:
+                      content = f.read()
+                  iter = increment_counts(count_file_path)   
+                  output = get_prompt(new_image_path, iter, content, user_name)
+                  res = output["question"]
+                  with open(input_filepath, 'a') as f:
+                      f.write("\n" + "Studs Terkel: "+ res)  
+                  return None, "", "I'd like to continue our conversation about this photograph.", res, transform_text_to_speech(res, user_name)   
  
-
     message = "Please upload an image"
     return None, "", message, message, transform_text_to_speech(message, user_name)