Update app.py
Browse files
app.py
CHANGED
@@ -26,8 +26,26 @@ logger = logging.getLogger(__name__)
|
|
26 |
|
27 |
# API ํด๋ผ์ด์ธํธ ์ค์
|
28 |
def get_client():
|
29 |
-
|
30 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
31 |
|
32 |
# ์ธ์
๋ณ ์์ ํ์ผ ๊ด๋ฆฌ๋ฅผ ์ํ ๋์
๋๋ฆฌ
|
33 |
session_temp_files = {}
|
@@ -194,7 +212,19 @@ def wrapper_modified(keyword, korean_only, apply_main_keyword_option, exclude_ze
|
|
194 |
api_name="/process_search_results"
|
195 |
)
|
196 |
|
197 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
198 |
|
199 |
local_file = None
|
200 |
if download_file:
|
@@ -239,7 +269,18 @@ def analyze_with_auto_download(analysis_keywords, selected_category, state_df, s
|
|
239 |
api_name="/process_analyze_results"
|
240 |
)
|
241 |
|
242 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
243 |
|
244 |
local_file = None
|
245 |
if download_file:
|
|
|
26 |
|
27 |
# API ํด๋ผ์ด์ธํธ ์ค์
|
28 |
def get_client():
|
29 |
+
# ํ๊ฒฝ๋ณ์์์ API ์๋ํฌ์ธํธ ์ฝ๊ธฐ
|
30 |
+
endpoint = os.environ.get('API_ENDPOINT', '')
|
31 |
+
|
32 |
+
# ํ๊ฒฝ๋ณ์์ ํ์ผ ๋ด์ฉ์ด๋ ๋ถํ์ํ ํ
์คํธ๊ฐ ๋ค์ด์จ ๊ฒฝ์ฐ ์ ๋ฆฌ
|
33 |
+
if endpoint:
|
34 |
+
# ์ค๋ฐ๊ฟ์ผ๋ก ๋ถ๋ฆฌํด์ ์ฒซ ๋ฒ์งธ ์ ํจํ ๋ผ์ธ ์ฐพ๊ธฐ
|
35 |
+
lines = endpoint.split('\n')
|
36 |
+
for line in lines:
|
37 |
+
line = line.strip()
|
38 |
+
# ์ฃผ์์ด๋ ๋น์ด์๋ ๋ผ์ธ ์ ์ธ
|
39 |
+
if line and not line.startswith('#') and '/' in line:
|
40 |
+
# API_ENDPOINT= ๊ฐ์ ํค๊ฐ ์ ๊ฑฐ
|
41 |
+
if '=' in line:
|
42 |
+
line = line.split('=', 1)[1].strip()
|
43 |
+
# ๋ฐ์ดํ ์ ๊ฑฐ
|
44 |
+
line = line.strip('"\'')
|
45 |
+
if line and '/' in line and len(line) < 50:
|
46 |
+
return Client(line)
|
47 |
+
|
48 |
+
raise ValueError("์ฌ๋ฐ๋ฅธ API_ENDPOINT๋ฅผ ์ค์ ํด์ฃผ์ธ์ (์: username/repo-name)")
|
49 |
|
50 |
# ์ธ์
๋ณ ์์ ํ์ผ ๊ด๋ฆฌ๋ฅผ ์ํ ๋์
๋๋ฆฌ
|
51 |
session_temp_files = {}
|
|
|
212 |
api_name="/process_search_results"
|
213 |
)
|
214 |
|
215 |
+
# API ์๋ต ํ์ธ ๋ฐ ์ฒ๋ฆฌ
|
216 |
+
logger.info(f"API ์๋ต ํ์
: {type(result)}, ๊ธธ์ด: {len(result) if isinstance(result, (list, tuple)) else 'N/A'}")
|
217 |
+
|
218 |
+
if isinstance(result, (list, tuple)) and len(result) >= 5:
|
219 |
+
table_html, cat_choices, vol_choices, selected_cat, download_file = result[:5]
|
220 |
+
else:
|
221 |
+
# ์๋ต์ด ์์๊ณผ ๋ค๋ฅธ ๊ฒฝ์ฐ ๊ธฐ๋ณธ๊ฐ ์ฌ์ฉ
|
222 |
+
logger.warning(f"์์๊ณผ ๋ค๋ฅธ API ์๋ต: {result}")
|
223 |
+
table_html = "<p>๊ฒ์ ๊ฒฐ๊ณผ๋ฅผ ์ฒ๋ฆฌํ๋ ์ค ์ค๋ฅ๊ฐ ๋ฐ์ํ์ต๋๋ค.</p>"
|
224 |
+
cat_choices = ["์ ์ฒด ๋ณด๊ธฐ"]
|
225 |
+
vol_choices = ["์ ์ฒด"]
|
226 |
+
selected_cat = "์ ์ฒด ๋ณด๊ธฐ"
|
227 |
+
download_file = None
|
228 |
|
229 |
local_file = None
|
230 |
if download_file:
|
|
|
269 |
api_name="/process_analyze_results"
|
270 |
)
|
271 |
|
272 |
+
# API ์๋ต ํ์ธ ๋ฐ ์ฒ๋ฆฌ
|
273 |
+
logger.info(f"๋ถ์ API ์๋ต ํ์
: {type(result)}, ๊ธธ์ด: {len(result) if isinstance(result, (list, tuple)) else 'N/A'}")
|
274 |
+
|
275 |
+
if isinstance(result, (list, tuple)) and len(result) >= 2:
|
276 |
+
analysis_result, download_file = result[:2]
|
277 |
+
elif isinstance(result, str):
|
278 |
+
analysis_result = result
|
279 |
+
download_file = None
|
280 |
+
else:
|
281 |
+
logger.warning(f"์์๊ณผ ๋ค๋ฅธ ๋ถ์ API ์๋ต: {result}")
|
282 |
+
analysis_result = "๋ถ์ ๊ฒฐ๊ณผ๋ฅผ ์ฒ๋ฆฌํ๋ ์ค ์ค๋ฅ๊ฐ ๋ฐ์ํ์ต๋๋ค."
|
283 |
+
download_file = None
|
284 |
|
285 |
local_file = None
|
286 |
if download_file:
|