Update app.py

app.py

@@ -73,33 +73,33 @@ def start_queue(prompt_workflow):
     requests.post(URL, data=data)
 
 
-def check_server_ready(new_port):
+def check_server_ready():
     try:
-        response = requests.get(f"http://127.0.0.1:{new_port}/history/123", timeout=5)
+        response = requests.get(f"http://127.0.0.1:8188/history/123", timeout=5)
         return response.status_code == 200
     except requests.RequestException:
         return False
 
+queue_reqs=set()
 
 @spaces.GPU(duration=240)
 def generate_image(prompt, image):
     prompt = json.loads(prompt)
     
-    previous_image = None
-
     image = Image.fromarray(image)
     image.save(INPUT_DIR+'/input.png', format='PNG')
-
-    new_port = random.randint(8188, 8288)
+    
     prefix_filename = random.randint(0, 999999)
-    # Запускаем скрипт как подпроцесс
-    process = subprocess.Popen([sys.executable, COMF_PATH, "--listen", "127.0.0.1", "--port", f"{new_port}"])
-    logger.debug(f'Subprocess started with PID: {process.pid}')
-    latest_image = None
+    queue_reqs.add(prefix_filename)
+    process = None
     try:
+        # Запускаем скрипт как подпроцесс
+        process = subprocess.Popen([sys.executable, COMF_PATH, "--listen", "127.0.0.1"])
+        logger.debug(f'Subprocess started with PID: {process.pid}')
+
         # Ожидание запуска сервера
         for _ in range(20):  # Максимум 20 секунд ожидания
-            if check_server_ready(new_port):  # Вам нужно реализовать эту функцию
+            if check_server_ready():
                 break
             time.sleep(1)
         else:
@@ -112,31 +112,33 @@ def generate_image(prompt, image):
         start_time = time.time()
         while time.time() - start_time < timeout:
             latest_image = wait_for_image_with_prefix(OUTPUT_DIR, prefix_filename)
-            if latest_image != previous_image:
+            if latest_image:
                 logger.debug(f"file is: {latest_image}")
-                with open(latest_image, 'rb') as f:
-                    photo = file.read()
-                logger.debug(f"file bytes size: {len(photo)}")
-                delete_image_file(latest_image)
-                return io.BytesIO(photo)
+                try:
+                    with open(latest_image, 'rb') as f:
+                        photo = f.read()
+                    logger.debug(f"file bytes size: {len(photo)}")
+                    return io.BytesIO(photo)
+                finally:
+                    delete_image_file(latest_image)
             time.sleep(1)
 
         raise TimeoutError("New image was not generated in time")
 
     except Exception as e:
         logger.error(f"Error in generate_image: {e}")
-        raise
+        return None
+
     finally:
-        # Завершаем подпроцесс
-        if process.poll() is None:
+        queue_reqs.remove(prefix_filename)
+        if len(queue_reqs) == 0 and process and process.poll() is None:
             process.terminate()
             try:
                 process.wait(timeout=5)
             except subprocess.TimeoutExpired:
-                process.kill()        
-        
-        #logger.error("No new image was generated")
-        return latest_image
+                process.kill()
+
+
 
 
 if __name__ == "__main__":