REPLICATE複数トークン対応、トークン数を取得できるように修正、シーン数を環境変数化、

.env.example

@@ -1,3 +1,4 @@
 REPLICATE_API_TOKEN_LIST=key1,key2
 OPENAI_API_KEY=
 ENV=PRODUCTION
+NUMBER_OF_SCENES=4

app.py

@@ -8,6 +8,8 @@ import time
 import requests
 import argparse
 import markdown2
+import uuid
+from pathlib import Path
 
 from dotenv import load_dotenv
 from IPython.display import Image
@@ -27,6 +29,7 @@ openai.api_key = os.getenv('OPENAI_API_KEY')
 # REPLICATE_API_TOKEN_LISTをロードし、カンマで分割してリストに変換
 REPLICATE_API_TOKEN_LIST = os.getenv("REPLICATE_API_TOKEN_LIST").split(',')
 REPLICATE_API_TOKEN_INDEX = 0 # トークンのインデックスを初期化
+NUMBER_OF_SCENES = os.getenv("NUMBER_OF_SCENES")
 
 if ENV == "PRODUCTION":
     import replicate
@@ -34,7 +37,8 @@ else:
     from stub import replicate
 
 class Video:
-    def __init__(self, scene, index):
+    def __init__(self, scene, index, token_controller):
+        self.token_controller = token_controller
         self.scene = scene
         self.prompt = "masterpiece, awards, best quality, dramatic-lighting, "
         self.prompt = self.prompt + scene.get("visual_prompt_in_en")
@@ -42,33 +46,47 @@ class Video:
         self.nagative_prompt = "badhandv4, easynegative, ng_deepnegative_v1_75t, verybadimagenegative_v1.3, bad-artist, bad_prompt_version2-neg, nsfw, "
         self.index = index
         self.output_url = None
-        self.file_path = f"assets/thread_{index}_video.mp4"
-
-    def run_replicate(self):
-        global REPLICATE_API_TOKEN_INDEX
-        start_time = time.time()
-
-        # 現在のトークンを取得し、次のトークンにインデックスを更新
-        token = REPLICATE_API_TOKEN_LIST[REPLICATE_API_TOKEN_INDEX]
-        REPLICATE_API_TOKEN_INDEX = (REPLICATE_API_TOKEN_INDEX + 1) % len(REPLICATE_API_TOKEN_LIST)
-        os.environ['REPLICATE_API_TOKEN'] = token
-        
-        start_time = time.time()
-
-        self.output_url = replicate.run(
-            "lucataco/animate-diff:1531004ee4c98894ab11f8a4ce6206099e732c1da15121987a8eef54828f0663",
-            input={
-                "motion_module": "mm_sd_v14", 
-                "prompt": self.prompt,
-                "n_prompt": self.nagative_prompt,
-                }
-        )
-
-        end_time = time.time()
-        duration = end_time - start_time
+        self.video_id = uuid.uuid4()
+        self.file_path = f"assets/thread_{index}_request_{self.video_id}_video.mp4"
+
+    MAX_RETRIES = 2
+    def run_replicate(self, retries=0):
+        try:
+            self.token = self.token_controller.get_next_token()
+            start_time = time.time()
+
+            os.environ["REPLICATE_API_TOKEN"] = self.token
+            #tokenの最初の10文字だけ出力
+            print(f"Thread {self.index} token: {self.token[:10]}")
+            
+            self.output_url = replicate.run(
+                "lucataco/animate-diff:1531004ee4c98894ab11f8a4ce6206099e732c1da15121987a8eef54828f0663",
+                input={
+                    "motion_module": "mm_sd_v14", 
+                    "prompt": self.prompt,
+                    "n_prompt": self.nagative_prompt,
+                    "seed": 0,
+                    }
+            )
 
-        self.download_and_save(url=self.output_url, file_path=self.file_path)
-        self.print_thread_info(start_time, end_time, duration)
+            end_time = time.time()
+            duration = end_time - start_time
+
+            self.download_and_save(url=self.output_url, file_path=self.file_path)
+            self.print_thread_info(start_time, end_time, duration)
+        except replicate.exceptions.ReplicateError as e:
+            if str(e) == "The requested resource could not be found." and retries < self.MAX_RETRIES:
+                print("リソースが見つからないエラーが発生しました。2秒後に再試行します。")
+                time.sleep(2)
+                self.run_replicate(retries + 1)  # 再帰的に関数を呼び出して再試行
+            elif retries >= self.MAX_RETRIES:
+                print("最大再試行回数に達しました。スレッドを終了します。")
+                # 最大再試行回数に達した場合の追加処理
+            else:
+                print("予期しないエラーが発生しました。スレッドを終了します。")
+                # 予期しないエラーが発生した場合の追加処理
+        except Exception as e:
+            print(f"Error in thread {self.index}: {e}")
 
     def download_and_save(self, url, file_path):
         response = requests.get(url)
@@ -84,18 +102,17 @@ class Video:
 class ThreadController:
     def __init__(self, args):
         self.args = args
-        self.num_threads = len(args)
         scenes = args.get("scenes")
-        # prompts = []
-        # if scenes:
-        #     for scene_data in scenes:
-        #         prompt = scene_data.get("visual_prompt_in_en")
-        #         prompt = prompt + ", " + scene_data.get("cinematic_angles")
-        #         prompt = prompt + ", " + scene_data.get("visual_prompt_in_en")
-        #         prompts.append(prompt)
-        
-        self.videos = [Video(scene, index) for index, scene in enumerate(scenes)]
+        self.videos = []
         self.threads = []
+        self.token_index = 0
+        self.lock = threading.Lock()
+        for index, scene in enumerate(scenes):
+            for _ in REPLICATE_API_TOKEN_LIST:
+                # token = REPLICATE_API_TOKEN_LIST[self.token_index]
+                video = Video(scene, index, self)
+                self.videos.append(video)
+                self.token_index = (self.token_index + 1) % len(REPLICATE_API_TOKEN_LIST)
 
     def run_threads(self):
         os.makedirs("assets", exist_ok=True)
@@ -104,6 +121,8 @@ class ThreadController:
             thread = threading.Thread(target=video.run_replicate)
             self.threads.append(thread)
             thread.start()
+            # 1秒待ってから実行
+            # time.sleep(1)
 
         for thread in self.threads:
             thread.join()
@@ -111,12 +130,17 @@ class ThreadController:
     def merge_videos(self):
         clips = []
         for video in self.videos:
-            clips.append(VideoFileClip(video.file_path))
+            video_path = Path(video.file_path)
+            if video_path.exists():
+                clips.append(VideoFileClip(video.file_path))
+            else:
+                print(f"Error: Video file {video.file_path} could not be found! Skipping this file.")
+                # 他のログ出力方法も使用可能、例: loggingモジュール
 
         final_clip = concatenate_videoclips(clips)
 
         os.makedirs("videos", exist_ok=True)
-        output_path = "videos/final_concatenated_video.mp4"
+        output_path = f"videos/final_concatenated_video_{uuid.uuid4()}.mp4"
 
         final_clip.write_videofile(output_path, codec='libx264', fps=24)
 
@@ -126,6 +150,12 @@ class ThreadController:
         for video in self.videos:
             print(f"Thread {video.index} prompt: {video.prompt}")
 
+    def get_next_token(self):
+        with self.lock:
+            token = REPLICATE_API_TOKEN_LIST[self.token_index]
+            self.token_index = (self.token_index + 1) % len(REPLICATE_API_TOKEN_LIST)
+            return token
+
 def main(args):
     thread_controller = ThreadController(args)
     thread_controller.run_threads()
@@ -173,8 +203,8 @@ class OpenAI:
         # ChatCompletion APIから返された結果を取得する
         message = response.choices[0].message
         print("chat completion message: " + json.dumps(message, indent=2))
-        
-        return message
+
+        return response
 
 class NajiminoAI:
 
@@ -230,7 +260,7 @@ class NajiminoAI:
     def create_video(self):
         main_start_time = time.time()
         
-        user_message = self.user_message + " 4シーン"
+        user_message = self.user_message + f" {NUMBER_OF_SCENES}シーン"
         
         messages = [
             {"role": "user", "content": user_message}
@@ -238,7 +268,10 @@ class NajiminoAI:
         
         functions = get_functions_from_schema('schema.json')
         
-        message = OpenAI.chat_completion_with_function(prompt=user_message, messages=messages, functions=functions)
+        response = OpenAI.chat_completion_with_function(prompt=user_message, messages=messages, functions=functions)
+        
+        message = response.choices[0].message
+        total_tokens = response.usage.total_tokens
         
         video_path = None
         html = None

schema.json

@@ -16,11 +16,11 @@
 				"properties": {
 					"title": {
 						"type": "string",
-						"description": "動画のタイトル"
+						"description": "映画のタイトル"
 					},
 					"story": {
 						"type": "string",
-						"description": "動画のストーリーを詳しく時系列に説明する"
+						"description": "映画のあらすじを、起承転結を交えて時系列に詳しく説明する"
 					},
 					"visual_style": {
 						"type": "string",