Compare commits
2 Commits
app-v0.1.2
...
app-v0.1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bef5db912 | ||
|
|
17927b6450 |
@@ -36,7 +36,7 @@
|
||||
- 원하면 게임 중에는 봇을 일시정지할 수 있습니다.
|
||||
- **안티치트 보호**: 뱅가드 같은 안티치트가 걸린 게임이 실행 중이면 키보드·마우스 자동 조작을 막고 그 이유를 알려 줍니다.
|
||||
- **기존 기능 유지**: 메모리, 날씨, 웹 검색, 식단 기록, MCP, 브라우저 제어를 그대로 가져갑니다.
|
||||
- **기상청 날씨**: 관리 앱 "기능" 화면에 기상청 API허브 인증키를 넣으면 한국 안의 현재 날씨를 기상청에서 받습니다(초단기실황조회, 초단기예보조회 활용신청 필요). 키가 없거나 한국 밖이면 open-meteo, 그다음 met.no에서 받습니다.
|
||||
- **기상청 날씨**: 관리 앱 "기능" 화면에 기상청 API허브 인증키를 넣으면 한국 안의 현재 날씨와 10일 뒤까지의 예보("내일 날씨", "주말 날씨")를 기상청에서 받습니다(초단기실황조회, 초단기예보조회, 단기예보조회, 중기기온조회, 중기육상예보조회 활용신청 필요). 키가 없거나 한국 밖이면 open-meteo에서 받고, 현재 날씨는 그다음 met.no에서 받습니다.
|
||||
- **관리 앱**:
|
||||
- 첫 실행 마법사, 대시보드, 모델 다운로드, 기능별 켜기/끄기를 제공합니다.
|
||||
- 로그 화면에서 로그를 보고, 복사하고, 내려받을 수 있습니다. 비밀값은 자동으로 가립니다.
|
||||
|
||||
2
app/Cargo.lock
generated
2
app/Cargo.lock
generated
@@ -1520,7 +1520,7 @@ checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4"
|
||||
|
||||
[[package]]
|
||||
name = "jarvis-app"
|
||||
version = "0.1.27"
|
||||
version = "0.1.28"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"base64 0.22.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "jarvis-app"
|
||||
version = "0.1.27"
|
||||
version = "0.1.28"
|
||||
edition = "2021"
|
||||
rust-version = "1.85"
|
||||
description = "Jarvis v2 Windows app core: Discord voice, voice worker supervisor, chat channels"
|
||||
|
||||
4
app/shell/Cargo.lock
generated
4
app/shell/Cargo.lock
generated
@@ -2637,7 +2637,7 @@ checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4"
|
||||
|
||||
[[package]]
|
||||
name = "jarvis-app"
|
||||
version = "0.1.27"
|
||||
version = "0.1.28"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"base64 0.22.1",
|
||||
@@ -2666,7 +2666,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "jarvis-shell"
|
||||
version = "0.1.27"
|
||||
version = "0.1.28"
|
||||
dependencies = [
|
||||
"jarvis-app",
|
||||
"serde_json",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "jarvis-shell"
|
||||
version = "0.1.27"
|
||||
version = "0.1.28"
|
||||
edition = "2021"
|
||||
rust-version = "1.85"
|
||||
description = "Jarvis v2 management app window (Tauri 2 over the app core's AdminApi)"
|
||||
|
||||
@@ -86,8 +86,8 @@ manages the MCP servers it connects.
|
||||
`kmaApiKey`, never in the settings file or `config/brain.json`, and saving `mcpServers` keeps it.
|
||||
On start the app passes it to the worker in `JARVIS_KMA_API_KEY`; the worker takes that variable
|
||||
out of its environment before any child process starts, and only the weather tool uses it
|
||||
(current weather inside Korea from KMA, else open-meteo, then met.no). Without a key nothing
|
||||
changes.
|
||||
(the weather now and the forecast up to 10 days ahead inside Korea from KMA, else open-meteo;
|
||||
the weather now then met.no). Without a key nothing changes.
|
||||
- Each server's outcome (its tool count, or why it failed) is a worker line in the LLM log tab,
|
||||
also without debug logging. MCP servers are programs the PC runs; the screen says to add only
|
||||
trusted ones.
|
||||
|
||||
78
evals/test_weather_forecast_days.py
Normal file
78
evals/test_weather_forecast_days.py
Normal file
@@ -0,0 +1,78 @@
|
||||
"""
|
||||
Eval: a question about a later day reaches getWeather as that day (days_ahead/days).
|
||||
|
||||
Before getWeather took days_ahead/days (2026-11-18), "내일 날씨 어때?" was answered
|
||||
with the weather now. The model counts the days from today's date in the context:
|
||||
tomorrow is 1, this weekend is the coming Saturday with 2 days, and a plain
|
||||
question about the weather stays the weather now (no days_ahead or 0).
|
||||
|
||||
Runs like the v2 brain (compact prompt, intent judge, Korean replies).
|
||||
|
||||
Run: EVAL_JUDGE_MODEL=qwen3:8b ./scripts/run_evals.sh weather_forecast_days
|
||||
"""
|
||||
|
||||
from datetime import date
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
|
||||
from conftest import requires_judge_llm
|
||||
from helpers import JUDGE_BASE_URL, ToolCallCapture, create_mock_tool_run
|
||||
|
||||
|
||||
def _ask(mock_config, eval_db, eval_dialogue_memory, query):
|
||||
from helpers import JUDGE_MODEL
|
||||
from jarvis.memory.history import HistoryContext
|
||||
from jarvis.reply import turn_state
|
||||
from jarvis.reply.engine import run_reply_engine
|
||||
|
||||
mock_config.ollama_base_url = JUDGE_BASE_URL
|
||||
mock_config.ollama_chat_model = JUDGE_MODEL
|
||||
capture = ToolCallCapture()
|
||||
turn_state.reset()
|
||||
try:
|
||||
with patch('jarvis.reply.engine.run_tool_with_retries', side_effect=create_mock_tool_run(capture, {
|
||||
"getWeather": "서울 날씨는 맑음, 최저 -1도, 최고 4도, 강수확률 0%입니다.",
|
||||
})), patch('jarvis.reply.engine.get_location_context_with_timezone',
|
||||
return_value=("Location: Seoul, South Korea", None)):
|
||||
reply = run_reply_engine(db=eval_db, cfg=mock_config, tts=None, text=query,
|
||||
dialogue_memory=eval_dialogue_memory, history=HistoryContext(),
|
||||
legacy_memory=False, default_language="Korean",
|
||||
compact_prompt=True, intent_judge=True)
|
||||
finally:
|
||||
turn_state.reset()
|
||||
args = capture.get_args("getWeather")
|
||||
print(f"\n forecast days [{JUDGE_MODEL}] {query!r}: tools={capture.tool_names()} "
|
||||
f"args={args} reply={(reply or '')[:160]!r}")
|
||||
return args
|
||||
|
||||
|
||||
def _num(args, name):
|
||||
try:
|
||||
return int(float((args or {}).get(name) or 0))
|
||||
except (TypeError, ValueError):
|
||||
return 0
|
||||
|
||||
|
||||
@pytest.mark.eval
|
||||
@requires_judge_llm
|
||||
class TestWeatherForecastDays:
|
||||
@pytest.mark.parametrize("query", ["내일 날씨 어때?", "what's the weather tomorrow?"])
|
||||
def test_tomorrow_is_one_day_ahead(self, mock_config, eval_db, eval_dialogue_memory, query):
|
||||
args = _ask(mock_config, eval_db, eval_dialogue_memory, query)
|
||||
assert args is not None, "getWeather was not called"
|
||||
assert _num(args, "days_ahead") == 1, args
|
||||
|
||||
def test_the_weekend_is_the_coming_saturday_and_sunday(self, mock_config, eval_db, eval_dialogue_memory):
|
||||
today = date.today()
|
||||
if today.weekday() >= 5:
|
||||
pytest.skip("on a weekend day 'this weekend' has two readings")
|
||||
args = _ask(mock_config, eval_db, eval_dialogue_memory, "이번 주말 날씨 어때?")
|
||||
assert args is not None, "getWeather was not called"
|
||||
assert _num(args, "days_ahead") == 5 - today.weekday(), args
|
||||
assert _num(args, "days") >= 2, args
|
||||
|
||||
def test_the_weather_now_stays_now(self, mock_config, eval_db, eval_dialogue_memory):
|
||||
args = _ask(mock_config, eval_db, eval_dialogue_memory, "지금 날씨 어때?")
|
||||
assert args is not None, "getWeather was not called"
|
||||
assert _num(args, "days_ahead") == 0 and _num(args, "days") <= 1, args
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
import math
|
||||
import os
|
||||
from collections import Counter
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
import requests
|
||||
@@ -252,7 +253,9 @@ def _met_no_current(lat: float, lon: float) -> Dict[str, Any]:
|
||||
|
||||
# KMA (기상청 API허브): current weather inside Korea when the app gives a key (admin.spec.md).
|
||||
KMA_KEY_ENV = "JARVIS_KMA_API_KEY"
|
||||
_KMA_URL = "https://apihub.kma.go.kr/api/typ02/openApi/VilageFcstInfoService_2.0/"
|
||||
_KMA_API = "https://apihub.kma.go.kr/api/typ02/openApi/"
|
||||
_KMA_URL = _KMA_API + "VilageFcstInfoService_2.0/"
|
||||
_KMA_MID_URL = _KMA_API + "MidFcstInfoService/"
|
||||
_KMA_TIMEOUT_SEC = 5
|
||||
_KST = timezone(timedelta(hours=9))
|
||||
# KMA's own words: PTY (precipitation type, 0 = none) wins over SKY (sky state).
|
||||
@@ -261,6 +264,32 @@ _KMA_PTY_WMO = {1: 63, 2: 69, 3: 73, 5: 51, 6: 68, 7: 71}
|
||||
_KMA_SKY_KO = {1: "맑음", 3: "구름 많음", 4: "흐림"}
|
||||
_KMA_SKY_WMO = {1: 0, 3: 2, 4: 3}
|
||||
_kma_key = ""
|
||||
# 중기예보 places: (getMidTa city, lat, lon); getMidLandFcst's region comes from the city's code.
|
||||
# Every code checked live against KMA on 2026-11-18.
|
||||
_KMA_MID_CITIES = (
|
||||
("11B10101", 37.5665, 126.9780), ("11B20201", 37.4563, 126.7052), ("11B20601", 37.2636, 127.0286),
|
||||
("11B20305", 37.7599, 126.7800), ("11B20701", 37.2720, 127.4350), ("11B20606", 36.9921, 127.1129),
|
||||
("11D10301", 37.8813, 127.7298), ("11D10401", 37.3422, 127.9202), ("11D20501", 37.7519, 128.8761),
|
||||
("11D20401", 38.2070, 128.5918), ("11C20401", 36.3504, 127.3845), ("11C20404", 36.4800, 127.2890),
|
||||
("11C20104", 36.6013, 126.6608), ("11C20101", 36.7845, 126.4503), ("11C20301", 36.8151, 127.1139),
|
||||
("11C10301", 36.6424, 127.4890), ("11C10101", 36.9910, 127.9259), ("11F10201", 35.8242, 127.1480),
|
||||
("21F10501", 35.9676, 126.7369), ("11F20501", 35.1595, 126.8526), ("21F20801", 34.8118, 126.3922),
|
||||
("11F20401", 34.7604, 127.6622), ("11F20405", 34.9507, 127.4872), ("11H10701", 35.8714, 128.6014),
|
||||
("11H10501", 36.5684, 128.7294), ("11H10201", 36.0190, 129.3435), ("11H20201", 35.1796, 129.0756),
|
||||
("11H20101", 35.5384, 129.3114), ("11H20301", 35.2280, 128.6811), ("11H20701", 35.1800, 128.1076),
|
||||
("11G00201", 33.4996, 126.5312), ("11G00401", 33.2541, 126.5600),
|
||||
)
|
||||
_KMA_MID_REGIONS = {"11B": "11B00000", "11D1": "11D10000", "11D2": "11D20000", "11C1": "11C10000",
|
||||
"11C2": "11C20000", "11F1": "11F10000", "11F2": "11F20000", "11H1": "11H10000",
|
||||
"11H2": "11H20000", "11G": "11G00000"}
|
||||
# A forecast goes this many days ahead (KMA 중기예보's last day).
|
||||
MAX_DAYS_AHEAD = 10
|
||||
_WEEKDAYS_KO = "월화수목금토일"
|
||||
_DAY_NAMES_KO = {0: "오늘", 1: "내일", 2: "모레"}
|
||||
|
||||
|
||||
def _now() -> datetime:
|
||||
return datetime.now(_KST)
|
||||
|
||||
|
||||
def take_kma_key() -> None:
|
||||
@@ -289,11 +318,10 @@ def _kma_grid(lat: float, lon: float) -> tuple:
|
||||
return int(ra * math.sin(theta) + 43 + 0.5), int(ro - ra * math.cos(theta) + 136 + 0.5)
|
||||
|
||||
|
||||
def _kma_items(service: str, key: str, base: datetime, nx: int, ny: int) -> list:
|
||||
def _kma_get(url: str, key: str, params: Dict[str, Any]) -> list:
|
||||
"""One KMA call's items; raises on any failure. The key is in the URL: never log the error text."""
|
||||
resp = requests.get(_KMA_URL + service, timeout=_KMA_TIMEOUT_SEC, params={
|
||||
"pageNo": 1, "numOfRows": 100, "dataType": "JSON", "base_date": base.strftime("%Y%m%d"),
|
||||
"base_time": base.strftime("%H%M"), "nx": nx, "ny": ny, "authKey": key})
|
||||
resp = requests.get(url, timeout=_KMA_TIMEOUT_SEC, params={
|
||||
"pageNo": 1, "numOfRows": 100, "dataType": "JSON", **params, "authKey": key})
|
||||
resp.raise_for_status()
|
||||
body = (resp.json() or {}).get("response") or {}
|
||||
code = (body.get("header") or {}).get("resultCode")
|
||||
@@ -302,6 +330,151 @@ def _kma_items(service: str, key: str, base: datetime, nx: int, ny: int) -> list
|
||||
return ((body.get("body") or {}).get("items") or {}).get("item") or []
|
||||
|
||||
|
||||
def _kma_items(service: str, key: str, base: datetime, nx: int, ny: int, rows: int = 100) -> list:
|
||||
return _kma_get(_KMA_URL + service, key, {"numOfRows": rows, "base_date": base.strftime("%Y%m%d"),
|
||||
"base_time": base.strftime("%H%M"), "nx": nx, "ny": ny})
|
||||
|
||||
|
||||
def _kma_failed(what: str, e: Exception) -> None:
|
||||
why = str(e) if isinstance(e, (ValueError, KeyError)) else type(e).__name__
|
||||
debug_log(f"KMA {what} failed ({why}); using open-meteo", "tools")
|
||||
|
||||
|
||||
def _kma_half(cats: Dict[str, Dict[str, str]], pm: bool) -> Optional[str]:
|
||||
"""Half a day's weather from 단기예보's hours: the commonest precipitation if any, else the commonest
|
||||
(on a tie the cloudier) sky. None when the forecast has no hour of that half left."""
|
||||
times = [t for t in cats.get("SKY", {}) if (t >= "1200") == pm]
|
||||
if not times:
|
||||
return None
|
||||
wet = [p for p in (int(float(cats.get("PTY", {}).get(t, 0))) for t in times) if p in _KMA_PTY_KO]
|
||||
if wet:
|
||||
return _KMA_PTY_KO[Counter(wet).most_common(1)[0][0]]
|
||||
skies = Counter(int(float(cats["SKY"][t])) for t in times)
|
||||
return _KMA_SKY_KO.get(max(skies, key=lambda v: (skies[v], v)))
|
||||
|
||||
|
||||
def _kma_short_days(lat: float, lon: float, key: str, now: datetime, offsets: list) -> Dict[int, Dict[str, Any]]:
|
||||
"""단기예보 (out about 10 minutes after 02, 05, ..., 23 h) for the days it covers: today to 3 days ahead."""
|
||||
t = now - timedelta(minutes=15)
|
||||
hours = [h for h in (2, 5, 8, 11, 14, 17, 20, 23) if h <= t.hour]
|
||||
base = (t.replace(hour=hours[-1]) if hours else (t - timedelta(days=1)).replace(hour=23)).replace(
|
||||
minute=0, second=0, microsecond=0)
|
||||
nx, ny = _kma_grid(lat, lon)
|
||||
by_date: Dict[str, Dict[str, Dict[str, str]]] = {}
|
||||
for i in _kma_items("getVilageFcst", key, base, nx, ny, rows=1500):
|
||||
by_date.setdefault(i.get("fcstDate"), {}).setdefault(i.get("category"), {})[i.get("fcstTime")] = i.get("fcstValue")
|
||||
out = {}
|
||||
for off in offsets:
|
||||
date = now.date() + timedelta(days=off)
|
||||
cats = by_date.get(date.strftime("%Y%m%d")) or {}
|
||||
if not (cats.get("TMN") or cats.get("TMX")): # a day the forecast does not (fully) cover
|
||||
continue
|
||||
temps = [float(v) for v in cats.get("TMP", {}).values()]
|
||||
lo = float(next(iter(cats["TMN"].values()))) if cats.get("TMN") else min(temps, default=None)
|
||||
hi = float(next(iter(cats["TMX"].values()))) if cats.get("TMX") else max(temps, default=None)
|
||||
out[off] = {"date": date, "am": _kma_half(cats, False), "pm": _kma_half(cats, True), "min": lo,
|
||||
"max": hi, "pop": max((int(float(v)) for v in cats.get("POP", {}).values()), default=None)}
|
||||
return out
|
||||
|
||||
|
||||
def _kma_mid_days(lat: float, lon: float, key: str, now: datetime, offsets: list) -> Dict[int, Dict[str, Any]]:
|
||||
"""중기예보 (out about 30 minutes after 06 and 18 h) for the nearest KMA city and its region; its days
|
||||
are counted from the day it came out, up to 10 days ahead."""
|
||||
t = now - timedelta(minutes=30)
|
||||
base = (t.replace(hour=18) if t.hour >= 18 else t.replace(hour=6) if t.hour >= 6
|
||||
else (t - timedelta(days=1)).replace(hour=18)).replace(minute=0, second=0, microsecond=0)
|
||||
city = min(_KMA_MID_CITIES, key=lambda c: (c[1] - lat) ** 2 + ((c[2] - lon) * math.cos(math.radians(lat))) ** 2)[0]
|
||||
region = _KMA_MID_REGIONS.get(city[:3]) or _KMA_MID_REGIONS["11" + city[2:4]]
|
||||
tm_fc = base.strftime("%Y%m%d%H%M")
|
||||
ta = _kma_get(_KMA_MID_URL + "getMidTa", key, {"regId": city, "tmFc": tm_fc})[0]
|
||||
land = _kma_get(_KMA_MID_URL + "getMidLandFcst", key, {"regId": region, "tmFc": tm_fc})[0]
|
||||
out = {}
|
||||
for off in offsets:
|
||||
date = now.date() + timedelta(days=off)
|
||||
n = (date - base.date()).days
|
||||
am = land.get(f"wf{n}Am") or land.get(f"wf{n}")
|
||||
pops = [p for p in (land.get(f"rnSt{n}Am"), land.get(f"rnSt{n}Pm"), land.get(f"rnSt{n}")) if p is not None]
|
||||
if am is None and ta.get(f"taMax{n}") is None:
|
||||
continue
|
||||
out[off] = {"date": date, "am": am, "pm": land.get(f"wf{n}Pm") or am, "min": ta.get(f"taMin{n}"),
|
||||
"max": ta.get(f"taMax{n}"), "pop": max(pops) if pops else None}
|
||||
return out
|
||||
|
||||
|
||||
def _kma_days(lat: float, lon: float, key: str, offsets: list) -> Dict[int, Dict[str, Any]]:
|
||||
"""KMA's forecast for each day it has: 단기예보 first, 중기예보 for the rest; {} on failure."""
|
||||
now = _now().astimezone(_KST)
|
||||
out: Dict[int, Dict[str, Any]] = {}
|
||||
if any(off <= 3 for off in offsets):
|
||||
try:
|
||||
out.update(_kma_short_days(lat, lon, key, now, offsets))
|
||||
except Exception as e:
|
||||
_kma_failed("short-term forecast", e)
|
||||
rest = [off for off in offsets if off not in out]
|
||||
if any(off >= 3 for off in rest):
|
||||
try:
|
||||
out.update(_kma_mid_days(lat, lon, key, now, rest))
|
||||
except Exception as e:
|
||||
_kma_failed("mid-term forecast", e)
|
||||
return out
|
||||
|
||||
|
||||
def _open_meteo_days(lat: float, lon: float, offsets: list) -> Dict[int, Dict[str, Any]]:
|
||||
"""open-meteo's daily forecast (the place's own days) for the given days; {} on failure."""
|
||||
try:
|
||||
resp = requests.get("https://api.open-meteo.com/v1/forecast", timeout=_OPEN_METEO_TIMEOUT_SEC, params={
|
||||
"latitude": lat, "longitude": lon, "timezone": "auto", "forecast_days": max(offsets) + 1,
|
||||
"daily": "weather_code,temperature_2m_max,temperature_2m_min,precipitation_probability_max"})
|
||||
resp.raise_for_status()
|
||||
daily = (resp.json() or {}).get("daily") or {}
|
||||
except Exception as e:
|
||||
debug_log(f"open-meteo daily forecast failed ({type(e).__name__})", "tools")
|
||||
return {}
|
||||
|
||||
def at(name: str, off: int):
|
||||
values = daily.get(name) or []
|
||||
return values[off] if off < len(values) else None
|
||||
|
||||
out = {}
|
||||
for off in offsets:
|
||||
code, date = at("weather_code", off), at("time", off)
|
||||
if date is None or (code is None and at("temperature_2m_max", off) is None):
|
||||
continue
|
||||
ko = WMO_CODES_KO.get(code) if code is not None else None
|
||||
out[off] = {"date": datetime.fromisoformat(date).date(), "am": ko, "pm": ko,
|
||||
"min": at("temperature_2m_min", off), "max": at("temperature_2m_max", off),
|
||||
"pop": at("precipitation_probability_max", off)}
|
||||
return out
|
||||
|
||||
|
||||
def _day_span(args: Optional[Dict[str, Any]]) -> tuple:
|
||||
"""(first, last) day asked for, counted from today: (0, 0) is the weather now."""
|
||||
def num(name: str, default: int) -> int:
|
||||
try:
|
||||
return int(float((args or {}).get(name)))
|
||||
except (TypeError, ValueError):
|
||||
return default
|
||||
first = min(max(num("days_ahead", 0), 0), MAX_DAYS_AHEAD)
|
||||
return first, min(first + max(num("days", 1), 1) - 1, MAX_DAYS_AHEAD)
|
||||
|
||||
|
||||
def _day_sentence(off: int, day: Dict[str, Any], place: str) -> str:
|
||||
"""'내일(11월 19일 목요일) 서울 날씨는 오전 맑음, 오후 비, 최저 -1도, 최고 4도, 강수확률 60%입니다.'"""
|
||||
d = day["date"]
|
||||
when = f"{d.month}월 {d.day}일 {_WEEKDAYS_KO[d.weekday()]}요일"
|
||||
if off in _DAY_NAMES_KO:
|
||||
when = f"{_DAY_NAMES_KO[off]}({when})"
|
||||
am, pm = day.get("am"), day.get("pm")
|
||||
parts = [f"오전 {am}, 오후 {pm}" if am and pm and am != pm else am or pm]
|
||||
if day.get("min") is not None:
|
||||
parts.append(f"최저 {round(float(day['min']))}도")
|
||||
if day.get("max") is not None:
|
||||
parts.append(f"최고 {round(float(day['max']))}도")
|
||||
if day.get("pop") is not None:
|
||||
parts.append(f"강수확률 {round(float(day['pop']))}%")
|
||||
return f"{when} {place} 날씨는 " + ", ".join(p for p in parts if p) + "입니다."
|
||||
|
||||
|
||||
def _kma_current(lat: float, lon: float, key: str, now: Optional[datetime] = None) -> Dict[str, Any]:
|
||||
"""Current weather from KMA in open-meteo's 'current' keys plus 'condition_ko'; {} on failure.
|
||||
|
||||
@@ -351,6 +524,10 @@ class WeatherTool(Tool):
|
||||
"Weather only (current + forecast). NOT for time-of-day, date, or "
|
||||
"location questions — those are already in the assistant's context. "
|
||||
"Use for ANY weather question: now, later today, tomorrow, this week. "
|
||||
"For another day set days_ahead, the days from today's date in the "
|
||||
"context to that day (tomorrow 1, up to 10), and days for more than one "
|
||||
"day: a weekend is days_ahead to the coming Saturday with days 2, a week "
|
||||
"is days 7. "
|
||||
"Set location to the place the user asked about. If they named none, "
|
||||
"set it to where the user has said they are, from the conversation or "
|
||||
"what you remember about them. Otherwise leave it empty: the tool "
|
||||
@@ -366,6 +543,14 @@ class WeatherTool(Tool):
|
||||
"location": {
|
||||
"type": "string",
|
||||
"description": "City name or location (e.g., 'London', 'New York', 'Tokyo'): the place the user asked about, or else where the user has said they are (the conversation or your memory of them). Omit otherwise; the tool then auto-detects the user's location. Never ask the user for this argument."
|
||||
},
|
||||
"days_ahead": {
|
||||
"type": "integer",
|
||||
"description": "Days from today's date in the context to the day asked about: omit or 0 for now, 1 for tomorrow, 2 for the day after, up to 10. For a weekday count from today's weekday (on a Wednesday the coming Saturday is 3)."
|
||||
},
|
||||
"days": {
|
||||
"type": "integer",
|
||||
"description": "How many days from days_ahead on (default 1): 2 for a weekend (Saturday and Sunday), 7 for a week."
|
||||
}
|
||||
},
|
||||
"required": []
|
||||
@@ -416,8 +601,27 @@ class WeatherTool(Tool):
|
||||
debug_log(f" ⚠️ location detection error: {e}", "tools")
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def _forecast_lines(lat: float, lon: float, country_code: Optional[str], first: int, last: int,
|
||||
location_display: str) -> list:
|
||||
"""A sentence for each day from first to last that a forecast has: KMA inside Korea with the
|
||||
app's key, open-meteo for the days KMA does not give."""
|
||||
offsets = list(range(first, last + 1))
|
||||
days: Dict[int, Dict[str, Any]] = {}
|
||||
kma_key = _kma_key_now()
|
||||
if kma_key and country_code == "KR":
|
||||
days = _kma_days(lat, lon, kma_key, offsets)
|
||||
from_kma = len(days)
|
||||
rest = [off for off in offsets if off not in days]
|
||||
if rest:
|
||||
days.update(_open_meteo_days(lat, lon, rest))
|
||||
debug_log(f" 🌤️ forecast days {first}-{last}: {from_kma} from KMA, "
|
||||
f"{len(days) - from_kma} from open-meteo", "tools")
|
||||
place = location_display.split(",")[0].strip() or location_display
|
||||
return [_day_sentence(off, days[off], place) for off in offsets if off in days]
|
||||
|
||||
def run(self, args: Optional[Dict[str, Any]], context: ToolContext) -> ToolExecutionResult:
|
||||
"""Get current weather for a location."""
|
||||
"""Get the weather now, or the forecast for the days asked about, for a location."""
|
||||
context.user_print("🌤️ Checking weather...")
|
||||
|
||||
try:
|
||||
@@ -562,6 +766,17 @@ class WeatherTool(Tool):
|
||||
|
||||
debug_log(f" 📍 resolved to {location_display} ({lat}, {lon})", "tools")
|
||||
|
||||
first, last = _day_span(args)
|
||||
if first > 0:
|
||||
lines = self._forecast_lines(lat, lon, country_code, first, last, location_display)
|
||||
if not lines:
|
||||
return ToolExecutionResult(
|
||||
success=False,
|
||||
reply_text=f"Weather forecast temporarily unavailable for {location_display}."
|
||||
)
|
||||
context.user_print(f"✅ Forecast for {location_display.split(',')[0].strip()}")
|
||||
return ToolExecutionResult(success=True, reply_text="\n".join(lines))
|
||||
|
||||
# Step 2: Get current weather + forecast
|
||||
weather_url = "https://api.open-meteo.com/v1/forecast"
|
||||
weather_params = {
|
||||
@@ -631,6 +846,8 @@ class WeatherTool(Tool):
|
||||
# for the model to echo ("25도 Celsius"), no forecast firehose to
|
||||
# ramble over. The model just echoes this one sentence.
|
||||
lines = [ko_sentence]
|
||||
if last > 0: # "this week": now, then each day
|
||||
lines += self._forecast_lines(lat, lon, country_code, 0, last, location_display)
|
||||
|
||||
reply_text = "\n".join(lines)
|
||||
|
||||
|
||||
@@ -289,10 +289,15 @@ which carry Discord's own time.
|
||||
brain adds each server's values to that server's environment only. Each server's outcome is printed without debug logging (category `llm`):
|
||||
`MCP server <name>: <n> tool(s)`, or `Warning: MCP server <name> failed: <reason>`.
|
||||
The KMA key (`JARVIS_KMA_API_KEY`, `app/src/admin.spec.md`) leaves the environment at the same
|
||||
point; the weather tool keeps it and uses it only for the current weather inside Korea
|
||||
(geocoded or detected country `KR`): KMA's 초단기실황 (temperature, humidity, wind,
|
||||
precipitation) and 초단기예보 (the coming hour's sky). Any KMA failure falls back to open-meteo,
|
||||
then met.no; the key is in KMA's URLs, so a failure is logged by its kind only.
|
||||
point; the weather tool keeps it and uses it only for the weather inside Korea (geocoded or
|
||||
detected country `KR`). Now: KMA's 초단기실황 (temperature, humidity, wind, precipitation) and
|
||||
초단기예보 (the coming hour's sky). A later day (`getWeather` `days_ahead`, 1 to 10, and `days`
|
||||
for a span such as a weekend): 단기예보 for today to 3 days ahead (the morning's and the
|
||||
afternoon's commonest precipitation or sky, the day's lowest and highest, the highest chance of
|
||||
rain), then 중기예보 for the nearest of the KMA cities in `weather.py` and its region (중기기온,
|
||||
중기육상). Days KMA does not give, and every KMA failure, come from open-meteo (now: then
|
||||
met.no; later days: open-meteo's daily forecast only). The key is in KMA's URLs, so a failure is
|
||||
logged by its kind only.
|
||||
- `prepare` tells the brain that `user` is saying a call whose partial transcript is `text` (the app
|
||||
sends it while the speaker is still talking, `app/src/conversation.spec.md`). The brain runs the
|
||||
intent judge's tool pick for it on its own thread, with the asker's dialogue memory and the tool
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import pytest
|
||||
from unittest.mock import Mock, patch
|
||||
import requests
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from src.jarvis.tools.builtin.weather import (
|
||||
WeatherTool,
|
||||
@@ -824,3 +825,220 @@ class TestKmaWeather:
|
||||
|
||||
assert "흐림" in result.reply_text or "구름 많음" in result.reply_text
|
||||
assert any(p.get("authKey") == self.KEY for u, p in calls if "apihub.kma.go.kr" in u)
|
||||
|
||||
|
||||
class TestForecast:
|
||||
"""A later day (days_ahead/days): KMA 단기예보 and 중기예보 inside Korea, else open-meteo's daily forecast."""
|
||||
|
||||
KEY = "kma-test-key-123"
|
||||
# Wednesday 18 November 2026, 10:20 KST.
|
||||
NOW = datetime(2026, 11, 18, 10, 20, tzinfo=timezone(timedelta(hours=9)))
|
||||
|
||||
def setup_method(self):
|
||||
self.tool = WeatherTool()
|
||||
self.context = Mock(spec=ToolContext)
|
||||
self.context.user_print = Mock()
|
||||
self.context.cfg = Mock()
|
||||
self.context.cfg.location_name = None
|
||||
self.context.redacted_text = ""
|
||||
|
||||
@staticmethod
|
||||
def _ok(payload):
|
||||
r = Mock(status_code=200, raise_for_status=Mock())
|
||||
r.json.return_value = payload
|
||||
return r
|
||||
|
||||
def _kma(self, items):
|
||||
return self._ok({"response": {"header": {"resultCode": "00"}, "body": {"items": {"item": items}}}})
|
||||
|
||||
@staticmethod
|
||||
def _vilage_items():
|
||||
"""단기예보: tomorrow (19th) clear in the morning, rain in the afternoon; Saturday (21st) cloudy."""
|
||||
items = []
|
||||
for date, sky_am, sky_pm, pty_pm, pops in [
|
||||
("20261119", "1", "4", "1", ("10", "60")),
|
||||
("20261120", "3", "3", "0", ("20", "20")),
|
||||
("20261121", "4", "4", "0", ("30", "30")),
|
||||
]:
|
||||
for hour in range(0, 24):
|
||||
t = f"{hour:02d}00"
|
||||
am = hour < 12
|
||||
items += [
|
||||
{"category": "SKY", "fcstDate": date, "fcstTime": t, "fcstValue": sky_am if am else sky_pm},
|
||||
{"category": "PTY", "fcstDate": date, "fcstTime": t, "fcstValue": "0" if am else pty_pm},
|
||||
{"category": "POP", "fcstDate": date, "fcstTime": t, "fcstValue": pops[0] if am else pops[1]},
|
||||
{"category": "TMP", "fcstDate": date, "fcstTime": t, "fcstValue": str(hour % 7)},
|
||||
]
|
||||
items += [{"category": "TMN", "fcstDate": date, "fcstTime": "0600", "fcstValue": "-1.0"},
|
||||
{"category": "TMX", "fcstDate": date, "fcstTime": "1500", "fcstValue": "4.0"}]
|
||||
return items
|
||||
|
||||
def _routes(self, country_code="KR", lat=37.566, lon=126.9784, calls=None, fail_kma=False):
|
||||
def get(url, *a, **k):
|
||||
params = k.get("params") or {}
|
||||
if calls is not None:
|
||||
calls.append((url, params))
|
||||
if "geocoding" in url:
|
||||
return self._ok({"results": [{"latitude": lat, "longitude": lon, "name": "Seoul",
|
||||
"country_code": country_code}]})
|
||||
if "apihub.kma.go.kr" in url:
|
||||
if fail_kma:
|
||||
raise requests.exceptions.Timeout(f"timed out: {url}?authKey={self.KEY}")
|
||||
if "getVilageFcst" in url:
|
||||
return self._kma(self._vilage_items())
|
||||
if "getMidTa" in url:
|
||||
return self._kma([{"regId": params["regId"], "taMin4": -4, "taMax4": 5,
|
||||
"taMin5": -2, "taMax5": 7, "taMin10": 2, "taMax10": 10}])
|
||||
if "getMidLandFcst" in url:
|
||||
return self._kma([{"regId": params["regId"], "wf4Am": "맑음", "wf4Pm": "구름많음",
|
||||
"rnSt4Am": 10, "rnSt4Pm": 20, "wf5Am": "흐림", "wf5Pm": "흐리고 비",
|
||||
"rnSt5Am": 30, "rnSt5Pm": 60, "wf10": "맑음", "rnSt10": 10}])
|
||||
raise AssertionError(url)
|
||||
assert "api.open-meteo.com/v1/forecast" in url, url
|
||||
return self._ok({"current": {"temperature_2m": 11.0, "weather_code": 0}, "daily": {
|
||||
"time": [f"2026-11-{d}" for d in range(18, 29)],
|
||||
"weather_code": [0, 61, 3, 2, 0, 0, 0, 0, 0, 0, 0],
|
||||
"temperature_2m_min": [1.2, 2.6, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
"temperature_2m_max": [9.0, 11.4, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
"precipitation_probability_max": [0, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
||||
}})
|
||||
return get
|
||||
|
||||
def _run(self, args, monkeypatch, key=True, now=None, **routes):
|
||||
if key:
|
||||
monkeypatch.setenv("JARVIS_KMA_API_KEY", self.KEY)
|
||||
else:
|
||||
monkeypatch.delenv("JARVIS_KMA_API_KEY", raising=False)
|
||||
calls = []
|
||||
with patch('requests.get', side_effect=self._routes(calls=calls, **routes)), \
|
||||
patch('src.jarvis.tools.builtin.weather._now', return_value=now or self.NOW):
|
||||
result = self.tool.run({"location": "Seoul", **args}, self.context)
|
||||
return result, calls
|
||||
|
||||
def test_the_schema_offers_a_later_day_and_a_span_of_days(self):
|
||||
props = self.tool.inputSchema["properties"]
|
||||
assert props["days_ahead"]["type"] == "integer" and props["days"]["type"] == "integer"
|
||||
assert self.tool.inputSchema["required"] == []
|
||||
|
||||
def test_tomorrow_in_korea_comes_from_the_kma_short_term_forecast(self, monkeypatch):
|
||||
result, calls = self._run({"days_ahead": 1}, monkeypatch)
|
||||
|
||||
assert result.success is True
|
||||
text = result.reply_text
|
||||
assert text.startswith("내일(11월 19일 목요일) Seoul 날씨는")
|
||||
assert "오전 맑음" in text and "오후 비" in text
|
||||
assert "최저 -1도" in text and "최고 4도" in text and "강수확률 60%" in text
|
||||
assert not any("open-meteo.com/v1/forecast" in u for u, _ in calls)
|
||||
vilage = [p for u, p in calls if "getVilageFcst" in u]
|
||||
assert len(vilage) == 1 and vilage[0]["authKey"] == self.KEY
|
||||
assert (vilage[0]["nx"], vilage[0]["ny"]) == (60, 127)
|
||||
assert (vilage[0]["base_date"], vilage[0]["base_time"]) == ("20261118", "0800")
|
||||
assert not any("MidFcstInfoService" in u for u, _ in calls)
|
||||
|
||||
def test_five_days_ahead_in_korea_comes_from_the_kma_mid_term_forecast(self, monkeypatch):
|
||||
result, calls = self._run({"days_ahead": 5}, monkeypatch)
|
||||
|
||||
text = result.reply_text
|
||||
assert text.startswith("11월 23일 월요일 Seoul 날씨는")
|
||||
assert "오전 흐림" in text and "오후 흐리고 비" in text
|
||||
assert "최저 -2도" in text and "최고 7도" in text and "강수확률 60%" in text
|
||||
mid = {u.rsplit("/", 1)[-1]: p for u, p in calls if "MidFcstInfoService" in u}
|
||||
assert mid["getMidTa"]["regId"] == "11B10101" and mid["getMidLandFcst"]["regId"] == "11B00000"
|
||||
assert mid["getMidTa"]["tmFc"] == "202611180600" and mid["getMidTa"]["authKey"] == self.KEY
|
||||
assert not any("getVilageFcst" in u for u, _ in calls)
|
||||
|
||||
def test_the_weekend_spans_the_short_and_mid_term_forecasts(self, monkeypatch):
|
||||
result, _ = self._run({"days_ahead": 3, "days": 2}, monkeypatch)
|
||||
|
||||
lines = result.reply_text.split("\n")
|
||||
assert len(lines) == 2
|
||||
assert lines[0].startswith("11월 21일 토요일") and "흐림" in lines[0] and "강수확률 30%" in lines[0]
|
||||
assert lines[1].startswith("11월 22일 일요일") and "오전 맑음" in lines[1] and "오후 구름많음" in lines[1]
|
||||
assert "최저 -4도" in lines[1] and "최고 5도" in lines[1]
|
||||
|
||||
def test_the_same_weather_all_day_is_said_once(self, monkeypatch):
|
||||
result, _ = self._run({"days_ahead": 2}, monkeypatch)
|
||||
|
||||
assert result.reply_text.startswith("모레(11월 20일 금요일) Seoul 날씨는 구름 많음,")
|
||||
assert "오전" not in result.reply_text
|
||||
|
||||
@pytest.mark.parametrize("lat,lon,city,region", [
|
||||
(35.1796, 129.0756, "11H20201", "11H20000"), # 부산
|
||||
(33.4996, 126.5312, "11G00201", "11G00000"), # 제주
|
||||
(35.9676, 126.7369, "21F10501", "11F10000"), # 군산
|
||||
(37.7519, 128.8761, "11D20501", "11D20000"), # 강릉
|
||||
])
|
||||
def test_the_mid_term_forecast_is_for_the_nearest_kma_city_and_its_region(
|
||||
self, lat, lon, city, region, monkeypatch):
|
||||
_, calls = self._run({"days_ahead": 6}, monkeypatch, lat=lat, lon=lon)
|
||||
|
||||
mid = {u.rsplit("/", 1)[-1]: p for u, p in calls if "MidFcstInfoService" in u}
|
||||
assert mid["getMidTa"]["regId"] == city and mid["getMidLandFcst"]["regId"] == region
|
||||
|
||||
@pytest.mark.parametrize("now,vilage,tmfc", [
|
||||
(datetime(2026, 11, 18, 1, 50), ("20261117", "2300"), "202611171800"),
|
||||
(datetime(2026, 11, 18, 2, 20), ("20261118", "0200"), "202611171800"),
|
||||
(datetime(2026, 11, 18, 6, 40), ("20261118", "0500"), "202611180600"),
|
||||
(datetime(2026, 11, 18, 23, 59), ("20261118", "2300"), "202611181800"),
|
||||
])
|
||||
def test_kma_forecasts_are_the_latest_published(self, now, vilage, tmfc, monkeypatch):
|
||||
"""단기예보 is out about 10 minutes after 02, 05, ..., 23 h; 중기예보 about 30 minutes after 06 and 18 h."""
|
||||
now = now.replace(tzinfo=timezone(timedelta(hours=9)))
|
||||
_, calls = self._run({"days_ahead": 1}, monkeypatch, now=now)
|
||||
_, mid_calls = self._run({"days_ahead": 7}, monkeypatch, now=now)
|
||||
|
||||
(p,) = [p for u, p in calls if "getVilageFcst" in u]
|
||||
assert (p["base_date"], p["base_time"]) == vilage
|
||||
assert {p["tmFc"] for u, p in mid_calls if "MidFcstInfoService" in u} == {tmfc}
|
||||
|
||||
def test_an_evening_mid_term_forecast_from_yesterday_counts_its_days_from_yesterday(self, monkeypatch):
|
||||
# 05:00 on the 19th: the latest 중기예보 is the 18th's 18:00, whose day 5 is the 23rd = 4 days ahead.
|
||||
now = datetime(2026, 11, 19, 5, 0, tzinfo=timezone(timedelta(hours=9)))
|
||||
result, _ = self._run({"days_ahead": 4}, monkeypatch, now=now)
|
||||
|
||||
assert result.reply_text.startswith("11월 23일 월요일") and "최고 7도" in result.reply_text
|
||||
|
||||
def test_when_kma_fails_open_meteo_gives_the_forecast_and_the_key_is_not_logged(self, monkeypatch):
|
||||
with patch("src.jarvis.tools.builtin.weather.debug_log") as log:
|
||||
result, calls = self._run({"days_ahead": 1}, monkeypatch, fail_kma=True)
|
||||
|
||||
assert result.success is True
|
||||
assert result.reply_text.startswith("내일(11월 19일 목요일) Seoul 날씨는 약한 비,")
|
||||
assert "최저 3도" in result.reply_text and "최고 11도" in result.reply_text
|
||||
assert "강수확률 80%" in result.reply_text
|
||||
assert not any(self.KEY in str(c) for c in log.call_args_list)
|
||||
|
||||
def test_outside_korea_the_forecast_is_open_meteos_daily_one(self, monkeypatch):
|
||||
result, calls = self._run({"days_ahead": 1}, monkeypatch, country_code="JP")
|
||||
|
||||
assert "약한 비" in result.reply_text and "최고 11도" in result.reply_text
|
||||
assert not any("apihub.kma.go.kr" in u for u, _ in calls)
|
||||
(p,) = [p for u, p in calls if "open-meteo.com/v1/forecast" in u]
|
||||
assert "precipitation_probability_max" in p["daily"] and p["forecast_days"] >= 2
|
||||
|
||||
def test_this_week_starts_with_the_weather_now(self, monkeypatch):
|
||||
"""days_ahead 0 with more days: the current weather, then a line for each day."""
|
||||
result, _ = self._run({"days": 3}, monkeypatch, key=False)
|
||||
|
||||
lines = result.reply_text.split("\n")
|
||||
assert lines[0].startswith("지금 Seoul 날씨는")
|
||||
assert lines[1].startswith("오늘(11월 18일 수요일)") and lines[2].startswith("내일(11월 19일 목요일)")
|
||||
assert lines[3].startswith("모레(11월 20일 금요일)") and len(lines) == 4
|
||||
|
||||
def test_more_than_ten_days_ahead_is_the_tenth_day(self, monkeypatch):
|
||||
result, _ = self._run({"days_ahead": 30, "days": 5}, monkeypatch)
|
||||
|
||||
assert result.reply_text.split("\n") == [result.reply_text]
|
||||
assert result.reply_text.startswith("11월 28일 토요일") and "맑음" in result.reply_text
|
||||
|
||||
def test_when_no_forecast_is_available_the_answer_says_so(self, monkeypatch):
|
||||
def down(url, *a, **k):
|
||||
if "geocoding" in url:
|
||||
return self._ok({"results": [{"latitude": 1.0, "longitude": 2.0, "name": "X",
|
||||
"country_code": "FR"}]})
|
||||
raise requests.exceptions.ConnectionError("down")
|
||||
with patch('requests.get', side_effect=down), \
|
||||
patch('src.jarvis.tools.builtin.weather._now', return_value=self.NOW):
|
||||
result = self.tool.run({"location": "X", "days_ahead": 2}, self.context)
|
||||
|
||||
assert result.success is False and "forecast" in result.reply_text.lower()
|
||||
|
||||
Reference in New Issue
Block a user