tripleS-Dev commited on
Commit
9f4281b
โ€ข
1 Parent(s): 0f92878

update V1.1.2L Beta

Browse files

-Add OMA to Beta user
-fix bug

Files changed (3) hide show
  1. generate.py +4 -0
  2. login_discord.py +6 -6
  3. main.py +1 -1
generate.py CHANGED
@@ -51,6 +51,8 @@ def front_static(img, obj_color, obj_color_picker, ai_num, txt_color, txt_color_
51
  img.paste(front_side, (0, 0), front_side)
52
  case "Special":
53
  img = edimg.paste_img(img, "resource/special_side.png", (0, 0))
 
 
54
  case "Other color":
55
  obj_color = obj_color_picker
56
  front_side = edimg.color("resource/front_side.png", obj_color)
@@ -179,6 +181,8 @@ def back(obj_color, obj_color_picker, ai_num, txt_color, txt_color_picker, group
179
  img = Image.new("RGB", (1164, 1800), obj_color)
180
  case "Special":
181
  img = Image.open('resource/special_back.png')
 
 
182
  case "Other color":
183
  obj_color = obj_color_picker
184
  img = Image.new("RGB", (1164, 1800), obj_color)
 
51
  img.paste(front_side, (0, 0), front_side)
52
  case "Special":
53
  img = edimg.paste_img(img, "resource/special_side.png", (0, 0))
54
+ case "OMA":
55
+ img = edimg.paste_img(img, "resource/oma_side.png", (1016, 83))
56
  case "Other color":
57
  obj_color = obj_color_picker
58
  front_side = edimg.color("resource/front_side.png", obj_color)
 
181
  img = Image.new("RGB", (1164, 1800), obj_color)
182
  case "Special":
183
  img = Image.open('resource/special_back.png')
184
+ case "OMA":
185
+ img = Image.open('resource/oma_back.png')
186
  case "Other color":
187
  obj_color = obj_color_picker
188
  img = Image.new("RGB", (1164, 1800), obj_color)
login_discord.py CHANGED
@@ -5,7 +5,7 @@ from urllib.parse import urlparse, parse_qs
5
  def id_check(request: gr.Request):
6
  param = str(request.query_params)
7
  if not "code=" in param:
8
- return "Login to Discord", gr.Tab(visible=False)
9
 
10
  code = param.split('code=')
11
  print(code[1])
@@ -13,11 +13,11 @@ def id_check(request: gr.Request):
13
  user_id, username, avatar_url = get_discord_user_profile(str(code[1]))
14
  if user_id == None:
15
  return "Login to Discord", gr.Tab(visible=False)
16
- if user_id == "412827396027187211":
17
- return gr.Button(value=username, icon=avatar_url, link=redirect_uri), gr.Tab(visible=True)
18
  print(user_id)
19
- return gr.Button(value=username, icon=avatar_url, link=redirect_uri), gr.Tab(visible=False)
20
-
21
 
22
  def get_discord_user_profile(code):
23
  # Discord์˜ API ์—”๋“œํฌ์ธํŠธ
@@ -60,7 +60,7 @@ def get_discord_user_profile(code):
60
  except requests.exceptions.RequestException as e:
61
  print("Error to login")
62
  # print(str(e)) # ์˜ค๋ฅ˜ ๋‚ด์šฉ ์ถœ๋ ฅ์„ ์›ํ•œ๋‹ค๋ฉด ์ฃผ์„ ํ•ด์ œ
63
- return None, None, None # ์˜ค๋ฅ˜ ๋ฐœ์ƒ์‹œ None ๋ฐ˜ํ™˜
64
 
65
  # ์‚ฌ์šฉ ์˜ˆ:
66
  client_id = "1239473790732472370"
 
5
  def id_check(request: gr.Request):
6
  param = str(request.query_params)
7
  if not "code=" in param:
8
+ return "Login to Discord", gr.Tab(visible=False), gr.Radio(["Atom01", "Binary01", "Cream01", "Divine01", "Special", "Other color", "AI Color"], label="Objekt Color", value="Cream01")
9
 
10
  code = param.split('code=')
11
  print(code[1])
 
13
  user_id, username, avatar_url = get_discord_user_profile(str(code[1]))
14
  if user_id == None:
15
  return "Login to Discord", gr.Tab(visible=False)
16
+ if user_id == "412827396027187211" or user_id == "676049087300239369":
17
+ 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")
18
  print(user_id)
19
+ 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")
20
+ #1
21
 
22
  def get_discord_user_profile(code):
23
  # Discord์˜ API ์—”๋“œํฌ์ธํŠธ
 
60
  except requests.exceptions.RequestException as e:
61
  print("Error to login")
62
  # print(str(e)) # ์˜ค๋ฅ˜ ๋‚ด์šฉ ์ถœ๋ ฅ์„ ์›ํ•œ๋‹ค๋ฉด ์ฃผ์„ ํ•ด์ œ
63
+ return None, None, None, None # ์˜ค๋ฅ˜ ๋ฐœ์ƒ์‹œ None ๋ฐ˜ํ™˜
64
 
65
  # ์‚ฌ์šฉ ์˜ˆ:
66
  client_id = "1239473790732472370"
main.py CHANGED
@@ -235,7 +235,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo: # , js=js_func
235
  right_btn, rounded_back], outputs=[preview, ex_img_b])
236
 
237
  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])
238
- demo.load(fn=login_discord.id_check, outputs=[login, dev])
239
 
240
 
241
 
 
235
  right_btn, rounded_back], outputs=[preview, ex_img_b])
236
 
237
  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])
238
+ demo.load(fn=login_discord.id_check, outputs=[login, dev, obj_color])
239
 
240
 
241