Update app.py

app.py

@@ -8,11 +8,89 @@ from huggingface_hub import InferenceClient
 API_KEY = os.getenv("SERPHOUSE_API_KEY")
 hf_client = InferenceClient("CohereForAI/c4ai-command-r-plus-08-2024", token=os.getenv("HF_TOKEN"))
 
-# 국가별 언어 코드 매핑
+
+
+COUNTRY_CODES = {
+    "United States": "US",
+    "United Kingdom": "GB",
+    "Canada": "CA",
+    "Australia": "AU",
+    "Germany": "DE",
+    "France": "FR",
+    "Japan": "JP",
+    "South Korea": "KR",
+    "China": "CN",
+    "Taiwan": "TW",  # 대만 추가
+    "India": "IN",
+    "Brazil": "BR",
+    "Mexico": "MX",
+    "Russia": "RU",
+    "Italy": "IT",
+    "Spain": "ES",
+    "Netherlands": "NL",
+    "Singapore": "SG",
+    "Hong Kong": "HK",
+    "Indonesia": "ID",
+    "Malaysia": "MY",
+    "Philippines": "PH",
+    "Thailand": "TH",
+    "Vietnam": "VN",
+    "Belgium": "BE",
+    "Denmark": "DK",
+    "Finland": "FI",
+    "Ireland": "IE",
+    "Norway": "NO",
+    "Poland": "PL",
+    "Sweden": "SE",
+    "Switzerland": "CH",
+    "Austria": "AT",
+    "Czech Republic": "CZ",
+    "Greece": "GR",
+    "Hungary": "HU",
+    "Portugal": "PT",
+    "Romania": "RO",
+    "Turkey": "TR",
+    "Israel": "IL",
+    "Saudi Arabia": "SA",
+    "United Arab Emirates": "AE",
+    "South Africa": "ZA",
+    "Argentina": "AR",
+    "Chile": "CL",
+    "Colombia": "CO",
+    "Peru": "PE",
+    "Venezuela": "VE",
+    "New Zealand": "NZ",
+    "Bangladesh": "BD",
+    "Pakistan": "PK",
+    "Egypt": "EG",
+    "Morocco": "MA",
+    "Nigeria": "NG",
+    "Kenya": "KE",
+    "Ukraine": "UA",
+    "Croatia": "HR",
+    "Slovakia": "SK",
+    "Bulgaria": "BG",
+    "Serbia": "RS",
+    "Estonia": "EE",
+    "Latvia": "LV",
+    "Lithuania": "LT",
+    "Slovenia": "SI",
+    "Luxembourg": "LU",
+    "Malta": "MT",
+    "Cyprus": "CY",
+    "Iceland": "IS"
+}
+
+
+def is_english(text):
+    # 영어로만 구성되어 있는지 확인
+    return all(ord(char) < 128 for char in text.replace(' ', ''))
+    
 COUNTRY_LANGUAGES = {
     "South Korea": "ko",
     "Japan": "ja",
     "China": "zh",
+    "Taiwan": "zh-tw",  # 대만어(번체 중국어) 추가
     "Russia": "ru",
     "France": "fr",
     "Germany": "de",
@@ -27,93 +105,46 @@ COUNTRY_LANGUAGES = {
     "Saudi Arabia": "ar",
     "United Arab Emirates": "ar",
     "Egypt": "ar",
-    "Morocco": "ar"
+    "Morocco": "ar",
+    "Greece": "el",
+    "Poland": "pl",
+    "Czech Republic": "cs",
+    "Hungary": "hu",
+    "Turkey": "tr",
+    "Romania": "ro",
+    "Bulgaria": "bg",
+    "Croatia": "hr",
+    "Serbia": "sr",
+    "Slovakia": "sk",
+    "Slovenia": "sl",
+    "Estonia": "et",
+    "Latvia": "lv",
+    "Lithuania": "lt",
+    "Ukraine": "uk",
+    "Israel": "he",
+    "Bangladesh": "bn",
+    "Pakistan": "ur",
+    "Finland": "fi",
+    "Denmark": "da",
+    "Norway": "no",
+    "Sweden": "sv",
+    "Iceland": "is",
+    "Philippines": "fil",
+    "Brazil": "pt-br",
+    "Argentina": "es-ar",
+    "Chile": "es-cl",
+    "Colombia": "es-co",
+    "Peru": "es-pe",
+    "Venezuela": "es-ve"
 }
 
-COUNTRY_LOCATIONS = {
-    "United States": "United States",
-    "United Kingdom": "United Kingdom",
-    "Canada": "Canada",
-    "Australia": "Australia",
-    "Germany": "Germany",
-    "France": "France",
-    "Japan": "Japan",
-    "South Korea": "South Korea",
-    "China": "China",
-    "India": "India",
-    "Brazil": "Brazil",
-    "Mexico": "Mexico",
-    "Russia": "Russia",
-    "Italy": "Italy",
-    "Spain": "Spain",
-    "Netherlands": "Netherlands",
-    "Singapore": "Singapore",
-    "Hong Kong": "Hong Kong",
-    "Indonesia": "Indonesia",
-    "Malaysia": "Malaysia",
-    "Philippines": "Philippines",
-    "Thailand": "Thailand",
-    "Vietnam": "Vietnam",
-    "Belgium": "Belgium",
-    "Denmark": "Denmark",
-    "Finland": "Finland",
-    "Ireland": "Ireland",
-    "Norway": "Norway",
-    "Poland": "Poland",
-    "Sweden": "Sweden",
-    "Switzerland": "Switzerland",
-    "Austria": "Austria",
-    "Czech Republic": "Czech Republic",
-    "Greece": "Greece",
-    "Hungary": "Hungary",
-    "Portugal": "Portugal",
-    "Romania": "Romania",
-    "Turkey": "Turkey",
-    "Israel": "Israel",
-    "Saudi Arabia": "Saudi Arabia",
-    "United Arab Emirates": "United Arab Emirates",
-    "South Africa": "South Africa",
-    "Argentina": "Argentina",
-    "Chile": "Chile",
-    "Colombia": "Colombia",
-    "Peru": "Peru",
-    "Venezuela": "Venezuela",
-    "New Zealand": "New Zealand",
-    "Bangladesh": "Bangladesh",
-    "Pakistan": "Pakistan",
-    "Egypt": "Egypt",
-    "Morocco": "Morocco",
-    "Nigeria": "Nigeria",
-    "Kenya": "Kenya",
-    "Ukraine": "Ukraine",
-    "Croatia": "Croatia",
-    "Slovakia": "Slovakia",
-    "Bulgaria": "Bulgaria",
-    "Serbia": "Serbia",
-    "Estonia": "Estonia",
-    "Latvia": "Latvia",
-    "Lithuania": "Lithuania",
-    "Slovenia": "Slovenia",
-    "Luxembourg": "Luxembourg",
-    "Malta": "Malta",
-    "Cyprus": "Cyprus",
-    "Iceland": "Iceland"
-}
-
-MAJOR_COUNTRIES = list(COUNTRY_LOCATIONS.keys())
-
-def is_english(text):
-    # 영어로만 구성되어 있는지 확인
-    return all(ord(char) < 128 for char in text.replace(' ', ''))
-
+# 번역 프롬프트 수정
 def translate_query(query, country):
     try:
-        # 영어 입력인 경우 번역하지 않고 그대로 사용
         if is_english(query):
             print(f"English query detected, using original: {query}")
             return query[:255]
             
-        # 한글 입력이고 South Korea가 선택된 경우
         if country == "South Korea":
             return query[:255]
             
@@ -124,7 +155,8 @@ def translate_query(query, country):
             # 번역 프롬프트 개선
             prompt = f"""Translate this text to {target_lang} language. 
             For Japanese, use Kanji and Kana.
-            For Chinese, use Simplified Chinese.
+            For Chinese (China), use Simplified Chinese.
+            For Chinese (Taiwan), use Traditional Chinese.
             For Korean, use Hangul.
             Only output the translated text without any explanation.
             Text to translate: {query}"""
@@ -145,6 +177,10 @@ def translate_query(query, country):
 
 
 
+# MAJOR_COUNTRIES 정의 수정
+MAJOR_COUNTRIES = list(COUNTRY_CODES.keys())  # COUNTRY_LOCATIONS 대신 COUNTRY_CODES 사용
+
+# search_serphouse 함수 수정
 def search_serphouse(query, country, page=1, num_result=10):
     url = "https://api.serphouse.com/serp/live"
     
@@ -157,12 +193,12 @@ def search_serphouse(query, country, page=1, num_result=10):
         "data": {
             "q": translated_query,
             "domain": "google.com",
-            "loc": COUNTRY_LOCATIONS.get(country, "United States"),
+            "country_code": COUNTRY_CODES.get(country, "US"),  # country_code 사용
             "lang": COUNTRY_LANGUAGES.get(country, "en"),
             "device": "desktop",
             "serp_type": "news",
             "page": "1",
-            "num": "10"  # num으로 변경
+            "num": "10"
         }
     }