Weather command/tests. Finally Whispers.

Author: MrChuw

bot/apis/weather/open_meteo/models.py

@@ -111,17 +111,21 @@ async def forecast(
             timezone=timezone,
         )
         data = await self._request(url=url)
-        return Forecast.model_validate(data)
+        return Forecast(data)
 
     async def geocoding(self, *, name: str, language: str = "en") -> Geocoding:
         url = URL("https://nominatim.openstreetmap.org/search.php").with_query(
-            q=name,  # name=name,
+            q=name,
             # count=count,
             language=language,
             format="jsonv2",
+            addressdetails=1,
+            extratags=1,
+            namedetails=1,
+            entrances=1
         )
         data = await self._request(url=url)
-        return Geocoding.model_validate({"results": data})
+        return Geocoding({"results": data})
 
     async def close(self) -> None:
         """Close open client session."""

bot/apis/weather/open_meteo/open_meteo.py

@@ -29,6 +29,8 @@
 
     from bot.ext import Context
 
+# quit(0)
+
 
 class Gorenmu(TypesBot):
     def __init__(self, configs: Config, case_insensitive: bool, log: Logger, adapter) -> None:
@@ -73,7 +75,7 @@ async def event_ready(self) -> None:
 
     @commands.Component.listener("Whisper")
     async def event_message_whisper(self, payload: twitchio.Whisper):
-        return await self.event_message_whisper(payload)
+        return await self.LifecycleHandler.event_message_whisper(payload)
 
     async def global_guard(self, ctx: Context) -> bool:
         return await self.LifecycleHandler.global_guard(ctx)

bot/bot.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from bot.ext import Admonitions, CommandExemples, Response, TranslationBase
+from bot.ext import CommandExemples, Response, TranslationBase
 from bot.ext.translations.extras import TBase
 
 if TYPE_CHECKING:
@@ -99,10 +99,4 @@ def deco_commands(self, ctx: Context, *args, **kwargs) -> CommandExemples:
                 )
             return self._untangle_commands(ctx, self._cname)
 
-        def deco_admonitions(self, ctx: Context, *args, **kwargs) -> Admonitions:
-            with self.lang_dict.once(self._cname):
-                self.lang_dict.add_with("en", Admonitions([]))
-                self.lang_dict.add_with(["pt_br", "pt"], Admonitions([]))
-            return self._untangle_admonitions(ctx, self._cname)
-
     AccountAge: AccountAge

bot/cogs/accountage/command/translations.py

@@ -45,10 +45,11 @@ async def set_mention(self, ctx: Context, *, args: str) -> Response:
     @set.command(name="city", aliases=["savecity", "savelocation", "location"])
     async def set_city(self, ctx: Context, *, args: str) -> Response:
         translations = self.translations.City
-        args, hidden = self.StringTools.extract_and_remove_field(args, "hidden")
+        args, hidden = self.StringTools.extract_and_remove_bool_field(args, "hidden", self.translations, ctx)
         city = args.lower()
-        if hidden:
-            ctx.user.city_hidden = True
+        ctx.user.city_hidden = True
+        if hidden is False:
+            ctx.user.city_hidden = False
         if city == "remove":
             ctx.user.city = None
             await ctx.user.save()

bot/cogs/set/command/set.py

@@ -0,0 +1,116 @@
+from __future__ import annotations
+
+import datetime
+from typing import TYPE_CHECKING
+
+from bot.apis.weather import DailyParameters, HourlyParameters, OpenMeteo
+from bot.ext import Context, Response, commands
+from bot.models import User
+from bot.utils import SessionsCaches, StringTools
+
+from .translations import Translations
+
+if TYPE_CHECKING:
+    from bot.bot import Gorenmu
+
+
+class WeatherCmd(commands.CustomComponent):
+    def __init__(self, bot: Gorenmu) -> None:
+        self.bot = bot
+        self.translations: Translations = Translations(bot)
+        self.SessionsCaches: SessionsCaches = SessionsCaches(bot)
+        self.StringTools: StringTools = StringTools()
+
+    cooldown_rate = 3
+    cooldown_per = 10
+    cooldown_key = commands.BucketType.user
+
+    async def component_command_error(self, payload: commands.CommandErrorPayload) -> bool | None: ...
+
+    @commands.Component.guard()
+    def guards_component(self, ctx: commands.Context) -> bool:  # NOQA
+        return True
+
+    @commands.command(name='weather', aliases=['wt'])
+    async def weather(self, ctx: Context, *, location: str = "") -> Response:
+        from_chat = True
+        location, from_user = self.StringTools.extract_and_remove_field(location, "user", False)
+        user = None
+        if from_user:
+            user = await User.get_user_or_none(ctx, self.translations, name=from_user)
+            if not user:
+                return self.translations.Exceptions.user_not_found_name(ctx, name=from_user)
+            if not user.city:
+                return self.translations.Weather.user_has_no_city(ctx, from_user)
+            from_chat = False
+            location = user.city
+        if ctx.user.city and not location:
+            location = ctx.user.city
+            from_chat = False
+
+        is_private = not from_chat and (user or ctx.user).city_hidden
+        safe_location_name = self.translations.Weather.hidden(ctx) if is_private else location
+        if not location:
+            return self.translations.Weather.city_not_passed(ctx)
+
+        meteo = OpenMeteo(self.SessionsCaches.Weather.session)
+        try:
+            async with meteo as open_meteo:
+                geocoding_result = await open_meteo.geocoding(name=location)
+            if geocoding_result.results:
+                city = geocoding_result.results[0]
+            else:
+                return self.translations.Weather.city_not_found(ctx, safe_location_name)
+        except Exception as e:
+            ctx.bot.log.error(e)
+            return self.translations.Weather.city_not_found(ctx, safe_location_name)
+
+        async with meteo as open_meteo:
+            weather_obj = await open_meteo.forecast(
+                latitude=city.latitude,
+                longitude=city.longitude,
+                current_weather=True,
+                daily=[
+                    DailyParameters.SUNRISE,
+                    DailyParameters.SUNSET,
+                    DailyParameters.PRECIPITATION_HOURS,
+                    DailyParameters.TEMPERATURE_2M_MAX,
+                ],
+                hourly=[
+                    HourlyParameters.APPARENT_TEMPERATURE,
+                    HourlyParameters.TEMPERATURE_2M,
+                    HourlyParameters.RELATIVE_HUMIDITY_2M,
+                    HourlyParameters.PRESSURE_MSL,
+                    HourlyParameters.WIND_SPEED_10M,
+                    HourlyParameters.PRECIPITATION,
+                    HourlyParameters.IS_DAY,
+                ],
+            )
+        if not weather_obj.current_weather:
+            return self.translations.Weather.no_weather_found(ctx, safe_location_name)
+        hour = weather_obj.hourly.time
+        index = min(range(len(hour)), key=lambda i: abs(hour[i] - datetime.datetime.now()))
+
+        weather_str, emoji = self.translations.Weather.weather_from_codes(
+            ctx, weather_obj.current_weather.weather_code, weather_obj.hourly.is_day[index]
+        )
+        wind_direction = self.translations.Weather.weather_wind_direction(
+            ctx, weather_obj.current_weather.wind_direction, True
+        )
+
+        return self.translations.Weather.weather(
+            ctx,
+            weather_obj=weather_obj,
+            index=index,
+            city_name=safe_location_name if is_private else city.display,
+            weather_str=weather_str,
+            emoji=emoji,
+            wind_direction=wind_direction,
+        )
+
+
+async def setup(bot: Gorenmu) -> None:
+    await bot.add_component(WeatherCmd(bot))
+
+
+async def teardown(bot: Gorenmu) -> None: ...  # NOQA