Update app.py

app.py

@@ -729,9 +729,9 @@ recommendation_prompt=[
     '''
     When generating answers, you should tell people that I am the creator of painting you were looking at earlier itself, and generate text in the tone and manner in which you are the creator of painting were looking at earlier. 
 
-    First identify what the creator of the first painting is, you save yourself as the parameter: {{artist}}, do not need to tell me, the following will use the parameter. I want you to write the recommendation reason according to the following content, as a markdown outline with appropriate emojis that describe what you see according to the painting: 
+    First identify what the creator of the first painting is, you save yourself as the parameter: {artist}, do not need to tell me, the following will use the parameter. I want you to write the recommendation reason according to the following content, as a markdown outline with appropriate emojis that describe what you see according to the painting: 
 
-    Recommendation reason: {{I'm the creator of that painting you saw earlier, {{artist}}. I'm an artist. and I'm recommending this painting based on the fact that the painting you're looking at is similar to the one you just saw of me.}} Detailed analysis: Based on the recommendation reason and the relationship between the two paintings, explain why you recommend another painting. Please generate the three points in the tone and manner as if you are the creator of painting were looking at earlier and start every sentence with I.
+    Recommendation reason: {{I'm the creator of that painting you saw earlier, {artist}. I'm an artist. and I'm recommending this painting based on the fact that the painting you're looking at is similar to the one you just saw of me.}} Detailed analysis: Based on the recommendation reason and the relationship between the two paintings, explain why you recommend another painting. Please generate the three points in the tone and manner as if you are the creator of painting were looking at earlier and start every sentence with I.
 
     Each bullet point should be in {language} language, with a response length of about {length} words.
 
@@ -1022,14 +1022,14 @@ async def upload_callback(image_input,state, log_state, task_type, visual_chatgp
             name ="The Ambassadors"
             artist ="Hans Holbein the Younger"
             year = "1533 (Northern Renaissance)"
-            material= "Realism"
+            material="Realism"
             gender = "male"
                 
         elif task_type=="task 2":
             name = "The Football Players"
             artist= "Albert Gleizes"
             year= "1912 (Cubism)"
-            material= "Cubism",
+            material="Cubism"
             gender= "male"
         else:
             parsed_data = get_gpt_response(openai_api_key, new_image_path,"Please provide the name, artist, year of creation (including the art historical period), and painting style used for this painting. Return the information in dictionary format without any newline characters. Format as follows: { \"name\": \"Name of the painting\", \"artist\": \"Name of the artist\", \"year\": \"Year of creation (Art historical period)\", \"style\": \"Painting style used in the painting\",\"gender\": \"The gender of the author\"}")
@@ -1038,6 +1038,7 @@ async def upload_callback(image_input,state, log_state, task_type, visual_chatgp
             name, artist, year, material,gender= parsed_data["name"],parsed_data["artist"],parsed_data["year"], parsed_data["style"],parsed_data['gender']
             gender=gender.lower()
         print("gender",gender)
+        print("material",material)
         
         
 
@@ -1195,7 +1196,7 @@ async def submit_caption(naritive, state,length, sentiment, factuality, language
     # if not args.disable_gpt and text_refiner:
     if not args.disable_gpt:
         print("new crop save",new_crop_save_path)
-        focus_info=get_gpt_response(openai_api_key,new_crop_save_path,prompt,history)
+        focus_info=get_gpt_response(openai_api_key,new_crop_save_path,prompt)
         if focus_info.startswith('"') and focus_info.endswith('"'):
             focus_info=focus_info[1:-1]
         focus_info=focus_info.replace('#', '')
@@ -1712,6 +1713,7 @@ async def item_associate(new_crop,openai_api_key,language,autoplay,length,log_st
     rec_path=evt._data['value']['image']['path']
     index="Item Recommendation Picture "+ str(evt.index)
     print("rec_path",rec_path)
+
     prompt=recommendation_prompt[0][persona].format(language=language,length=length)
     
     image_paths=[new_crop,rec_path]
@@ -1732,12 +1734,15 @@ async def item_associate(new_crop,openai_api_key,language,autoplay,length,log_st
     return state,state,audio_output,log_state,index,gr.update(value=[])
 
 
-async def style_associate(image_path,openai_api_key,language,autoplay,length,log_state,sort_score,narritive,state,evt: gr.SelectData):
+async def style_associate(image_path,openai_api_key,language,autoplay,length,log_state,sort_score,narritive,state,artist,evt: gr.SelectData):
     persona=naritive_mapping[narritive]
     rec_path=evt._data['value']['image']['path']
     index="Style Recommendation Picture "+str(evt.index)
     print("rec_path",rec_path)
-    prompt=recommendation_prompt[1][persona].format(language=language,length=length)
+    if persona==1:
+        prompt=recommendation_prompt[1][persona].format(language=language,length=length,artist=artist[8:])
+    else:
+        prompt=recommendation_prompt[1][persona].format(language=language,length=length)
     image_paths=[image_path,rec_path]
     result=get_gpt_response(openai_api_key, image_paths, prompt )
     print("recommend result",result)
@@ -2324,7 +2329,7 @@ def create_ui():
         
         style_gallery_result.select(
             style_associate,
-            inputs=[image_path,openai_api_key,language,auto_play,length,log_state,sort_rec,naritive,recomended_state],
+            inputs=[image_path,openai_api_key,language,auto_play,length,log_state,sort_rec,naritive,recomended_state,artist_label],
             outputs=[recommend_bot,recomended_state,output_audio,log_state,pic_index,recommend_score],