Update src/util.py

src/util.py

@@ -16,8 +16,8 @@ bucket_name = os.getenv("BUCKET_NAME")
 endpoint = os.getenv("ENDPOINT")
 
 bucket = oss2.Bucket(oss2.Auth(access_key_id, access_key_secret), endpoint, bucket_name)
-oss_path = "hejunjie.hjj/TransferAnythingHF"
-oss_path_img_gallery = "hejunjie.hjj/TransferAnythingHF_img_gallery"
+oss_path = "nightfury.abc/ImageSynthesizerHF"
+oss_path_img_gallery = "nightfury.abc/ImageSynthesizerHF_img_gallery"
 
 
 def download_img_pil(index, img_url):
@@ -43,7 +43,7 @@ def download_images(img_urls, batch_size):
             ret = future.result()
             # worker_results.append(ret)
             index, img_pil = ret
-            imgs_pil[index] = img_pil  # 按顺序排列url，后续下载关联的图片或者svg需要使用
+            imgs_pil[index] = img_pil  # Arrange the URLs in order, which will be used to download the associated images or svg later.
 
     return imgs_pil
 
@@ -62,8 +62,8 @@ def upload_np_2_oss(input_image, name="cache.png", gallery=False):
     else:
         path = oss_path
 
-    bucket.put_object(path + "/" + name, imgByteArr)  # data为数据，可以是图片
-    ret = bucket.sign_url('GET', path + "/" + name, 60 * 60 * 24)  # 返回值为链接，参数依次为，方法/oss上文件路径/过期时间(s)
+    bucket.put_object(path + "/" + name, imgByteArr)  # data is data, which can be a picture
+    ret = bucket.sign_url('GET', path + "/" + name, 60 * 60 * 24)  # The return value is the link, and the parameters are, in order, method/file path on oss/expiration time (s)
     del imgByteArr
     return ret
 
@@ -74,8 +74,8 @@ def upload_json_string_2_oss(jsonStr, name="cache.txt", gallery=False):
     else:
         path = oss_path
 
-    bucket.put_object(path + "/" + name, bytes(jsonStr, "utf-8"))  # data为数据
-    ret = bucket.sign_url('GET', path + "/" + name, 60 * 60 * 24)  # 返回值为链接，参数依次为，方法/oss上文件路径/过期时间(s)
+    bucket.put_object(path + "/" + name, bytes(jsonStr, "utf-8"))  # data is data
+    ret = bucket.sign_url('GET', path + "/" + name, 60 * 60 * 24)  # The return value is the link, and the parameters are, in order, method/file path on oss/expiration time (s)
     return ret
 
 
@@ -128,15 +128,15 @@ def upload_preprocess(pil_base_image_rgba, pil_layout_image_dict, pil_style_imag
 
 
 def pad_image(image, target_size):
-    iw, ih = image.size  # 原始图像的尺寸
-    w, h = target_size  # 目标图像的尺寸
-    scale = min(w / iw, h / ih)  # 转换的最小比例
-    # 保证长或宽，至少一个符合目标图像的尺寸 0.5保证四舍五入
+    iw, ih = image.size  # Original image size
+    w, h = target_size  # The size of the target image
+    scale = min(w / iw, h / ih)  # minimum ratio to convert
+    # Guaranteed length or width, at least one size that fits the target image 0.5 guarantees rounding
     nw = int(iw * scale + 0.5)
     nh = int(ih * scale + 0.5)
-    image = image.resize((nw, nh), Image.BICUBIC)  # 更改图像尺寸，双立法插值效果很好
-    new_image = Image.new('RGB', target_size, (255, 255, 255))  # 生成白色图像
-    new_image.paste(image, ((w - nw) // 2, (h - nh) // 2))  # 将图像填充为中间图像，两侧为黑色的样式
+    image = image.resize((nw, nh), Image.BICUBIC)  # Changing the image size, bi-legislative interpolation works well
+    new_image = Image.new('RGB', target_size, (255, 255, 255))  # generate white image
+    new_image.paste(image, ((w - nw) // 2, (h - nh) // 2))  # Style that fills the image with the middle image and black on both sides
     return new_image
 
 
@@ -152,17 +152,17 @@ def add_text(image, text):
     image = Image.blend(image, text_image, 0.5)
 
     image_draw = ImageDraw.Draw(image)
-    fillColor = (0, 0, 0, 255)  # 文字颜色：黑色
-    pos = (0, 0)  # 文本左上角位置 (离左边界距离， 离上边界距离)
+    fillColor = (0, 0, 0, 255)  # Text color: black
+    pos = (0, 0)  # The position of the upper left corner of the text (distance from the left border, distance from the top border)
     image_draw.text(pos, text, font=ttf, fill=fillColor)
     return image.convert("RGB")
 
 
 def compose_image(image_list, text_list, pil_size, nrow, ncol):
-    w, h = pil_size  # 每张小图片大小
+    w, h = pil_size  # Each small picture size
 
     if len(image_list) > nrow * ncol:
-        raise ValueError("合成图片的参数和要求的数量不能匹配！")
+        raise ValueError("The parameters of the composite image and the required quantity do not match！")
 
     assert len(image_list) == len(text_list)
     new_image_list = []
@@ -173,7 +173,7 @@ def compose_image(image_list, text_list, pil_size, nrow, ncol):
             new_text_list.append(text)
     if len(new_image_list) == 1:
         ncol = nrow = 1
-    to_image = Image.new('RGB', (ncol * w, nrow * h), (255, 255, 255))  # 创建一个新图
+    to_image = Image.new('RGB', (ncol * w, nrow * h), (255, 255, 255))  # Create a new diagram
     for y in range(1, nrow + 1):
         for x in range(1, ncol + 1):
             if ncol * (y - 1) + x - 1 < len(new_image_list):