update:合并非tts代码

2026-07-29 16:23:56 +08:00 · 2025-05-21 13:18:12 +08:00
parent ede2bc6a4e
commit 851365fb58
65 changed files with 5423 additions and 1943 deletions
@@ -2,6 +2,7 @@ import requests
 from bs4 import BeautifulSoup
 from config.logger import setup_logging
 from plugins_func.register import register_function, ToolType, ActionResponse, Action
+from core.utils.util import get_ip_info

 TAG = __name__
 logger = setup_logging()
@@ -12,55 +13,104 @@ GET_WEATHER_FUNCTION_DESC = {
        "name": "get_weather",
        "description": (
            "获取某个地点的天气，用户应提供一个位置，比如用户说杭州天气，参数为：杭州。"
-            "如果用户说的是省份，默认用省会城市。如果用户说的不是省份或城市而是一个地名，"
-            "默认用该地所在省份的省会城市。"
+            "如果用户说的是省份，默认用省会城市。如果用户说的不是省份或城市而是一个地名，默认用该地所在省份的省会城市。"
+            "如果用户没有指明地点，说“天气怎么样”，”今天天气如何“，location参数为空"
        ),
        "parameters": {
            "type": "object",
            "properties": {
                "location": {
                    "type": "string",
-                    "description": "地点名，例如杭州。可选参数，如果不提供则不传"
+                    "description": "地点名，例如杭州。可选参数，如果不提供则不传",
                },
                "lang": {
                    "type": "string",
-                    "description": "返回用户使用的语言code，例如zh_CN/zh_HK/en_US/ja_JP等，默认zh_CN"
-                }
+                    "description": "返回用户使用的语言code，例如zh_CN/zh_HK/en_US/ja_JP等，默认zh_CN",
+                },
            },
-            "required": ["lang"]
-        }
-    }
+            "required": ["lang"],
+        },
+    },
 }

 HEADERS = {
-    'User-Agent': (
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '
-        '(KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36'
+    "User-Agent": (
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
    )
 }

 # 天气代码 https://dev.qweather.com/docs/resource/icons/#weather-icons
 WEATHER_CODE_MAP = {
-    "100": "晴", "101": "多云", "102": "少云", "103": "晴间多云", "104": "阴",
-    "150": "晴", "151": "多云", "152": "少云", "153": "晴间多云",
-    "300": "阵雨", "301": "强阵雨", "302": "雷阵雨", "303": "强雷阵雨", "304": "雷阵雨伴有冰雹",
-    "305": "小雨", "306": "中雨", "307": "大雨", "308": "极端降雨", "309": "毛毛雨/细雨",
-    "310": "暴雨", "311": "大暴雨", "312": "特大暴雨", "313": "冻雨", "314": "小到中雨",
-    "315": "中到大雨", "316": "大到暴雨", "317": "暴雨到大暴雨", "318": "大暴雨到特大暴雨",
-    "350": "阵雨", "351": "强阵雨", "399": "雨",
-    "400": "小雪", "401": "中雪", "402": "大雪", "403": "暴雪", "404": "雨夹雪",
-    "405": "雨雪天气", "406": "阵雨夹雪", "407": "阵雪", "408": "小到中雪", "409": "中到大雪", "410": "大到暴雪",
-    "456": "阵雨夹雪", "457": "阵雪", "499": "雪",
-    "500": "薄雾", "501": "雾", "502": "霾", "503": "扬沙", "504": "浮尘",
-    "507": "沙尘暴", "508": "强沙尘暴",
-    "509": "浓雾", "510": "强浓雾", "511": "中度霾", "512": "重度霾", "513": "严重霾", "514": "大雾", "515": "特强浓雾",
-    "900": "热", "901": "冷", "999": "未知"
+    "100": "晴",
+    "101": "多云",
+    "102": "少云",
+    "103": "晴间多云",
+    "104": "阴",
+    "150": "晴",
+    "151": "多云",
+    "152": "少云",
+    "153": "晴间多云",
+    "300": "阵雨",
+    "301": "强阵雨",
+    "302": "雷阵雨",
+    "303": "强雷阵雨",
+    "304": "雷阵雨伴有冰雹",
+    "305": "小雨",
+    "306": "中雨",
+    "307": "大雨",
+    "308": "极端降雨",
+    "309": "毛毛雨/细雨",
+    "310": "暴雨",
+    "311": "大暴雨",
+    "312": "特大暴雨",
+    "313": "冻雨",
+    "314": "小到中雨",
+    "315": "中到大雨",
+    "316": "大到暴雨",
+    "317": "暴雨到大暴雨",
+    "318": "大暴雨到特大暴雨",
+    "350": "阵雨",
+    "351": "强阵雨",
+    "399": "雨",
+    "400": "小雪",
+    "401": "中雪",
+    "402": "大雪",
+    "403": "暴雪",
+    "404": "雨夹雪",
+    "405": "雨雪天气",
+    "406": "阵雨夹雪",
+    "407": "阵雪",
+    "408": "小到中雪",
+    "409": "中到大雪",
+    "410": "大到暴雪",
+    "456": "阵雨夹雪",
+    "457": "阵雪",
+    "499": "雪",
+    "500": "薄雾",
+    "501": "雾",
+    "502": "霾",
+    "503": "扬沙",
+    "504": "浮尘",
+    "507": "沙尘暴",
+    "508": "强沙尘暴",
+    "509": "浓雾",
+    "510": "强浓雾",
+    "511": "中度霾",
+    "512": "重度霾",
+    "513": "严重霾",
+    "514": "大雾",
+    "515": "特强浓雾",
+    "900": "热",
+    "901": "冷",
+    "999": "未知",
 }

-def fetch_city_info(location, api_key):
-    url = f"https://geoapi.qweather.com/v2/city/lookup?key={api_key}&location={location}&lang=zh"
+
+def fetch_city_info(location, api_key, api_host):
+    url = f"https://{api_host}/geo/v2/city/lookup?key={api_key}&location={location}&lang=zh"
    response = requests.get(url, headers=HEADERS).json()
-    return response.get('location', [])[0] if response.get('location') else None
+    return response.get("location", [])[0] if response.get("location") else None


 def fetch_weather_page(url):
@@ -72,10 +122,14 @@ def parse_weather_info(soup):
    city_name = soup.select_one("h1.c-submenu__location").get_text(strip=True)

    current_abstract = soup.select_one(".c-city-weather-current .current-abstract")
-    current_abstract = current_abstract.get_text(strip=True) if current_abstract else "未知"
+    current_abstract = (
+        current_abstract.get_text(strip=True) if current_abstract else "未知"
+    )

    current_basic = {}
-    for item in soup.select(".c-city-weather-current .current-basic .current-basic___item"):
+    for item in soup.select(
+        ".c-city-weather-current .current-basic .current-basic___item"
+    ):
        parts = item.get_text(strip=True, separator=" ").split(" ")
        if len(parts) == 2:
            key, value = parts[1], parts[0]
@@ -84,7 +138,9 @@ def parse_weather_info(soup):
    temps_list = []
    for row in soup.select(".city-forecast-tabs__row")[:7]:  # 取前7天的数据
        date = row.select_one(".date-bg .date").get_text(strip=True)
-        weather_code = row.select_one(".date-bg .icon")["src"].split("/")[-1].split(".")[0]
+        weather_code = (
+            row.select_one(".date-bg .icon")["src"].split("/")[-1].split(".")[0]
+        )
        weather = WEATHER_CODE_MAP.get(weather_code, "未知")
        temps = [span.get_text(strip=True) for span in row.select(".tmp-cont .temp")]
        high_temp, low_temp = (temps[0], temps[-1]) if len(temps) >= 2 else (None, None)
@@ -93,31 +149,47 @@ def parse_weather_info(soup):
    return city_name, current_abstract, current_basic, temps_list


-@register_function('get_weather', GET_WEATHER_FUNCTION_DESC, ToolType.SYSTEM_CTL)
+@register_function("get_weather", GET_WEATHER_FUNCTION_DESC, ToolType.SYSTEM_CTL)
 def get_weather(conn, location: str = None, lang: str = "zh_CN"):
-    api_key = conn.config["plugins"]["get_weather"]["api_key"]
+    api_host = conn.config["plugins"]["get_weather"].get("api_host", "mj7p3y7naa.re.qweatherapi.com")
+    api_key = conn.config["plugins"]["get_weather"].get("api_key", "a861d0d5e7bf4ee1a83d9a9e4f96d4da")
    default_location = conn.config["plugins"]["get_weather"]["default_location"]
-    location = location or conn.client_ip_info.get("city") or default_location
-    logger.bind(tag=TAG).debug(f"获取天气: {location}")
-
-    city_info = fetch_city_info(location, api_key)
+    client_ip = conn.client_ip
+    # 优先使用用户提供的location参数
+    if not location:
+        # 通过客户端IP解析城市
+        if client_ip:
+            # 动态解析IP对应的城市信息
+            ip_info = get_ip_info(client_ip, logger)
+            location = ip_info.get("city") if ip_info and "city" in ip_info else None
+        else:
+            # 若IP解析失败或无IP，使用默认位置
+            location = default_location
+    city_info = fetch_city_info(location, api_key, api_host)
    if not city_info:
-        return ActionResponse(Action.REQLLM, f"未找到相关的城市: {location}，请确认地点是否正确", None)
-
-    soup = fetch_weather_page(city_info['fxLink'])
+        return ActionResponse(
+            Action.REQLLM, f"未找到相关的城市: {location}，请确认地点是否正确", None
+        )
+    soup = fetch_weather_page(city_info["fxLink"])
    if not soup:
        return ActionResponse(Action.REQLLM, None, "请求失败")
-
    city_name, current_abstract, current_basic, temps_list = parse_weather_info(soup)
-    weather_report = f"根据下列数据，用{lang}回应用户的查询天气请求：\n{city_name}未来7天天气:\n"
-    for i, (date, weather, high, low) in enumerate(temps_list):
-        if high and low:
-            weather_report += f"{date}: {low}到{high}, {weather}\n"
-    weather_report += (
-        f"当前天气: {current_abstract}\n"
-        f"当前天气参数: {current_basic}\n"
-        f"(确保只报告指定单日的天气情况，除非未来会出现异常天气；或者用户明确要求想要了解多日天气，如果未指定，默认报告今天的天气。"
-        "参数为0的值不需要报告给用户，每次都报告体感温度，根据语境选择合适的参数内容告知用户，并对参数给出相应评价)"
-    )

-    return ActionResponse(Action.REQLLM, weather_report, None)
+    weather_report = f"您查询的位置是：{city_name}\n\n当前天气: {current_abstract}\n"
+
+    # 添加有效的当前天气参数
+    if current_basic:
+        weather_report += "详细参数：\n"
+        for key, value in current_basic.items():
+            if value != "0":  # 过滤无效值
+                weather_report += f"  · {key}: {value}\n"
+
+    # 添加7天预报
+    weather_report += "\n未来7天预报：\n"
+    for date, weather, high, low in temps_list:
+        weather_report += f"{date}: {weather}，气温 {low}~{high}\n"
+
+    # 提示语
+    weather_report += "\n（如需某一天的具体天气，请告诉我日期）"
+
+    return ActionResponse(Action.REQLLM, weather_report, None)