ci(version): 0.6.1

Dockerfile

@@ -27,11 +27,13 @@ ENV PATH="/app/.venv/bin:$PATH"
 WORKDIR /app
 
 ENV TZ="Europe/Moscow"
+
 COPY --from=builder /app ./
+RUN .venv/bin/playwright install chromium --with-deps --only-shell
+
 COPY --from=node-builder /app/dist ./static/dist
+
 COPY gallery gallery/
 COPY --from=builder --parents locales/**/*.mo ./
 
-RUN .venv/bin/playwright install chromium --with-deps --only-shell
-
 CMD ["uvicorn", "gallery.main:app", "--host", "0.0.0.0", "--port", "80", "--log-config", "gallery/logging.yaml"]

gallery/painting/gismeteo/api.py

@@ -41,7 +41,9 @@ class GismeteoApi(WeatherApi):
         # group values by 3 hours
         if len(values) > 8:
             n = 3
-            values = [merge_weather_values(values[i].date, values[i : i + n]) for i in range(0, len(values), n)]
+            values = [
+                merge_weather_values(values[i].date, values[i : i + n], "average") for i in range(0, len(values), n)
+            ]
         return WeatherResponse(
             location=location or "n/a",
             date=date,

gallery/painting/yandexweather/parser.py

@@ -37,11 +37,13 @@ def parse_sky(sky: str) -> Sky:
     elif sky == "пасмурно":
         cloudness = Cloudness.MAINLY_CLOUDY
     elif sky == "небольшой дождь":
-        precipitation = Precipitation.RAIN
-    elif sky == "дождь":
         precipitation = Precipitation.SMALL_RAIN
+    elif sky == "дождь":
+        precipitation = Precipitation.RAIN
+    elif sky == "ливень":
+        precipitation = Precipitation.SHOWER
     else:
-        logger.warning("unknown sky value: %s:", sky)
+        logger.warning("unknown sky value: %s", sky)
     return Sky(
         cloudness=cloudness,
         precipitation=precipitation,

gallery/sketch/weather/util.py

@@ -1,8 +1,11 @@
 import datetime
 import statistics
+from typing import Literal
 
 from .model import Cloudness, Precipitation, Sky, WeatherValue, WindDirectionDeg
 
+MergeMode = Literal["interval", "average"]
+
 
 def build_weather_value(date: datetime.datetime) -> WeatherValue:
     return WeatherValue(
@@ -23,7 +26,15 @@ def build_weather_value(date: datetime.datetime) -> WeatherValue:
     )
 
 
-def merge_weather_values(date: datetime.datetime, values: list[WeatherValue]) -> WeatherValue:
+def _merge_values(values: list[int], mode: MergeMode) -> list[int]:
+    return [max(values), min(values)] if mode == "interval" else [round(sum(values) / len(values))]
+
+
+def merge_weather_values(
+    date: datetime.datetime,
+    values: list[WeatherValue],
+    mode: MergeMode = "interval",
+) -> WeatherValue:
     result = build_weather_value(date)
     temperatures = []
     pressures = []
@@ -44,8 +55,8 @@ def merge_weather_values(date: datetime.datetime, values: list[WeatherValue]) ->
         cloudnesses.append(value.sky.cloudness)
         precipitations.append(value.sky.precipitation)
         precipitation += value.precipitation
-    result.temperature = [max(temperatures), min(temperatures)]
+    result.temperature = _merge_values(temperatures, mode)
-    result.pressure = [max(pressures), min(pressures)]
+    result.pressure = _merge_values(pressures, mode)
     result.humidity = round(statistics.mean(humidities))
     result.wind_speed = round(statistics.mean(wind_speeds))
     result.wind_gust = round(statistics.mean(wind_gusts))

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "gallery"
 description = ""
-version = "0.5.4"
+version = "0.6.1"
 readme = "README.md"
 authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
 requires-python = '>=3.14,<4.0'

static/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "gallery",
-  "version": "0.5.4",
+  "version": "0.6.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "gallery",
-      "version": "0.5.4",
+      "version": "0.6.1",
       "license": "ISC",
       "dependencies": {
         "@popperjs/core": "^2.11.8",

static/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gallery",
-  "version": "0.5.4",
+  "version": "0.6.1",
   "type": "module",
   "scripts": {
     "build": "webpack --mode production",