ci(version): 0.3.4

gallery/easel/__init__.py

@@ -4,8 +4,7 @@ from fastapi.staticfiles import StaticFiles
 from gallery.sketch.bundle import ApiBundle
 from gallery.util import root_path
 
-from .route import api, doc
+from .route import api, doc, view
-from .route.view import router as view_router
 
 
 def build_app(api_bundle: ApiBundle) -> FastAPI:
@@ -17,6 +16,6 @@ def build_app(api_bundle: ApiBundle) -> FastAPI:
     app.state.api = api_bundle
     app.mount("/static", StaticFiles(directory=root_path / "static/dist"))
     doc.mount(app)
-    api.mount(app)
+    app.include_router(api.router)
-    app.include_router(view_router)
+    app.include_router(view.router)
     return app

gallery/easel/route/api/__init__.py

@@ -1,8 +1,7 @@
-from fastapi import FastAPI
+from fastapi import APIRouter
 
 from . import schedule, weather
 
-
+router = APIRouter(prefix="/api", tags=["API"])
-def mount(app: FastAPI):
+router.include_router(weather.router)
-    weather.mount(app)
+router.include_router(schedule.router)
-    schedule.mount(app)

gallery/easel/route/api/schedule.py

@@ -1,18 +1,20 @@
 import datetime
 
-from fastapi import FastAPI
+from fastapi import APIRouter
 
 from gallery.easel.core import AppRequest
 from gallery.sketch.schedule.model import ChannelId, Schedule
 
+router = APIRouter(prefix="/schedule")
 
-def mount(app: FastAPI):
-    @app.get("/api/schedule/channels", tags=["API"])
-    async def get_api_schedule_channels(request: AppRequest) -> list[ChannelId]:
-        schedule_api = request.app.state.api.schedule
-        return await schedule_api.get_channels()
 
-    @app.get("/api/schedule/{channel}/{date}", tags=["API"])
+@router.get("/channels")
-    async def get_api_schedule_channel_schedule(request: AppRequest, channel: str, date: datetime.date) -> Schedule:
+async def get_api_schedule_channels(request: AppRequest) -> list[ChannelId]:
-        schedule_api = request.app.state.api.schedule
+    schedule_api = request.app.state.api.schedule
-        return await schedule_api.get_channel_schedule(ChannelId(channel), date)
+    return await schedule_api.get_channels()
+
+
+@router.get("/{channel}/{date}")
+async def get_api_schedule_channel_schedule(request: AppRequest, channel: str, date: datetime.date) -> Schedule:
+    schedule_api = request.app.state.api.schedule
+    return await schedule_api.get_channel_schedule(ChannelId(channel), date)

gallery/easel/route/api/weather.py

@@ -1,23 +1,26 @@
 import datetime
 
-from fastapi import FastAPI
+from fastapi import APIRouter
 
 from gallery.easel.core import AppRequest
 from gallery.sketch.weather.model import Location, WeatherResponse
 
+router = APIRouter(prefix="/weather")
 
-def mount(app: FastAPI):
-    @app.get("/api/weather/locations", tags=["API"])
-    async def get_api_weather_locations(request: AppRequest, query: str) -> list[Location]:
-        weather_api = request.app.state.api.weather
-        return await weather_api.find_locations(query)
 
-    @app.get("/api/weather/{location}/day/{date}", tags=["API"])
+@router.get("/locations")
-    async def get_api_weather_day(request: AppRequest, location: str, date: datetime.date) -> WeatherResponse:
+async def get_api_weather_locations(request: AppRequest, query: str) -> list[Location]:
-        weather_api = request.app.state.api.weather
+    weather_api = request.app.state.api.weather
-        return await weather_api.get_day(location, date)
+    return await weather_api.find_locations(query)
 
-    @app.get("/api/weather/{location}/days/{days}", tags=["API"])
+
-    async def get_api_weather_days(request: AppRequest, location: str, days: int) -> WeatherResponse:
+@router.get("/{location}/day/{date}")
-        weather_api = request.app.state.api.weather
+async def get_api_weather_day(request: AppRequest, location: str, date: datetime.date) -> WeatherResponse:
-        return await weather_api.get_days(location, days)
+    weather_api = request.app.state.api.weather
+    return await weather_api.get_day(location, date)
+
+
+@router.get("/{location}/days/{days}")
+async def get_api_weather_days(request: AppRequest, location: str, days: int) -> WeatherResponse:
+    weather_api = request.app.state.api.weather
+    return await weather_api.get_days(location, days)

gallery/easel/route/view/__init__.py

@@ -5,7 +5,7 @@ from .schedule import router as schedule_router
 from .translation import set_language
 from .weather import router as weather_router
 
-router = APIRouter(dependencies=[Depends(set_language)])
+router = APIRouter(tags=["view"], dependencies=[Depends(set_language)])
 router.include_router(common_router)
 router.include_router(weather_router)
 router.include_router(schedule_router)

gallery/easel/route/view/common/templates/base.html

@@ -30,6 +30,9 @@
         {% block header %}{% endblock %}
       </div>
       <ul class="navbar-nav flex-row flex-wrap ms-md-auto">
+        <li class="nav-item me-2">
+          <span class="nav-link">{{ version }}</span>
+        </li>
         <li class="nav-item dropdown">
           <button class="btn btn-link nav-link py-2 px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
                   id="bd-language"

gallery/painting/gismeteo/parser.py

@@ -39,14 +39,11 @@ class DateParser(RowParser[datetime.datetime]):
     KEY = "date"
 
     def parse_row(self, tag: Tag) -> Iterable[datetime.datetime]:
-        datetime_date_tag = tag.select_one(".widget-row.widget-row-datetime-date > .row-item")
+        datetime_time_row = tag.select_one(".widget-row.widget-row-datetime-time")
-        if datetime_date_tag:
+        if datetime_time_row:
-            date_str = datetime_date_tag.find(text=True, recursive=False).text
+            for item in datetime_time_row.select(".row-item > time-value"):
-            date = dateparser.parse(date_str, languages=["ru"])
+                timestamp = int(item.attrs["timestamp"])
-            for item in tag.select(".widget-row.widget-row-datetime-time > .row-item"):
+                time = datetime.datetime.fromtimestamp(timestamp)
-                time_str = item.text
-                time = dateparser.parse(time_str, languages=["ru"])
-                time = time.replace(year=date.year, month=date.month, day=date.day)
                 yield time
         else:
             for item in tag.select(".widget-row.widget-row-date > .row-item"):
@@ -173,8 +170,12 @@ class PrecipitationParser(RowParser[float]):
     KEY = "precipitation"
 
     def parse_row(self, tag: Tag) -> Iterable[float]:
-        for item in tag.select(".widget-row[data-row=precipitation-bars] > .row-item > .item-unit"):
+        for item in tag.select(".widget-row[data-row=precipitation-bars] > .row-item"):
-            yield float(item.text.replace(",", "."))
+            value = item.select_one("precipitation-value")
+            if value:
+                yield float(value.attrs["value"])
+            else:
+                yield 0
 
 
 class PressureParser(RowParser[list[int]]):

gallery/version.py

@@ -1,5 +1,3 @@
-__version__ = "0.2.2"
-
 import tomllib
 from pathlib import Path
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gallery"
-version = "0.3.0"
+version = "0.3.4"
 description = ""
 authors = ["shmyga <shmyga.z@gmail.com>"]
 readme = "README.md"

static/package-lock.json

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

static/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gallery",
-  "version": "0.3.0",
+  "version": "0.3.4",
   "scripts": {
     "build": "vite build",
     "dev": "vite build --watch"