html形式で描画するように修正

app.py

@@ -2,14 +2,15 @@ import gradio as gr
 import openai
 import requests
 import os
-import fileinput
 from dotenv import load_dotenv
 import io
 import sys
 import json
-from PIL import Image
+import PIL
+import time
 from stability_sdk import client
 import stability_sdk.interfaces.gooseai.generation.generation_pb2 as generation
+import markdown2
 
 title="najimino AI recipe generator"
 inputs_label="どんな料理か教えてくれれば，新しいレシピを考えます"
@@ -67,10 +68,11 @@ class StabilityAI:
         
         for resp in answers:
             for artifact in resp.artifacts:
+                print("artifact: " + json.dumps(artifact, indent=2))
                 if artifact.finish_reason == generation.FILTER:
                     print("NSFW")
                 if artifact.type == generation.ARTIFACT_IMAGE:
-                    img = Image.open(io.BytesIO(artifact.binary))
+                    img = PIL.Image.open(io.BytesIO(artifact.binary))
                     return img
 
 class OpenAI:
@@ -92,6 +94,8 @@ class OpenAI:
                     ],
                 }
                 
+        # 文章生成にかかる時間を計測する
+        start = time.time()
         # ChatCompletion APIを呼び出す
         response = requests.post(
             "https://api.openai.com/v1/chat/completions",
@@ -101,6 +105,7 @@ class OpenAI:
             },
             json=data
             )
+        print("gpt generation time: "+str(time.time() - start))
 
         # ChatCompletion APIから返された結果を取得する
         result = response.json()
@@ -127,16 +132,20 @@ class OpenAI:
     def chat_completion_with_function(cls, prompt, messages, functions):
         print("prompt:"+prompt)
                 
+        # 文章生成にかかる時間を計測する
+        start = time.time()
+        # ChatCompletion APIを呼び出す
         response = openai.ChatCompletion.create(
                 model=MODEL,
                 messages=messages,
                 functions=functions,
                 function_call="auto"
             )
+        print("gpt generation time: "+str(time.time() - start))
 
         # ChatCompletion APIから返された結果を取得する
         message = response.choices[0].message
-        print(json.dumps(message, indent=2))
+        print("chat completion message: " + json.dumps(message, indent=2))
         
         return message
         
@@ -156,7 +165,7 @@ class NajiminoAI:
         """
         return prompt
 
-    def format_recipe(self, lang, title, description, ingredients, instruction, comment_feelings_taste, explanation_to_blind_person, prompt_for_visual_expression_in_en):
+    def format_recipe(self, lang, title, description, ingredients, instruction, comment_feelings_taste, explanation_to_blind_person, prompt_for_visual_expression):
 
         template = get_filetext(filename = "template.md")
         debug_message = template.format(
@@ -167,7 +176,7 @@ class NajiminoAI:
             instruction=instruction,
             comment_feelings_taste=comment_feelings_taste,
             explanation_to_blind_person=explanation_to_blind_person,
-            prompt_for_visual_expression_in_en=prompt_for_visual_expression_in_en
+            prompt_for_visual_expression=prompt_for_visual_expression
         )
         
         print("debug_message: "+debug_message)
@@ -197,8 +206,10 @@ class NajiminoAI:
         
         # resultからfunction_callを取り出す
         # message = result["function_call"]
-        print(json.dumps(message, indent=2))
+        print("chat completion message: " + json.dumps(message, indent=2))
         
+        image = None
+        html = None
         if message.get("function_call"):
             function_name = message["function_call"]["name"]
             
@@ -213,6 +224,17 @@ class NajiminoAI:
             explanation_to_blind_person=args.get("explanation_to_blind_person")
             prompt_for_visual_expression_in_en=args.get("prompt_for_visual_expression_in_en")
             
+            prompt_for_visual_expression = \
+                prompt_for_visual_expression_in_en \
+                + " delicious looking extremely detailed photo leica f1.2 (50mm|85mm) award winner depth of field bokeh perfect lighting " 
+                
+            print("prompt_for_visual_expression: "+prompt_for_visual_expression)
+            
+            # 画像生成にかかる時間を計測する
+            start = time.time()
+            image = StabilityAI.generate_image(prompt_for_visual_expression)
+            print("image generation time: "+str(time.time() - start))
+            
             function_response = self.format_recipe(
                 lang=lang,
                 title=title,
@@ -221,17 +243,24 @@ class NajiminoAI:
                 instruction=instruction,
                 comment_feelings_taste=comment_feelings_taste,
                 explanation_to_blind_person=explanation_to_blind_person,
-                prompt_for_visual_expression_in_en=prompt_for_visual_expression_in_en
+                prompt_for_visual_expression=prompt_for_visual_expression
             )
             
-            answers = StabilityAI.generate_image(prompt_for_visual_expression_in_en)
+            html = (
+                "<div style='max-width:100%; overflow:auto'>"
+                + "<p>"
+                + markdown2.markdown(function_response)
+                + "</div>"
+            )
+        return [image, html]
             
-        return [function_response, answers]
-
 def main():
     iface = gr.Interface(fn=NajiminoAI.generate,
                         inputs=gr.Textbox(label=inputs_label),
-                        outputs=[gr.Textbox(label=inputs_label), gr.Image(label=visual_outputs_label)],
+                        outputs=[
+                            gr.Image(label="Visual Expression"),
+                            "html"
+                            ],
                         title=title,
                         description=description,
                         article=article,
@@ -249,16 +278,13 @@ if __name__ == '__main__':
         NajiminoAI.generate("グルテンフリーの香ばしいサバのお好み焼き")
         
     elif function == 'generate_image':
-        answers = StabilityAI.generate_image("Imagine a delicious gluten-free okonomiyaki with mackerel. The okonomiyaki is crispy on the outside and chewy on the inside. It is topped with savory sauce and creamy mayonnaise, creating a mouthwatering visual. The dish is garnished with finely chopped green onions and red pickled ginger, adding a pop of color. The mackerel fillets are beautifully grilled and placed on top of the okonomiyaki, adding a touch of elegance. The dish is served on a traditional Japanese plate, completing the visual presentation.")
-        print(answers)
-        # <PIL.PngImagePlugin.PngImageFile image mode=RGB size=512x512 at 0x139900430>
-        
-        import PIL
+        image = StabilityAI.generate_image("Imagine a delicious gluten-free okonomiyaki with mackerel. The okonomiyaki is crispy on the outside and chewy on the inside. It is topped with savory sauce and creamy mayonnaise, creating a mouthwatering visual. The dish is garnished with finely chopped green onions and red pickled ginger, adding a pop of color. The mackerel fillets are beautifully grilled and placed on top of the okonomiyaki, adding a touch of elegance. The dish is served on a traditional Japanese plate, completing the visual presentation.")
+        print("image: " + image)
         
-        # answersが何のクラス確認する
-        if type(answers) == PIL.PngImagePlugin.PngImageFile:
+        # imageが何のクラス確認する
+        if type(image) == PIL.PngImagePlugin.PngImageFile:
             #save image
-            answers.save("image.png")
+            image.save("image.png")
 
     else:
         main()

schema.json

@@ -47,10 +47,10 @@
 					"ingredients": {
 						"type": "string",
 						"default": "",
-						"title": "Your Ingredients",
-						"description": "Brainstorm the ingredients needed to cook a new recipe and come up with all the ingredients for the new recipe.",
+						"title": "Your Ingredients List",
+						"description": "Brainstorm the ingredients needed to make a new recipe, and list with '- ' all the ingredients needed for the new recipe.",
 						"examples": [
-							"・サバのフィレ 200g\n・卵 2個\n・キャベツ 1/4個\n・もやし 50g\n・紅しょうが（刻んだもの） 2片\n・ネギ（小口切り） 適量\n・酒大さじ2\n・しょうゆ 大さじ2\n・だし汁 100ml\n・片栗粉 大さじ2\n・サラダ油 お好みで"
+							"- サバのフィレ 200g\n- 卵 2個\n- キャベツ 1/4個\n- もやし 50g\n- 紅しょうが（刻んだもの） 2片\n- ネギ（小口切り） 適量\n- 酒大さじ2\n- しょうゆ 大さじ2\n- だし汁 100ml\n- 片栗粉 大さじ2\n- サラダ油 お好みで"
 						]
 					},
 					"instruction": {
@@ -83,10 +83,8 @@
 					"prompt_for_visual_expression_in_en": {
 						"type": "string",
 						"default": "",
-						"title": "The Schema of prompt for visual expression in English",
-						"examples": [
-							"Imagine a delicious gluten-free okonomiyaki with mackerel. The okonomiyaki is crispy on the outside and chewy on the inside. It is topped with savory sauce and creamy mayonnaise, creating a mouthwatering visual. The dish is garnished with finely chopped green onions and red pickled ginger, adding a pop of color. The mackerel fillets are beautifully grilled and placed on top of the okonomiyaki, adding a touch of elegance. The dish is served on a traditional Japanese plate, completing the visual presentation."
-						]
+						"title": "The Schema of prompt for visual expression  in English",
+						"description": "Prompts for visual representation of AI image generation, consisting of no more than 20 words only"
 					}
 				}
 			}

template.md

@@ -20,4 +20,4 @@
 
 ## 画像生成プロンプト
 
-{prompt_for_visual_expression_in_en}
+{prompt_for_visual_expression}