init

app.py

@@ -10,7 +10,7 @@ from nfsw import NSFWDetector
 # Configuration parameters
 
 TIP_TRY_N = 4      # Show like button tip after 12 tries
-FREE_TRY_N = 10        # Free phase: first 15 tries without restrictions
+FREE_TRY_N = 8        # Free phase: first 15 tries without restrictions
 SLOW_TRY_N = 15       # Slow phase start: 25 tries
 SLOW2_TRY_N = 20        # Slow phase start: 32 tries
 RATE_LIMIT_60 = 25     # Full restriction: blocked after 40 tries
@@ -450,7 +450,7 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
         print(f"✅ Processing started - IP: {client_ip}, phase: {current_phase}, total count: {updated_count}, prompt: {prompt.strip()}", flush=True)
         
         # Call image editing processing function
-        result_url, message, task_uuid = process_image_edit(input_image, prompt.strip(), None, progress_callback)
+        input_image_url, result_url, message, task_uuid = process_image_edit(input_image, prompt.strip(), None, progress_callback)
         
         if result_url:
             print(f"✅ Processing completed successfully - IP: {client_ip}, result_url: {result_url}, task_uuid: {task_uuid}", flush=True)
@@ -532,8 +532,11 @@ def edit_image_interface(input_image, prompt, request: gr.Request, progress=gr.P
             action_buttons_html = ""
             if task_uuid:
                 task_detail_url = f"https://omnicreator.net/my-creations/task/{task_uuid}"
-                # Create image-to-video URL with result image
-                image_to_video_url = f"https://omnicreator.net/image-to-video?input_image={final_result}"
+                # Create image-to-video URL with input image, end image, and prompt
+                from urllib.parse import quote
+                # Use result URL as end_image, original upload URL as input_image
+                encoded_prompt = quote(prompt.strip())
+                image_to_video_url = f"https://omnicreator.net/image-to-video?input_image={input_image_url}&end_image={result_url}&prompt={encoded_prompt}"
                 action_buttons_html = f"""
                 <div style='display: flex; justify-content: center; gap: 15px; margin: 10px 0 5px 0; padding: 0px;'>
                     <a href='{task_detail_url}' target='_blank' style='
@@ -809,10 +812,10 @@ def local_edit_interface(image_dict, prompt, reference_image, request: gr.Reques
         # Call local image editing processing function
         if is_example_case:
             # For example case, pass special flag to use local mask file
-            result_url, message, task_uuid = process_local_image_edit(base_image, layers, clean_prompt, reference_image, progress_callback, use_example_mask="datas/panda01m.jpeg")
+            input_image_url, result_url, message, task_uuid = process_local_image_edit(base_image, layers, clean_prompt, reference_image, progress_callback, use_example_mask="datas/panda01m.jpeg")
         else:
             # Normal case
-            result_url, message, task_uuid = process_local_image_edit(base_image, layers, clean_prompt, reference_image, progress_callback)
+            input_image_url, result_url, message, task_uuid = process_local_image_edit(base_image, layers, clean_prompt, reference_image, progress_callback)
         
         if result_url:
             print(f"✅ Local editing completed successfully - IP: {client_ip}, result_url: {result_url}, task_uuid: {task_uuid}", flush=True)
@@ -894,8 +897,11 @@ def local_edit_interface(image_dict, prompt, reference_image, request: gr.Reques
             action_buttons_html = ""
             if task_uuid:
                 task_detail_url = f"https://omnicreator.net/my-creations/task/{task_uuid}"
-                # Create image-to-video URL with result image
-                image_to_video_url = f"https://omnicreator.net/image-to-video?input_image={final_result}"
+                # Create image-to-video URL with input image, end image, and prompt
+                from urllib.parse import quote
+                # Use result URL as end_image, original upload URL as input_image
+                encoded_prompt = quote(clean_prompt)
+                image_to_video_url = f"https://omnicreator.net/image-to-video?input_image={input_image_url}&end_image={result_url}&prompt={encoded_prompt}"
                 action_buttons_html = f"""
                 <div style='display: flex; justify-content: center; gap: 15px; margin: 10px 0 5px 0; padding: 0px;'>
                     <a href='{task_detail_url}' target='_blank' style='

util.py

@@ -418,7 +418,7 @@ def process_image_edit(img_input, prompt, reference_image=None, progress_callbac
         # Upload user image directly from memory
         uploaded_url = upload_user_img_r2(client_ip, time_id, pil_image)
         if not uploaded_url:
-            return None, "image upload failed", None
+            return None, None, "image upload failed", None
         
         # Extract actual image URL from upload URL
         if "?" in uploaded_url:
@@ -440,17 +440,17 @@ def process_image_edit(img_input, prompt, reference_image=None, progress_callbac
 
                 reference_url = upload_user_img_r2(client_ip, time_id, reference_pil)
                 if not reference_url:
-                    return None, "reference image upload failed", None
+                    return None, None, "reference image upload failed", None
 
                 if "?" in reference_url:
                     reference_url = reference_url.split("?")[0]
             except Exception as e:
-                return None, f"reference image processing failed: {str(e)}", None
+                return None, None, f"reference image processing failed: {str(e)}", None
 
         # Submit image editing task
         task_id, error = submit_image_edit_task(uploaded_url, prompt, reference_image_url=reference_url)
         if error:
-            return None, error, None
+            return None, None, error, None
         
         if progress_callback:
             progress_callback(f"task submitted, ID: {task_id}, processing...")
@@ -467,11 +467,11 @@ def process_image_edit(img_input, prompt, reference_image=None, progress_callbac
             
             if status == 'completed':
                 if output_url:
-                    return output_url, "image edit completed", task_uuid
+                    return uploaded_url, output_url, "image edit completed", task_uuid
                 else:
-                    return None, "Task completed but no result image returned", task_uuid
+                    return None, None, "Task completed but no result image returned", task_uuid
             elif status == 'error' or status == 'failed':
-                return None, f"task processing failed: {task_data}", task_uuid
+                return None, None, f"task processing failed: {task_data}", task_uuid
             elif status in ['queued', 'processing', 'running', 'created', 'working']:
                 # Enhanced progress message with queue info and website promotion
                 if progress_callback and task_data and isinstance(task_data, dict):
@@ -498,10 +498,10 @@ def process_image_edit(img_input, prompt, reference_image=None, progress_callbac
                     progress_callback(f"unknown status: {status}")
                 time.sleep(1)
         
-        return None, "task processing timeout", task_uuid
+        return None, None, "task processing timeout", task_uuid
         
     except Exception as e:
-        return None, f"error occurred during processing: {str(e)}", None
+        return None, None, f"error occurred during processing: {str(e)}", None
 
 
 def process_local_image_edit(base_image, layers, prompt, reference_image=None, progress_callback=None, use_example_mask=None):
@@ -531,7 +531,7 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
                 
                 # Check if base_image is valid
                 if base_image is None:
-                    return None, "Base image is None, cannot process example mask", None
+                    return None, None, "Base image is None, cannot process example mask", None
                 
                 if os.path.exists(use_example_mask):
                     mask_image = Image.open(use_example_mask)
@@ -546,11 +546,11 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
                     
                     print(f"🎭 Using example mask from: {use_example_mask}, size: {mask_image.size}")
                 else:
-                    return None, f"Example mask file not found: {use_example_mask}", None
+                    return None, None, f"Example mask file not found: {use_example_mask}", None
             except Exception as e:
                 import traceback
                 traceback.print_exc()
-                return None, f"Failed to load example mask: {str(e)}", None
+                return None, None, f"Failed to load example mask: {str(e)}", None
         else:
             # Normal case: create mask from layers
             mask_image = create_mask_from_layers(base_image, layers)
@@ -558,7 +558,7 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
             # 检查mask是否有内容
             mask_array = np.array(mask_image)
             if np.max(mask_array) == 0:
-                return None, "please draw mask", None
+                return None, None, "please draw mask", None
         
         # Print mask statistics
         if not use_example_mask:
@@ -573,7 +573,7 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
         # 直接从内存上传原始图片
         uploaded_url = upload_user_img_r2(client_ip, time_id, base_image)
         if not uploaded_url:
-            return None, "original image upload failed", None
+            return None, None, "original image upload failed", None
         
         # 从上传 URL 中提取实际的图片 URL
         if "?" in uploaded_url:
@@ -585,7 +585,7 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
         # 直接从内存上传mask图片
         mask_url = upload_mask_image_r2(client_ip, time_id, mask_image)
         if not mask_url:
-            return None, "mask image upload failed", None
+            return None, None, "mask image upload failed", None
         
         # 从上传 URL 中提取实际的图片 URL
         if "?" in mask_url:
@@ -604,12 +604,12 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
 
                 reference_url = upload_user_img_r2(client_ip, time_id, reference_pil)
                 if not reference_url:
-                    return None, "reference image upload failed", None
+                    return None, None, "reference image upload failed", None
 
                 if "?" in reference_url:
                     reference_url = reference_url.split("?")[0]
             except Exception as e:
-                return None, f"reference image processing failed: {str(e)}", None
+                return None, None, f"reference image processing failed: {str(e)}", None
 
         print(f"📤 图片上传成功:")
         print(f"   原始图片: {uploaded_url}")
@@ -629,7 +629,7 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
             reference_image_url=reference_url
         )
         if error:
-            return None, error, None
+            return None, None, error, None
         
         if progress_callback:
             progress_callback(f"task submitted, ID: {task_id}, processing...")
@@ -649,11 +649,11 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
             if status == 'completed':
                 if output_url:
                     print(f"✅ 局部编辑任务完成，结果: {output_url}")
-                    return output_url, "local image edit completed", task_uuid
+                    return uploaded_url, output_url, "local image edit completed", task_uuid
                 else:
-                    return None, "task completed but no result image returned", task_uuid
+                    return None, None, "task completed but no result image returned", task_uuid
             elif status == 'error' or status == 'failed':
-                return None, f"task processing failed: {task_data}", task_uuid
+                return None, None, f"task processing failed: {task_data}", task_uuid
             elif status in ['queued', 'processing', 'running', 'created', 'working']:
                 # Enhanced progress message with queue info and website promotion
                 if progress_callback and task_data and isinstance(task_data, dict):
@@ -680,11 +680,11 @@ def process_local_image_edit(base_image, layers, prompt, reference_image=None, p
                     progress_callback(f"unknown status: {status}")
                 time.sleep(1)
         
-        return None, "task processing timeout", task_uuid
+        return None, None, "task processing timeout", task_uuid
         
     except Exception as e:
         print(f"❌ 局部编辑处理异常: {str(e)}")
-        return None, f"error occurred during processing: {str(e)}", None
+        return None, None, f"error occurred during processing: {str(e)}", None
 
 
 def download_and_check_result_nsfw(image_url, nsfw_detector=None):