Interpolation対応、冗長な処理をリファクタリング

app.py

@@ -45,7 +45,6 @@ class Replicate:
         self.REPLICATE_MODEL_PATH = ""
         self.REPLICATE_MODEL_VERSION = ""
         self.input={}
-        self.output_url = None
         self.response = None
         self.prediction_id = None
         self.lock = threading.Lock()
@@ -78,52 +77,19 @@ class Replicate:
 
             print(f"Thread {self.index} token: {self.client.api_token[:10]} prediction.status: {self.prediction.status}")
             if self.prediction.status == "succeeded":
-                self.output_url = self.prediction.output
+                self.response = self.prediction.output
+                self.response = self.response
                 print(f"Thread {self.index} token: {self.client.api_token[:10]} prediction.output: {self.prediction.output}")
             else:
-                self.output_url = None
+                self.response = None
             
             self.file_path = self.file_path_format.format(id=self.id, class_name=self.__class__.__name__, index=self.index, prediction_id=self.prediction_id)
             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:
-            print(f"Error fetching model or version: {e}")
-            print(f"Model Path: {self.REPLICATE_MODEL_PATH}")
-            print(f"Model Version: {self.REPLICATE_MODEL_VERSION}")
-            if self.prediction_id and str(e) == "The requested resource could not be found.":
-                predictions = self.client.predictions.list()
-                self.prediction = next((p for p in predictions if p.id == self.prediction_id), None)
-
-                if self.prediction:
-                    print(f"Found prediction with ID {self.prediction_id}: {self.prediction}")
-                else:
-                    print(f"No prediction found with ID {self.prediction_id}")
-                self.prediction.wait()
-
-                print(f"Thread {self.index} token: {self.client.api_token[:10]} prediction.status: {self.prediction.status}")
-                if self.prediction.status == "succeeded":
-                    self.output_url = self.prediction.output
-                    print(f"Thread {self.index} token: {self.client.api_token[:10]} prediction.output: {self.prediction.output}")
-                else:
-                    self.output_url = None
-                    print(f"Thread {self.index} token: {self.client.api_token[:10]} prediction.output: Error")
-                    print(f"Thread {self.index} token: {self.client.api_token[:10]} prediction.output: {self.prediction.output}")
-                
-                self.file_path = self.file_path_format.format(id=self.id, class_name=self.__class__.__name__, index=self.index, prediction_id=self.prediction_id)
-                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)
-            else:
-                print(f"Error in thread {self.index}: {e}")
-                print(traceback.format_exc())
-                print("予期しないエラーが発生しました。スレッドを終了します。")
-                # 予期しないエラーが発生した場合の追加処理
-                raise e
+            
+            return self.response
         except Exception as e:
             print(f"Error in thread {self.index}: {e}")
             print(traceback.format_exc())
@@ -135,22 +101,22 @@ class Replicate:
                 f.write(response.content)
 
     def print_thread_info(self, start_time, end_time, duration):
-        print(f"Thread {self.index} output_url: {self.output_url}")
+        print(f"Thread {self.index} response: {self.response}")
         print(f"Thread {self.index} start time: {start_time}")
         print(f"Thread {self.index} end time: {end_time}")
         print(f"Thread {self.index} duration: {duration}")
 
-class Video(Replicate):
+class LucatacoAnimateDiff(Replicate):
 
     def __init__(self, id, client: Client, args, scene, index=None):
         super().__init__(id, client, args, index)
         self.REPLICATE_MODEL_PATH = "lucataco/animate-diff"
-        self.REPLICATE_MODEL_VERSION = "1531004ee4c98894ab11f8a4ce6206099e732c1da15121987a8eef54828f0663"
+        self.REPLICATE_MODEL_VERSION = "beecf59c4aee8d81bf04f0381033dfa10dc16e845b4ae00d281e2fa377e48a9f"
         self.scene = scene
         self.prompt = "masterpiece, awards, best quality, dramatic-lighting, "
         self.prompt = self.prompt + scene.get("visual_prompt_in_en")
         self.prompt = self.prompt + ", cinematic-angles-" + scene.get("cinematic_angles") 
-        self.nagative_prompt = "badhandv4, easynegative, ng_deepnegative_v1_75t, verybadimagenegative_v1.3, bad-artist, bad_prompt_version2-neg, nsfw, "
+        self.nagative_prompt = "badhandv4, easynegative, ng_deepnegative_v1_75t, verybadimagenegative_v1.3, bad-artist, bad_prompt_version2-neg, nsfw, deformed iris, deformed pupils, mutated hands and fingers, deformed, distorted, disfigured, poorly drawn, bad anatomy, wrong anatomy, extra limb, missing limb, floating limbs, disconnected limbs, mutation, mutated, ugly, disgusting, amputation"
         self.file_path_format = "assets/{id}/{class_name}_thread_{index}_request_{prediction_id}.mp4"
         self.file_path = None
         self.input={
@@ -162,9 +128,74 @@ class Video(Replicate):
 
     def run_replicate(self, retries=0):
         self.response = super().run_replicate()
+        self.download_and_save(url=self.response, file_path=self.file_path)
+        self.file_path = self.file_path_format.format(id=self.id, class_name=self.__class__.__name__, index=self.index, prediction_id=self.prediction_id)
+        return self.response
+
+class ZsxkibAnimateDiff(Replicate):
+
+    def __init__(self, id, client: Client, args, scene, index=None):
+        super().__init__(id, client, args, index)
+        self.REPLICATE_MODEL_PATH = "zsxkib/animate-diff"
+        self.REPLICATE_MODEL_VERSION = "269a616c8b0c2bbc12fc15fd51bb202b11e94ff0f7786c026aa905305c4ed9fb"
+        self.scene = scene
+        self.prompt = "masterpiece, awards, best quality, dramatic-lighting, "
+        self.prompt = self.prompt + scene.get("visual_prompt_in_en")
+        self.prompt = self.prompt + ", cinematic-angles-" + scene.get("cinematic_angles") 
+        self.nagative_prompt = "badhandv4, easynegative, ng_deepnegative_v1_75t, verybadimagenegative_v1.3, bad-artist, bad_prompt_version2-neg, nsfw, deformed iris, deformed pupils, mutated hands and fingers, deformed, distorted, disfigured, poorly drawn, bad anatomy, wrong anatomy, extra limb, missing limb, floating limbs, disconnected limbs, mutation, mutated, ugly, disgusting, amputation"
+        self.file_path_format = "assets/{id}/{class_name}_thread_{index}_request_{prediction_id}.mp4"
+        self.file_path = None
+        self.input={
+            "prompt": self.prompt,
+            "negative_prompt": self.nagative_prompt,
+            "base_model": "toonyou_beta3", #Allowed values:realisticVisionV20_v20, lyriel_v16, majicmixRealistic_v5Preview, rcnzCartoon3d_v10, toonyou_beta3
+            }
+
+    def run_replicate(self, retries=0):
+        self.response = super().run_replicate()
+        self.video = self.response[0]
+        self.download_and_save(url=self.video, file_path=self.file_path)
         self.file_path = self.file_path_format.format(id=self.id, class_name=self.__class__.__name__, index=self.index, prediction_id=self.prediction_id)
         return self.response
 
+class Interpolator(Replicate):
+
+    def __init__(self, id, client: Client, args, video, index=None):
+        super().__init__(id, client, args, index)
+        self.REPLICATE_MODEL_PATH = "zsxkib/st-mfnet"
+        self.REPLICATE_MODEL_VERSION = "faa7693430b0a4ac95d1b8e25165673c1d7a7263537a7c4bb9be82a3e2d130fb"
+        self.file_path_format = "assets/{id}/{class_name}_thread_{index}_request_{prediction_id}.mp4"
+        self.file_path = None
+        self.input={
+            "mp4": video, 
+            "framerate_multiplier": 4,
+            "keep_original_duration": False,
+            "custom_fps": 24,
+            }
+
+    def run_replicate(self, retries=0):
+        self.response = super().run_replicate()
+        self.download_and_save(url=list(self.response)[-1], file_path=self.file_path)
+        self.file_path = self.file_path_format.format(id=self.id, class_name=self.__class__.__name__, index=self.index, prediction_id=self.prediction_id)
+        return self.response
+
+class Video():
+
+    def __init__(self, id, client: Client, args, scene, index=None):
+        self.client = client
+        self.index = index
+        # self.animatediff = LucatacoAnimateDiff(id, client, args, scene, index)
+        self.animatediff = ZsxkibAnimateDiff(id, client, args, scene, index)
+        self.prompt = self.animatediff.prompt
+        self.interpolator = None
+
+    def run_replicate(self, retries=0):
+        self.animatediff.run_replicate(retries)
+        self.interpolator = Interpolator(self.animatediff.id, self.animatediff.client, self.animatediff.args, self.animatediff.video, self.animatediff.index)
+        self.response = self.interpolator.run_replicate(retries)
+        self.file_path = self.interpolator.file_path
+        return self.response
+
 class Music(Replicate):
 
     def __init__(self, id, client: Client, args, duration):
@@ -203,13 +234,12 @@ class Music(Replicate):
                 }
         )
         print(output)
-        self.output_url = output
         self.response = output
         
         self.file_path = self.file_path_format.format(id=self.id, class_name=self.__class__.__name__, index=self.index, prediction_id=self.prediction_id)
         end_time = time.time()
         duration = end_time - start_time
-        self.download_and_save(url=self.output_url, file_path=self.file_path)
+        self.download_and_save(url=self.response, file_path=self.file_path)
         self.print_thread_info(start_time, end_time, duration)
         
         return self.response
@@ -471,7 +501,8 @@ if __name__ == "__main__":
     if args.prompts_file:
         prompts = load_prompts(args.prompts_file)
         # main(prompts)
-        NajiminoAI.generate("伝統工芸と最新技術の融合")
+        NajiminoAI.generate("子どもたちが笑ったり怒ったり泣いたり楽しんだりする")
+
     else:
 
         description = """