jeongsoo commited on
Commit
baca89e
ยท
1 Parent(s): ed1011c
Files changed (1) hide show
  1. app/app_device_routes.py +17 -2
app/app_device_routes.py CHANGED
@@ -1,5 +1,5 @@
1
  """
2
- RAG ๊ฒ€์ƒ‰ ์ฑ—๋ด‡ ์›น ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ - ์žฅ์น˜ ๊ด€๋ฆฌ API ๋ผ์šฐํŠธ ์ •์˜ (์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰ ์ถ”๊ฐ€๋จ)
3
  """
4
 
5
  import logging
@@ -7,6 +7,7 @@ import requests
7
  import uuid # ์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰์„ ์œ„ํ•ด ์ถ”๊ฐ€
8
  import time # ์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰์„ ์œ„ํ•ด ์ถ”๊ฐ€
9
  import shlex # ์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰์„ ์œ„ํ•ด ์ถ”๊ฐ€
 
10
  from flask import request, jsonify
11
 
12
  # ๋กœ๊ฑฐ ๊ฐ€์ ธ์˜ค๊ธฐ
@@ -433,12 +434,26 @@ def register_device_routes(app, login_required, DEVICE_SERVER_URL):
433
  path = parts[0]
434
  args = parts[1:] if len(parts) > 1 else []
435
 
 
 
 
 
 
 
 
 
 
 
 
 
 
436
  # ํ”„๋กœ๊ทธ๋žจ ๋“ฑ๋ก API ํ˜ธ์ถœ ๋ฐ์ดํ„ฐ ๊ตฌ์„ฑ
437
  logger.info(f"์ž„์‹œ ํ”„๋กœ๊ทธ๋žจ ๋“ฑ๋ก ์‹œ๋„: ID={temp_id}, ๊ฒฝ๋กœ='{path}', ์ธ์ˆ˜={args}")
438
 
439
  register_data = {
440
  "id": temp_id,
441
- "name": f"์ž„์‹œ ํ”„๋กœ๊ทธ๋žจ ({path.split('/')[-1].split('\\')[-1]})", # ํŒŒ์ผ๋ช…๋งŒ ์ถ”์ถœ
 
442
  "path": path,
443
  "args": args,
444
  "ui_required": True, # UI๊ฐ€ ํ•„์š”ํ•œ ๊ฒƒ์œผ๋กœ ๊ฐ€์ • (ํ•„์š”์‹œ ์ˆ˜์ •)
 
1
  """
2
+ RAG ๊ฒ€์ƒ‰ ์ฑ—๋ด‡ ์›น ์• ํ”Œ๋ฆฌ์ผ€์ด์…˜ - ์žฅ์น˜ ๊ด€๋ฆฌ API ๋ผ์šฐํŠธ ์ •์˜ (์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰, f-string ์˜ค๋ฅ˜ ์ˆ˜์ •๋จ)
3
  """
4
 
5
  import logging
 
7
  import uuid # ์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰์„ ์œ„ํ•ด ์ถ”๊ฐ€
8
  import time # ์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰์„ ์œ„ํ•ด ์ถ”๊ฐ€
9
  import shlex # ์‚ฌ์šฉ์ž ์ •์˜ ์‹คํ–‰์„ ์œ„ํ•ด ์ถ”๊ฐ€
10
+ import os # ๊ฒฝ๋กœ ์ฒ˜๋ฆฌ๋ฅผ ์œ„ํ•ด ์ถ”๊ฐ€ (ํ•„์š”์‹œ)
11
  from flask import request, jsonify
12
 
13
  # ๋กœ๊ฑฐ ๊ฐ€์ ธ์˜ค๊ธฐ
 
434
  path = parts[0]
435
  args = parts[1:] if len(parts) > 1 else []
436
 
437
+ # ================== ์ˆ˜์ •๋œ ๋ถ€๋ถ„ ์‹œ์ž‘ ==================
438
+ # ๊ฒฝ๋กœ์—์„œ ํŒŒ์ผ๋ช…๋งŒ ์ถ”์ถœ (๋ฐฑ์Šฌ๋ž˜์‹œ ๋ฌธ์ œ ํ•ด๊ฒฐ)
439
+ # os.path.basename ์‚ฌ์šฉ ๋˜๋Š” ๋ฌธ์ž์—ด ์ฒ˜๋ฆฌ ๋ฐฉ์‹ ์‚ฌ์šฉ
440
+ try:
441
+ # ๋ชจ๋“  ๋ฐฑ์Šฌ๋ž˜์‹œ๋ฅผ ์Šฌ๋ž˜์‹œ๋กœ ๋ณ€๊ฒฝ ํ›„ ๋งˆ์ง€๋ง‰ ๋ถ€๋ถ„ ์ถ”์ถœ
442
+ filename = path.replace('\\', '/').split('/')[-1]
443
+ if not filename: # ๊ฒฝ๋กœ๊ฐ€ '/'๋‚˜ '\\'๋กœ ๋๋‚˜๋Š” ๊ฒฝ์šฐ ๋Œ€๋น„
444
+ filename = path # ์›๋ณธ ๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•˜๊ฑฐ๋‚˜ ๋‹ค๋ฅธ ๊ธฐ๋ณธ๊ฐ’ ์„ค์ •
445
+ except Exception:
446
+ filename = "unknown" # ์˜ˆ์™ธ ๋ฐœ์ƒ ์‹œ ๊ธฐ๋ณธ๊ฐ’
447
+ # ================== ์ˆ˜์ •๋œ ๋ถ€๋ถ„ ๋ ====================
448
+
449
+
450
  # ํ”„๋กœ๊ทธ๋žจ ๋“ฑ๋ก API ํ˜ธ์ถœ ๋ฐ์ดํ„ฐ ๊ตฌ์„ฑ
451
  logger.info(f"์ž„์‹œ ํ”„๋กœ๊ทธ๋žจ ๋“ฑ๋ก ์‹œ๋„: ID={temp_id}, ๊ฒฝ๋กœ='{path}', ์ธ์ˆ˜={args}")
452
 
453
  register_data = {
454
  "id": temp_id,
455
+ # ์ˆ˜์ •๋œ filename ์‚ฌ์šฉ
456
+ "name": f"์ž„์‹œ ํ”„๋กœ๊ทธ๋žจ ({filename})",
457
  "path": path,
458
  "args": args,
459
  "ui_required": True, # UI๊ฐ€ ํ•„์š”ํ•œ ๊ฒƒ์œผ๋กœ ๊ฐ€์ • (ํ•„์š”์‹œ ์ˆ˜์ •)