git push

app.py

@@ -1,6 +1,8 @@
+import json
 import os
 import shutil
 import time
+from typing import Tuple
 
 import cv2
 import base64
@@ -238,53 +240,71 @@ class TipCalculator:
         self.model_clients = model_clients
         self.video_processor = video_processor
 
-    def parse_llm_output(self, output_text):
-        """LLM 출력을 파싱하여 팁 계산 결과 추출"""
+    def parse_llm_output(self, output_text: str) -> Tuple[str, float, float, float, str]:
         analysis = "Analysis not found."
         tip_percentage = 0.0
         tip_amount = 0.0
         total_bill = 0.0
 
-        # Analysis 부분: "Analysis:" 이후부터 "**Final Tip Percentage**" 이전까지 추출
-        analysis_match = re.search(r"Analysis:\s*(.*?)\*\*Final Tip Percentage\*\*", output_text,
-                                   re.DOTALL | re.IGNORECASE)
-        if analysis_match:
-            analysis = analysis_match.group(1).strip()
-        else:
-            analysis_match_alt = re.search(r"Analysis:\s*(.*)", output_text, re.DOTALL | re.IGNORECASE)
-            if analysis_match_alt:
-                analysis = analysis_match_alt.group(1).strip()
-
-        # **Final Tip Percentage** 추출 (예: **Final Tip Percentage**: 2.00%)
-        percentage_match = re.search(r"\*\*Final Tip Percentage\*\*:\s*([0-9]+(?:\.[0-9]+)?)%", output_text,
-                                     re.DOTALL | re.IGNORECASE)
-        if percentage_match:
-            try:
-                tip_percentage = float(percentage_match.group(1))
-            except ValueError:
-                print(f"경고: Tip Percentage 변환 실패 - {percentage_match.group(1)}")
-                tip_percentage = 0.0
-
-        # **Final Tip Amount** 추출 (예: **Final Tip Amount**: $1.44)
-        tip_match = re.search(r"\*\*Final Tip Amount\*\*:\s*\$?\s*([0-9]+(?:\.[0-9]+)?)", output_text, re.IGNORECASE)
-        if tip_match:
+        # ------------------------------------------------------------------
+        # 1) JSON 블록 탐색  ```json ... ```   또는   { "final_tip_percentage": ... }
+        # ------------------------------------------------------------------
+        json_block = None
+
+        # 1‑A) ```json ... ``` 패턴
+        m = re.search(r"```json\s*(\{.*?\})\s*```", output_text, re.DOTALL | re.IGNORECASE)
+        if not m:
+            # 1‑B) 백틱이 없는 경우, 첫 번째 { ... } 중에 key 가 포함돼 있으면 잡기
+            m = re.search(r"(\{[^{}]*\"final_tip_percentage\"[^{}]*\})", output_text,
+                          re.DOTALL | re.IGNORECASE)
+
+        if m:
+            json_block = m.group(1)
             try:
-                tip_amount = float(tip_match.group(1))
-            except ValueError:
-                print(f"경고: Tip Amount 변환 실패 - {tip_match.group(1)}")
-                tip_amount = 0.0
+                json_data = json.loads(json_block)
+                tip_percentage = float(json_data.get("final_tip_percentage", 0.0))
+                tip_amount = float(json_data.get("final_tip_amount", 0.0))
+                total_bill = float(json_data.get("final_total_bill", 0.0))
+            except (ValueError, json.JSONDecodeError) as e:
+                print(f"[WARN] JSON 파싱 실패: {e}")
+
+        # ------------------------------------------------------------------
+        # 2) JSON이 없으면 구(舊) 포맷(**Final Tip …**)으로 파싱
+        # ------------------------------------------------------------------
+        if json_block is None:
+            # Tip %
+            m = re.search(r"\*\*Final Tip Percentage\*\*:\s*([0-9]+(?:\.[0-9]+)?)%", output_text,
+                          re.IGNORECASE)
+            if m:
+                tip_percentage = float(m.group(1))
+
+            # Tip Amount
+            m = re.search(r"\*\*Final Tip Amount\*\*:\s*\$?\s*([0-9]+(?:\.[0-9]+)?)", output_text,
+                          re.IGNORECASE)
+            if m:
+                tip_amount = float(m.group(1))
+
+            # Total Bill
+            m = re.search(r"\*\*Final Total Bill\*\*:\s*\$?\s*([0-9]+(?:\.[0-9]+)?)", output_text,
+                          re.IGNORECASE)
+            if m:
+                total_bill = float(m.group(1))
+
+        # ------------------------------------------------------------------
+        # 3) Analysis 추출  (JSON 블록 앞부분을 그대로 쓰거나, 키워드로 파싱)
+        # ------------------------------------------------------------------
+        if json_block:
+            analysis_part = output_text.split(json_block)[0]  # JSON 앞 텍스트
         else:
-            print(f"경고: 출력에서 Tip Amount를 찾을 수 없습니다:\n{output_text}")
+            analysis_part = output_text
 
-        # **Final Total Bill** 추출 (예: **Final Total Bill**: $73.44)
-        total_match = re.search(r"\*\*Final Total Bill\*\*:\s*\$?\s*([0-9]+(?:\.[0-9]+)?)", output_text, re.IGNORECASE)
-        if total_match:
-            try:
-                total_bill = float(total_match.group(1))
-            except ValueError:
-                print(f"경고: Total Bill 변환 실패 - {total_match.group(1)}")
-        if len(analysis) < 20 and analysis == "Analysis not found.":
-            analysis = output_text
+        # “Analysis:” 또는 “Overall Analysis:” 이후만 잘라 주면 더 깔끔
+        m = re.search(r"(?:Overall\s+Analysis|Analysis):\s*(.*)", analysis_part,
+                      re.DOTALL | re.IGNORECASE)
+        if m:
+            analysis = m.group(1).strip()
+        else:
+            analysis = analysis_part.strip()
 
         return analysis, tip_percentage, tip_amount, output_text
 
@@ -673,8 +693,8 @@ class App:
                 gr.Examples(
                     examples=[
                         # 입력 순서: [Alibaba API Key, Video, Subtotal, Star Rating, Review] + [각 음식의 Qty]
-                        ["video/sample.mp4", 0.0, 1, "He drop the tray..so bad", 0, 0, 0, 0, 0, 2, 0, 0],
-                        ["video/sample2.mp4", 0.0, 5, "Good service!", 0, 0, 0, 0, 0, 2, 0, 0]
+                        ["./video/sample.mp4", 0.0, 1, "He drop the tray..so bad", 0, 0, 0, 0, 0, 2, 0, 0],
+                        ["./video/sample2.mp4", 0.0, 5, "Good service!", 0, 0, 0, 0, 0, 2, 0, 0]
                     ],
                     inputs=[video_input, subtotal_display, rating_input,
                             review_input] + quantity_inputs,