weather-agent-mcp 0.1.7 → 0.1.8

package/README.md

@@ -70,7 +70,7 @@ Reload MCP. Tools: `geocode`, `getCurrentWeather`, `getForecast`, `getHistorical
 
 1. Войдите в [Кабинет разработчика](https://developer.tech.yandex.ru/) с Яндекс ID.
 2. Нажмите «Подключить API» и выберите «JavaScript API и HTTP Геокодер».
-3. Заполните форму. Ключ появится в разделе «Ключи». Он начинает отвечать примерно через 15 минут ([формат запроса Геокодера](https://yandex.ru/dev/geocode/doc/ru/request)).
+3. Заполните форму. Ключ появится в разделе «Ключи». Он начинает отвечать примерно через 15 минут. Запрос идёт на `https://geocode-maps.yandex.ru/v1/` ([формат запроса](https://yandex.ru/dev/geocode/doc/ru/request)).
 
 **`YANDEX_WEATHER_API_KEY`** — API Яндекс Погоды.
 

package/dist/weather-mcp.js

@@ -173,7 +173,7 @@ var init_http = __esm({
   }
 });
 
-// src/weather/open-meteo-client.ts
+// src/weather/open-meteo/client.ts
 function defaultConfig(overrides = {}) {
   return {
     forecastBaseUrl: process.env.OPEN_METEO_FORECAST_URL ?? "https://api.open-meteo.com",
@@ -207,14 +207,52 @@ async function meteoGet(baseUrl, path, params, config2) {
   }
   return res.data;
 }
-var init_open_meteo_client = __esm({
-  "src/weather/open-meteo-client.ts"() {
+var init_client = __esm({
+  "src/weather/open-meteo/client.ts"() {
     "use strict";
     init_http();
     init_errors();
   }
 });
 
+// src/weather/open-meteo/geocode.ts
+var geocode_exports = {};
+__export(geocode_exports, {
+  geocodeOpenMeteo: () => geocodeOpenMeteo
+});
+async function geocodeOpenMeteo(city, config2 = {}) {
+  const cfg = defaultConfig(config2);
+  const data = await meteoGet(
+    cfg.geocodingBaseUrl,
+    "/v1/search",
+    { name: city, count: 5, language: "en", format: "json" },
+    cfg
+  );
+  if (!data.results || data.results.length === 0) {
+    throw new ToolError("CITY_NOT_FOUND", `No location found for city: ${city}`, false, { city });
+  }
+  const sorted = [...data.results].sort(
+    (a, b) => (b.population ?? 0) - (a.population ?? 0)
+  );
+  const best = sorted[0];
+  return {
+    name: best.name,
+    latitude: best.latitude,
+    longitude: best.longitude,
+    country: best.country ?? best.country_code ?? "Unknown",
+    admin1: best.admin1,
+    population: best.population,
+    timezone: best.timezone
+  };
+}
+var init_geocode = __esm({
+  "src/weather/open-meteo/geocode.ts"() {
+    "use strict";
+    init_errors();
+    init_client();
+  }
+});
+
 // src/weather/wmo-codes.ts
 function describeWmo(code) {
   return WMO[code] ?? `Unknown weather code ${code}`;
@@ -249,7 +287,11 @@ var init_wmo_codes = __esm({
   }
 });
 
-// src/weather/current.ts
+// src/weather/open-meteo/current.ts
+var current_exports = {};
+__export(current_exports, {
+  getCurrentWeatherOpenMeteo: () => getCurrentWeatherOpenMeteo
+});
 async function getCurrentWeatherOpenMeteo(latitude, longitude, config2 = {}) {
   const cfg = defaultConfig(config2);
   const data = await meteoGet(
@@ -277,16 +319,11 @@ async function getCurrentWeatherOpenMeteo(latitude, longitude, config2 = {}) {
     observedAt: c.time
   };
 }
-async function getCurrentWeather(latitude, longitude, config2) {
-  if (config2) return getCurrentWeatherOpenMeteo(latitude, longitude, config2);
-  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream(), upstream_exports));
-  return createWeatherUpstream2().getCurrentWeather(latitude, longitude);
-}
 var init_current = __esm({
-  "src/weather/current.ts"() {
+  "src/weather/open-meteo/current.ts"() {
     "use strict";
     init_wmo_codes();
-    init_open_meteo_client();
+    init_client();
   }
 });
 
@@ -320,6 +357,28 @@ function isValidCalendarDate(iso) {
   const dt = new Date(Date.UTC(y, m - 1, d));
   return dt.getUTCFullYear() === y && dt.getUTCMonth() === m - 1 && dt.getUTCDate() === d;
 }
+async function getForecast(latitude, longitude, startDate, endDate, config2) {
+  if (config2) {
+    const { getForecastOpenMeteo: getForecastOpenMeteo2 } = await Promise.resolve().then(() => (init_forecast2(), forecast_exports));
+    return getForecastOpenMeteo2(latitude, longitude, startDate, endDate, config2);
+  }
+  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream3(), upstream_exports));
+  return createWeatherUpstream2().getForecast(latitude, longitude, startDate, endDate);
+}
+var DATE_RE;
+var init_forecast = __esm({
+  "src/weather/forecast.ts"() {
+    "use strict";
+    init_errors();
+    DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+  }
+});
+
+// src/weather/open-meteo/forecast.ts
+var forecast_exports = {};
+__export(forecast_exports, {
+  getForecastOpenMeteo: () => getForecastOpenMeteo
+});
 async function getForecastOpenMeteo(latitude, longitude, startDate, endDate, config2 = {}) {
   assertDateRange(startDate, endDate);
   const cfg = defaultConfig(config2);
@@ -354,19 +413,12 @@ async function getForecastOpenMeteo(latitude, longitude, startDate, endDate, con
     days
   };
 }
-async function getForecast(latitude, longitude, startDate, endDate, config2) {
-  if (config2) return getForecastOpenMeteo(latitude, longitude, startDate, endDate, config2);
-  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream(), upstream_exports));
-  return createWeatherUpstream2().getForecast(latitude, longitude, startDate, endDate);
-}
-var DATE_RE;
-var init_forecast = __esm({
-  "src/weather/forecast.ts"() {
+var init_forecast2 = __esm({
+  "src/weather/open-meteo/forecast.ts"() {
     "use strict";
-    init_errors();
+    init_forecast();
     init_wmo_codes();
-    init_open_meteo_client();
-    DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+    init_client();
   }
 });
 
@@ -421,6 +473,45 @@ function assertHistoricalSpan(month, day, startYear, endYear) {
     );
   }
 }
+async function getHistoricalWeather(latitude, longitude, month, day, startYear, endYear, config2) {
+  if (config2) {
+    const { getHistoricalWeatherOpenMeteo: getHistoricalWeatherOpenMeteo2 } = await Promise.resolve().then(() => (init_history2(), history_exports));
+    return getHistoricalWeatherOpenMeteo2(
+      latitude,
+      longitude,
+      month,
+      day,
+      startYear,
+      endYear,
+      config2
+    );
+  }
+  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream3(), upstream_exports));
+  return createWeatherUpstream2().getHistoricalWeather(
+    latitude,
+    longitude,
+    month,
+    day,
+    startYear,
+    endYear
+  );
+}
+var MAX_HISTORICAL_YEARS, ARCHIVE_FIRST_YEAR, DAYS_IN_MONTH;
+var init_history = __esm({
+  "src/weather/history.ts"() {
+    "use strict";
+    init_errors();
+    MAX_HISTORICAL_YEARS = 20;
+    ARCHIVE_FIRST_YEAR = 1940;
+    DAYS_IN_MONTH = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+  }
+});
+
+// src/weather/open-meteo/history.ts
+var history_exports = {};
+__export(history_exports, {
+  getHistoricalWeatherOpenMeteo: () => getHistoricalWeatherOpenMeteo
+});
 function isoDate(year, month, day) {
   const m = String(month).padStart(2, "0");
   const d = String(day).padStart(2, "0");
@@ -556,42 +647,17 @@ async function getHistoricalWeatherOpenMeteo(latitude, longitude, month, day, st
     summary: summarize(rows)
   };
 }
-async function getHistoricalWeather(latitude, longitude, month, day, startYear, endYear, config2) {
-  if (config2) {
-    return getHistoricalWeatherOpenMeteo(
-      latitude,
-      longitude,
-      month,
-      day,
-      startYear,
-      endYear,
-      config2
-    );
-  }
-  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream(), upstream_exports));
-  return createWeatherUpstream2().getHistoricalWeather(
-    latitude,
-    longitude,
-    month,
-    day,
-    startYear,
-    endYear
-  );
-}
-var MAX_HISTORICAL_YEARS, ARCHIVE_FIRST_YEAR, DAYS_IN_MONTH;
-var init_history = __esm({
-  "src/weather/history.ts"() {
+var init_history2 = __esm({
+  "src/weather/open-meteo/history.ts"() {
     "use strict";
     init_errors();
+    init_history();
     init_wmo_codes();
-    init_open_meteo_client();
-    MAX_HISTORICAL_YEARS = 20;
-    ARCHIVE_FIRST_YEAR = 1940;
-    DAYS_IN_MONTH = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+    init_client();
   }
 });
 
-// src/weather/open-meteo-upstream.ts
+// src/weather/open-meteo/upstream.ts
 function createOpenMeteoUpstream() {
   return {
     name: "open-meteo",
@@ -616,17 +682,17 @@ function createOpenMeteoUpstream() {
     }
   };
 }
-var init_open_meteo_upstream = __esm({
-  "src/weather/open-meteo-upstream.ts"() {
+var init_upstream = __esm({
+  "src/weather/open-meteo/upstream.ts"() {
     "use strict";
     init_current();
-    init_forecast();
+    init_forecast2();
     init_geocode();
-    init_history();
+    init_history2();
   }
 });
 
-// src/weather/yandex-map.ts
+// src/weather/yandex/map.ts
 function conditionToWmo(condition) {
   if (!condition) return 2;
   return CONDITION_WMO[condition] ?? 2;
@@ -717,8 +783,8 @@ function mapYandexForecast(latitude, longitude, startDate, endDate, body) {
   };
 }
 var CONDITION_WMO;
-var init_yandex_map = __esm({
-  "src/weather/yandex-map.ts"() {
+var init_map = __esm({
+  "src/weather/yandex/map.ts"() {
     "use strict";
     init_errors();
     init_wmo_codes();
@@ -745,11 +811,11 @@ var init_yandex_map = __esm({
   }
 });
 
-// src/weather/yandex-client.ts
+// src/weather/yandex/client.ts
 function yandexEndpoints(env) {
   return {
     weatherUrl: env.YANDEX_WEATHER_URL ?? "https://api.weather.yandex.ru/graphql/query",
-    geocoderUrl: env.YANDEX_GEOCODER_URL ?? "https://geocode-maps.yandex.ru/1.x/",
+    geocoderUrl: env.YANDEX_GEOCODER_URL ?? "https://geocode-maps.yandex.ru/v1/",
     weatherKey: env.YANDEX_WEATHER_API_KEY ?? "",
     geocoderKey: env.YANDEX_GEOCODER_API_KEY ?? "",
     timeoutMs: 1e4
@@ -814,13 +880,13 @@ async function yandexForecast(latitude, longitude, startDate, endDate, endpoints
   return mapYandexForecast(latitude, longitude, startDate, endDate, body);
 }
 var WEATHER_QUERY;
-var init_yandex_client = __esm({
-  "src/weather/yandex-client.ts"() {
+var init_client2 = __esm({
+  "src/weather/yandex/client.ts"() {
     "use strict";
     init_errors();
     init_http();
     init_forecast();
-    init_yandex_map();
+    init_map();
     WEATHER_QUERY = `{
   weatherByPoint(request: { lat: $lat, lon: $lon }) {
     now {
@@ -850,7 +916,7 @@ var init_yandex_client = __esm({
   }
 });
 
-// src/weather/yandex-upstream.ts
+// src/weather/yandex/upstream.ts
 function createYandexUpstream(env) {
   const endpoints = yandexEndpoints(env);
   return {
@@ -873,11 +939,11 @@ function createYandexUpstream(env) {
     }
   };
 }
-var init_yandex_upstream = __esm({
-  "src/weather/yandex-upstream.ts"() {
+var init_upstream2 = __esm({
+  "src/weather/yandex/upstream.ts"() {
     "use strict";
     init_errors();
-    init_yandex_client();
+    init_client2();
   }
 });
 
@@ -898,51 +964,12 @@ function createWeatherUpstream(env = process.env) {
   if (name === "yandex") return createYandexUpstream(env);
   return createOpenMeteoUpstream();
 }
-var init_upstream = __esm({
+var init_upstream3 = __esm({
   "src/weather/upstream.ts"() {
     "use strict";
     init_errors();
-    init_open_meteo_upstream();
-    init_yandex_upstream();
-  }
-});
-
-// src/weather/geocode.ts
-async function geocodeOpenMeteo(city, config2 = {}) {
-  const cfg = defaultConfig(config2);
-  const data = await meteoGet(
-    cfg.geocodingBaseUrl,
-    "/v1/search",
-    { name: city, count: 5, language: "en", format: "json" },
-    cfg
-  );
-  if (!data.results || data.results.length === 0) {
-    throw new ToolError("CITY_NOT_FOUND", `No location found for city: ${city}`, false, { city });
-  }
-  const sorted = [...data.results].sort(
-    (a, b) => (b.population ?? 0) - (a.population ?? 0)
-  );
-  const best = sorted[0];
-  return {
-    name: best.name,
-    latitude: best.latitude,
-    longitude: best.longitude,
-    country: best.country ?? best.country_code ?? "Unknown",
-    admin1: best.admin1,
-    population: best.population,
-    timezone: best.timezone
-  };
-}
-async function geocode(city, config2) {
-  if (config2) return geocodeOpenMeteo(city, config2);
-  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream(), upstream_exports));
-  return createWeatherUpstream2().geocode(city);
-}
-var init_geocode = __esm({
-  "src/weather/geocode.ts"() {
-    "use strict";
-    init_errors();
-    init_open_meteo_client();
+    init_upstream();
+    init_upstream2();
   }
 });
 
@@ -35333,9 +35360,27 @@ function toError(value) {
 // node_modules/@modelcontextprotocol/server/dist/index.mjs
 var DEFAULT_MAX_REQUEST_BODY_SIZE = 4 * 1024 * 1024;
 
+// src/weather/geocode.ts
+async function geocode(city, config2) {
+  if (config2) {
+    const { geocodeOpenMeteo: geocodeOpenMeteo2 } = await Promise.resolve().then(() => (init_geocode(), geocode_exports));
+    return geocodeOpenMeteo2(city, config2);
+  }
+  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream3(), upstream_exports));
+  return createWeatherUpstream2().geocode(city);
+}
+
+// src/weather/current.ts
+async function getCurrentWeather(latitude, longitude, config2) {
+  if (config2) {
+    const { getCurrentWeatherOpenMeteo: getCurrentWeatherOpenMeteo2 } = await Promise.resolve().then(() => (init_current(), current_exports));
+    return getCurrentWeatherOpenMeteo2(latitude, longitude, config2);
+  }
+  const { createWeatherUpstream: createWeatherUpstream2 } = await Promise.resolve().then(() => (init_upstream3(), upstream_exports));
+  return createWeatherUpstream2().getCurrentWeather(latitude, longitude);
+}
+
 // src/weather/index.ts
-init_geocode();
-init_current();
 init_forecast();
 init_history();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weather-agent-mcp",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Model-agnostic AI agent with MCP tools over Open-Meteo",
   "type": "module",
   "engines": {