extract s3uploadimage from all and index methods

src/endpoints/generate.py

@@ -48,17 +48,8 @@ async def generate(user: User, index: int | None = None) -> GenerateResult:
 async def generate_index(user: User, index: int) -> GenerateResult:
     s3 = s3client()
 
-    output_path = os.path.join(IMAGE_STORE_PATH, f"{user.uuid}-{str(index).zfill(2)}.png")
-    used_model = model.model_cols[get_model(index)]
-    image = generate_img_index(reloaded_model=used_model, index=index % 11)
-    save_img(image, output_path)
-
-    s3_path: str = f"{user.uuid}/{str(index).zfill(2)}.png"
-    s3.upload_file(output_path, BUCKET_NAME, s3_path)
-    img_url: str = f'https://{BUCKET_NAME}.s3.amazonaws.com/{s3_path}'
-
-    result: List[ImageResult] = [ImageResult(index=index, image_url=img_url)]
-    os.remove(output_path)
+    img_detail = s3uploadimage(user, s3, index)
+    result: List[ImageResult] = [img_detail]
 
     s3.close()
 
@@ -70,21 +61,26 @@ async def generate_all(user: User):
     result: List[ImageResult] = []
 
     for index in range(0, 88):
-        output_path = os.path.join(IMAGE_STORE_PATH, f"{user.uuid}-{str(index).zfill(2)}.png")
-        used_model = model.model_cols[get_model(index)]
-        image = generate_img_index(reloaded_model=used_model, index=index % 11)
-        save_img(image, output_path)
-
-        s3_path: str = f"{user.uuid}/{str(index).zfill(2)}.png"
-        s3.upload_file(output_path, BUCKET_NAME, s3_path)
-        image_url = f'https://{BUCKET_NAME}.s3.amazonaws.com/{s3_path}'
-
-        img_detail = ImageResult(index=index,
-                                 image_url=image_url)
+        img_detail = s3uploadimage(user, s3, index)
         result.append(img_detail)
 
-        os.remove(output_path)
-
     s3.close()
 
     return GenerateResult(user=user, method=Method.all, result=result)
+
+
+def s3uploadimage(user, s3, index):
+    output_path = os.path.join(
+        IMAGE_STORE_PATH, f"{user.uuid}-{str(index).zfill(2)}.png")
+    used_model = model.model_cols[get_model(index)]
+    image = generate_img_index(reloaded_model=used_model, index=index % 11)
+    save_img(image, output_path)
+
+    s3_path: str = f"{user.uuid}/{str(index).zfill(2)}.png"
+    s3.upload_file(output_path, BUCKET_NAME, s3_path)
+    image_url = f'https://{BUCKET_NAME}.s3.amazonaws.com/{s3_path}'
+
+    img_detail = ImageResult(index=index,
+                             image_url=image_url)
+    os.remove(output_path)
+    return img_detail