リクエストごとにインスタンス化、出力メッセージをjsonからフリーテキストに変更、functionsにdescription, examplesを追加、テストコード追加

.gitignore

@@ -0,0 +1 @@
+.env

app.py

@@ -5,6 +5,7 @@ import os
 import fileinput
 from dotenv import load_dotenv
 import io
+import sys
 import json
 from PIL import Image
 from stability_sdk import client
@@ -48,6 +49,24 @@ def get_filetext(filename, cache={}):
         cache[filename] = text
         return text
 
+class StabilityAI:
+    @classmethod
+    def generate_image(cls, visualize_prompt):
+
+        print("visualize_prompt:"+visualize_prompt)
+
+        answers = stability_api.generate(
+            prompt=visualize_prompt,
+        )
+        
+        for resp in answers:
+            for artifact in resp.artifacts:
+                if artifact.finish_reason == generation.FILTER:
+                    print("NSFW")
+                if artifact.type == generation.ARTIFACT_IMAGE:
+                    img = Image.open(io.BytesIO(artifact.binary))
+                    return img
+
 class OpenAI:
     
     @classmethod
@@ -110,18 +129,20 @@ class OpenAI:
             )
 
         # ChatCompletion APIから返された結果を取得する
-        content = json.dumps(response.choices[0].message, indent=2)
-        print(content)
+        message = response.choices[0].message
+        print(json.dumps(message, indent=2))
         
-        return [content, None]
+        return message
         
 class NajiminoAI:
-    
-    @classmethod
-    def generate_emo_prompt(cls, user_message):
+
+    def __init__(self, user_message):
+        self.user_message = user_message
+
+    def generate_recipe_prompt(self):
         template = get_filetext(filename="template.md")
         prompt = f"""
-        {user_message}
+        {self.user_message}
         ---
         上記を元に、下記テンプレートを埋めてください。
         ---
@@ -129,22 +150,43 @@ 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):
+
+        debug_message = f"""
+            lang: {lang}
+            title: {title}
+            description: {description}
+            ingredients: {ingredients}
+            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}
+        """
+        
+        print(debug_message)
+        
+        return debug_message
+    
     @classmethod
-    def generate_emo(cls, user_message):
-        # prompt = NajiminoAI.generate_emo_prompt(user_message);
-        # start_with = ""
-        # result = OpenAI.chat_completion(prompt=prompt, start_with=start_with)
-        # result = OpenAI.chat_completion(prompt=user_message, start_with=start_with)
+    def generate(cls, user_message):
         
+        najiminoai = NajiminoAI(user_message)
+        
+        return najiminoai.generate_recipe()
+    
+    def generate_recipe(self):
+        
+        user_message = self.user_message
         constraints = get_filetext(filename = "constraints.md")
         
         messages = [
             {"role": "system", "content": constraints}
             ,{"role": "user", "content": user_message}
         ]
+        
         functions = [
             {
-                "name": "set_recipe",
+                "name": "format_recipe",
                 "description": "どんな料理か教えてくれれば，新しいレシピを考えます",
                 "parameters": {
                     "type": "object",
@@ -154,11 +196,11 @@ class NajiminoAI:
                         "lang",
                         "title",
                         "description",
+                        "ingredients",
                         "instruction",
                         "comment_feelings_taste",
-                        # "explanation_to_blind_person",
-                        "explanation_to_blind_person"
-                        # "prompt_for_visual_expression_in_en"
+                        "explanation_to_blind_person",
+                        "prompt_for_visual_expression_in_en"
                     ],
                     "properties": {
                         "lang": {
@@ -172,47 +214,107 @@ class NajiminoAI:
                         "title": {
                             "type": "string",
                             "default": "",
-                            "title": "The title Schema",
+                            "title": "Title of New Recipe.",
+                            "description": "Write your title of new recipe.",
                             "examples": [
-                                "グルテンフリーの香ばしいサバのお好み焼き"
+                                "グルテンフリーサバのお好み焼き"
                             ]
                         },
                         "description": {
                             "type": "string",
                             "default": "",
-                            "title": "The description Schema"
+                            "title": "Your New Recipe",
+                            "description": "Write new recipe and brainstorm and work out the details of every aspect of the new recipe.",
+                            "examples": [
+                                "サバを使ったお好み焼きのレシピです。グルテンフリー仕様で作られているので、小麦粉を使わずに作ることができます。"
+                            ]
+                        },
+                        "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.",
+                            "examples": [
+                                "・サバのフィレ 200g\n・卵 2個\n・キャベツ 1/4個\n・もやし 50g\n・紅しょうが（刻んだもの） 2片\n・ネギ（小口切り） 適量\n・酒大さじ2\n・しょうゆ 大さじ2\n・だし汁 100ml\n・片栗粉 大さじ2\n・サラダ油 お好みで"
+                            ]
                         },
                         "instruction": {
                             "type": "string",
                             "default": "",
-                            "title": "The instruction Schema"
+                            "title": "Your Instruction",
+                            "description": "Instruct them to cook a new recipe, brainstorming and working out every aspect and detail of the new recipe.",
+                            "examples": [
+                                "1. キャベツは粗みじん切りにし、もやしは石づきを取っておく。\n2. ボウルに卵を割り入れ、よく混ぜる。酒、しょうゆ、だし汁を加えてさらに混ぜる。\n3. キャベツ、もやし、紅しょうが、ネギを卵液に加え、さらに混ぜる。\n4. サバのフィレを食べやすい大きさに切り、片栗粉をまぶす。\n5. フライパンにサラダ油を熱し、サバを並べ入れる。両面をこんがり焼く。\n6. サバの上に卵液を流し入れ、蓋をして約5分ほど蒸し焼きにする。\n7. ひっくり返して、もう片面も蓋をして約5分ほど蒸し焼きにする。\n8. お好み焼きを取り出し、お好みでソースやマヨネーズをかけて完成です。"
+                            ]
                         },
                         "comment_feelings_taste": {
                             "type": "string",
                             "default": "",
-                            "title": "The Schema of comment feelings taste Schema"
+                            "title": "Your Comment and Feelings, taste of new recipe.",
+                            "description": "Review commnet of new recipe and brainstorm every point of new recipe to fill the details.",
+                            "examples": [
+                                "このグルテンフリーサバのお好み焼きは、サバの旨味とキャベツの甘みが絶妙にマッチしています。表面はサクサク、中はもちもちとした食感で、一度食べたらやみつきになる美味しさです。"
+                            ]
                         },
                         "explanation_to_blind_person": {
                             "type": "string",
                             "default": "",
-                            "title": "The Schema of Explanation to blind person"
+                            "title": "Your Explanation to Blind Person",
+                            "description": "Review commnet of new recipe here to explain to the blind people more concretely in detail. Please brainstorm every point of new recipe to fill the details.",
+                            "examples": [
+                                "このグルテンフリーサバのお好み焼きは、サバのフィレとキャベツを主な材料としています。まず、キャベツを細かく刻んでおきます。次に、卵をボウルに割り入れ、酒、しょうゆ、だし汁と一緒によく混ぜます。その後、刻んだキャベツ、もやし、紅しょうが、ネギを卵液に加えて混ぜます。サバのフィレは食べやすい大きさに切り、片栗粉をまぶしてから焼きます。フライパンにサラダ油を熱し、サバを焼きます。その上に卵液を流し入れ、蓋をして約5分蒸し焼きにします。ひっくり返して、もう片面も蓋をして約5分蒸し焼きにします。最後にお好み焼きを取り出し、ソースやマヨネーズをかけて完成です。"
+                            ]
                         },
                         "prompt_for_visual_expression_in_en": {
                             "type": "string",
                             "default": "",
-                            "title": "The Schema of prompt for visual expression in English"
+                            "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."
+                            ]
                         }
                     }
                 }
             }
         ]
         
-        result = OpenAI.chat_completion_with_function(prompt=user_message, messages=messages, functions=functions)
+        message = OpenAI.chat_completion_with_function(prompt=user_message, messages=messages, functions=functions)
         
-        return result
+        # resultからfunction_callを取り出す
+        # message = result["function_call"]
+        print(json.dumps(message, indent=2))
+        
+        if message.get("function_call"):
+            function_name = message["function_call"]["name"]
+            
+            args = json.loads(message["function_call"]["arguments"])
+            
+            lang=args.get("lang")
+            title=args.get("title")
+            description=args.get("description")
+            ingredients=args.get("ingredients")
+            instruction=args.get("instruction")
+            comment_feelings_taste=args.get("comment_feelings_taste")
+            explanation_to_blind_person=args.get("explanation_to_blind_person")
+            prompt_for_visual_expression_in_en=args.get("prompt_for_visual_expression_in_en")
+            
+            function_response = self.format_recipe(
+                lang=lang,
+                title=title,
+                description=description,
+                ingredients=ingredients,
+                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
+            )
+            
+            answers = StabilityAI.generate_image(prompt_for_visual_expression_in_en)
+            
+        return [function_response, answers]
 
 def main():
-    iface = gr.Interface(fn=NajiminoAI.generate_emo,
+    iface = gr.Interface(fn=NajiminoAI.generate,
                         inputs=gr.Textbox(label=inputs_label),
                         outputs=[gr.Textbox(label=inputs_label), gr.Image(label=visual_outputs_label)],
                         title=title,
@@ -224,4 +326,24 @@ def main():
     iface.launch()
 
 if __name__ == '__main__':
-    main()
+    function = ''
+    if len(sys.argv) > 1:
+        function = sys.argv[1]
+    
+    if function == 'generate':
+        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
+        
+        # answersが何のクラス確認する
+        if type(answers) == PIL.PngImagePlugin.PngImageFile:
+            #save image
+            answers.save("image.png")
+
+    else:
+        main()