update V1.3.0L Beta

beta_fn.py

@@ -0,0 +1,46 @@
+import pre
+import gradio as gr
+
+import preset_fn
+
+
+
+
+
+
+def save(preset_name, artist_name, group_name, company_name, top_logo_img, qr_logo_img, sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12, userid, user_name):
+    
+
+    group_name_radio = gr.Radio(choices=pre.groups, label="Group Name")
+    member_name_dropdown = gr.Dropdown(choices=pre.names, label="Member Name", allow_custom_value=True)
+    logo_radio = gr.Radio(choices=pre.groups, label="Add Logo", interactive=True, value="None")
+    sign = gr.Dropdown(choices=pre.names, label="Sign", type='index')
+    qr_Logo_radio = gr.Radio(["tripleS", "None"], label="QR Logo", value="None", interactive=True)
+
+
+    signs = [sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12]
+
+    if any(arg is None for arg in (preset_name, artist_name, group_name, company_name, top_logo_img, qr_logo_img)):
+        gr.Warning("Fill all blank")
+        return group_name_radio, member_name_dropdown, logo_radio, sign, qr_Logo_radio, sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12
+
+    for i in range(len(artist_name)):
+        if signs[i] is None:
+            gr.Warning("Fill all blank")
+            return group_name_radio, member_name_dropdown, logo_radio, sign, qr_Logo_radio, sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12
+
+
+
+
+    group_name_radio = gr.Radio(choices=[group_name] + pre.groups_Other, label="Group Name", value=group_name)
+    member_name_dropdown = gr.Dropdown(choices=artist_name, label="Member Name", allow_custom_value=True, value=artist_name[0])
+    logo_radio = gr.Radio(choices=[group_name] + pre.groups, label="Add Logo", interactive=True, value=group_name)
+    sign = gr.Dropdown(choices=artist_name + pre.names, label="Sign", type='index', value=artist_name[0])
+    qr_Logo_radio = gr.Radio([group_name] + ["tripleS", "None"], label="QR Logo", value=group_name, interactive=True)
+
+    preset_id = preset_fn.create(userid, user_name, preset_name, group_name, artist_name, company_name, top_logo_img, qr_logo_img, sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12)
+
+    folders = preset_fn.refresh_folder()
+    preset = gr.Dropdown(choices=folders, value=preset_id)
+
+    return group_name_radio, member_name_dropdown, logo_radio, sign, qr_Logo_radio, preset

fns.py

@@ -1,3 +1,5 @@
+import pickle
+
 import gradio as gr
 import random
 import shutil
@@ -5,6 +7,8 @@ import fn
 import edimg
 import os
 
+import pre
+
 
 def change_img_type(a):
     if a == "Image":
@@ -46,17 +50,30 @@ def txt_color_update(txt_color_picker):
 
 
 
-def group_member_name_update(a):
+def group_member_name_update(a, artist_name, folder):
     if a == "Other":
-        return gr.Textbox(visible=True), gr.Dropdown([], label="Name", allow_custom_value=True)
+        return gr.Textbox(visible=True), gr.Dropdown([], label="Member Name", allow_custom_value=True)
     elif a == "tripleS":
         return gr.Textbox(visible=False), gr.Dropdown(
             ["SeoYeon", "HyeRin", "JiWoo", "ChaeYeon", "YooYeon", "SooMin", "NaKyoung", "YuBin", "Kaede", "DaHyun",
-             "Kotone", "YeonJi", "Nien", "SoHyun", "Xinyu", "Mayu", "Lynn", "JooBin", "HaYeon", "ShiOn", "ChaeWon", "Sullin", "SeoAh", "JiYeon"], label="Name",
+             "Kotone", "YeonJi", "Nien", "SoHyun", "Xinyu", "Mayu", "Lynn", "JooBin", "HaYeon", "ShiOn", "ChaeWon", "Sullin", "SeoAh", "JiYeon"], label="Member Name",
             allow_custom_value=True)
     elif a == "ARTMS":
         return gr.Textbox(visible=False), gr.Dropdown(["HeeJin", "JinSoul", "Kim Lip", "Choerry", "HaSeul"],
-                                                      label="Name", allow_custom_value=True)
+                                                      label="Member Name", allow_custom_value=True)
+    else:
+
+        directory_path = f"/data/presets/{folder}"
+
+        with open(f'{directory_path}/data.pkl', 'rb') as f:
+            data = pickle.load(f)
+
+        group_name = data['group']
+        artist_name = data['artist']
+
+        member_name_dropdown = gr.Dropdown(choices=artist_name, label="Member Name", allow_custom_value=True,
+                                           value=artist_name[0])
+        return gr.Textbox(visible=False), member_name_dropdown
 
 
 def alphabet_txt_update(a):
@@ -67,12 +84,9 @@ def alphabet_txt_update(a):
 
 
 def serial_random():
-    ran1 = random.randrange(0, 9)
-    ran2 = random.randrange(0, 9)
-    ran3 = random.randrange(0, 9)
-    ran4 = random.randrange(0, 9)
-    ran5 = random.randrange(0, 9)
-    return gr.Textbox(value=f"{ran1}{ran2}{ran3}{ran4}{ran5}")
+    random_number = random.randint(0, 99999)
+    formatted_number = f"{random_number:05}"
+    return gr.Textbox(value=formatted_number)
 
 def frame_color_update(a):
     if a == "Other":
@@ -113,6 +127,10 @@ def refresh():
     # 현재 작업 디렉토리의 폴더 이름들을 튜플로 반환 (특정 폴더 제외)
     return folders_tuple
 
+
+
+
+
 def dev():
     folders = refresh()
     return "Do", gr.Dropdown(folders, visible=True, interactive=True)
@@ -161,3 +179,19 @@ def txt_class_visibility(a):
     else:
         return gr.Textbox(visible=False)
 
+def custom_name(count):
+    visibilities = [True] * len(count) + [False] * (12 - len(count))
+    return (
+        gr.Image(label=count[0] if len(count) > 0 else 'Sign', visible=visibilities[0]),
+        gr.Image(label=count[1] if len(count) > 1 else 'Sign', visible=visibilities[1]),
+        gr.Image(label=count[2] if len(count) > 2 else 'Sign', visible=visibilities[2]),
+        gr.Image(label=count[3] if len(count) > 3 else 'Sign', visible=visibilities[3]),
+        gr.Image(label=count[4] if len(count) > 4 else 'Sign', visible=visibilities[4]),
+        gr.Image(label=count[5] if len(count) > 5 else 'Sign', visible=visibilities[5]),
+        gr.Image(label=count[6] if len(count) > 6 else 'Sign', visible=visibilities[6]),
+        gr.Image(label=count[7] if len(count) > 7 else 'Sign', visible=visibilities[7]),
+        gr.Image(label=count[8] if len(count) > 8 else 'Sign', visible=visibilities[8]),
+        gr.Image(label=count[9] if len(count) > 9 else 'Sign', visible=visibilities[9]),
+        gr.Image(label=count[10] if len(count) > 10 else 'Sign', visible=visibilities[10]),
+        gr.Image(label=count[11] if len(count) > 11 else 'Sign', visible=visibilities[11])
+    )

generate.py

@@ -89,10 +89,14 @@ def front_static(img, obj_color, obj_color_picker, ai_num, txt_color, txt_color_
         case "ARTMS":
             img_artms_side = edimg.color("resource/artms_side.png", txt_color_hex)
             img.paste(img_artms_side, (1081, 1371), img_artms_side)
-
         case "Other":
             img_group_name = edimg.txt(group_name_txt, txt_color_r, txt_color_g, txt_color_b, 61, 270, "r")
             img.paste(img_group_name, (1050, 1240), img_group_name)
+        case None:
+            pass
+        case _:
+            img_group_name = edimg.txt(group_name_radio, txt_color_r, txt_color_g, txt_color_b, 61, 270, "r")
+            img.paste(img_group_name, (1050, 1240), img_group_name)
 
     if obj_num != "" and obj_alphabet != "":
         if obj_alphabet == "Other":
@@ -113,6 +117,7 @@ def front_static(img, obj_color, obj_color_picker, ai_num, txt_color, txt_color_
 
 back_ui = Image.open("resource/back_ui.png")
 outline_ui = Image.open("resource/outline.png")
+outline_ui_oma = Image.open("resource/outline_oma.png")
 
 
 sign_positions = {
@@ -152,18 +157,22 @@ cream01 = Image.open("resource/cream01.png")
 atom01 = Image.open("resource/atom01.png")
 binary01 = Image.open("resource/binary01.png")
 divine01 = Image.open("resource/divine01.png")
-oma_frame = Image.open("resource/oma_frame.png")
 
 right_modhaus = Image.open("resource/right_modhaus.png")
 img_qr_white_space = Image.new("RGB", (335, 335), 'white')
-def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group_name_radio, group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt, obj_serial, obj_outline_color, obj_outline_color_picker, logo_radio, class_radio, class_txt, season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown, qr_Logo_radio, right_btn, rounded_back):
+def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group_name_radio, group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt, obj_serial, obj_outline_color, obj_outline_color_picker, logo_radio, class_radio, class_txt, season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown, qr_Logo_radio, right_btn, rounded_back, preset):
+    if obj_color == 'OMA':
+        frame = outline_ui_oma
+    else:
+        frame = outline_ui
+
     match obj_outline_color:
         case "White":
-            outline = edimg.color(outline_ui, "#FFFFFF")
+            outline = edimg.color(frame, "#FFFFFF")
         case "Black":
-            outline = edimg.color(outline_ui, "#000000")
+            outline = edimg.color(frame, "#000000")
         case _:
-            outline = edimg.color(outline_ui, obj_outline_color_picker)
+            outline = edimg.color(frame, obj_outline_color_picker)
 
 
 
@@ -192,6 +201,7 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
         case _:
             img = Image.new("RGB", (1164, 1800), "#FFFFFF")
 
+
     img.paste(outline, (0,0), outline)
 
     match txt_color:
@@ -220,6 +230,20 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
         case "ARTMS":
             logo = edimg.color('resource/artms_logo.png', txt_color_hex)
             img.paste(logo, (61, 162), logo)
+        case 'None':
+            pass
+        case _:
+            logo = edimg.color(f'/data/presets/{preset}/top_logo.png', txt_color_hex)
+            width, height = logo.size
+
+            # Calculate the new width to maintain the aspect ratio
+            new_height = 117
+            aspect_ratio = width / height
+            new_width = int(new_height * aspect_ratio)
+
+            # Resize the image
+            logo = logo.resize((new_width, new_height), Image.Resampling.LANCZOS)
+            img.paste(logo, (57, 151), logo)
 
 
     if member_name_dropdown:
@@ -239,7 +263,6 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
         if obj_serial:
             img_obj_serial_side = edimg.serial(obj_serial, txt_color_r,txt_color_g,txt_color_b, 75)
             img.paste(img_obj_serial_side, (943, 867), img_obj_serial_side)
-
     match group_name_radio:
         case "tripleS":
             img_group_name_side = edimg.txt("tripleS", txt_color_r, txt_color_g, txt_color_b, 61, 270, "r")
@@ -251,6 +274,12 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
             img_group_name_side = edimg.txt(group_name_txt, txt_color_r, txt_color_g, txt_color_b, 61, 270, "r")
             img.paste(img_group_name_side, (943, 1238), img_group_name_side)
             group_name_radio = group_name_txt
+        case None:
+            pass
+        case _:
+            img_group_name_side = edimg.txt(group_name_radio, txt_color_r, txt_color_g, txt_color_b, 61, 270, "r")
+            img.paste(img_group_name_side, (943, 1238), img_group_name_side)
+            group_name_radio = group_name_txt
 
     match class_radio:
         case "Zero" | "First" | "Double" | "Special":
@@ -307,8 +336,7 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
     if right_btn:
         img_right_modhaus = edimg.color(right_modhaus, txt_color_hex)
         img.paste(img_right_modhaus, (61,1604), img_right_modhaus)
-    if obj_color == "OMA":
-        img.paste(oma_frame, (0, 0), oma_frame)
+
     if rounded_back:
         img = edimg.rounded(img)
 
@@ -363,89 +391,5 @@ def ex_gen(img_front, file_front_path, img_back, count, blur, blur_strength, wat
 
 
 
-underbar = Image.open("event/under.png")
-
-def event(event_img, event_radio, event_txt, position):
-    if event_img == None:
-        gr.Warning("Upload the image first")
-        return "resource/upload_first.png"
-
-    img_jpeg = event_img.convert('RGB')
-    krtime = fn.get_kr_time()
-    img_jpeg.save(
-        f'/data/cache/event_original_{krtime}.jpg',
-        quality=90)
-
-    #txt가 x700 넘을때 경우 나누기
-
-    images_list = []
-
-    # 반복문을 사용하여 이미지 생성 및 추가
-    for i in range(4):
-
-        event_img_s = event_img.copy()
-        event_black = Image.open("event/Black.png")
-        event_white = Image.open("event/White.png")
-        match event_radio:
-            case "White":
-                r = 255
-                g = 255
-                b = 255
-                hex = "#FFFFFF"
-                event_img_gnd = event_white
-            case "Black":
-                r = 0
-                g = 0
-                b = 0
-                hex = "#000"
-                event_img_gnd = event_black
-            case _:
-                r = 0
-                g = 0
-                b = 0
-                hex = "#000"
-                event_img_gnd = event_black
-
-        i1 = i + 1
-        x = edimg.calculate_size(event_txt, 260, f"event/{i1}.ttf")
-        match i:
-            case 0:
-                offset_x = -30
-                offset_y = 0
-            case 1:
-                offset_x = 80
-                offset_y = 0
-            case 2:
-                offset_x = 0
-                offset_y = 0
-            case 3:
-                offset_x = 70
-                offset_y = 20
-            case _:
-                offset_x = 0
-                offset_y = 0
-        img_txt = edimg.txt(event_txt, r, g, b, 260, 0, "l", f"event/{i1}.ttf", (3000, 370 - offset_y))
-        x_half = x / 2
-        event_img_gnd.paste(img_txt, (2434 - int(x_half), 0), img_txt)
-        x, y = event_img_s.size
-        x1, y1 = event_img_gnd.size
-        y2 = x * y1 / x1
-        event_img_gnd = edimg.resize_img(event_img_gnd, int(x), int(y2))
-        y3 = find_value(y - y2, position)
-        event_img_s.paste(event_img_gnd, (0, int(y3)), event_img_gnd)
-        img_jpeg = event_img_s.convert('RGB')
-        krtime = fn.get_kr_time()
-        img_jpeg.save(
-            f'/data/cache/event_{krtime}_{i1}.jpg',
-            quality=70)
-        # 이미지 리스트에 추가
-
-        images_list.append(event_img_s)
-
-    
-
-    return images_list
-
-
 def find_value(n, percent):
     return n * (percent / 100.0)

login_discord.py

@@ -2,23 +2,25 @@ import requests
 import gradio as gr
 from urllib.parse import urlparse, parse_qs
 
+import pre
+
+
 def id_check(request: gr.Request):
     param = str(request.query_params)
     if not "code=" in param:
-        return "Login to Discord", gr.Tab(visible=False), gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "Other color", "AI Color"], label="Objekt Color", value="Divine01"), gr.Tab(visible=False)
+        return "Login to Discord", gr.Tab(visible=False), gr.Tab(visible=False), '', gr.Tab(visible=False), gr.Dropdown(visible=False)
 
     code = param.split('code=')
     print(code[1])
 
     user_id, username, avatar_url = get_discord_user_profile(str(code[1]))
     if user_id == None:
-        return "Login to Discord", gr.Tab(visible=False)
+        return "Login to Discord", gr.Tab(visible=False), gr.Tab(visible=False), '', gr.Tab(visible=False), gr.Dropdown(visible=False)
     if user_id == "412827396027187211":
-        return gr.Button(value=username, icon=avatar_url, link=redirect_uri), gr.Tab(visible=True), gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "OMA", "Other color", "AI Color"], label="Objekt Color", value="Divine01"), gr.Tab(visible=True)
-    if user_id == "676049087300239369":
-        return gr.Button(value=username, icon=avatar_url, link=redirect_uri), gr.Tab(visible=False), gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "OMA", "Other color", "AI Color"],label="Objekt Color", value="Divine01"), gr.Tab(visible=True)
+        return gr.Button(value=username, icon=avatar_url, link=redirect_uri), gr.Tab(visible=True), gr.Tab(visible=True), user_id, gr.Tab(visible=True), gr.Dropdown(visible=True)
+
     print(user_id)
-    return gr.Button(value=username, icon=avatar_url, link=redirect_uri), gr.Tab(visible=False), gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "Other color", "AI Color"], label="Objekt Color", value="Cream01"), gr.Tab(visible=False)
+    return gr.Button(value=username, icon=avatar_url, link=redirect_uri), gr.Tab(visible=False), gr.Tab(visible=False), user_id, gr.Tab(visible=True), gr.Dropdown(visible=True)
 #1
 
 def get_discord_user_profile(code):
@@ -62,11 +64,13 @@ def get_discord_user_profile(code):
     except requests.exceptions.RequestException as e:
         print("Error to login")
         # print(str(e))  # 오류 내용 출력을 원한다면 주석 해제
-        return "Login to Discord", gr.Tab(visible=False), gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "Other color", "AI Color"], label="Objekt Color", value="Divine01"), gr.Tab(visible=False)  # 오류 발생시 None 반환
+        return None, None, None
 
 # 사용 예:
 client_id = "1239473790732472370"
 client_secret = "C7RLdB4YArSM9jVk8tsznQnKOzwGKwsO"
 # code = "THE_CODE_FROM_REDIRECT_URI"
-redirect_uri = "https://chohj06ms-objektify2.hf.space/"
+#redirect_uri = "https://chohj06ms-objektify2.hf.space/"
+redirect_uri = pre.login_uri
+
 

main.py

@@ -1,8 +1,12 @@
 import gradio as gr
+
+import beta_fn
 import fns
 import generate
 import login_discord
+import preset_fn
 import rekord
+import pre
 
 js_func = """
 function refresh() {
@@ -14,23 +18,37 @@ function refresh() {
     }
 }
 """
-with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
+
+
+theme = gr.themes.Soft(
+    secondary_hue="violet",
+    text_size="sm",
+    spacing_size="sm",
+    radius_size="lg",
+).set(
+    block_background_fill='*secondary_50'
+)
+
+
+login_uri = pre.login_uri
+
+
+with gr.Blocks(theme=theme) as demo: # , js=js_func
     with gr.Column():
         with gr.Row():
             gr.Markdown(
             """
             # Objektify
             """)
-            login = gr.Button(size="sm", value="Login to Discord", link="https://discord.com/oauth2/authorize?client_id=1239473790732472370&response_type=code&redirect_uri=https%3A%2F%2Fchohj06ms-objektify2.hf.space%2F&scope=identify", scale=0)
-
-        gr.Markdown(
-            """
-            ### [Join objektify official discord!](https://discord.gg/K44Ka83BYT)
-            ## Input image and Select Options
-            """
-        )
-
-
+            login = gr.Button(size="sm", value="Login to Discord", link=f"https://discord.com/oauth2/authorize?client_id=1239473790732472370&response_type=code&redirect_uri={login_uri}&scope=identify", scale=0)
+        with gr.Row():
+            gr.Markdown(
+                """
+                ### [Join objektify official discord!](https://discord.com/invite/KAuTCUGXpH)
+                ## Input image and Select Options
+                """
+            )
+            preset = gr.Dropdown(scale=0, label='Preset', interactive=True, allow_custom_value=False, type='value', visible=False)
 
 
     with gr.Tab("Front"):
@@ -49,8 +67,8 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
 
 
             with gr.Column():       #2
-                with gr.Group():        #objekt color
-                    obj_color = gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "Other color", "AI Color"], label="Objekt Color", value="Cream01")
+                with gr.Accordion(label='Colors'):        #objekt color
+                    obj_color = gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "OMA","Other color", "AI Color"], value="Cream01", label='Objekt Color')
 
                     with gr.Row():
                         ai_num = gr.Slider(1, 1000, 500, label="AI Serial", visible=False, step=1)
@@ -61,27 +79,25 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
                     obj_color.change(fn=fns.obj_color_update, inputs=obj_color, outputs=[obj_color_picker, ai_num, change_ai])
 
 
-                with gr.Group():
+
                     txt_color = gr.Radio(["White", "Black", "Other"], label="Text Color", value="Black")
                     txt_color_picker = gr.ColorPicker(label="Other Text Color", value="#ffffff", visible=False, interactive=True)
                     txt_color.change(fns.txt_color_update, txt_color, txt_color_picker)
-                with gr.Group():
-                    group_name_radio = gr.Radio(["tripleS", "ARTMS", "Other"], label="Group Name")
+
+
+                with gr.Accordion('Names'):
+                    group_name_radio = gr.Radio(choices=pre.groups_Other, label="Group Name")
                     group_name_txt = gr.Textbox(label="Other Group name", placeholder="CLASSY", visible=False, interactive=True)
 
-                with gr.Group():
-                    member_name_dropdown = gr.Dropdown(
-                        ["SeoYeon", "HyeRin", "JiWoo", "ChaeYeon", "YooYeon", "SooMin", "NaKyoung", "YuBin", "Kaede",
-                         "DaHyun", "Kotone", "YeonJi", "Nien", "SoHyun", "Xinyu", "Mayu", "Lynn", "JooBin", "HaYeon",
-                         "ShiOn", "ChaeWon", "Sullin", "SeoAh", "JiYeon"], label="Member Name", allow_custom_value=True)
 
-                    group_name_radio.change(fns.group_member_name_update, group_name_radio, [group_name_txt, member_name_dropdown])
+                    member_name_dropdown = gr.Dropdown(choices=pre.names, label="Member Name", allow_custom_value=True)
+
 
 
                 with gr.Accordion("Add Objekt Number", open=False):
                     with gr.Row():
                         obj_num = gr.Textbox(label="Objekt Number", placeholder="100", interactive=True, visible=True, scale=1)
-                        obj_alphabet = gr.Radio(["Z", "A", "Other"], label="Z or A", interactive=True, visible=True, scale=1)
+                        obj_alphabet = gr.Radio(["Z", "A", "Other"], label="Z or A", interactive=True, visible=True, scale=1, value='Z')
                         obj_alphabet_txt = gr.Textbox(label="Alphabet", placeholder="S", interactive=True, visible=False, scale=1)
 
                         obj_alphabet.change(fns.alphabet_txt_update, obj_alphabet, obj_alphabet_txt)
@@ -107,24 +123,24 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
     with gr.Tab("Back") as back_tab:
         with gr.Row():
             preview = gr.Image(label="Image", interactive=False)
+
             with gr.Column():
-                with gr.Group():
+                with gr.Accordion('Contents'):
                     obj_outline_color = gr.Radio(["White", "Black", "Other"], label="Frame color", value="White")
                     obj_outline_color_picker = gr.ColorPicker(label="Other Outline Color", value="#ffffff", visible=False, interactive=True)
 
                     obj_outline_color.change(fns.frame_color_update, obj_outline_color, obj_outline_color_picker)
 
-                with gr.Group():
-                    logo_radio = gr.Radio(["tripleS", "ARTMS", "None"], label="Add Logo", interactive=True, value="None")
+                    logo_radio = gr.Radio(choices=pre.groups, label="Add Logo", interactive=True, value="None")
 
 
-                with gr.Group():
+                with gr.Accordion('Texts'):
                     class_radio = gr.Radio(["Zero", "First", "Double", "Special", "Other"], label="CLASS", visible=True)
                     class_txt = gr.Textbox(label="Other class", placeholder="Third", visible=False)
 
                     class_radio.change(fns.txt_class_visibility, class_radio, class_txt)
 
-                with gr.Group():
+
                     season_radio = gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Other"], label="SEASON", type="value")
 
                     with gr.Row():
@@ -133,23 +149,19 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
 
                     season_radio.change(fns.txt_season_visibility, season_radio, [season_txt, season_txt_outline])
 
-                with gr.Group():
-                    sign = gr.Dropdown(
-                        ["SeoYeon", "HyeRin", "JiWoo", "ChaeYeon", "YooYeon", "SooMin", "NaKyoung", "YuBin", "Kaede",
-                         "DaHyun", "Kotone", "YeonJi", "Nien", "SoHyun", "Xinyu", "Mayu", "Lynn", "JooBin", "HaYeon",
-                         "ShiOn", "ChaeWon", "Sullin", "SeoAh", "JiYeon", "HeeJin", "KimLip", "JinSoul", "Choerry", "HaSeul"], label="Sign", type='index')
-                with gr.Group():
-                    qr_url_dropdown = gr.Dropdown(["tripleS website", "tripleS youtube", "tripleS 𝕏", "tripleS discord"],
-                                         label="qr url", info="Can write any url", allow_custom_value=True)
-                    with gr.Row():
-                        qr_Logo_radio = gr.Radio(["tripleS", "None"], label="tripleS Logo", value="None",
-                                              interactive=True)
-                with gr.Group():
-                    right_btn = gr.Checkbox(label="Add Rights", value=False, interactive=True)
-                with gr.Group():
-                    rounded_back = gr.Checkbox(label="Rounded", value=True, interactive=True)
-                with gr.Group():
-                    generate_btn_back = gr.Button(value="Generate")
+
+                sign = gr.Dropdown(choices=pre.names, label="Sign", type='index')
+
+
+                with gr.Accordion('QR Options'):
+                    qr_url_dropdown = gr.Dropdown(["tripleS website", "tripleS youtube", "tripleS 𝕏", "tripleS discord"], label="QR url", info="Can write any url", allow_custom_value=True, value='https://objektify.wav.haus')
+
+                    qr_Logo_radio = gr.Radio(["tripleS", "None"], label="QR Logo", value="None", interactive=True)
+
+
+                right_btn = gr.Checkbox(label="Add Rights", value=False, interactive=True)
+                rounded_back = gr.Checkbox(label="Rounded", value=True, interactive=True)
+                generate_btn_back = gr.Button(value="Generate")
 
             with gr.Column():
                 outputs2 = gr.Image(label="Edited Image", scale=10)
@@ -175,25 +187,51 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
         with gr.Row():
             ex_img_f_out = gr.Image(label="Front", interactive=False)
             ex_img_b_out = gr.Image(label="Back", visible=False, interactive=False)
-    with gr.Tab("Event"):
+
+
+    with gr.Tab("Beta", visible=True) as beta:
+        gr.Markdown(
+            """
+            ## This is the beta channel for testing new features.
+            ### Please join [here](https://discord.com/invite/KAuTCUGXpH) to report bugs and provide feedback.
+            """
+        )
         with gr.Row():
             with gr.Column():
-                event_img = gr.Image(label="Image", interactive=True, sources=['upload', 'clipboard'], type="pil", visible=True, scale=10)
-            with gr.Column():
-                event_radio = gr.Radio(["White", "Black"], value="White", interactive=True, label="Font")
-                event_txt = gr.Textbox(label="Girls Never ____", placeholder="Die")
-                event_position = gr.Slider(label="Y position", maximum=100, minimum=0)
-                event_generate = gr.Button(value="Generate")
-            with gr.Column():
-                event_output = gr.Gallery(label="output", interactive=False, type="pil", visible=True, scale=10, object_fit="scale-down")
-            event_generate.click(fn=generate.event, inputs=[event_img, event_radio, event_txt, event_position], outputs=event_output)
+                preset_name = gr.Textbox(label="Set preset name", placeholder="aespa winter")
+                artist_name = gr.Dropdown(label="Artist name", multiselect=True, allow_custom_value=True, info="Press Enter to add more than 1 people (Max 12)", max_choices=12)
+                group_name = gr.Textbox(label="Group name", placeholder="aespa")
+                company_name = gr.Textbox(label="Company name", placeholder="SM ent")
+
+            top_logo_img = gr.Image(label="Top Logo", type='pil')
+            qr_logo_img = gr.Image(label="QR Logo", type='pil')
+
+        with gr.Accordion('Signs', open=True):
+            with gr.Row():
+                sign_img1 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img2 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img3 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img4 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+            with gr.Row():
+                sign_img5 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img6 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img7 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img8 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+            with gr.Row():
+                sign_img9 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img10 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img11 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+                sign_img12 = gr.Image(label="Sign", visible=False, interactive=True, type='pil')
+
+        save = gr.Button(value="Save and Apply all")
+
+
+        artist_name.change(fn=fns.custom_name, inputs=artist_name, outputs=[sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12])
+
     with gr.Tab("ReKord", visible=False) as rec:
         rekord_img = gr.Image(type="filepath")
 
-        rekord_member = gr.Dropdown(
-                        ["SeoYeon", "HyeRin", "JiWoo", "ChaeYeon", "YooYeon", "SooMin", "NaKyoung", "YuBin", "Kaede",
-                         "DaHyun", "Kotone", "YeonJi", "Nien", "SoHyun", "Xinyu", "Mayu", "Lynn", "JooBin", "HaYeon",
-                         "ShiOn", "ChaeWon", "Sullin", "SeoAh", "JiYeon", "HeeJin", "KimLip", "JinSoul", "Choerry", "HaSeul"], label="Sign", type='index')
+        rekord_member = gr.Dropdown(choices=pre.names, label="Sign", type='index')
         rekord_submit = gr.Button()
         rekord_out = gr.Textbox()
         rekord_submit.click(fn=rekord.upload, inputs=[rekord_img, rekord_member], outputs=rekord_out)
@@ -219,11 +257,20 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
         ## Made by
         # Discord : hj_sss
         ## official discord
-        ### [Click here and Join](https://discord.gg/K44Ka83BYT)
+        ### [Click here and Join](https://discord.com/invite/KAuTCUGXpH)
         
         ### Members or group presets can be added and advertised. Check the official discord.
         #### Check the objektify official discord for licensing and other data processing policies.
         """)
+    userid = gr.Textbox(visible=False)
+
+    preset.change(fn=preset_fn.apply, inputs=preset,
+                  outputs=[group_name_radio, member_name_dropdown, logo_radio, sign, qr_Logo_radio, preset])
+
+    group_name_radio.change(fns.group_member_name_update, [group_name_radio, artist_name, preset], [group_name_txt, member_name_dropdown])
+
+    save.click(fn=beta_fn.save, inputs=[preset_name, artist_name, group_name, company_name, top_logo_img, qr_logo_img, sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12, userid, login], outputs=[group_name_radio, member_name_dropdown, logo_radio, sign, qr_Logo_radio, preset])
+
 
     generate_btn.click(fn=generate.sorting,
                        inputs=[img_type, img_static, img_dynamic_file, obj_color, obj_color_picker, ai_num, txt_color,
@@ -241,17 +288,18 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
                                     group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt,
                                     obj_serial, obj_outline_color, obj_outline_color_picker, logo_radio, class_radio,
                                     class_txt, season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown,
-                                    qr_Logo_radio, right_btn, rounded_back], outputs=[outputs2, ex_img_b])
+                                    qr_Logo_radio, right_btn, rounded_back, preset], outputs=[outputs2, ex_img_b])
 
     back_tab.select(fn=generate.back,
                     inputs=[obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group_name_radio,
                             group_name_txt, member_name_dropdown, obj_num, obj_alphabet, obj_alphabet_txt, obj_serial,
                             obj_outline_color, obj_outline_color_picker, logo_radio, class_radio, class_txt,
                             season_radio, season_txt, season_txt_outline, sign, qr_url_dropdown, qr_Logo_radio,
-                            right_btn, rounded_back], outputs=[preview, ex_img_b])
+                            right_btn, rounded_back, preset], outputs=[preview, ex_img_b])
 
     ex_btn.click(fn=generate.ex_gen, inputs=[ex_img_f, ex_file_f, ex_img_b, ex_gen_file_count, ex_hide_blur, ex_hide_blur_range, watermark], outputs=[ex_img_f_out, ex_img_b_out])
-    demo.load(fn=login_discord.id_check, outputs=[login, dev, obj_color, rec])
+    demo.load(fn=login_discord.id_check, outputs=[login, dev, rec, userid, beta, preset])
+    demo.load(fn=preset_fn.refresh, outputs=preset)
 
 
 

pre.py

@@ -0,0 +1,5 @@
+groups = ["tripleS", "ARTMS", "None"]
+groups_Other = ["tripleS", "ARTMS", "Other"]
+names = ["SeoYeon", "HyeRin", "JiWoo", "ChaeYeon", "YooYeon", "SooMin", "NaKyoung", "YuBin", "Kaede", "DaHyun", "Kotone", "YeonJi", "Nien", "SoHyun", "Xinyu", "Mayu", "Lynn", "JooBin", "HaYeon", "ShiOn", "ChaeWon", "Sullin", "SeoAh", "JiYeon", "HeeJin", "KimLip", "JinSoul", "Choerry", "HaSeul"]
+login_uri = 'http://localhost:7860/'
+#login_uri = 'http://localhost:7860'

preset_fn.py

@@ -0,0 +1,113 @@
+import cairosvg
+import gradio as gr
+import random
+import shutil
+import fn
+import edimg
+import os
+from PIL import Image, ImageDraw, ImageFont, ImageColor, ImageFilter, ImageSequence
+import pickle
+
+import pre
+from wand.image import Image
+from wand.color import Color
+
+def convert_svg_to_image(svg_path, output_path):
+    with Image(filename=svg_path, background=Color('white')) as img:
+        img.format = 'png'
+        img.save(filename=output_path)
+
+def refresh():
+
+    directory_path = "/data/presets"
+
+    if not os.path.exists(directory_path):
+        os.makedirs(directory_path)
+    else:
+        print(f"폴더 '{directory_path}'가 이미 존재합니다.")
+
+    items = os.listdir(directory_path)
+    folders = [item for item in items]
+
+    return gr.Dropdown(folders)
+
+def refresh_folder():
+
+    directory_path = "/data/presets"
+
+    if not os.path.exists(directory_path):
+        os.makedirs(directory_path)
+    else:
+        print(f"폴더 '{directory_path}'가 이미 존재합니다.")
+
+    items = os.listdir(directory_path)
+    folders = [item for item in items]
+
+    return folders
+
+def create(userid, user_name, preset_name, group, artist, company, top_logo, qr_logo, sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12):
+    print(user_name)
+
+    path = f"/data/presets/{preset_name}_{user_name.split('#')[0]}"
+    if not os.path.exists(path):
+        os.makedirs(path)
+    else:
+        shutil.rmtree(path)
+        os.makedirs(path)
+
+    if isinstance(top_logo, str):
+        cairosvg.svg2png(url=top_logo, write_to=f"{path}/top_logo.png")
+    else:
+        top_logo.save(f"{path}/top_logo.png")
+
+    if isinstance(qr_logo, str):
+        cairosvg.svg2png(url=qr_logo, write_to=f"{path}/qr_logo.png")
+    else:
+        qr_logo.save(f"{path}/qr_logo.png")
+
+
+    signs = [sign_img1, sign_img2, sign_img3, sign_img4, sign_img5, sign_img6, sign_img7, sign_img8, sign_img9, sign_img10, sign_img11, sign_img12]
+
+
+    for i in range(len(artist)):
+        if isinstance(signs[i], str):
+            cairosvg.svg2png(url=signs[i], write_to=f"{path}/sign{i}.png")
+        else:
+            signs[i].save(f"{path}/sign{i}.png")
+
+    data = {}
+    data['userid'] = userid
+    data['preset_name'] = preset_name
+    data['group'] = group
+    data['artist'] = artist
+    data['company'] = company
+
+    with open(f'{path}/data.pkl', 'wb') as f:
+        pickle.dump(data, f)
+
+    f.close()
+
+    return f"{preset_name}_{user_name.split('#')[0]}"
+
+
+def apply(folder):
+    if folder == None:
+        return
+    directory_path = f"/data/presets/{folder}"
+
+    with open(f'{directory_path}/data.pkl', 'rb') as f:
+        data = pickle.load(f)
+
+    group_name = data['group']
+    artist_name = data['artist']
+
+    group_name_radio = gr.Radio(choices=[group_name] + pre.groups_Other, label="Group Name", value=group_name)
+    member_name_dropdown = gr.Dropdown(choices=artist_name, label="Member Name", allow_custom_value=True,
+                                       value=artist_name[0])
+    logo_radio = gr.Radio(choices=[group_name] + pre.groups, label="Add Logo", interactive=True, value=group_name)
+    sign = gr.Dropdown(choices=artist_name + pre.names, label="Sign", type='index', value=artist_name[0])
+    qr_Logo_radio = gr.Radio([group_name] + ["tripleS", "None"], label="QR Logo", value=group_name, interactive=True)
+
+    preset = gr.Dropdown()
+
+    return group_name_radio, member_name_dropdown, logo_radio, sign, qr_Logo_radio, preset

requirements.txt

@@ -3,4 +3,5 @@ numpy
 Pillow
 qrcode
 pytz
-requests
+requests
+cairosvg