init

app.py

@@ -660,7 +660,40 @@ def edit_image_interface(input_image, prompt, lang, request: gr.Request, progres
         print(f"✅ Processing started - IP: {client_ip}, phase: {current_phase}, total count: {updated_count}, priority: {task_priority}, prompt: {prompt.strip()}", flush=True)
         
         # Call image editing processing function with priority
-        input_image_url, result_url, message, task_uuid = process_image_edit(input_image, prompt.strip(), None, progress_callback, priority=task_priority)
+        input_image_url, result_url, message, task_uuid = process_image_edit(input_image, prompt.strip(), None, progress_callback, priority=task_priority, client_ip=client_ip)
+        
+        # Check if HF user limit exceeded
+        if message and message.startswith("HF_LIMIT_EXCEEDED:"):
+            error_message = message.replace("HF_LIMIT_EXCEEDED:", "")
+            # Generate HF limit exceeded button (similar to blocked status)
+            hf_limit_url = 'https://omnicreator.net/#generator'
+            
+            hf_limit_button_html = f"""
+            <div style='display: flex; justify-content: center; gap: 15px; margin: 10px 0 5px 0; padding: 0px;'>
+                <a href='{hf_limit_url}' target='_blank' style='
+                    display: inline-flex; 
+                    align-items: center;
+                    justify-content: center;
+                    padding: 16px 32px; 
+                    background: linear-gradient(135deg, #e74c3c 0%, #c0392b 100%);
+                    color: white; 
+                    text-decoration: none; 
+                    border-radius: 12px; 
+                    font-weight: 600;
+                    font-size: 16px;
+                    text-align: center;
+                    min-width: 200px;
+                    box-shadow: 0 4px 15px rgba(231, 76, 60, 0.4);
+                    transition: all 0.3s ease;
+                    border: none;
+                '>&#128640; Unlimited Generation</a>
+            </div>
+            """
+            
+            # Use translated message or default
+            limit_message = error_message if error_message else t("error_free_limit_reached", lang)
+            
+            return None, limit_message, gr.update(value=hf_limit_button_html, visible=True)
         
         if result_url:
             print(f"✅ Processing completed successfully - IP: {client_ip}, result_url: {result_url}, task_uuid: {task_uuid}", flush=True)

util.py

@@ -18,10 +18,6 @@ from botocore.client import Config
 from PIL import Image
 
 
-# TOKEN = os.environ['TOKEN']
-# APIKEY = os.environ['APIKEY']
-# UKAPIURL = os.environ['UKAPIURL']
-
 OneKey = os.environ['OneKey'].strip()
 OneKey = OneKey.split("#")
 TOKEN = OneKey[0]
@@ -33,46 +29,8 @@ R2_SECRET_KEY = OneKey[5]
 R2_ENDPOINT = OneKey[6]
 GoodWebsiteUrl = OneKey[7]
 
-
-# tmpFolder is no longer needed since we upload directly from memory
-# tmpFolder = "tmp"
-# os.makedirs(tmpFolder, exist_ok=True)
-
-
-# Legacy function - no longer used since we upload directly from memory
-# def upload_user_img(clientIp, timeId, img):
-#     fileName = clientIp.replace(".", "")+str(timeId)+".jpg"
-#     local_path = os.path.join(tmpFolder, fileName)
-#     img = cv2.imread(img)
-#     cv2.imwrite(os.path.join(tmpFolder, fileName), img)
-# 
-#     json_data = {
-#         "token": TOKEN,  
-#         "input1": fileName,
-#         "input2": "",
-#         "protocol": "",
-#         "cloud": "ali"
-#     }
-#     
-#     session = requests.session()
-#     ret = requests.post(
-#         f"{UKAPIURL}/upload",
-#         headers={'Content-Type': 'application/json'},
-#         json=json_data
-#     )
-#     
-#     res = ""
-#     if ret.status_code==200:
-#         if 'upload1' in ret.json():
-#             upload_url = ret.json()['upload1']
-#             headers = {'Content-Type': 'image/jpeg'}
-#             response = session.put(upload_url, data=open(local_path, 'rb').read(), headers=headers)
-#             # print(response.status_code)
-#             if response.status_code == 200:
-#                 res = upload_url
-#     if os.path.exists(local_path):
-#         os.remove(local_path)
-#     return res
+# HuggingFace用户任务限制配置
+HF_TASK_LIMIT = 2
 
 
 class R2Api:
@@ -164,100 +122,7 @@ def upload_user_img_r2(clientIp, timeId, pil_image):
     return res
 
 
-
-def create_mask_from_layers(base_image, layers):
-    """
-    Create mask image from ImageEditor layers
-    
-    Args:
-        base_image (PIL.Image): Original image
-        layers (list): ImageEditor layer data
-        
-    Returns:
-        PIL.Image: Black and white mask image
-    """
-    from PIL import Image, ImageDraw
-    import numpy as np
-    
-    # Create blank mask with same size as original image
-    mask = Image.new('L', base_image.size, 0)  # 'L' mode is grayscale, 0 is black
-    
-    if not layers:
-        return mask
-    
-    # Iterate through all layers, set drawn areas to white
-    for layer in layers:
-        if layer is not None:
-            # Convert layer to numpy array
-            layer_array = np.array(layer)
-            
-            # Check layer format
-            if len(layer_array.shape) == 3:  # RGB/RGBA format
-                # If RGBA, check alpha channel
-                if layer_array.shape[2] == 4:
-                    # Use alpha channel as mask
-                    alpha_channel = layer_array[:, :, 3]
-                    # Set non-transparent areas (alpha > 0) to white
-                    mask_array = np.where(alpha_channel > 0, 255, 0).astype(np.uint8)
-                else:
-                    # RGB format, check if not pure black (0,0,0)
-                    # Assume drawn areas are non-black
-                    non_black = np.any(layer_array > 0, axis=2)
-                    mask_array = np.where(non_black, 255, 0).astype(np.uint8)
-            elif len(layer_array.shape) == 2:  # Grayscale
-                # Use grayscale values directly, set non-zero areas to white
-                mask_array = np.where(layer_array > 0, 255, 0).astype(np.uint8)
-            else:
-                continue
-            
-            # Convert mask_array to PIL image and merge into total mask
-            layer_mask = Image.fromarray(mask_array, mode='L')
-            # Resize to match original image
-            if layer_mask.size != base_image.size:
-                layer_mask = layer_mask.resize(base_image.size, Image.LANCZOS)
-            
-            # Merge masks (use maximum value to ensure all drawn areas are included)
-            mask_array_current = np.array(mask)
-            layer_mask_array = np.array(layer_mask)
-            combined_mask_array = np.maximum(mask_array_current, layer_mask_array)
-            mask = Image.fromarray(combined_mask_array, mode='L')
-    
-    return mask
-
-
-def upload_mask_image_r2(client_ip, time_id, mask_image):
-    """
-    Upload mask image to R2 directly from memory
-    
-    Args:
-        client_ip (str): Client IP
-        time_id (int): Timestamp
-        mask_image (PIL.Image): Mask image
-        
-    Returns:
-        str: Uploaded URL
-    """
-    # Generate unique filename using UUID to prevent file conflicts in concurrent environment
-    unique_id = str(uuid.uuid4())
-    file_name = f"mask_img_{unique_id}_{time_id}.png"
-    
-    try:
-        # Convert mask image to bytes
-        img_buffer = io.BytesIO()
-        mask_image.save(img_buffer, format='PNG')
-        img_data = img_buffer.getvalue()
-        
-        # Upload directly from memory
-        res = R2Api().upload_from_memory(img_data, file_name, 'image/png')
-        
-        return res
-    except Exception as e:
-        print(f"Failed to upload mask image: {e}")
-        return None
-
-
-
-def submit_image_edit_task(user_image_url, prompt, task_type="80", mask_image_url="", reference_image_url="", priority=0):
+def submit_image_edit_task(user_image_url, prompt, task_type="80", mask_image_url="", reference_image_url="", priority=0, client_ip=""):
     """
     Submit image editing task with improved error handling using API v2
     
@@ -270,13 +135,15 @@ def submit_image_edit_task(user_image_url, prompt, task_type="80", mask_image_ur
     }
     
     data = {
+        "client_ip":client_ip,
         "user_image": user_image_url,
         "user_mask": mask_image_url,
         "type": task_type,
         "text": prompt,
         "user_uuid": APIKEY,
         "priority": priority,
-        "secret_key": "219ngu"
+        "secret_key": "219ngu",
+        "hf_task_limit": HF_TASK_LIMIT  # 传递HF用户任务限制配置
     }
 
     if reference_image_url:
@@ -288,7 +155,7 @@ def submit_image_edit_task(user_image_url, prompt, task_type="80", mask_image_ur
     while retry_count < max_retries:
         try:
             response = requests.post(
-                f'{UKAPIURL}/public_image_edit_v2',
+                f'{UKAPIURL}/public_image_edit_v3',
                 headers=headers,
                 json=data,
                 timeout=30  # 增加超时时间
@@ -344,7 +211,7 @@ def check_task_status(task_id):
     while retry_count < max_retries:
         try:
             response = requests.post(
-                f'{UKAPIURL}/status_image_edit_v2',
+                f'{UKAPIURL}/status_image_edit_v3',
                 headers=headers,
                 json=data,
                 timeout=15  # 状态查询超时时间短一些
@@ -393,7 +260,7 @@ def check_task_status(task_id):
     return 'error', None, f"Failed after {max_retries} retries"
 
 
-def process_image_edit(img_input, prompt, reference_image=None, progress_callback=None, priority=0):
+def process_image_edit(img_input, prompt, reference_image=None, progress_callback=None, priority=0, client_ip=""):
     """
     Complete process for image editing
     
@@ -405,7 +272,6 @@ def process_image_edit(img_input, prompt, reference_image=None, progress_callbac
     """
     try:
         # Generate client IP and timestamp
-        client_ip = "127.0.0.1"  # Default IP
         time_id = int(time.time())
         
         # Process input image - supports PIL Image and file path
@@ -453,8 +319,11 @@ def process_image_edit(img_input, prompt, reference_image=None, progress_callbac
                 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, priority=priority)
+        task_id, error = submit_image_edit_task(uploaded_url, prompt, reference_image_url=reference_url, priority=priority, client_ip=client_ip)
         if error:
+            # Check if error is HF user limit exceeded
+            if "Task creation failed: HuggingFace user has reached the task limit" in error or ("HuggingFace" in error and "task limit" in error):
+                return None, None, "HF_LIMIT_EXCEEDED:" + error, None
             return None, None, error, None
         
         if progress_callback:
@@ -509,191 +378,6 @@ def process_image_edit(img_input, prompt, reference_image=None, progress_callbac
         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, priority=0):
-    """
-    处理局部图片编辑的完整流程
-    
-    Args:
-        base_image (PIL.Image): 原始图片
-        layers (list): ImageEditor的层数据
-        prompt (str): 编辑指令
-        progress_callback: 进度回调函数
-        priority (int): Task priority, 1 for high priority, 0 for normal priority
-    """
-    try:
-        # Generate client IP and timestamp
-        client_ip = "127.0.0.1"  # Default IP
-        time_id = int(time.time())
-        
-        if progress_callback:
-            progress_callback("creating mask image...")
-        
-        # Check if we should use example mask (backdoor for example case)
-        if use_example_mask:
-            # Load local mask file for example
-            try:
-                from PIL import Image
-                import os
-                
-                # Check if base_image is valid
-                if base_image is 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)
-                    
-                    # Ensure mask has same size as base image
-                    if hasattr(base_image, 'size') and mask_image.size != base_image.size:
-                        mask_image = mask_image.resize(base_image.size)
-                    
-                    # Ensure mask is in L mode (grayscale)
-                    if mask_image.mode != 'L':
-                        mask_image = mask_image.convert('L')
-                    
-                    print(f"🎭 Using example mask from: {use_example_mask}, size: {mask_image.size}")
-                else:
-                    return None, None, f"Example mask file not found: {use_example_mask}", None
-            except Exception as e:
-                import traceback
-                traceback.print_exc()
-                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)
-            
-            # 检查mask是否有内容
-            mask_array = np.array(mask_image)
-            if np.max(mask_array) == 0:
-                return None, None, "please draw mask", None
-        
-        # Print mask statistics
-        if not use_example_mask:
-            print(f"📝 创建mask图片成功，绘制区域像素数: {np.sum(mask_array > 0)}")
-        else:
-            mask_array = np.array(mask_image)
-            print(f"🎭 Example mask loaded successfully, mask pixels: {np.sum(mask_array > 0)}")
-        
-        if progress_callback:
-            progress_callback("uploading original image...")
-        
-        # 直接从内存上传原始图片
-        uploaded_url = upload_user_img_r2(client_ip, time_id, base_image)
-        if not uploaded_url:
-            return None, None, "original image upload failed", None
-        
-        # 从上传 URL 中提取实际的图片 URL
-        if "?" in uploaded_url:
-            uploaded_url = uploaded_url.split("?")[0]
-        
-        if progress_callback:
-            progress_callback("uploading mask image...")
-        
-        # 直接从内存上传mask图片
-        mask_url = upload_mask_image_r2(client_ip, time_id, mask_image)
-        if not mask_url:
-            return None, None, "mask image upload failed", None
-        
-        # 从上传 URL 中提取实际的图片 URL
-        if "?" in mask_url:
-            mask_url = mask_url.split("?")[0]
-        
-        reference_url = ""
-        if reference_image is not None:
-            try:
-                if progress_callback:
-                    progress_callback("uploading reference image...")
-
-                if hasattr(reference_image, 'save'):
-                    reference_pil = reference_image
-                else:
-                    reference_pil = Image.open(reference_image)
-
-                reference_url = upload_user_img_r2(client_ip, time_id, reference_pil)
-                if not reference_url:
-                    return None, None, "reference image upload failed", None
-
-                if "?" in reference_url:
-                    reference_url = reference_url.split("?")[0]
-            except Exception as e:
-                return None, None, f"reference image processing failed: {str(e)}", None
-
-        print(f"📤 图片上传成功:")
-        print(f"   原始图片: {uploaded_url}")
-        print(f"   Mask图片: {mask_url}")
-        if reference_url:
-            print(f"   参考图片: {reference_url}")
-        
-        if progress_callback:
-            progress_callback("submitting local edit task...")
-        
-        # 提交局部图片编辑任务 (task_type=81)
-        task_id, error = submit_image_edit_task(
-            uploaded_url,
-            prompt,
-            task_type="81",
-            mask_image_url=mask_url,
-            reference_image_url=reference_url,
-            priority=priority
-        )
-        if error:
-            return None, None, error, None
-        
-        if progress_callback:
-            progress_callback(f"task submitted, ID: {task_id}, processing...")
-        
-        print(f"🚀 局部编辑任务已提交，任务ID: {task_id}")
-        
-        # Wait for task completion
-        max_attempts = 60  # Wait up to 10 minutes
-        task_uuid = None
-        for attempt in range(max_attempts):
-            status, output_url, task_data = check_task_status(task_id)
-            
-            # Extract task_uuid from task_data
-            if task_data and isinstance(task_data, dict):
-                task_uuid = task_data.get('uuid', None)
-            
-            if status == 'completed':
-                if output_url:
-                    print(f"✅ 局部编辑任务完成，结果: {output_url}")
-                    return uploaded_url, output_url, "local image edit completed", task_uuid
-                else:
-                    return None, None, "task completed but no result image returned", task_uuid
-            elif status == 'error' or status == 'failed':
-                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):
-                    queue_info = task_data.get('queue_info', {})
-                    if queue_info and status in ['queued', 'created']:
-                        tasks_ahead = queue_info.get('tasks_ahead', 0)
-                        current_priority = queue_info.get('current_priority', 0)
-                        if tasks_ahead > 0:
-                            progress_callback(f"⏳ Queue: {tasks_ahead} tasks ahead | Low priority | Visit website for instant processing → https://omnicreator.net/#generator")
-                        else:
-                            progress_callback(f"🚀 Processing your local editing request...")
-                    elif status == 'processing':
-                        progress_callback(f"🎨 AI is processing... Please wait")
-                    elif status in ['running', 'working']:
-                        progress_callback(f"⚡ Generating... Almost done")
-                    else:
-                        progress_callback(f"📋 Task status: {status}")
-                else:
-                    if progress_callback:
-                        progress_callback(f"processing... (status: {status})")
-                time.sleep(1)  # Wait 1 second before retry
-            else:
-                if progress_callback:
-                    progress_callback(f"unknown status: {status}")
-                time.sleep(1)
-        
-        return None, None, "task processing timeout", task_uuid
-        
-    except Exception as e:
-        print(f"❌ 局部编辑处理异常: {str(e)}")
-        return None, None, f"error occurred during processing: {str(e)}", None
-
-
 def download_and_check_result_nsfw(image_url, nsfw_detector=None):
     """
     下载结果图片并进行NSFW检测