Update app.py
Browse files
app.py
CHANGED
|
@@ -28,28 +28,31 @@ def call_api(content, system_message, max_tokens, temperature, top_p):
|
|
| 28 |
)
|
| 29 |
return response.choices[0].message["content"]
|
| 30 |
|
| 31 |
-
#########################
|
| 32 |
-
# λ³ν©
|
| 33 |
-
#########################
|
| 34 |
-
def
|
| 35 |
"""
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
| 39 |
"""
|
| 40 |
-
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
|
|
|
|
|
|
|
|
|
| 47 |
|
| 48 |
######################
|
| 49 |
# λΆμ ν¨μ
|
| 50 |
######################
|
| 51 |
def analyze_texts(difficulties, goals):
|
| 52 |
-
# μ λ‘μ¬ν
|
| 53 |
preview_difficulties = call_api(
|
| 54 |
content=difficulties,
|
| 55 |
system_message="μ¬μ©μκ° μ
λ ₯ν μ λ‘μ¬νμ κ°λ¨ν λΆμν΄μ€.",
|
|
@@ -57,7 +60,7 @@ def analyze_texts(difficulties, goals):
|
|
| 57 |
temperature=0.7,
|
| 58 |
top_p=0.9,
|
| 59 |
)
|
| 60 |
-
# 컨μ€ν
λͺ©ν
|
| 61 |
preview_goals = call_api(
|
| 62 |
content=goals,
|
| 63 |
system_message="μ¬μ©μκ° μ
λ ₯ν 컨μ€ν
λͺ©νλ₯Ό κ°λ¨ν μμ½ν΄μ€.",
|
|
@@ -71,7 +74,7 @@ def analyze_texts(difficulties, goals):
|
|
| 71 |
# μμ
μμ±(λ€μ΄λ‘λ) ν¨μ
|
| 72 |
######################
|
| 73 |
def generate_excel(
|
| 74 |
-
# 8κ° μ
λ ₯
|
| 75 |
consultant_name_rep,
|
| 76 |
consultant_contact,
|
| 77 |
consultant_address,
|
|
@@ -85,7 +88,7 @@ def generate_excel(
|
|
| 85 |
photo1,
|
| 86 |
photo2,
|
| 87 |
|
| 88 |
-
#
|
| 89 |
preview_difficulties,
|
| 90 |
preview_goals
|
| 91 |
):
|
|
@@ -93,34 +96,39 @@ def generate_excel(
|
|
| 93 |
ws = wb.active
|
| 94 |
|
| 95 |
############################
|
| 96 |
-
#
|
| 97 |
-
# (C4, G4, C5, G5, C6, G6, C7, G7)
|
| 98 |
############################
|
| 99 |
-
|
| 100 |
-
|
| 101 |
-
|
| 102 |
-
|
| 103 |
-
|
| 104 |
-
set_value_in_merged_cell(ws, "G6", consultant_round)
|
| 105 |
-
set_value_in_merged_cell(ws, "C7", consultant_client_name)
|
| 106 |
-
set_value_in_merged_cell(ws, "G7", consultant_region)
|
| 107 |
|
| 108 |
############################
|
| 109 |
-
#
|
| 110 |
############################
|
| 111 |
-
|
| 112 |
-
|
| 113 |
-
|
| 114 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 115 |
ws["D11"].alignment = Alignment(wrap_text=True)
|
| 116 |
ws["D22"].alignment = Alignment(wrap_text=True)
|
| 117 |
-
|
| 118 |
-
# 10cm κ·Όμ¬μΉ
|
| 119 |
-
ws.column_dimensions["D"].width = 42
|
| 120 |
|
| 121 |
############################
|
| 122 |
-
# μ¬μ§ μ½μ
(B117, F117)
|
| 123 |
-
#
|
| 124 |
############################
|
| 125 |
width_px = int(37.79 * 8) # 8cm
|
| 126 |
height_px = int(37.79 * 5) # 5cm
|
|
@@ -144,7 +152,7 @@ def generate_excel(
|
|
| 144 |
ws.add_image(img2_for_excel, "F117")
|
| 145 |
|
| 146 |
############################
|
| 147 |
-
# μμ νμΌ -> EXE.xlsx
|
| 148 |
############################
|
| 149 |
output = BytesIO()
|
| 150 |
wb.save(output)
|
|
@@ -195,8 +203,10 @@ def run_generate_excel(
|
|
| 195 |
consultant_round,
|
| 196 |
consultant_client_name,
|
| 197 |
consultant_region,
|
|
|
|
| 198 |
photo1,
|
| 199 |
photo2,
|
|
|
|
| 200 |
preview_difficulties,
|
| 201 |
preview_goals
|
| 202 |
)
|
|
@@ -207,7 +217,7 @@ def run_generate_excel(
|
|
| 207 |
######################
|
| 208 |
def create_app():
|
| 209 |
with gr.Blocks() as demo:
|
| 210 |
-
gr.Markdown("##
|
| 211 |
|
| 212 |
with gr.Row():
|
| 213 |
consultant_name_rep = gr.Textbox(label="컨μ€ν
μ
체 λ° λν μ΄λ¦")
|
|
@@ -229,7 +239,6 @@ def create_app():
|
|
| 229 |
|
| 230 |
gr.Markdown("---")
|
| 231 |
|
| 232 |
-
# μ¬μ§ 2κ° μ
λ‘λ
|
| 233 |
with gr.Row():
|
| 234 |
photo_input_1 = gr.Image(label="μμ§μ
체μ¬μ§", type="pil")
|
| 235 |
photo_input_2 = gr.Image(label="μμ§μ
체μ¬μ§", type="pil")
|
|
@@ -245,7 +254,7 @@ def create_app():
|
|
| 245 |
analyze_button.click(
|
| 246 |
fn=run_analyze,
|
| 247 |
inputs=[difficulties_input, goals_input],
|
| 248 |
-
outputs=[preview_difficulties_output, preview_goals_output]
|
| 249 |
)
|
| 250 |
|
| 251 |
download_button.click(
|
|
@@ -259,14 +268,16 @@ def create_app():
|
|
| 259 |
consultant_round,
|
| 260 |
consultant_client_name,
|
| 261 |
consultant_region,
|
|
|
|
| 262 |
photo_input_1,
|
| 263 |
photo_input_2,
|
|
|
|
| 264 |
difficulties_input,
|
| 265 |
goals_input,
|
| 266 |
preview_difficulties_output,
|
| 267 |
-
preview_goals_output
|
| 268 |
],
|
| 269 |
-
outputs=[download_file]
|
| 270 |
)
|
| 271 |
|
| 272 |
return demo
|
|
|
|
| 28 |
)
|
| 29 |
return response.choices[0].message["content"]
|
| 30 |
|
| 31 |
+
############################
|
| 32 |
+
# λ³ν© λ²μ κ°μ ν΄μ ν¨μ
|
| 33 |
+
############################
|
| 34 |
+
def unmerge_conflicting_cells(ws, cell_coords):
|
| 35 |
"""
|
| 36 |
+
cell_coords 리μ€νΈ λ΄μ μλ κ° μ’ν(μ: 'C4')κ°
|
| 37 |
+
μ΄λ€ λ³ν© λ²μ(merged_range)μ ν¬ν¨λμ΄ μμΌλ©΄,
|
| 38 |
+
ν΄λΉ λ²μλ₯Ό μ λΆ unmerge ν΄λ²λ¦°λ€.
|
| 39 |
"""
|
| 40 |
+
# λ³ν© λ²μλ₯Ό μννλ©΄μ ν΄μ ν΄μΌ νλ―λ‘,
|
| 41 |
+
# λ³ν© λͺ©λ‘μ list(...)λ‘ λ³΅μ¬ ν μμ ν΄μΌ ν¨
|
| 42 |
+
merged_ranges = list(ws.merged_cells.ranges)
|
| 43 |
+
|
| 44 |
+
for rng in merged_ranges:
|
| 45 |
+
# μ: rng.coord == 'C4:D42'
|
| 46 |
+
for c in cell_coords:
|
| 47 |
+
if c in rng.coord:
|
| 48 |
+
ws.unmerge_cells(str(rng.coord)) # κ°μ ν΄μ
|
| 49 |
+
break # νλ² unmerge νλ©΄ ν΄λΉ rngλ κΉ¨μ‘μΌλ―λ‘ break
|
| 50 |
|
| 51 |
######################
|
| 52 |
# λΆμ ν¨μ
|
| 53 |
######################
|
| 54 |
def analyze_texts(difficulties, goals):
|
| 55 |
+
# μ λ‘μ¬ν
|
| 56 |
preview_difficulties = call_api(
|
| 57 |
content=difficulties,
|
| 58 |
system_message="μ¬μ©μκ° μ
λ ₯ν μ λ‘μ¬νμ κ°λ¨ν λΆμν΄μ€.",
|
|
|
|
| 60 |
temperature=0.7,
|
| 61 |
top_p=0.9,
|
| 62 |
)
|
| 63 |
+
# 컨μ€ν
λͺ©ν
|
| 64 |
preview_goals = call_api(
|
| 65 |
content=goals,
|
| 66 |
system_message="μ¬μ©μκ° μ
λ ₯ν 컨μ€ν
λͺ©νλ₯Ό κ°λ¨ν μμ½ν΄μ€.",
|
|
|
|
| 74 |
# μμ
μμ±(λ€μ΄λ‘λ) ν¨μ
|
| 75 |
######################
|
| 76 |
def generate_excel(
|
| 77 |
+
# 8κ° μ
λ ₯
|
| 78 |
consultant_name_rep,
|
| 79 |
consultant_contact,
|
| 80 |
consultant_address,
|
|
|
|
| 88 |
photo1,
|
| 89 |
photo2,
|
| 90 |
|
| 91 |
+
# λΆμ ν
μ€νΈ
|
| 92 |
preview_difficulties,
|
| 93 |
preview_goals
|
| 94 |
):
|
|
|
|
| 96 |
ws = wb.active
|
| 97 |
|
| 98 |
############################
|
| 99 |
+
# 1) λ³ν© ν΄μ (νμν μ
λ§)
|
|
|
|
| 100 |
############################
|
| 101 |
+
# C4,G4,C5,G5,C6,G6,C7,G7 μ D11,D22
|
| 102 |
+
# -> μ΄ μ€ νλλΌλ λ³ν© λ²μμ ν¬ν¨λμ΄ μλ€λ©΄
|
| 103 |
+
# μ λΆ unmerge ν΄λ²λ¦Ό
|
| 104 |
+
targets = ["C4","G4","C5","G5","C6","G6","C7","G7","D11","D22"]
|
| 105 |
+
unmerge_conflicting_cells(ws, targets)
|
|
|
|
|
|
|
|
|
|
| 106 |
|
| 107 |
############################
|
| 108 |
+
# 2) μ/μλ μ 보 κΈ°μ
|
| 109 |
############################
|
| 110 |
+
# (1) μλ¨ μ 보 (C4, G4, C5, G5, C6, G6, C7, G7)
|
| 111 |
+
ws["C4"] = consultant_name_rep
|
| 112 |
+
ws["G4"] = consultant_contact
|
| 113 |
+
ws["C5"] = consultant_address
|
| 114 |
+
ws["G5"] = consultant_time
|
| 115 |
+
ws["C6"] = consultant_field
|
| 116 |
+
ws["G6"] = consultant_round
|
| 117 |
+
ws["C7"] = consultant_client_name
|
| 118 |
+
ws["G7"] = consultant_region
|
| 119 |
+
|
| 120 |
+
# (2) μ λ‘μ¬ν/λͺ©ν (D11, D22)
|
| 121 |
+
ws["D11"] = preview_difficulties
|
| 122 |
+
ws["D22"] = preview_goals
|
| 123 |
+
|
| 124 |
+
# wrap_text / 컬λΌλλΉ
|
| 125 |
ws["D11"].alignment = Alignment(wrap_text=True)
|
| 126 |
ws["D22"].alignment = Alignment(wrap_text=True)
|
| 127 |
+
ws.column_dimensions["D"].width = 42 # λλ΅ 10cm
|
|
|
|
|
|
|
| 128 |
|
| 129 |
############################
|
| 130 |
+
# 3) μ¬μ§ μ½μ
(B117, F117)
|
| 131 |
+
# (κ°λ‘ 8cm, μΈλ‘ 5cm)
|
| 132 |
############################
|
| 133 |
width_px = int(37.79 * 8) # 8cm
|
| 134 |
height_px = int(37.79 * 5) # 5cm
|
|
|
|
| 152 |
ws.add_image(img2_for_excel, "F117")
|
| 153 |
|
| 154 |
############################
|
| 155 |
+
# 4) μμ νμΌ -> EXE.xlsx
|
| 156 |
############################
|
| 157 |
output = BytesIO()
|
| 158 |
wb.save(output)
|
|
|
|
| 203 |
consultant_round,
|
| 204 |
consultant_client_name,
|
| 205 |
consultant_region,
|
| 206 |
+
|
| 207 |
photo1,
|
| 208 |
photo2,
|
| 209 |
+
|
| 210 |
preview_difficulties,
|
| 211 |
preview_goals
|
| 212 |
)
|
|
|
|
| 217 |
######################
|
| 218 |
def create_app():
|
| 219 |
with gr.Blocks() as demo:
|
| 220 |
+
gr.Markdown("## λ³ν©λ μ
μλ ν΄μ -> μμ νκ² μ°κΈ°")
|
| 221 |
|
| 222 |
with gr.Row():
|
| 223 |
consultant_name_rep = gr.Textbox(label="컨μ€ν
μ
체 λ° λν μ΄λ¦")
|
|
|
|
| 239 |
|
| 240 |
gr.Markdown("---")
|
| 241 |
|
|
|
|
| 242 |
with gr.Row():
|
| 243 |
photo_input_1 = gr.Image(label="μμ§μ
체μ¬μ§", type="pil")
|
| 244 |
photo_input_2 = gr.Image(label="μμ§μ
체μ¬μ§", type="pil")
|
|
|
|
| 254 |
analyze_button.click(
|
| 255 |
fn=run_analyze,
|
| 256 |
inputs=[difficulties_input, goals_input],
|
| 257 |
+
outputs=[preview_difficulties_output, preview_goals_output]
|
| 258 |
)
|
| 259 |
|
| 260 |
download_button.click(
|
|
|
|
| 268 |
consultant_round,
|
| 269 |
consultant_client_name,
|
| 270 |
consultant_region,
|
| 271 |
+
|
| 272 |
photo_input_1,
|
| 273 |
photo_input_2,
|
| 274 |
+
|
| 275 |
difficulties_input,
|
| 276 |
goals_input,
|
| 277 |
preview_difficulties_output,
|
| 278 |
+
preview_goals_output
|
| 279 |
],
|
| 280 |
+
outputs=[download_file]
|
| 281 |
)
|
| 282 |
|
| 283 |
return demo
|