Update app.py

app.py

@@ -1,24 +1,3 @@
-# -*- coding: utf-8 -*-
-"""gradio_chat_image.ipynb
-
-Automatically generated by Colaboratory.
-
-Original file is located at
-    https://colab.research.google.com/drive/1UOcwXwg1bHrPbhkM9tB5ivx6OnI9lB7q
-"""
-
-!pip install gradio
-!pip install openai
-
-import os
-
-os.environ["TEST_OPENAI_KEY"] = "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"
-os.environ["ASSIST_ID"] = "asst_ePkuRLY0DUmChyCv8tXtf0gC"
-os.environ["MAX_TRIAL"] = "50"
-os.environ["INTER_SEC"] = "1"   # 画像は1
-os.environ["MAX_TOKENS"] = "300"
-
-from logging import DEBUG
 import os
 import json
 import base64
@@ -53,6 +32,7 @@ ANT_MSG = "（下部の[出力ファイル]にファイルを追加しました
 MAX_TRIAL = int(os.environ["MAX_TRIAL"])  # メッセージ取得最大試行数
 INTER_SEC = int(os.environ["INTER_SEC"])   # 試行間隔（秒）
 MAX_TOKENS = int(os.environ["MAX_TOKENS"])  # Vison最大トークン
+IMAGE_LIMIT = int(os.environ["IMAGE_LIMIT"])
 
 # 正規表現用パターン
 pt = r".*\[(.*)\]\((.*)\)"
@@ -223,6 +203,7 @@ def bot(state, history, image_path):
     thread_id = state["thread_id"]
     last_msg_id = state["last_msg_id"]
     user_id = state["user_id"]
+    image_count = state["image_count"]
 
     # メッセージ設定
     message = client.beta.threads.messages.create(
@@ -277,7 +258,8 @@ def bot(state, history, image_path):
                 image_name = dt.strftime("%Y%m%d%H%M%S") + ".png"
 
                 # ファイルパスは手動設定（誤りがないように）
-                out_image_path = user_id + "/" + image_name
+                # out_image_path = user_id + "/" + image_name
+                out_image_path = "cat.jpg"
 
                 # dall-e3のとき"image_path"は出力ファイルパス
                 func_args["image_path"] = out_image_path
@@ -300,7 +282,14 @@ def bot(state, history, image_path):
                 continue
 
             # 関数を実行
-            func_output = func_action(state, func_name, func_args)
+
+            if image_count < IMAGE_LIMIT:
+                func_output = func_action(state, func_name, func_args)
+
+            else:
+
+                # 10枚以上生成した場合終了とする
+                func_output = '{"answer" : "", "error_message" : "画像の生成上限を超えました。"}'
 
             print(func_output)
 
@@ -395,6 +384,8 @@ def bot(state, history, image_path):
                                 # Functionで画像を取得していた場合表示
                                 history = history + [(None, (out_image_path,))]
 
+                                image_count += 1
+
                                 image_preview = False
 
                             # 最終メッセージID更新
@@ -405,6 +396,7 @@ def bot(state, history, image_path):
 
             # セッションのメッセージID更新
             state["last_msg_id"] = last_msg_id
+            state["image_count"] = image_count
 
             # 完了なら終了
             if run.status == "completed":
@@ -546,7 +538,7 @@ with gr.Blocks() as demo:
         "thread_id" : "",
         "last_msg_id" : "",
         "user_id" : "",
-        "image_count" : ""
+        "image_count" : 0
     })
 
     with gr.Tab("Chat画面") as chat:
@@ -717,29 +709,3 @@ def request_Vision(client, prompt, image_path, detail, max_tokens):
             "error_message" : err_msg
         }
         return json.dumps(vision_result)
-
-def request_DallE3(client, prompt, size, quality, out_image_path):
-    """ DallE3を呼び出す """
-
-    err_msg = ""
-
-    imgage_path = "/content/sample_datacat1.png"
-
-    dalle3_result = {
-        "imgage_path" : imgage_path,
-        "error_message" : err_msg
-    }
-
-    return json.dumps(dalle3_result)
-
-
-def request_Vision(prompt, detail, image_path):
-    """ GPT4 Visionを呼び出す """
-
-    response_text = "この画像は驚いた表情をしている人物を写した写真です。"
-
-    vision_result = {
-        "answer" : response_text
-    }
-
-    return json.dumps(vision_result)