fix bugs

Rodin.py

@@ -28,6 +28,7 @@ def login(email, password):
     log("INFO", f"Logged successfully")
     user_uuid = response_data['user_uuid']
     token = response_data['token']
+    print(user_uuid, token)
     
     return user_uuid, token
 
@@ -126,17 +127,18 @@ def log(level, 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:
-        _, self.token = login(user_id, password)
+    def __init__(self, user_id, password, token) -> None:
+        # _, self.token = login(user_id, password)
+        self.token = token
         self.user_id = user_id
         self.password = password
         self.task_uuid = None
         self.processed_image = None
         
-    def preprocess(self, prompt, image_path, task_uuid=""):
-        if prompt and task_uuid != "":
+    def preprocess(self, prompt, image_path, processed_image , task_uuid=""):
+        if processed_image and prompt and task_uuid != "":
             log("INFO", "Using cached image and prompt...")
-            return prompt
+            return prompt, processed_image
         log("INFO", "Preprocessing image...")
         success = False
         while not success:
@@ -158,19 +160,19 @@ class Generator:
                 try:
                     if not (prompt and task_uuid):
                         prompt = preprocess_response.get('prompt', None)   
-                    self.processed_image = "data:image/png;base64," + preprocess_response.get('processed_image', None)
+                    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
+        return prompt, processed_image
     
-    def generate_mesh(self, prompt, task_uuid=""):
+    def generate_mesh(self, prompt, processed_image, 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 = [self.processed_image]  # List of images, all the images should be processed first
+            images = [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'])
@@ -199,6 +201,7 @@ class Generator:
             except Exception as e:
                 log("ERROR", f"Error in updating mesh: {e}")
                 time.sleep(5)
+
         history = rodin_history(task_uuid, self.token)
         try:
             preview_image = next(reversed(history.items()))[1]["preview_image"]

app.py

@@ -1,6 +1,6 @@
 import os
-os.system('pip uninstall -y gradio_fake3d')
-os.system('pip install gradio_fake3d-0.0.3-py3-none-any.whl')
+# os.system('pip uninstall -y gradio_fake3d')
+# os.system('pip install gradio_fake3d-0.0.3-py3-none-any.whl')
 
 import gradio as gr
 import re
@@ -9,7 +9,7 @@ from PIL import Image
 from Rodin import Generator, crop_image
 from constant import *
 
-generator = Generator(USER, PASSWORD)
+generator = Generator(USER, PASSWORD, TOKEN)
 
 change_button_name = """
 function updateButton(input) {
@@ -19,6 +19,14 @@ function updateButton(input) {
 }
 """
 
+change_button_name_to_generating = """
+function updateButton(input) {
+    var buttonGenerate = document.getElementById('button_generate');
+    buttonGenerate.innerText = 'Generating...';
+    return '';
+}
+"""
+
 reset_button_name = """
 function updateButton(input) {
     var buttonGenerate = document.getElementById('button_generate');
@@ -52,6 +60,19 @@ options = [
     "OpenClay(200M) - Coming soon"
 ]
 
+example = [
+    ["assets/00.png", "Creature with adorable and grumpy face, cartoon style. symmetric geometry. character. smooth edges. simple geometry."],
+    ["assets/07.png", "Retro-styled robot with minimalistic design, glowing eyes. symmetric geometry. character. smooth edges. simple geometry. game-ready."],
+    ["assets/08.png", ""],
+    ["assets/11.png", ""],
+    ["assets/13.png", ""],
+    ["assets/21.png", ""],
+    ["assets/24.PNG", "Dragon-like cartoon character with small wings and antennae. symmetric geometry. character. smooth edges.", ],
+    ["assets/30.png", ""],
+    ["assets/42.png", ""],
+    ["assets/46.png", ""]
+]
+
 def do_nothing(text):
     return ""
 
@@ -88,6 +109,9 @@ def handle_prompt_change(prompt):
 def clear_task():
     return "", "", [], None
 
+def clear_task_id():
+    return ""
+
 def return_render(image):
     image = Image.fromarray(image)
     return image, crop_image(image, DEFAULT)
@@ -118,7 +142,7 @@ with gr.Blocks() as demo:
                     show_label=True,
                     label="Prompt",
                 )
-                block_prompt_hint = gr.CheckboxGroup(value="Labels", choices=PROMPT_HINT_LIST)
+                block_prompt_hint = gr.CheckboxGroup(value="Labels", choices=PROMPT_HINT_LIST, show_label=False)
 
         with gr.Column():
             with gr.Group():
@@ -135,25 +159,33 @@ with gr.Blocks() as demo:
                             block_normal = gr.Button("Normal", min_width=0)
             
             button_more = gr.Button(value="Download", variant="primary", link=rodin_url)
-
+            
     cache_raw_image = gr.Image(visible=False, type="pil")
     cacha_empty = gr.Text(visible=False)
+    cache_image_base64 = gr.Text(visible=False)
     cache_task_uuid = gr.Text(value="", visible=False)
+    
+    # block_example = gr.Examples(examples=example ,inputs=[block_image, block_prompt], outputs=[fake3d], label="Examples")
 
     block_image.upload(
         fn=do_nothing, 
-        js=change_button_name, 
+        js=change_button_name_to_generating, 
         inputs=[cacha_empty],
         outputs=[cacha_empty]
     ).success(
         fn=generator.preprocess, 
-        inputs=[block_prompt, block_image, cache_task_uuid], 
-        outputs=[block_prompt],
+        inputs=[block_prompt, block_image, cache_image_base64, cache_task_uuid], 
+        outputs=[block_prompt, cache_image_base64],
         show_progress="minimal"
     ).success(
         fn=generator.generate_mesh,
-        inputs=[block_prompt, cache_task_uuid],
+        inputs=[block_prompt, cache_image_base64, cache_task_uuid],
         outputs=[cache_raw_image, cache_task_uuid, fake3d],
+    ).success(
+        fn=do_nothing, 
+        js=change_button_name, 
+        inputs=[cacha_empty],
+        outputs=[cacha_empty]
     )
     
     block_image.clear(
@@ -163,15 +195,32 @@ with gr.Blocks() as demo:
         outputs=[cacha_empty]
     ).then(fn=clear_task, outputs=[cache_task_uuid, block_prompt, block_prompt_hint, fake3d], show_progress="hidden")
     
+    # block_image.change(
+    #     fn=do_nothing, 
+    #     js=reset_button_name, 
+    #     inputs=[cacha_empty],
+    #     outputs=[cacha_empty]
+    # ).then(fn=clear_task_id, outputs=[cache_task_uuid], show_progress="hidden")
+    
     button_generate.click(
+        fn=do_nothing, 
+        js=change_button_name_to_generating, 
+        inputs=[cacha_empty],
+        outputs=[cacha_empty]
+    ).success(
         fn=generator.preprocess, 
-        inputs=[block_prompt, block_image, cache_task_uuid], 
-        outputs=[block_prompt],
+        inputs=[block_prompt, block_image, cache_image_base64, cache_task_uuid], 
+        outputs=[block_prompt, cache_image_base64],
         show_progress="minimal"
     ).success(
         fn=generator.generate_mesh,
-        inputs=[block_prompt, cache_task_uuid],
+        inputs=[block_prompt, cache_image_base64, cache_task_uuid],
         outputs=[cache_raw_image, cache_task_uuid, fake3d],
+    ).then(
+        fn=do_nothing, 
+        js=change_button_name, 
+        inputs=[cacha_empty],
+        outputs=[cacha_empty]
     )
     
     block_default.click(fn=crop_image_default, inputs=[cache_raw_image], outputs=fake3d, show_progress="minimal")

constant.py

@@ -6,6 +6,7 @@ BASE_URL = os.getenv("BASE_URL")
 # Creds
 USER = os.getenv("USER")
 PASSWORD = os.getenv("PASSWORD")
+TOKEN = os.getenv("TOKEN")
 
 DEFAULT = [0, 0]
 CONTRAST = [360, 0]