🔱 SONAR-AI v18.2 | 2026-04-11 08:29:38

app.py

@@ -240,14 +240,31 @@ def load_tsc_database():
             try:
                 df = pd.read_excel(path, engine='openpyxl')
                 for _, row in df.iterrows():
-                    hs = str(int(row['IDE_HSC_NB1']))
+                    try:
+                        hs = str(int(float(str(row['IDE_HSC_NB1']).replace(',','')))).strip()
+                    except:
+                        continue
                     if hs not in TSC_DATABASE:
+                        try: avg_p = round(float(str(row['AVR_MNT']).replace(',','')), 3)
+                        except: avg_p = 0
+                        try: min_p = round(float(str(row['CAL_MIN_VAL']).replace(',','')), 3)
+                        except: min_p = 0
+                        try: max_p = round(float(str(row['CAL_MAX_VAL']).replace(',','')), 3)
+                        except: max_p = 0
+                        try: duty = round(float(str(row['GDS_MRG']).replace(',','')), 1)
+                        except: duty = 0
+                        unit_name = ''
+                        if pd.notna(row.get('AVR_UNT_NAM',None)): unit_name = str(row['AVR_UNT_NAM'])
+                        elif pd.notna(row.get('AVR_UNT',None)): unit_name = str(row['AVR_UNT'])
                         TSC_DATABASE[hs] = {
-                            'desc': str(row['GDS_DS2']).strip()[:100] if pd.notna(row['GDS_DS2']) else '',
-                            'avg_price': round(float(row['AVR_MNT']), 2) if pd.notna(row['AVR_MNT']) else 0,
-                            'unit': str(row['AVR_UNT']) if pd.notna(row['AVR_UNT']) else '',
-                            'nb5': str(row['IDE_HSC_NB5']) if pd.notna(row['IDE_HSC_NB5']) else '',
-                            'currency': 'USD',
+                            'desc':      str(row['GDS_DS2']).strip()[:120] if pd.notna(row['GDS_DS2']) else '',
+                            'avg_price': avg_p,
+                            'min_price': min_p,
+                            'max_price': max_p,
+                            'unit':      unit_name,
+                            'duty':      duty,
+                            'nb5':       str(row['IDE_HSC_NB5']) if pd.notna(row['IDE_HSC_NB5']) else '',
+                            'currency':  str(row['GDS_CUR_COD']) if pd.notna(row.get('GDS_CUR_COD',None)) else 'USD',
                         }
                 print(f"✅ TSC loaded: {len(TSC_DATABASE)} HS codes from {path}")
                 return
@@ -1211,16 +1228,20 @@ def lookup_hs(hs_code):
 def get_hs_info(cargo_key):
     if cargo_key not in CARGO_DATABASE:
         return {'en': cargo_key.upper(), 'ar': cargo_key, 'hs': '999999', 'ch': '99',
-                'ch_name': '', 'duty': 15, 'tsc_desc': '', 'avg_price': 0, 'unit': '', 'tsc_code': ''}
+                'ch_name': '', 'duty': 15, 'tsc_desc': '', 'avg_price': 0,
+                'min_price': 0, 'max_price': 0, 'unit': '', 'tsc_code': '', 'currency': 'USD'}
     c = CARGO_DATABASE[cargo_key]
     tsc = lookup_hs(c['hs'])
     return {
         'en': cargo_key.upper().replace('_', ' '), 'ar': c['ar'], 'hs': c['hs'], 'ch': c['ch'],
-        'ch_name': HS_CHAPTERS.get(c['ch'], ''), 'duty': c['duty'],
+        'ch_name': HS_CHAPTERS.get(c['ch'], ''), 'duty': tsc['duty'] if tsc else c['duty'],
         'tsc_desc': tsc['desc'] if tsc else c['ar'],
         'avg_price': tsc['avg_price'] if tsc else 0,
-        'unit': tsc['unit'] if tsc else '',
-        'tsc_code': tsc['nb5'] if tsc else '',
+        'min_price': tsc['min_price'] if tsc else 0,
+        'max_price': tsc['max_price'] if tsc else 0,
+        'unit':      tsc['unit'] if tsc else '',
+        'currency':  tsc['currency'] if tsc else 'USD',
+        'tsc_code':  tsc['nb5'] if tsc else '',
     }
 
 # ═══════════════════════════════════════════════════════════════
@@ -3480,10 +3501,10 @@ def analyze_full(img, declared_text):
 
     # ══ دمج ذكي للفئات المتشابهة ══
     _SMART_GROUPS = {
-        'rice':           (['seeds','rice','food','canned_food','sugar'],          'رز',    '🌾'),
-        'banana':         (['banana','fruit','food'],                              'موز',   '🍌'),
-        'pharmaceutical': (['pharmaceutical','medicine','medical','pharmacy'],      'أدوية', '💊'),
-        'tobacco':        (['tobacco','cigarette','snacks','smoking'],              'سجائر', '🚬'),
+        'rice':           (['seeds','rice','food','canned_food','sugar'],                    'رز',          '🌾'),
+        'banana':         (['banana','fruit','food'],                                        'موز',         '🍌'),
+        'pharmaceutical': (['pharmaceutical','medicine','medical','pharmacy','drug'],         'أدوية بشرية', '💊'),
+        'tobacco':        (['tobacco','cigarette','snacks','smoking'],                        'سجائر',       '🚬'),
     }
 
     def smart_category(top5):
@@ -3580,11 +3601,24 @@ def analyze_full(img, declared_text):
             ar4    = info4.get('ar', best_cat14) or best_cat14
             hs4    = info4.get('hs', '—') or '—'
             duty4  = info4.get('duty', 0)
+            avg_p4 = info4.get('avg_price', 0)
+            min_p4 = info4.get('min_price', 0)
+            max_p4 = info4.get('max_price', 0)
+            unit4  = info4.get('unit', '')
+            cur4   = info4.get('currency', 'USD')
             is_d4  = any(d in best_cat14.lower() for d in DANGER_48)
             bg4    = '#FFEBEE' if is_d4 else '#E8F5E9'
             clr4   = '#B71C1C' if is_d4 else '#1B5E20'
             icon4  = '🚨' if is_d4 else '✅'
             smart_badge14 = f"<span style='background:#1565C0;color:white;font-size:11px;padding:2px 7px;border-radius:8px;margin-top:4px;display:inline-block;'>{smart_note14}</span>" if smart_note14 else ""
+            # سعر TSC
+            if avg_p4 > 0:
+                price_str = f"{avg_p4:.2f} {cur4}/{unit4}"
+                if min_p4 > 0 and max_p4 > 0:
+                    price_str += f" (نطاق: {min_p4:.2f}–{max_p4:.2f})"
+                price_row4 = f"<div style='background:#E3F2FD;padding:5px 10px;font-size:12px;color:#0D47A1;border-top:1px solid #E0E0E0;'>💰 متوسط السعر: <b>{price_str}</b></div>"
+            else:
+                price_row4 = ""
             rows4  = ''.join([
                 f"<div style='display:flex;justify-content:space-between;padding:4px 8px;"
                 f"border-bottom:1px solid #F0F0F0;font-size:13px;'>"
@@ -3603,6 +3637,7 @@ def analyze_full(img, declared_text):
     <div style='font-size:12px;color:{clr4};margin-top:2px;'>HS: {hs4} | الرسوم: {duty4}% | ثقة: {best_conf14:.1%}</div>
     {smart_badge14}
   </div>
+  {price_row4}
   <div style='padding:4px 0;'>{rows4}</div>
 </div>"""
     except Exception as e:
@@ -3702,11 +3737,24 @@ def analyze_full(img, declared_text):
             ar17   = info17.get('ar', best_cat17) or best_cat17
             hs17   = info17.get('hs', '—') or '—'
             duty17 = info17.get('duty', 0)
+            avg_p17= info17.get('avg_price', 0)
+            min_p17= info17.get('min_price', 0)
+            max_p17= info17.get('max_price', 0)
+            unit17 = info17.get('unit', '')
+            cur17  = info17.get('currency', 'USD')
             is_d17 = any(d in best_cat17.lower() for d in DANGER_48)
             bg17   = '#FFEBEE' if is_d17 else '#E8F5E9'
             clr17  = '#B71C1C' if is_d17 else '#1B5E20'
             icon17 = '🚨' if is_d17 else '✅'
             smart_badge17 = f"<span style='background:#1565C0;color:white;font-size:11px;padding:2px 7px;border-radius:8px;margin-top:4px;display:inline-block;'>{smart_note17}</span>" if smart_note17 else ""
+            # سعر TSC
+            if avg_p17 > 0:
+                price_str17 = f"{avg_p17:.2f} {cur17}/{unit17}"
+                if min_p17 > 0 and max_p17 > 0:
+                    price_str17 += f" (نطاق: {min_p17:.2f}–{max_p17:.2f})"
+                price_row17 = f"<div style='background:#E3F2FD;padding:5px 10px;font-size:12px;color:#0D47A1;border-top:1px solid #E0E0E0;'>💰 متوسط السعر: <b>{price_str17}</b></div>"
+            else:
+                price_row17 = ""
             rows17 = ''.join([
                 f"<div style='display:flex;justify-content:space-between;padding:4px 8px;"
                 f"border-bottom:1px solid #F0F0F0;font-size:13px;'>"
@@ -3747,6 +3795,7 @@ def analyze_full(img, declared_text):
     <div style='font-size:12px;color:{clr17};margin-top:2px;'>HS: {hs17} | الرسوم: {duty17}% | ثقة: {best_conf17:.1%}</div>
     <div style='margin-top:5px;'>{smart_badge17}{agree_badge}</div>
   </div>
+  {price_row17}
   <div style='padding:4px 0;'>{rows17}</div>
   <div style='background:{fusion_color};color:white;padding:8px 12px;text-align:center;font-weight:bold;font-size:14px;'>
     {fusion_icon} الحكم النهائي: {fusion_text}