remove cache

Rodin.py

@@ -123,7 +123,7 @@ def load_image(img_path):
     return image_bytes
 
 def log(level, info_text):
-    print(f"[ {level} ] - {time.strftime('%Y%m%d_%H%M%S', time.localtime())} - {info_text}")
+    print(f"[ {level} ] - {time.strftime('%Y%m%d_%H:%M:%S', time.localtime())} - {info_text}")
 
 class Generator:
     def __init__(self, user_id, password) -> None:
@@ -131,16 +131,17 @@ class Generator:
         self.user_id = user_id
         self.password = password
         self.task_uuid = None
+        self.processed_image = None
         
-    def preprocess(self, prompt, image_path, cache_image_base64, task_uuid=""):
-        if cache_image_base64 and prompt and task_uuid != "":
+    def preprocess(self, prompt, image_path, task_uuid=""):
+        if prompt and task_uuid != "":
             log("INFO", "Using cached image and prompt...")
-            return prompt, cache_image_base64
+            return prompt
         log("INFO", "Preprocessing image...")
         success = False
         while not success:
-            log("INFO", "Loading image...")
             image_file = load_image(image_path)
+            log("INFO", "Image loaded, processing...")
             if prompt and task_uuid:
                 preprocess_response = rodin_preprocess_image(generate_prompt=False, image=image_file, name="images.png", token=self.token)
             else:
@@ -157,19 +158,19 @@ class Generator:
                 try:
                     if not (prompt and task_uuid):
                         prompt = preprocess_response.get('prompt', None)   
-                    processed_image = "data:image/png;base64," + preprocess_response.get('processed_image', None)
+                    self.processed_image = "data:image/png;base64," + preprocess_response.get('processed_image', None)
                     success = True
                 except Exception as e:
                     log("ERROR", f"Error in image preprocessing: {preprocess_response}")
                     raise e
 
-        return prompt, processed_image
+        return prompt
     
-    def generate_mesh(self, prompt, processed_image, task_uuid=""):
+    def generate_mesh(self, prompt, task_uuid=""):
         log("INFO", "Generating mesh...")
         if task_uuid == "":
             settings = {'view_weights': [1]}  # Define weights as per your requirements, for multiple images, use multiple values, e,g [0.5, 0.5]
-            images = [processed_image]  # List of images, all the images should be processed first
+            images = [self.processed_image]  # List of images, all the images should be processed first
             
             mesh_response = rodin_mesh(prompt=prompt, group_uuid=None, settings=settings, images=images, name="images.jpeg", token=self.token)
             progress_checker = JobStatusChecker(BASE_URL, mesh_response['job']['subscription_key'])
@@ -198,8 +199,12 @@ class Generator:
             except Exception as e:
                 log("ERROR", f"Error in updating mesh: {e}")
                 time.sleep(5)
-        
-        preview_image = next(reversed(rodin_history(task_uuid, self.token).items()))[1]["preview_image"]
+        history = rodin_history(task_uuid, self.token)
+        try:
+            preview_image = next(reversed(history.items()))[1]["preview_image"]
+        except Exception as e:
+            print(history)
+            raise e
         response = requests.get(preview_image, stream=True)
         if response.status_code == 200:
             # 创建一个PIL Image对象

app.py

@@ -137,7 +137,6 @@ with gr.Blocks() as demo:
             button_more = gr.Button(value="Download", variant="primary", link=rodin_url)
 
     cache_raw_image = gr.Image(visible=False, type="pil")
-    cache_image_base64 = gr.Text(visible=False)
     cacha_empty = gr.Text(visible=False)
     cache_task_uuid = gr.Text(value="", visible=False)
 
@@ -148,12 +147,12 @@ with gr.Blocks() as demo:
         outputs=[cacha_empty]
     ).success(
         fn=generator.preprocess, 
-        inputs=[block_prompt, block_image, cache_image_base64, cache_task_uuid], 
-        outputs=[block_prompt, cache_image_base64],
+        inputs=[block_prompt, block_image, cache_task_uuid], 
+        outputs=[block_prompt],
         show_progress="minimal"
     ).success(
         fn=generator.generate_mesh,
-        inputs=[block_prompt, cache_image_base64, cache_task_uuid],
+        inputs=[block_prompt, cache_task_uuid],
         outputs=[cache_raw_image, cache_task_uuid, fake3d],
     )
     
@@ -166,12 +165,12 @@ with gr.Blocks() as demo:
     
     button_generate.click(
         fn=generator.preprocess, 
-        inputs=[block_prompt, block_image, cache_image_base64, cache_task_uuid], 
-        outputs=[block_prompt, cache_image_base64],
+        inputs=[block_prompt, block_image, cache_task_uuid], 
+        outputs=[block_prompt],
         show_progress="minimal"
     ).success(
         fn=generator.generate_mesh,
-        inputs=[block_prompt, cache_image_base64, cache_task_uuid],
+        inputs=[block_prompt, cache_task_uuid],
         outputs=[cache_raw_image, cache_task_uuid, fake3d],
     )