Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ce1be99016 | ||
|
|
ff79c6274f |
@@ -1,6 +1,9 @@
|
|||||||
DOCKER_REPO=git.shmyga.ru
|
DOCKER_REPO=git.shmyga.ru
|
||||||
DOCKER_GROUP=infernalgames
|
DOCKER_GROUP=infernalgames
|
||||||
DOCKER_ROOT="${DOCKER_REPO}/${DOCKER_GROUP}"
|
DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP"
|
||||||
|
VERSION=$(grep -m 1 'version' ./pyproject.toml | grep -oP 'version\s*=\s*"\K[^"]+')
|
||||||
|
PYTHON_VERSION=$(grep -m 1 'python' ./pyproject.toml | grep -oP 'python\s*=\s*"\^?\K[^"]+')
|
||||||
|
DOCKER_PROJECTS=("gallery")
|
||||||
DOCKER_TAG="${DOCKER_TAG:-latest}"
|
DOCKER_TAG="${DOCKER_TAG:-latest}"
|
||||||
|
|
||||||
OPENWEATHER_KEY=""
|
OPENWEATHER_KEY=""
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
name: deploy
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_run:
|
|
||||||
workflows: [release]
|
|
||||||
types: [completed]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: appleboy/ssh-action@v1
|
|
||||||
with:
|
|
||||||
host: ${{ secrets.DEPLOY_HOST }}
|
|
||||||
username: ${{ secrets.DEPLOY_USERNAME }}
|
|
||||||
key: ${{ secrets.DEPLOY_KEY }}
|
|
||||||
passphrase: ${{ secrets.DEPLOY_PASSPHRASE }}
|
|
||||||
script: |
|
|
||||||
cd /opt/gallery
|
|
||||||
docker compose pull
|
|
||||||
docker compose up -d
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
name: release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- "[0-9]+.[0-9]+.[0-9]+"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
- uses: https://git.shmyga.ru/InfernalGames/project-manager@master
|
|
||||||
- run: pm build:docker -vv
|
|
||||||
- uses: docker/login-action@v4
|
|
||||||
with:
|
|
||||||
registry: git.shmyga.ru
|
|
||||||
username: ${{ vars.PUBLISH_USERNAME }}
|
|
||||||
password: ${{ secrets.PUBLISH_TOKEN }}
|
|
||||||
- run: pm publish:docker -vv
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
name: test
|
|
||||||
|
|
||||||
on: push
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
- uses: https://git.shmyga.ru/InfernalGames/project-manager@master
|
|
||||||
with:
|
|
||||||
setup-python: true
|
|
||||||
- run: pm lint -vv
|
|
||||||
- run: pm test -vv
|
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
modules = [".", "static"]
|
[presets.python.tasks.setup.playwright]
|
||||||
|
conditions = ["{{ '.venv/bin/playwright' | file }}"]
|
||||||
|
commands = [".venv/bin/playwright install chromium --with-deps --only-shell"]
|
||||||
|
|
||||||
[presets.locales.tasks.build.locales]
|
[presets.locales.tasks.build.locales]
|
||||||
priority = 1
|
priority = 1
|
||||||
|
|||||||
@@ -23,23 +23,17 @@ COPY static ./
|
|||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM python:3.14-slim
|
FROM python:3.14-slim
|
||||||
|
|
||||||
ENV PLAYWRIGHT_BROWSERS_PATH="/opt/playwright-browsers"
|
|
||||||
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
|
||||||
--mount=type=cache,target=/var/lib/apt,sharing=locked \
|
|
||||||
pip install playwright==1.62 && \
|
|
||||||
playwright install --with-deps chromium
|
|
||||||
|
|
||||||
ENV PATH="/app/.venv/bin:$PATH"
|
ENV PATH="/app/.venv/bin:$PATH"
|
||||||
ENV TZ="Europe/Moscow"
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
ENV TZ="Europe/Moscow"
|
||||||
|
|
||||||
COPY --from=builder /app ./
|
COPY --from=builder /app ./
|
||||||
|
RUN .venv/bin/playwright install chromium --with-deps --only-shell
|
||||||
|
|
||||||
COPY --from=node-builder /app/dist ./static/dist
|
COPY --from=node-builder /app/dist ./static/dist
|
||||||
|
|
||||||
COPY gallery gallery/
|
COPY gallery gallery/
|
||||||
# COPY --from=builder --parents locales/**/*.mo ./
|
COPY --from=builder --parents locales/**/*.mo ./
|
||||||
COPY --from=builder /app/locales ./locales
|
|
||||||
|
|
||||||
CMD ["uvicorn", "gallery.main:app", "--host", "0.0.0.0", "--port", "80", "--log-config", "gallery/logging.yaml"]
|
CMD ["uvicorn", "gallery.main:app", "--host", "0.0.0.0", "--port", "80", "--log-config", "gallery/logging.yaml"]
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
# API Gallery
|
# API Gallery
|
||||||
|
|
||||||
[](https://git.shmyga.ru/InfernalGames/gallery/actions?workflow=test.yaml)
|
|
||||||
|
|
||||||
Currently implemented APIs:
|
Currently implemented APIs:
|
||||||
|
|
||||||
- Weather forecast
|
- Weather forecast
|
||||||
@@ -68,7 +66,7 @@ https://api.shmyga.ru/api/schedule/{provider}/{channel_id}/{date}
|
|||||||
| Provider | Site | API sample |
|
| Provider | Site | API sample |
|
||||||
| :- | :- | :- |
|
| :- | :- | :- |
|
||||||
| matchtv | https://matchtv.ru/tvguide | https://api.shmyga.ru/api/schedule/matchtv/igra/today |
|
| matchtv | https://matchtv.ru/tvguide | https://api.shmyga.ru/api/schedule/matchtv/igra/today |
|
||||||
| yandex | https://tv.yandex.ru | https://api.shmyga.ru/api/schedule/yandex/start-103/today |
|
| yandextv | https://tv.yandex.ru | https://api.shmyga.ru/api/schedule/yandextv/146/today |
|
||||||
|
|
||||||
## Demo
|
## Demo
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.responses import RedirectResponse
|
|
||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
from gallery.sketch.bundle import ApiBundle
|
from gallery.sketch.bundle import ApiBundle
|
||||||
from gallery.util import root_path
|
from gallery.util import root_path
|
||||||
|
|
||||||
from .route import api, view
|
from .route import api, doc, view
|
||||||
|
|
||||||
|
|
||||||
def build_app(api_bundle: ApiBundle) -> FastAPI:
|
def build_app(api_bundle: ApiBundle) -> FastAPI:
|
||||||
@@ -16,12 +15,7 @@ def build_app(api_bundle: ApiBundle) -> FastAPI:
|
|||||||
)
|
)
|
||||||
app.state.api = api_bundle
|
app.state.api = api_bundle
|
||||||
app.mount("/static", StaticFiles(directory=root_path / "static/dist"))
|
app.mount("/static", StaticFiles(directory=root_path / "static/dist"))
|
||||||
api.app.state.api = api_bundle
|
doc.mount(app)
|
||||||
app.mount("/api", api.app)
|
app.include_router(api.router)
|
||||||
app.include_router(view.router)
|
app.include_router(view.router)
|
||||||
|
|
||||||
@app.get("/docs")
|
|
||||||
def get_docs():
|
|
||||||
return RedirectResponse("/api/docs")
|
|
||||||
|
|
||||||
return app
|
return app
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Annotated, NamedTuple
|
from typing import Annotated
|
||||||
|
|
||||||
from fastapi import Depends
|
from fastapi import Depends
|
||||||
|
|
||||||
@@ -7,35 +7,3 @@ from gallery.sketch.schedule.api import ScheduleApi
|
|||||||
from .api import api_resolver
|
from .api import api_resolver
|
||||||
|
|
||||||
ScheduleApiDepends = Annotated[ScheduleApi, Depends(api_resolver(ScheduleApi))]
|
ScheduleApiDepends = Annotated[ScheduleApi, Depends(api_resolver(ScheduleApi))]
|
||||||
|
|
||||||
|
|
||||||
class ChannelDef(NamedTuple):
|
|
||||||
provider: str
|
|
||||||
id: str
|
|
||||||
|
|
||||||
|
|
||||||
GROUP_CANNELS_MAP: dict[str, list[ChannelDef]] = {
|
|
||||||
"central": [
|
|
||||||
ChannelDef("yandex", "pervyy-16"),
|
|
||||||
ChannelDef("yandex", "rossiya-1-31"),
|
|
||||||
ChannelDef("yandex", "ntv-11"),
|
|
||||||
ChannelDef("yandex", "sts-8"),
|
|
||||||
],
|
|
||||||
"sport": [
|
|
||||||
ChannelDef("matchtv", "matchtv"),
|
|
||||||
ChannelDef("matchtv", "igra"),
|
|
||||||
ChannelDef("matchtv", "arena"),
|
|
||||||
ChannelDef("matchtv", "futbol-1"),
|
|
||||||
ChannelDef("matchtv", "futbol-2"),
|
|
||||||
ChannelDef("matchtv", "futbol-3"),
|
|
||||||
ChannelDef("matchtv", "strana"),
|
|
||||||
ChannelDef("yandex", "start-103"),
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def resolve_group_channels(group_id: str) -> list[ChannelDef]:
|
|
||||||
return GROUP_CANNELS_MAP.get(group_id) or [ChannelDef(*item.split(":")) for item in group_id.split(",")]
|
|
||||||
|
|
||||||
|
|
||||||
ScheduleGroupChannelsDepends = Annotated[list[ChannelDef], Depends(resolve_group_channels)]
|
|
||||||
|
|||||||
@@ -1,21 +1,7 @@
|
|||||||
from fastapi import FastAPI
|
from fastapi import APIRouter
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
|
||||||
|
|
||||||
from gallery.easel.route import doc
|
|
||||||
|
|
||||||
from . import schedule, weather
|
from . import schedule, weather
|
||||||
|
|
||||||
app = FastAPI(
|
router = APIRouter(prefix="/api")
|
||||||
docs_url=None,
|
router.include_router(weather.router)
|
||||||
redoc_url=None,
|
router.include_router(schedule.router)
|
||||||
)
|
|
||||||
app.add_middleware(
|
|
||||||
CORSMiddleware,
|
|
||||||
allow_origins=["*"],
|
|
||||||
allow_credentials=True,
|
|
||||||
allow_methods=["*"],
|
|
||||||
allow_headers=["*"],
|
|
||||||
)
|
|
||||||
app.include_router(weather.router)
|
|
||||||
app.include_router(schedule.router)
|
|
||||||
doc.mount(app, "/api")
|
|
||||||
|
|||||||
@@ -1,11 +1,7 @@
|
|||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from gallery.easel.core import AppRequest
|
from gallery.easel.core import AppRequest
|
||||||
from gallery.easel.depends.schedule import (
|
from gallery.easel.depends.schedule import ScheduleApiDepends
|
||||||
GROUP_CANNELS_MAP,
|
|
||||||
ScheduleApiDepends,
|
|
||||||
ScheduleGroupChannelsDepends,
|
|
||||||
)
|
|
||||||
from gallery.sketch.schedule.api import ScheduleApi
|
from gallery.sketch.schedule.api import ScheduleApi
|
||||||
from gallery.sketch.schedule.model import Channel, Schedule
|
from gallery.sketch.schedule.model import Channel, Schedule
|
||||||
|
|
||||||
@@ -14,19 +10,6 @@ from ...depends.date import DateDepends
|
|||||||
router = APIRouter(prefix="/schedule", tags=["Schedule"])
|
router = APIRouter(prefix="/schedule", tags=["Schedule"])
|
||||||
|
|
||||||
|
|
||||||
@router.get("/groups")
|
|
||||||
async def get_api_schedule_groups():
|
|
||||||
return list(GROUP_CANNELS_MAP.keys())
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/group/{group_id}/{date}")
|
|
||||||
async def get_api_schedule_group_schedule(
|
|
||||||
request: AppRequest, channels: ScheduleGroupChannelsDepends, date: DateDepends
|
|
||||||
) -> list[Schedule]:
|
|
||||||
api = request.app.state.api
|
|
||||||
return [await api.get_api(ScheduleApi, channel.provider).get_schedule(channel.id, date) for channel in channels]
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/providers")
|
@router.get("/providers")
|
||||||
async def get_api_weather_providers(request: AppRequest) -> list[str]:
|
async def get_api_weather_providers(request: AppRequest) -> list[str]:
|
||||||
return request.app.state.api.get_api_providers(ScheduleApi)
|
return request.app.state.api.get_api_providers(ScheduleApi)
|
||||||
|
|||||||
@@ -8,8 +8,7 @@ from fastapi.openapi.docs import (
|
|||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
|
|
||||||
def mount(app: FastAPI, prefix: str | None = None):
|
def mount(app: FastAPI):
|
||||||
openapi_url = prefix + app.openapi_url if prefix else app.openapi_url
|
|
||||||
app.mount(
|
app.mount(
|
||||||
"/docs/static",
|
"/docs/static",
|
||||||
StaticFiles(directory=Path(__file__).parent / "static"),
|
StaticFiles(directory=Path(__file__).parent / "static"),
|
||||||
@@ -18,7 +17,7 @@ def mount(app: FastAPI, prefix: str | None = None):
|
|||||||
@app.get("/docs", include_in_schema=False)
|
@app.get("/docs", include_in_schema=False)
|
||||||
async def custom_swagger_ui_html():
|
async def custom_swagger_ui_html():
|
||||||
return get_swagger_ui_html(
|
return get_swagger_ui_html(
|
||||||
openapi_url=openapi_url,
|
openapi_url=app.openapi_url,
|
||||||
title=app.title + " - Swagger UI",
|
title=app.title + " - Swagger UI",
|
||||||
oauth2_redirect_url=app.swagger_ui_oauth2_redirect_url,
|
oauth2_redirect_url=app.swagger_ui_oauth2_redirect_url,
|
||||||
swagger_js_url="docs/static/swagger-ui-bundle.js",
|
swagger_js_url="docs/static/swagger-ui-bundle.js",
|
||||||
@@ -32,7 +31,7 @@ def mount(app: FastAPI, prefix: str | None = None):
|
|||||||
@app.get("/redoc", include_in_schema=False)
|
@app.get("/redoc", include_in_schema=False)
|
||||||
async def redoc_html():
|
async def redoc_html():
|
||||||
return get_redoc_html(
|
return get_redoc_html(
|
||||||
openapi_url=openapi_url,
|
openapi_url=app.openapi_url,
|
||||||
title=app.title + " - ReDoc",
|
title=app.title + " - ReDoc",
|
||||||
redoc_js_url="docs/static/redoc.standalone.js",
|
redoc_js_url="docs/static/redoc.standalone.js",
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<script type="module"
|
<script type="module"
|
||||||
src="/static/gallery.js?v={{version}}"></script>
|
src="/static/gallery.js?v={{version}}"></script>
|
||||||
<link rel="icon"
|
<link rel="icon"
|
||||||
href="/static/favicon.ico?v={{version}}"
|
href="/favicon.ico?v={{version}}"
|
||||||
type="image/x-icon">
|
type="image/x-icon">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ def build_url(
|
|||||||
if query:
|
if query:
|
||||||
query_dict = {**dict(parse_qsl(parts.query)), **query}
|
query_dict = {**dict(parse_qsl(parts.query)), **query}
|
||||||
parts = parts._replace(query=urlencode(query_dict))
|
parts = parts._replace(query=urlencode(query_dict))
|
||||||
return "/".join([""] + parts.geturl().split("/")[3:])
|
return parts.geturl()
|
||||||
|
|
||||||
|
|
||||||
def build_templates(
|
def build_templates(
|
||||||
|
|||||||
@@ -17,13 +17,13 @@
|
|||||||
</div>
|
</div>
|
||||||
<h1>{{_("Docs")}}</h1>
|
<h1>{{_("Docs")}}</h1>
|
||||||
<div class="list-group mb-3">
|
<div class="list-group mb-3">
|
||||||
<app-link href="/api/docs"
|
<app-link href="/docs"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
icon="file-earmark-text"
|
icon="file-earmark-text"
|
||||||
class="list-group-item list-group-item-action">
|
class="list-group-item list-group-item-action">
|
||||||
Swagger UI
|
Swagger UI
|
||||||
</app-link>
|
</app-link>
|
||||||
<app-link href="/api/redoc"
|
<app-link href="/redoc"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
icon="file-earmark-text"
|
icon="file-earmark-text"
|
||||||
class="list-group-item list-group-item-action">
|
class="list-group-item list-group-item-action">
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
GROUP_MAP = {
|
||||||
|
"central": [
|
||||||
|
("yandextv", "146"), # pervyy
|
||||||
|
("yandextv", "587"), # rossya-1
|
||||||
|
("yandextv", "162"), # ntv
|
||||||
|
("yandextv", "79"), # sts
|
||||||
|
],
|
||||||
|
"sport": [
|
||||||
|
("matchtv", "matchtv"),
|
||||||
|
("matchtv", "igra"),
|
||||||
|
("matchtv", "arena"),
|
||||||
|
("matchtv", "futbol-1"),
|
||||||
|
("matchtv", "futbol-2"),
|
||||||
|
("matchtv", "futbol-3"),
|
||||||
|
("matchtv", "strana"),
|
||||||
|
("yandextv", "1799"), # start
|
||||||
|
],
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import datetime
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from urllib import parse
|
from urllib import parse
|
||||||
|
|
||||||
@@ -7,14 +8,13 @@ from fastapi.responses import HTMLResponse, RedirectResponse
|
|||||||
from gallery.easel.core import AppRequest
|
from gallery.easel.core import AppRequest
|
||||||
from gallery.easel.depends.api import api_resolver
|
from gallery.easel.depends.api import api_resolver
|
||||||
from gallery.easel.depends.date import DateDepends
|
from gallery.easel.depends.date import DateDepends
|
||||||
from gallery.easel.depends.schedule import (
|
from gallery.easel.depends.schedule import ScheduleApiDepends
|
||||||
GROUP_CANNELS_MAP,
|
from gallery.sketch.bundle import ApiBundle
|
||||||
ScheduleApiDepends,
|
|
||||||
ScheduleGroupChannelsDepends,
|
|
||||||
)
|
|
||||||
from gallery.sketch.schedule.api import ScheduleApi
|
from gallery.sketch.schedule.api import ScheduleApi
|
||||||
|
from gallery.sketch.schedule.model import Schedule
|
||||||
|
|
||||||
from ..common.utils.template import build_templates
|
from ..common.utils.template import build_templates
|
||||||
|
from .bundle import GROUP_MAP
|
||||||
from .filters import timedelta_format
|
from .filters import timedelta_format
|
||||||
|
|
||||||
|
|
||||||
@@ -45,34 +45,29 @@ async def get_schedule_index(request: AppRequest, provider: str | None = None, q
|
|||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
request=request,
|
request=request,
|
||||||
name="index.html",
|
name="index.html",
|
||||||
context={"channels": [item.model_dump() for item in channels], "groups": GROUP_CANNELS_MAP.keys()},
|
context={"channels": [item.model_dump() for item in channels], "groups": GROUP_MAP.keys()},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def _get_group_schedule(api: ApiBundle, channels: list[tuple[str, str]], date: datetime.date) -> list[Schedule]:
|
||||||
|
return [
|
||||||
|
await api.get_api(ScheduleApi, provider).get_schedule(channel_id, date) for provider, channel_id in channels
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
@router.get("/group/{group_id}", response_class=RedirectResponse)
|
@router.get("/group/{group_id}", response_class=RedirectResponse)
|
||||||
async def get_group_default(group_id: str):
|
async def get_group_default(group_id: str):
|
||||||
return RedirectResponse(f"{parse.quote(group_id)}/today")
|
return RedirectResponse(f"{parse.quote(group_id)}/today")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/group/{group_id}/{date}", response_class=HTMLResponse)
|
@router.get("/group/{group_id}/{date}", response_class=HTMLResponse)
|
||||||
async def get_group(request: AppRequest, channels: ScheduleGroupChannelsDepends, date: DateDepends):
|
async def get_group(request: AppRequest, group_id: str, date: DateDepends):
|
||||||
responses = [
|
channels = GROUP_MAP.get(group_id, [tuple(item.split(":")) for item in group_id.split(",")])
|
||||||
await request.app.state.api.get_api(ScheduleApi, channel.provider).get_schedule(channel.id, date)
|
responses = await _get_group_schedule(request.app.state.api, channels, date)
|
||||||
for channel in channels
|
|
||||||
]
|
|
||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
request=request,
|
request=request,
|
||||||
name="group.html",
|
name="group.html",
|
||||||
context={
|
context={"responses": responses},
|
||||||
"responses": responses,
|
|
||||||
"api_route": "/".join(
|
|
||||||
[
|
|
||||||
"/api/schedule/group",
|
|
||||||
request.path_params["group_id"],
|
|
||||||
request.path_params["date"],
|
|
||||||
]
|
|
||||||
),
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -87,17 +82,5 @@ async def get_channel(request: AppRequest, schedule_api: ScheduleApiDepends, cha
|
|||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
request=request,
|
request=request,
|
||||||
name="channel.html",
|
name="channel.html",
|
||||||
context={
|
context={"response": response},
|
||||||
"response": response,
|
|
||||||
"api_route": (
|
|
||||||
"/".join(
|
|
||||||
[
|
|
||||||
"/api/schedule",
|
|
||||||
request.path_params["provider"],
|
|
||||||
request.path_params["channel"],
|
|
||||||
request.path_params["date"],
|
|
||||||
]
|
|
||||||
)
|
|
||||||
),
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ locale=request.state.language)}}
|
|||||||
{% block header %}
|
{% block header %}
|
||||||
<app-link href="/schedule"
|
<app-link href="/schedule"
|
||||||
icon="tv">{{_("TV program")}}</app-link>
|
icon="tv">{{_("TV program")}}</app-link>
|
||||||
<app-link target="_blank"
|
|
||||||
href="{{ api_route }}"
|
|
||||||
icon="filetype-json"></app-link>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
@@ -47,17 +44,9 @@ locale=request.state.language)}}
|
|||||||
{% for value in response.values %}
|
{% for value in response.values %}
|
||||||
<tr class="{{'d-none' if (live and not value.live) else 'table-success' if (not live and value.live) else ''}}">
|
<tr class="{{'d-none' if (live and not value.live) else 'table-success' if (not live and value.live) else ''}}">
|
||||||
<td>
|
<td>
|
||||||
<span>{{value.start.strftime('%H:%M')}}</span> <span class="small ms-1">({{(value.end - value.start) |
|
<span>{{value.start.strftime('%H:%M')}}</span> <span class="small ms-1">({{(value.end - value.start) | timedelta_format}})</span>
|
||||||
timedelta_format}})</span>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{% if value.category %}
|
|
||||||
<schedule-icon icon="{{value.category}}"
|
|
||||||
data-bs-toggle="tooltip"
|
|
||||||
data-bs-title="{{value.category}}"></schedule-icon>
|
|
||||||
{% endif %}
|
|
||||||
<span>{{value.label}}</span>
|
|
||||||
</td>
|
</td>
|
||||||
|
<td>{{value.label}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -9,9 +9,6 @@
|
|||||||
{% block header %}
|
{% block header %}
|
||||||
<app-link href="/schedule"
|
<app-link href="/schedule"
|
||||||
icon="tv">{{_("TV program")}}</app-link>
|
icon="tv">{{_("TV program")}}</app-link>
|
||||||
<app-link target="_blank"
|
|
||||||
href="{{ api_route }}"
|
|
||||||
icon="filetype-json"></app-link>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
@@ -53,14 +50,7 @@
|
|||||||
<span>{{value.start.strftime('%H:%M')}}</span> <span class="small ms-1">({{(value.end - value.start) |
|
<span>{{value.start.strftime('%H:%M')}}</span> <span class="small ms-1">({{(value.end - value.start) |
|
||||||
timedelta_format}})</span>
|
timedelta_format}})</span>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>{{value.label}}</td>
|
||||||
{% if value.category %}
|
|
||||||
<schedule-icon icon="{{value.category}}"
|
|
||||||
data-bs-toggle="tooltip"
|
|
||||||
data-bs-title="{{value.category}}"></schedule-icon>
|
|
||||||
{% endif %}
|
|
||||||
<span>{{value.label}}</span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -7,15 +7,17 @@ from gallery.sketch.weather.model import (
|
|||||||
Precipitation,
|
Precipitation,
|
||||||
Sky,
|
Sky,
|
||||||
WindDirection,
|
WindDirection,
|
||||||
|
WindDirectionDeg,
|
||||||
)
|
)
|
||||||
from gallery.util import root_path
|
from gallery.util import root_path
|
||||||
|
|
||||||
|
|
||||||
def wind_direction_icon(wind_direction: WindDirection | None) -> str:
|
def wind_direction_icon(wind_direction_deg: float) -> str:
|
||||||
if wind_direction is None:
|
wind_direction = WindDirectionDeg(wind_direction_deg).direction
|
||||||
|
if wind_direction == WindDirection.CALM:
|
||||||
return "wind-calm"
|
return "wind-calm"
|
||||||
else:
|
else:
|
||||||
return f"wind-from-{wind_direction.lower()}"
|
return f"wind-from-{wind_direction.name.lower()}"
|
||||||
|
|
||||||
|
|
||||||
def cloudness_icon(sky: Sky, date: datetime.datetime, period: str) -> list[str]:
|
def cloudness_icon(sky: Sky, date: datetime.datetime, period: str) -> list[str]:
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ from typing import Literal
|
|||||||
|
|
||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
from fastapi.responses import HTMLResponse, RedirectResponse
|
from fastapi.responses import HTMLResponse, RedirectResponse
|
||||||
from starlette.datastructures import URL
|
|
||||||
|
|
||||||
from gallery.easel.core import AppRequest
|
from gallery.easel.core import AppRequest
|
||||||
from gallery.easel.depends.api import api_resolver
|
from gallery.easel.depends.api import api_resolver
|
||||||
@@ -37,18 +36,7 @@ def build_weather_response(request: AppRequest, response: WeatherResponse):
|
|||||||
return templates.TemplateResponse(
|
return templates.TemplateResponse(
|
||||||
request=request,
|
request=request,
|
||||||
name="weather.html",
|
name="weather.html",
|
||||||
context={
|
context={"response": response},
|
||||||
"response": response,
|
|
||||||
"api_route": "/".join(
|
|
||||||
[
|
|
||||||
"/api/weather",
|
|
||||||
request.path_params["provider"],
|
|
||||||
request.path_params["location"],
|
|
||||||
response.period,
|
|
||||||
request.path_params.get("date") or request.path_params.get("days") or "",
|
|
||||||
]
|
|
||||||
),
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -80,13 +68,6 @@ async def get_weather_days(request: AppRequest, weather_api: WeatherApiDepends,
|
|||||||
return build_weather_response(request, response)
|
return build_weather_response(request, response)
|
||||||
|
|
||||||
|
|
||||||
# TODO: tag mode route deprecated, used in tizen app
|
|
||||||
@router.get("/{provider}/{location}/tag/days-{days}", response_class=RedirectResponse)
|
|
||||||
async def get_tag_days(request: AppRequest, days: int):
|
|
||||||
url = URL(path=f"../days/{days}", query=request.url.query)
|
|
||||||
return RedirectResponse(url)
|
|
||||||
|
|
||||||
|
|
||||||
# TODO: tag mode route deprecated, used in tizen app
|
# TODO: tag mode route deprecated, used in tizen app
|
||||||
@router.get("/{provider}/{location}/{mode:str}/{date}", response_class=HTMLResponse)
|
@router.get("/{provider}/{location}/{mode:str}/{date}", response_class=HTMLResponse)
|
||||||
async def get_weather_day(
|
async def get_weather_day(
|
||||||
|
|||||||
@@ -7,9 +7,6 @@ locale=request.state.language)}}{% endblock %}
|
|||||||
{% block header %}
|
{% block header %}
|
||||||
<app-link href="/weather"
|
<app-link href="/weather"
|
||||||
icon="brightness-high">{{_("Weather")}}</app-link>
|
icon="brightness-high">{{_("Weather")}}</app-link>
|
||||||
<app-link target="_blank"
|
|
||||||
href="{{ api_route }}"
|
|
||||||
icon="filetype-json"></app-link>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
@@ -110,8 +107,8 @@ locale=request.state.language)}}{% endblock %}
|
|||||||
{% for value in response.values %}
|
{% for value in response.values %}
|
||||||
<td class="wind"
|
<td class="wind"
|
||||||
data-bs-toggle="tooltip"
|
data-bs-toggle="tooltip"
|
||||||
data-bs-title="{{ value.wind.direction }}">
|
data-bs-title="{{ value.wind_direction }}">
|
||||||
<div class="wi-svg wi-s wi-{{value.wind.direction | wind_direction_icon}}"
|
<div class="wi-svg wi-s wi-{{value.wind_direction | wind_direction_icon}}"
|
||||||
style="margin: 0 auto;">{{ 'wind-deg' | weather_icon_svg }}</div>
|
style="margin: 0 auto;">{{ 'wind-deg' | weather_icon_svg }}</div>
|
||||||
</td>
|
</td>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -126,11 +123,11 @@ locale=request.state.language)}}{% endblock %}
|
|||||||
<tr>
|
<tr>
|
||||||
{% for value in response.values %}
|
{% for value in response.values %}
|
||||||
<td class="wind"
|
<td class="wind"
|
||||||
style="background-color: rgba(128, 128, 128, {{value.wind.speed * 0.05}});">
|
style="background-color: rgba(128, 128, 128, {{value.wind_speed * 0.05}});">
|
||||||
<span class="speed">{{value.wind.speed}}</span>
|
<span class="speed">{{value.wind_speed}}</span>
|
||||||
{% if value.wind.gust != value.wind.speed and value.wind.gust > 0 %}
|
{% if value.wind_gust != value.wind_speed and value.wind_gust > 0 %}
|
||||||
<span class="gust">
|
<span class="gust">
|
||||||
({{value.wind.gust}})
|
({{value.wind_gust}})
|
||||||
</span>
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ import uvicorn
|
|||||||
|
|
||||||
from gallery.easel import build_app
|
from gallery.easel import build_app
|
||||||
from gallery.painting.gismeteo.api import GismeteoApi
|
from gallery.painting.gismeteo.api import GismeteoApi
|
||||||
from gallery.painting.matchtv.api import MatchTVApi
|
from gallery.painting.matchtv.api import MatchTvApi
|
||||||
from gallery.painting.openweather.api import OpenWeatherApi
|
from gallery.painting.openweather.api import OpenWeatherApi
|
||||||
from gallery.painting.rp5.api import RP5WeatherApi
|
from gallery.painting.rp5.api import RP5WeatherApi
|
||||||
from gallery.painting.yandextv.api import YandexTVApi
|
from gallery.painting.yandextv.api import YandexTvApi
|
||||||
from gallery.painting.yandexweather.api import YandexWeatherApi
|
from gallery.painting.yandexweather.api import YandexWeatherApi
|
||||||
from gallery.sketch.bundle import ApiBundle
|
from gallery.sketch.bundle import ApiBundle
|
||||||
from gallery.sketch.schedule.cached import CachedScheduleApi
|
from gallery.sketch.schedule.cached import CachedScheduleApi
|
||||||
@@ -16,8 +16,8 @@ from gallery.sketch.weather.cached import CachedWeatherApi
|
|||||||
|
|
||||||
api = ApiBundle(
|
api = ApiBundle(
|
||||||
[
|
[
|
||||||
CachedScheduleApi(YandexTVApi()),
|
CachedScheduleApi(YandexTvApi()),
|
||||||
CachedScheduleApi(MatchTVApi()),
|
CachedScheduleApi(MatchTvApi()),
|
||||||
CachedWeatherApi(GismeteoApi()),
|
CachedWeatherApi(GismeteoApi()),
|
||||||
CachedWeatherApi(OpenWeatherApi()),
|
CachedWeatherApi(OpenWeatherApi()),
|
||||||
CachedWeatherApi(YandexWeatherApi()),
|
CachedWeatherApi(YandexWeatherApi()),
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
PROVIDER = "gismeteo"
|
|
||||||
|
|||||||
@@ -1,30 +1,25 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
from os import environ
|
from os import environ
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
from fastapi import HTTPException, status
|
||||||
|
|
||||||
from gallery.sketch.source import ApiSource
|
from gallery.sketch.source import ApiSource
|
||||||
from gallery.sketch.weather.api import WeatherApi
|
from gallery.sketch.weather.api import WeatherApi
|
||||||
from gallery.sketch.weather.model import Location, WeatherResponse
|
from gallery.sketch.weather.model import Location, WeatherResponse, WeatherValue
|
||||||
|
from gallery.sketch.weather.util import merge_weather_values
|
||||||
|
|
||||||
from . import PROVIDER
|
from . import datehelp
|
||||||
from .parser import ForecastData, GismeteoForecastParser, GismeteoLocationParser
|
from .parser import DAYS_PARSER, LOCATION_PARSER, ONE_DAY_PARSER, ROW_PARSERS
|
||||||
|
|
||||||
|
logger = logging.getLogger("gismeteo")
|
||||||
def format_date(date: datetime.date) -> str:
|
|
||||||
today = datetime.date.today()
|
|
||||||
days = (date - today).days
|
|
||||||
if days == 0:
|
|
||||||
return "today"
|
|
||||||
elif days == 1:
|
|
||||||
return "tomorrow"
|
|
||||||
else:
|
|
||||||
return f"{days + 1}-day"
|
|
||||||
|
|
||||||
|
|
||||||
class GismeteoApi(WeatherApi):
|
class GismeteoApi(WeatherApi):
|
||||||
PROVIDER = PROVIDER
|
PROVIDER = "gismeteo"
|
||||||
|
|
||||||
forecast_parser = GismeteoForecastParser()
|
|
||||||
location_parser = GismeteoLocationParser()
|
|
||||||
|
|
||||||
def _build_source(self) -> ApiSource:
|
def _build_source(self) -> ApiSource:
|
||||||
return ApiSource(
|
return ApiSource(
|
||||||
@@ -32,24 +27,89 @@ class GismeteoApi(WeatherApi):
|
|||||||
cookies={"xauth": auth} if (auth := environ.get("GISMETEO_AUTH")) else None,
|
cookies={"xauth": auth} if (auth := environ.get("GISMETEO_AUTH")) else None,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _parse_oneday(self, date: datetime.date, data: str) -> WeatherResponse:
|
||||||
|
result: list[dict[str, Any]] = []
|
||||||
|
soup = BeautifulSoup(data, features="html.parser")
|
||||||
|
location = LOCATION_PARSER.parse_location(data)
|
||||||
|
widget = ONE_DAY_PARSER.parse_widget(soup)
|
||||||
|
for parser in ROW_PARSERS:
|
||||||
|
for index, value in enumerate(parser.parse_row(widget)):
|
||||||
|
while len(result) < index + 1:
|
||||||
|
result.append({})
|
||||||
|
result[index][parser.KEY] = value
|
||||||
|
values = [WeatherValue(**item) for item in result]
|
||||||
|
# group values by 3 hours
|
||||||
|
if len(values) > 8:
|
||||||
|
n = 3
|
||||||
|
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,
|
||||||
|
period="day",
|
||||||
|
values=values,
|
||||||
|
)
|
||||||
|
|
||||||
|
def _parse_manydays(self, data: str) -> WeatherResponse:
|
||||||
|
result: list[dict[str, Any]] = []
|
||||||
|
soup = BeautifulSoup(data, features="html.parser")
|
||||||
|
location = LOCATION_PARSER.parse_location(data)
|
||||||
|
widget = DAYS_PARSER.parse_widget(soup)
|
||||||
|
for parser in ROW_PARSERS:
|
||||||
|
for index, value in enumerate(parser.parse_row(widget)):
|
||||||
|
while len(result) < index + 1:
|
||||||
|
result.append({})
|
||||||
|
result[index][parser.KEY] = value
|
||||||
|
values = [WeatherValue(**item) for item in result]
|
||||||
|
return WeatherResponse(
|
||||||
|
location=location or "n/a",
|
||||||
|
date=datetime.date.today(),
|
||||||
|
period="days",
|
||||||
|
values=values,
|
||||||
|
)
|
||||||
|
|
||||||
async def find_locations(self, query: str) -> list[Location]:
|
async def find_locations(self, query: str) -> list[Location]:
|
||||||
geo = "ru"
|
geo = "ru"
|
||||||
latitude = 52.968498
|
latitude = 52.968498
|
||||||
longitude = 36.0695
|
longitude = 36.0695
|
||||||
data = await self.source.request(
|
data = json.loads(
|
||||||
|
await self.source.request(
|
||||||
f"mq/city/q/?q={query}&geo={geo}&latitude={latitude}&longitude={longitude}&limit=10"
|
f"mq/city/q/?q={query}&geo={geo}&latitude={latitude}&longitude={longitude}&limit=10"
|
||||||
)
|
)
|
||||||
return self.location_parser.parse(data)
|
)
|
||||||
|
result = []
|
||||||
|
for item in data["data"]:
|
||||||
|
result.append(
|
||||||
|
Location(
|
||||||
|
id=f"{item['slug']}-{item['id']}",
|
||||||
|
name=item["translations"]["kk"]["city"]["name"],
|
||||||
|
provider=self.provider,
|
||||||
|
lat=item["coordinates"]["latitude"],
|
||||||
|
lon=item["coordinates"]["longitude"],
|
||||||
|
country=item["translations"]["kk"]["country"]["name"],
|
||||||
|
country_code=item["country"]["code"].lower(),
|
||||||
|
district=(
|
||||||
|
item["translations"]["kk"]["district"]["name"] if item["translations"]["kk"]["district"] else ""
|
||||||
|
),
|
||||||
|
subdistrict=(
|
||||||
|
item["translations"]["kk"]["subdistrict"]["name"]
|
||||||
|
if "subdistrict" in item["translations"]["kk"]
|
||||||
|
else ""
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
return result
|
||||||
|
|
||||||
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
||||||
max_date = datetime.date.today() + datetime.timedelta(days=9)
|
max_date = datetime.date.today() + datetime.timedelta(days=9)
|
||||||
if date > max_date:
|
if date > max_date:
|
||||||
raise ValueError(f"Invalid date: {date}, max: {max_date}")
|
raise HTTPException(
|
||||||
data = await self.source.request(f"weather-{location_id}/{format_date(date)}")
|
status_code=status.HTTP_400_BAD_REQUEST, detail={"max_date": max_date.strftime("%Y-%m-%d")}
|
||||||
context = ForecastData(date, "day", data, 8)
|
)
|
||||||
return self.forecast_parser.parse(context)
|
data = await self.source.request(f"weather-{location_id}/{datehelp.dump(date)}")
|
||||||
|
return self._parse_oneday(date, data)
|
||||||
|
|
||||||
async def get_days(self, location_id: str, days: int) -> WeatherResponse:
|
async def get_days(self, location_id: str, days: int) -> WeatherResponse:
|
||||||
data = await self.source.request(f"weather-{location_id}/{days}-days")
|
data = await self.source.request(f"weather-{location_id}/{days}-days")
|
||||||
context = ForecastData(datetime.date.today(), "days", data)
|
return self._parse_manydays(data)
|
||||||
return self.forecast_parser.parse(context)
|
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
from typing import Generic, Iterable, Optional, TypeVar
|
||||||
|
|
||||||
|
from bs4 import Tag
|
||||||
|
|
||||||
|
T = TypeVar("T")
|
||||||
|
|
||||||
|
|
||||||
|
class WidgetParser:
|
||||||
|
def parse_widget(self, tag: Tag) -> Tag:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
|
||||||
|
class BaseWidgetParser(WidgetParser):
|
||||||
|
SELECT: str
|
||||||
|
|
||||||
|
def __init__(self, select: Optional[str] = None):
|
||||||
|
super().__init__()
|
||||||
|
self._select = select or self.SELECT
|
||||||
|
|
||||||
|
def parse_widget(self, tag: Tag) -> Tag:
|
||||||
|
widget = tag.select_one(self._select)
|
||||||
|
if widget is None:
|
||||||
|
raise ValueError(self._select)
|
||||||
|
return widget
|
||||||
|
|
||||||
|
|
||||||
|
class RowParser(Generic[T]):
|
||||||
|
KEY: str
|
||||||
|
|
||||||
|
def parse_row(self, tag: Tag) -> Iterable[T]:
|
||||||
|
raise NotImplementedError
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import datetime
|
||||||
|
from enum import Enum
|
||||||
|
|
||||||
|
import dateparser
|
||||||
|
import dateparser.date_parser
|
||||||
|
|
||||||
|
|
||||||
|
class Day(str, Enum):
|
||||||
|
TODAY = "today"
|
||||||
|
TOMORROW = "tomorrow"
|
||||||
|
DAY_3 = "3-day"
|
||||||
|
DAY_4 = "4-day"
|
||||||
|
DAY_5 = "5-day"
|
||||||
|
|
||||||
|
|
||||||
|
def parse(value: str) -> datetime.date:
|
||||||
|
if value in ["today", "mock"]:
|
||||||
|
return datetime.date.today()
|
||||||
|
elif value == "tomorrow":
|
||||||
|
return datetime.date.today() + datetime.timedelta(days=1)
|
||||||
|
elif value.endswith("-day"):
|
||||||
|
days = int(value.split("-")[0]) - 1
|
||||||
|
return datetime.date.today() + datetime.timedelta(days=days)
|
||||||
|
else:
|
||||||
|
date = dateparser.parse(value)
|
||||||
|
if date is None:
|
||||||
|
raise ValueError(value)
|
||||||
|
return date.date()
|
||||||
|
|
||||||
|
|
||||||
|
def dump(date: datetime.date) -> str:
|
||||||
|
today = datetime.date.today()
|
||||||
|
days = (date - today).days
|
||||||
|
if days == 0:
|
||||||
|
return "today"
|
||||||
|
elif days == 1:
|
||||||
|
return "tomorrow"
|
||||||
|
else:
|
||||||
|
return f"{days + 1}-day"
|
||||||
@@ -1,59 +1,65 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
import logging
|
||||||
import re
|
import re
|
||||||
from dataclasses import dataclass
|
from typing import Iterable
|
||||||
from typing import Any, Literal
|
|
||||||
|
|
||||||
|
import dateparser
|
||||||
from bs4 import Tag
|
from bs4 import Tag
|
||||||
|
|
||||||
from gallery.sketch.parse.core import ParsedContext, ParseError, Parser
|
|
||||||
from gallery.sketch.parse.date import DATE_PARSER
|
|
||||||
from gallery.sketch.parse.html import HTMLContextParser, TableParser, TableValueParser
|
|
||||||
from gallery.sketch.parse.json import JSONParser
|
|
||||||
from gallery.sketch.weather.model import (
|
from gallery.sketch.weather.model import (
|
||||||
Cloudness,
|
Cloudness,
|
||||||
Location,
|
|
||||||
Precipitation,
|
Precipitation,
|
||||||
Sky,
|
Sky,
|
||||||
WeatherResponse,
|
|
||||||
WeatherValue,
|
|
||||||
WindDirection,
|
WindDirection,
|
||||||
)
|
)
|
||||||
from gallery.sketch.weather.parse.wind import WIND_DIRECTION_PARSER
|
from gallery.sketch.weather.parser import ParseError, parse_wind_direction
|
||||||
from gallery.sketch.weather.util import fix_dates_sequence, merge_weather_values
|
|
||||||
|
|
||||||
from . import PROVIDER
|
from .core import BaseWidgetParser, RowParser
|
||||||
|
|
||||||
|
logger = logging.getLogger("gismeteo")
|
||||||
|
|
||||||
|
ONE_DAY_PARSER = BaseWidgetParser(".widget.widget-oneday .widget-items")
|
||||||
|
DAYS_PARSER = BaseWidgetParser(".widget.widget-days .widget-items")
|
||||||
|
|
||||||
|
|
||||||
class LocationNameParser(Parser[str, str]):
|
class LocationParser:
|
||||||
PATTERN = re.compile('{"ru":{"city":{"name":"(.*?)"')
|
PATTERN = re.compile('{"ru":{"city":{"name":"(.*?)"')
|
||||||
|
|
||||||
def parse(self, data: str) -> str:
|
def parse_location(self, data: str) -> str | None:
|
||||||
match = self.PATTERN.search(data)
|
match = self.PATTERN.search(data)
|
||||||
if match:
|
if match:
|
||||||
return match.group(1)
|
return match.group(1)
|
||||||
raise ParseError("Location not found")
|
return None
|
||||||
|
|
||||||
|
|
||||||
class TimeParser(TableValueParser[datetime.datetime]):
|
LOCATION_PARSER = LocationParser()
|
||||||
selector = ".widget-row.widget-row-datetime-time > .row-item > time-value"
|
|
||||||
model_key = "date"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> datetime.datetime:
|
|
||||||
timestamp = int(data.attrs["timestamp"])
|
|
||||||
return datetime.datetime.fromtimestamp(timestamp)
|
|
||||||
|
|
||||||
|
|
||||||
class DateParser(TableValueParser[datetime.datetime]):
|
class DateParser(RowParser[datetime.datetime]):
|
||||||
selector = ".widget-row.widget-row-date > .row-item"
|
KEY = "date"
|
||||||
model_key = "date"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> datetime.datetime:
|
def parse_row(self, tag: Tag) -> Iterable[datetime.datetime]:
|
||||||
return DATE_PARSER.parse(data.text)
|
datetime_time_row = tag.select_one(".widget-row.widget-row-datetime-time")
|
||||||
|
if datetime_time_row:
|
||||||
|
for item in datetime_time_row.select(".row-item > time-value"):
|
||||||
|
timestamp = int(item.attrs["timestamp"])
|
||||||
|
time = datetime.datetime.fromtimestamp(timestamp)
|
||||||
|
yield time
|
||||||
|
else:
|
||||||
|
month = None
|
||||||
|
for item in tag.select(".widget-row.widget-row-date > .row-item"):
|
||||||
|
date_str = item.text
|
||||||
|
date = dateparser.parse(date_str, languages=["ru"])
|
||||||
|
if date is None:
|
||||||
|
raise ParseError.invalid_date(date_str)
|
||||||
|
if month and month > date.month:
|
||||||
|
date = date.replace(month=month)
|
||||||
|
month = date.month
|
||||||
|
yield date
|
||||||
|
|
||||||
|
|
||||||
class SkyParser(TableValueParser[Sky]):
|
class SkyParser(RowParser[Sky]):
|
||||||
selector = ".widget-row[data-row=icon-tooltip] > .row-item"
|
KEY = "sky"
|
||||||
model_key = "sky"
|
|
||||||
|
|
||||||
CLOUDNESS_MAP: dict[str, Cloudness] = {
|
CLOUDNESS_MAP: dict[str, Cloudness] = {
|
||||||
"ясно": Cloudness.CLEAR,
|
"ясно": Cloudness.CLEAR,
|
||||||
@@ -91,8 +97,9 @@ class SkyParser(TableValueParser[Sky]):
|
|||||||
result_values = values - flag_values
|
result_values = values - flag_values
|
||||||
return result_values, len(result_values) < len(values)
|
return result_values, len(result_values) < len(values)
|
||||||
|
|
||||||
def extract(self, data: Tag) -> Sky:
|
def parse_row(self, tag: Tag) -> Iterable[Sky]:
|
||||||
sky_str = data.attrs["data-tooltip"]
|
for item in tag.select(".widget-row[data-row=icon-tooltip] > .row-item"):
|
||||||
|
sky_str = item.attrs["data-tooltip"]
|
||||||
values = {item.strip().lower() for item in sky_str.split(",")}
|
values = {item.strip().lower() for item in sky_str.split(",")}
|
||||||
cloudness = Cloudness.CLEAR
|
cloudness = Cloudness.CLEAR
|
||||||
precipitation = Precipitation.NO
|
precipitation = Precipitation.NO
|
||||||
@@ -109,8 +116,8 @@ class SkyParser(TableValueParser[Sky]):
|
|||||||
values.remove(k)
|
values.remove(k)
|
||||||
break
|
break
|
||||||
if values:
|
if values:
|
||||||
raise ParseError("Unknown sky values", values)
|
logger.warning("unknown sky values: %s:", values)
|
||||||
return Sky(
|
yield Sky(
|
||||||
cloudness=cloudness,
|
cloudness=cloudness,
|
||||||
precipitation=precipitation,
|
precipitation=precipitation,
|
||||||
thunder=thunder,
|
thunder=thunder,
|
||||||
@@ -118,69 +125,71 @@ class SkyParser(TableValueParser[Sky]):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class TemperatureParser(TableValueParser[list[int]]):
|
class TemperatureParser(RowParser[list[int]]):
|
||||||
selector = ".widget-row-chart[data-row=temperature-air] > .chart > .values > .value"
|
KEY = "temperature"
|
||||||
model_key = "temperature"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[int]:
|
def parse_row(self, tag: Tag) -> Iterable[list[int]]:
|
||||||
return [int(value.attrs["value"]) for value in data.select("temperature-value")]
|
for item in tag.select(".widget-row-chart[data-row=temperature-air] > .chart > .values > .value"):
|
||||||
|
yield [int(value.attrs["value"]) for value in item.select("temperature-value")]
|
||||||
|
|
||||||
|
|
||||||
class WindSpeedParser(TableValueParser[int]):
|
class WindSpeedParser(RowParser[int]):
|
||||||
selector = ".widget-row-wind > .row-item > .wind-speed"
|
KEY = "wind_speed"
|
||||||
model_key = "wind.speed"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> int:
|
def parse_row(self, tag: Tag) -> Iterable[int]:
|
||||||
value = data.select_one("speed-value")
|
for item in tag.select(".widget-row-wind > .row-item > .wind-speed > speed-value"):
|
||||||
return int(value.attrs["value"]) if value else 0
|
yield int(item.attrs["value"])
|
||||||
|
|
||||||
|
|
||||||
class WindGustParser(TableValueParser[int]):
|
class WindGustParser(RowParser[int]):
|
||||||
selector = ".widget-row-wind > .row-item > .wind-gust"
|
KEY = "wind_gust"
|
||||||
model_key = "wind.gust"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> int:
|
def parse_row(self, tag: Tag) -> Iterable[int]:
|
||||||
value = data.select_one("speed-value")
|
for item in tag.select(".widget-row-wind > .row-item > .wind-gust"):
|
||||||
return int(value.attrs["value"]) if value else 0
|
value = item.select_one("speed-value")
|
||||||
|
yield int(value.attrs["value"]) if value else 0
|
||||||
|
|
||||||
|
|
||||||
class WindDirectionParser(TableValueParser[WindDirection | None]):
|
class WindDirectionParser(RowParser[WindDirection]):
|
||||||
selector = ".widget-row-wind > .row-item > .wind-speed > .wind-direction"
|
KEY = "wind_direction"
|
||||||
model_key = "wind.direction"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> WindDirection | None:
|
def parse_row(self, tag: Tag) -> Iterable[float]:
|
||||||
return WIND_DIRECTION_PARSER.parse(data.text.strip())
|
for item in tag.select(".widget-row-wind > .row-item > .wind-speed > .wind-direction"):
|
||||||
|
wind_direction_str = item.text.lower().strip()
|
||||||
|
yield parse_wind_direction(wind_direction_str)
|
||||||
|
|
||||||
|
|
||||||
class PrecipitationParser(TableValueParser[float]):
|
class PrecipitationParser(RowParser[float]):
|
||||||
selector = ".widget-row[data-row=precipitation-bars] > .row-item"
|
KEY = "precipitation"
|
||||||
model_key = "precipitation"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> float:
|
def parse_row(self, tag: Tag) -> Iterable[float]:
|
||||||
value = data.select_one("precipitation-value")
|
for item in tag.select(".widget-row[data-row=precipitation-bars] > .row-item"):
|
||||||
return float(value.attrs["value"]) if value else 0
|
value = item.select_one("precipitation-value")
|
||||||
|
if value:
|
||||||
|
yield float(value.attrs["value"])
|
||||||
|
else:
|
||||||
|
yield 0
|
||||||
|
|
||||||
|
|
||||||
class PressureParser(TableValueParser[list[int]]):
|
class PressureParser(RowParser[list[int]]):
|
||||||
selector = ".widget-row-chart[data-row=pressure] > .chart > .values > .value"
|
KEY = "pressure"
|
||||||
model_key = "pressure"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[int]:
|
def parse_row(self, tag: Tag) -> Iterable[list[int]]:
|
||||||
return [int(value.attrs["value"]) for value in data.select("pressure-value")]
|
for item in tag.select(".widget-row-chart[data-row=pressure] > .chart > .values > .value"):
|
||||||
|
yield [int(value.attrs["value"]) for value in item.select("pressure-value")]
|
||||||
|
|
||||||
|
|
||||||
class HumidityParser(TableValueParser[int]):
|
class HumidityParser(RowParser[int]):
|
||||||
selector = ".widget-row[data-row=humidity] > .row-item, .widget-row[data-row=humidity-avg] > .row-item"
|
KEY = "humidity"
|
||||||
model_key = "humidity"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> int:
|
def parse_row(self, tag: Tag) -> Iterable[int]:
|
||||||
return int(data.text)
|
for item in tag.select(
|
||||||
|
".widget-row[data-row=humidity] > .row-item, .widget-row[data-row=humidity-avg] > .row-item"
|
||||||
|
):
|
||||||
|
yield int(item.text)
|
||||||
|
|
||||||
|
|
||||||
class GismeteoTableParser(TableParser[WeatherValue]):
|
ROW_PARSERS: list[RowParser] = [
|
||||||
selector = ".widget .widget-items"
|
|
||||||
value_parsers = [
|
|
||||||
TimeParser(),
|
|
||||||
DateParser(),
|
DateParser(),
|
||||||
SkyParser(),
|
SkyParser(),
|
||||||
TemperatureParser(),
|
TemperatureParser(),
|
||||||
@@ -192,62 +201,4 @@ class GismeteoTableParser(TableParser[WeatherValue]):
|
|||||||
HumidityParser(),
|
HumidityParser(),
|
||||||
]
|
]
|
||||||
|
|
||||||
def create_model(self, data: dict) -> WeatherValue:
|
ROW_PARSERS_MAP: dict[str, RowParser] = {parser.KEY: parser for parser in ROW_PARSERS}
|
||||||
return WeatherValue.model_validate(data)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class ForecastData:
|
|
||||||
date: datetime.date
|
|
||||||
period: Literal["day", "days"]
|
|
||||||
data: str
|
|
||||||
values: int | None = None
|
|
||||||
|
|
||||||
|
|
||||||
class GismeteoForecastParser(HTMLContextParser[ForecastData, WeatherResponse]):
|
|
||||||
location_parser = LocationNameParser()
|
|
||||||
table_parser = GismeteoTableParser()
|
|
||||||
|
|
||||||
def extract(self, data: ParsedContext[ForecastData, Tag]) -> WeatherResponse:
|
|
||||||
location = self.location_parser.parse(data.context.data)
|
|
||||||
values = self.table_parser.parse(data.data)
|
|
||||||
if data.context.values and len(values) > data.context.values:
|
|
||||||
n = int(len((values)) / data.context.values)
|
|
||||||
values = [
|
|
||||||
merge_weather_values(values[i].date, values[i : i + n], "average") for i in range(0, len(values), n)
|
|
||||||
]
|
|
||||||
if data.context.period == "days":
|
|
||||||
fix_dates_sequence(values)
|
|
||||||
return WeatherResponse(
|
|
||||||
location=location,
|
|
||||||
date=data.context.date,
|
|
||||||
period=data.context.period,
|
|
||||||
values=values,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class GismeteoLocationParser(JSONParser[list[Location]]):
|
|
||||||
|
|
||||||
def extract(self, data: Any) -> list[Location]:
|
|
||||||
result = []
|
|
||||||
for item in data["data"]:
|
|
||||||
result.append(
|
|
||||||
Location(
|
|
||||||
id=f"{item['slug']}-{item['id']}",
|
|
||||||
name=item["translations"]["kk"]["city"]["name"],
|
|
||||||
provider=PROVIDER,
|
|
||||||
lat=item["coordinates"]["latitude"],
|
|
||||||
lon=item["coordinates"]["longitude"],
|
|
||||||
country=item["translations"]["kk"]["country"]["name"],
|
|
||||||
country_code=item["country"]["code"].lower(),
|
|
||||||
district=(
|
|
||||||
item["translations"]["kk"]["district"]["name"] if item["translations"]["kk"]["district"] else ""
|
|
||||||
),
|
|
||||||
subdistrict=(
|
|
||||||
item["translations"]["kk"]["subdistrict"]["name"]
|
|
||||||
if "subdistrict" in item["translations"]["kk"]
|
|
||||||
else ""
|
|
||||||
),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return result
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
PROVIDER = "matchtv"
|
|
||||||
|
|||||||
@@ -1,33 +1,57 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
|
||||||
from gallery.sketch.schedule.api import ScheduleApi
|
from gallery.sketch.schedule.api import ScheduleApi
|
||||||
from gallery.sketch.schedule.model import Channel, Schedule
|
from gallery.sketch.schedule.model import Channel, Schedule, ScheduleValue
|
||||||
from gallery.sketch.source import ApiSource
|
from gallery.sketch.source import ApiSource
|
||||||
|
|
||||||
from . import PROVIDER
|
logger = logging.getLogger("matchtv")
|
||||||
from .parser import (
|
|
||||||
ChannelData,
|
|
||||||
MatchTVChannelParser,
|
|
||||||
MatchTVScheduleParser,
|
|
||||||
ScheduleData,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class MatchTVApi(ScheduleApi):
|
class MatchTvApi(ScheduleApi):
|
||||||
PROVIDER = PROVIDER
|
PROVIDER = "matchtv"
|
||||||
|
|
||||||
schedule_parser = MatchTVScheduleParser()
|
|
||||||
channel_parser = MatchTVChannelParser()
|
|
||||||
|
|
||||||
def _build_source(self) -> ApiSource:
|
def _build_source(self) -> ApiSource:
|
||||||
return ApiSource("https://matchtv.ru")
|
return ApiSource("https://matchtv.ru")
|
||||||
|
|
||||||
async def find_channels(self, query: str) -> list[Channel]:
|
async def find_channels(self, query: str) -> list[Channel]:
|
||||||
endpoint = "api/v1/channels"
|
endpoint = "api/v1/channels"
|
||||||
data = await self.source.request(endpoint)
|
data = json.loads(await self.source.request(endpoint))
|
||||||
return self.channel_parser.parse(ChannelData(query, data))
|
result = []
|
||||||
|
query = query.lower()
|
||||||
|
for item in data["result"]:
|
||||||
|
if query in item["name"].lower() or query in item["alias"]:
|
||||||
|
channel_id = item["alias"]
|
||||||
|
name = item["name"].split("|")[0].strip()
|
||||||
|
result.append(Channel(id=channel_id, name=name, provider=self.provider))
|
||||||
|
return result
|
||||||
|
|
||||||
async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
|
async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
|
||||||
endpoint = f"api/v1/channels/{channel_id}/tv-schedule?date={date:%Y%m%d}"
|
endpoint = f"api/v1/channels/{channel_id}/tv-schedule?date={date:%Y%m%d}"
|
||||||
data = await self.source.request(endpoint)
|
data = json.loads(await self.source.request(endpoint))
|
||||||
return self.schedule_parser.parse(ScheduleData(date, data))
|
channel_data = data["result"]["channels"][0]
|
||||||
|
channel = Channel(id=channel_data["alias"], name=channel_data["name"], provider=self.provider)
|
||||||
|
values = []
|
||||||
|
current_day = datetime.datetime.combine(date.today(), datetime.datetime.min.time())
|
||||||
|
end = current_day + datetime.timedelta(days=1, hours=6)
|
||||||
|
prev_value: ScheduleValue | None = None
|
||||||
|
for item in channel_data["schedule"]:
|
||||||
|
title = item["title"]
|
||||||
|
time_str = item["time"]
|
||||||
|
hours, minutes = map(int, time_str.split(":"))
|
||||||
|
item_date = current_day.replace(hour=hours, minute=minutes)
|
||||||
|
if prev_value is not None and item_date.hour < prev_value.start.hour:
|
||||||
|
current_day += datetime.timedelta(days=1)
|
||||||
|
item_date += datetime.timedelta(days=1)
|
||||||
|
live = "Прямая трансляция" in title
|
||||||
|
value = ScheduleValue(start=item_date, end=end, label=title, live=live)
|
||||||
|
values.append(value)
|
||||||
|
if prev_value is not None:
|
||||||
|
prev_value.end = item_date
|
||||||
|
prev_value = value
|
||||||
|
return Schedule(
|
||||||
|
channel=channel,
|
||||||
|
date=date,
|
||||||
|
values=values,
|
||||||
|
)
|
||||||
|
|||||||
@@ -1,74 +0,0 @@
|
|||||||
import datetime
|
|
||||||
import re
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from gallery.sketch.parse.core import ParsedContext, Parser
|
|
||||||
from gallery.sketch.parse.json import JSONContextParser
|
|
||||||
from gallery.sketch.schedule.model import Channel, Schedule, ScheduleValue
|
|
||||||
from gallery.sketch.schedule.parse.category import CATEGORY_PARSER
|
|
||||||
|
|
||||||
from . import PROVIDER
|
|
||||||
|
|
||||||
|
|
||||||
class DateParser(Parser[str, datetime.date]):
|
|
||||||
def parse(self, data: str) -> datetime.date:
|
|
||||||
matched = re.compile('{\\"date\\":(\\d+)}').search(data)
|
|
||||||
return datetime.date.strptime(matched.group(1), data)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class ScheduleData:
|
|
||||||
date: datetime.date
|
|
||||||
data: str
|
|
||||||
|
|
||||||
|
|
||||||
class MatchTVScheduleParser(JSONContextParser[ScheduleData, Schedule]):
|
|
||||||
date_parser = DateParser()
|
|
||||||
|
|
||||||
def extract(self, data: ParsedContext[ScheduleData, Any]) -> Schedule:
|
|
||||||
channel_data = data.data["result"]["channels"][0]
|
|
||||||
channel = Channel(id=channel_data["alias"], name=channel_data["name"], provider=PROVIDER)
|
|
||||||
default_category = CATEGORY_PARSER.parse(channel.name)
|
|
||||||
values = []
|
|
||||||
start = datetime.datetime.combine(data.context.date, datetime.time.min)
|
|
||||||
end = start + datetime.timedelta(days=1, hours=6)
|
|
||||||
prev_value: ScheduleValue | None = None
|
|
||||||
for item in channel_data["schedule"]:
|
|
||||||
title = item["title"]
|
|
||||||
time_str = item["time"]
|
|
||||||
hours, minutes = map(int, time_str.split(":"))
|
|
||||||
item_date = start.replace(hour=hours, minute=minutes)
|
|
||||||
if prev_value is not None and item_date.hour < prev_value.start.hour:
|
|
||||||
start += datetime.timedelta(days=1)
|
|
||||||
item_date += datetime.timedelta(days=1)
|
|
||||||
live = "Прямая трансляция" in title
|
|
||||||
category = CATEGORY_PARSER.parse(title) or default_category
|
|
||||||
value = ScheduleValue(start=item_date, end=end, label=title, category=category, live=live)
|
|
||||||
values.append(value)
|
|
||||||
if prev_value is not None:
|
|
||||||
prev_value.end = item_date
|
|
||||||
prev_value = value
|
|
||||||
return Schedule(
|
|
||||||
channel=channel,
|
|
||||||
date=data.context.date,
|
|
||||||
values=values,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class ChannelData:
|
|
||||||
query: str
|
|
||||||
data: str
|
|
||||||
|
|
||||||
|
|
||||||
class MatchTVChannelParser(JSONContextParser[ChannelData, list[Channel]]):
|
|
||||||
def extract(self, data: ParsedContext[ChannelData, Any]) -> list[Channel]:
|
|
||||||
result = []
|
|
||||||
query = data.context.query.lower()
|
|
||||||
for item in data.data["result"]:
|
|
||||||
if query in item["name"].lower() or query in item["alias"]:
|
|
||||||
channel_id = item["alias"]
|
|
||||||
name = item["name"].split("|")[0].strip()
|
|
||||||
result.append(Channel(id=channel_id, name=name, provider=PROVIDER))
|
|
||||||
return result
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
PROVIDER = "openweather"
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import datetime
|
import datetime
|
||||||
from itertools import groupby
|
import logging
|
||||||
|
from collections import defaultdict
|
||||||
from os import environ
|
from os import environ
|
||||||
|
|
||||||
from aiocache import cached
|
from aiocache import cached
|
||||||
@@ -9,17 +10,16 @@ from gallery.sketch.weather.model import Location, WeatherResponse, WeatherValue
|
|||||||
from gallery.sketch.weather.util import merge_weather_values
|
from gallery.sketch.weather.util import merge_weather_values
|
||||||
from gallery.util import TimeUnit
|
from gallery.util import TimeUnit
|
||||||
|
|
||||||
from . import PROVIDER
|
from .openweather import Forecast
|
||||||
from .openweather import Location as OpenWeatherLocation
|
from .openweather import Location as OpenWeatherLocation
|
||||||
from .openweather import OpenWeather
|
from .openweather import OpenWeather
|
||||||
from .parser import OpenWeatherForecastParser, OpenWeatherLocationParser
|
from .parser import FORECAST_ITEM_PARSER
|
||||||
|
|
||||||
|
logger = logging.getLogger("openweather")
|
||||||
|
|
||||||
|
|
||||||
class OpenWeatherApi(WeatherApi[OpenWeather]):
|
class OpenWeatherApi(WeatherApi[OpenWeather]):
|
||||||
PROVIDER = PROVIDER
|
PROVIDER = "openweather"
|
||||||
|
|
||||||
forecast_parser = OpenWeatherForecastParser()
|
|
||||||
location_parser = OpenWeatherLocationParser()
|
|
||||||
|
|
||||||
def _build_source(self) -> OpenWeather:
|
def _build_source(self) -> OpenWeather:
|
||||||
return OpenWeather(environ["OPENWEATHER_KEY"])
|
return OpenWeather(environ["OPENWEATHER_KEY"])
|
||||||
@@ -41,17 +41,34 @@ class OpenWeatherApi(WeatherApi[OpenWeather]):
|
|||||||
alias="redis",
|
alias="redis",
|
||||||
ttl=TimeUnit.HOUR,
|
ttl=TimeUnit.HOUR,
|
||||||
)
|
)
|
||||||
async def _get_location_forecast(self, location_id: str) -> list[WeatherValue]:
|
async def _get_location_forecast(self, location_id: str) -> Forecast:
|
||||||
content = await self.source.get_forecast(*self._parse_location(location_id))
|
return await self.source.get_forecast(*self._parse_location(location_id))
|
||||||
return self.forecast_parser.parse(content)
|
|
||||||
|
|
||||||
async def find_locations(self, query: str) -> list[Location]:
|
async def find_locations(self, query: str) -> list[Location]:
|
||||||
content = await self.source.find_locations(query)
|
result = await self.source.find_locations(query)
|
||||||
return self.location_parser.parse(content)
|
return [
|
||||||
|
Location(
|
||||||
|
id=f"{item.lat}:{item.lon}",
|
||||||
|
name=item.name,
|
||||||
|
provider=self.provider,
|
||||||
|
lat=item.lat,
|
||||||
|
lon=item.lon,
|
||||||
|
country=item.country,
|
||||||
|
country_code=item.country.lower(),
|
||||||
|
district=item.state or "",
|
||||||
|
subdistrict="",
|
||||||
|
)
|
||||||
|
for item in result
|
||||||
|
]
|
||||||
|
|
||||||
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
||||||
location: OpenWeatherLocation = await self._get_location(location_id)
|
location: OpenWeatherLocation = await self._get_location(location_id)
|
||||||
values = [value for value in await self._get_location_forecast(location_id) if value.date.date() == date]
|
data: Forecast = await self._get_location_forecast(location_id)
|
||||||
|
values = []
|
||||||
|
for item in data.list:
|
||||||
|
value = FORECAST_ITEM_PARSER.parse(item)
|
||||||
|
if value.date.date() == date:
|
||||||
|
values.append(value)
|
||||||
return WeatherResponse(
|
return WeatherResponse(
|
||||||
location=location.name,
|
location=location.name,
|
||||||
date=date,
|
date=date,
|
||||||
@@ -61,13 +78,13 @@ class OpenWeatherApi(WeatherApi[OpenWeather]):
|
|||||||
|
|
||||||
async def get_days(self, location_id: str, days: int) -> WeatherResponse:
|
async def get_days(self, location_id: str, days: int) -> WeatherResponse:
|
||||||
location: OpenWeatherLocation = await self._get_location(location_id)
|
location: OpenWeatherLocation = await self._get_location(location_id)
|
||||||
values = [
|
data: Forecast = await self._get_location_forecast(location_id)
|
||||||
merge_weather_values(datetime.datetime.combine(k, datetime.datetime.min.time()), list(g))
|
values_by_date: dict[datetime.datetime, list[WeatherValue]] = defaultdict(list)
|
||||||
for k, g in groupby(
|
for item in data.list:
|
||||||
sorted(await self._get_location_forecast(location_id), key=lambda item: item.date.date()),
|
value = FORECAST_ITEM_PARSER.parse(item)
|
||||||
lambda item: item.date.date(),
|
item_date = value.date.replace(hour=0, minute=0)
|
||||||
)
|
values_by_date[item_date].append(value)
|
||||||
]
|
values = [merge_weather_values(date, values) for date, values in values_by_date.items()]
|
||||||
return WeatherResponse(
|
return WeatherResponse(
|
||||||
location=location.name,
|
location=location.name,
|
||||||
date=datetime.date.today(),
|
date=datetime.date.today(),
|
||||||
|
|||||||
@@ -1,21 +1,12 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from gallery.sketch.parse.core import Parser
|
from gallery.sketch.weather.model import Cloudness, Precipitation, WeatherValue
|
||||||
from gallery.sketch.weather.model import (
|
from gallery.sketch.weather.util import build_weather_value
|
||||||
Cloudness,
|
|
||||||
Location,
|
|
||||||
Precipitation,
|
|
||||||
WeatherValue,
|
|
||||||
)
|
|
||||||
from gallery.sketch.weather.parse.wind import WIND_DIRECTION_PARSER
|
|
||||||
from gallery.sketch.weather.util import convert_hPa_to_mmHg
|
|
||||||
|
|
||||||
from . import PROVIDER
|
from .openweather import ForecastItem
|
||||||
from .openweather import Forecast, ForecastItem
|
|
||||||
from .openweather import Location as OpenWeatherLocation
|
|
||||||
|
|
||||||
|
|
||||||
class ForecastItemParser(Parser[ForecastItem, list[WeatherValue]]):
|
class ForecastItemParser:
|
||||||
CLOUDNESS_MAP: dict[str, Cloudness] = {
|
CLOUDNESS_MAP: dict[str, Cloudness] = {
|
||||||
"clear sky": Cloudness.CLEAR,
|
"clear sky": Cloudness.CLEAR,
|
||||||
"few clouds": Cloudness.PARTLY_CLOUDY,
|
"few clouds": Cloudness.PARTLY_CLOUDY,
|
||||||
@@ -31,54 +22,23 @@ class ForecastItemParser(Parser[ForecastItem, list[WeatherValue]]):
|
|||||||
"heavy rain": Precipitation.SHOWER,
|
"heavy rain": Precipitation.SHOWER,
|
||||||
}
|
}
|
||||||
|
|
||||||
def parse(self, data: ForecastItem) -> WeatherValue:
|
def parse(self, item: ForecastItem) -> WeatherValue:
|
||||||
date = (
|
item_date = datetime.datetime.fromtimestamp(item.dt, datetime.UTC)
|
||||||
datetime.datetime.fromtimestamp(data.dt, datetime.UTC)
|
item_date = item_date.replace(tzinfo=datetime.timezone.utc).astimezone(tz=None).replace(tzinfo=None)
|
||||||
.replace(tzinfo=datetime.timezone.utc)
|
value = build_weather_value(item_date)
|
||||||
.astimezone(tz=None)
|
# TODO parse temperature interval flag
|
||||||
.replace(tzinfo=None)
|
value.temperature = [round(item.main.temp)]
|
||||||
)
|
# value.temperature = [round(item.main.temp_max), round(item.main.temp_min)]
|
||||||
return WeatherValue.model_validate(
|
value.pressure = [round(item.main.pressure * 0.75006)]
|
||||||
{
|
value.humidity = item.main.humidity
|
||||||
"date": date,
|
value.wind_speed = round(item.wind.speed)
|
||||||
"sky": {
|
value.wind_gust = round(item.wind.gust)
|
||||||
"cloudness": self.CLOUDNESS_MAP.get(data.weather[0].description, Cloudness.CLEAR),
|
value.wind_direction = item.wind.deg
|
||||||
"precipitation": self.PRECIPITATION_MAP.get(data.weather[0].description, Precipitation.NO),
|
value.sky.cloudness = self.CLOUDNESS_MAP.get(item.weather[0].description, Cloudness.CLEAR)
|
||||||
},
|
value.sky.precipitation = self.PRECIPITATION_MAP.get(item.weather[0].description, Precipitation.NO)
|
||||||
"wind": {
|
if item.rain:
|
||||||
"speed": round(data.wind.speed),
|
value.precipitation = round(item.rain.interval_3h, 1)
|
||||||
"gust": round(data.wind.gust),
|
return value
|
||||||
"direction": WIND_DIRECTION_PARSER.parse(data.wind.deg),
|
|
||||||
},
|
|
||||||
"temperature": [round(data.main.temp)], # [round(data.main.temp_max), round(data.main.temp_min)]
|
|
||||||
"precipitation": round(data.rain.interval_3h, 1) if data.rain else 0,
|
|
||||||
"pressure": [convert_hPa_to_mmHg(data.main.pressure)],
|
|
||||||
"humidity": data.main.humidity,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class OpenWeatherForecastParser(Parser[Forecast, list[WeatherValue]]):
|
FORECAST_ITEM_PARSER = ForecastItemParser()
|
||||||
item_parser = ForecastItemParser()
|
|
||||||
|
|
||||||
def parse(self, data: Forecast) -> list[WeatherValue]:
|
|
||||||
return [self.item_parser.parse(item) for item in data.list]
|
|
||||||
|
|
||||||
|
|
||||||
class OpenWeatherLocationParser(Parser[list[OpenWeatherLocation], list[Location]]):
|
|
||||||
|
|
||||||
def parse(self, data: list[OpenWeatherLocation]) -> list[Location]:
|
|
||||||
return [
|
|
||||||
Location(
|
|
||||||
id=f"{item.lat}:{item.lon}",
|
|
||||||
name=item.name,
|
|
||||||
provider=PROVIDER,
|
|
||||||
lat=item.lat,
|
|
||||||
lon=item.lon,
|
|
||||||
country=item.country,
|
|
||||||
country_code=item.country.lower(),
|
|
||||||
district=item.state or "",
|
|
||||||
subdistrict="",
|
|
||||||
)
|
|
||||||
for item in data
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
PROVIDER = "rp5"
|
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
import logging
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
from aiocache import cached
|
from aiocache import cached
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from gallery.sketch.headers import build_headers
|
|
||||||
from gallery.sketch.source import ApiSource
|
from gallery.sketch.source import ApiSource
|
||||||
from gallery.sketch.weather.api import WeatherApi
|
from gallery.sketch.weather.api import WeatherApi
|
||||||
from gallery.sketch.weather.model import (
|
from gallery.sketch.weather.model import (
|
||||||
@@ -13,15 +14,14 @@ from gallery.sketch.weather.model import (
|
|||||||
from gallery.sketch.weather.util import merge_weather_values
|
from gallery.sketch.weather.util import merge_weather_values
|
||||||
from gallery.util import TimeUnit
|
from gallery.util import TimeUnit
|
||||||
|
|
||||||
from . import PROVIDER
|
from ...sketch.headers import build_headers
|
||||||
from .parser import RP5ForecastParser, RP5LocationParser
|
from .parser import parse_page
|
||||||
|
|
||||||
|
logger = logging.getLogger("rp5")
|
||||||
|
|
||||||
|
|
||||||
class RP5WeatherApi(WeatherApi):
|
class RP5WeatherApi(WeatherApi):
|
||||||
PROVIDER = PROVIDER
|
PROVIDER = "rp5"
|
||||||
|
|
||||||
forecast_parser = RP5ForecastParser()
|
|
||||||
location_parser = RP5LocationParser()
|
|
||||||
|
|
||||||
def _build_source(self) -> ApiSource:
|
def _build_source(self) -> ApiSource:
|
||||||
return ApiSource("https://rp5.ru", headers=build_headers("rp5.ru"))
|
return ApiSource("https://rp5.ru", headers=build_headers("rp5.ru"))
|
||||||
@@ -29,8 +29,31 @@ class RP5WeatherApi(WeatherApi):
|
|||||||
async def find_locations(self, query: str) -> list[Location]:
|
async def find_locations(self, query: str) -> list[Location]:
|
||||||
endpoint = "docs/search/ru"
|
endpoint = "docs/search/ru"
|
||||||
data = aiohttp.FormData({"searchStr": query})
|
data = aiohttp.FormData({"searchStr": query})
|
||||||
content = await self.source.request(endpoint, method="POST", data=data)
|
response = await self.source.request(endpoint, method="POST", data=data)
|
||||||
return self.location_parser.parse(content)
|
soup = BeautifulSoup(response, features="html.parser")
|
||||||
|
table = soup.select_one(".searchResults")
|
||||||
|
result = []
|
||||||
|
for row in table.select("tr")[1:]:
|
||||||
|
cells = row.select("td")
|
||||||
|
name = cells[0].text.strip()
|
||||||
|
location_id = cells[0].select_one("a").attrs["href"].lstrip("/")
|
||||||
|
country = cells[1].text.strip()
|
||||||
|
district = cells[2].text.strip()
|
||||||
|
subdistrict = cells[3].text.strip()
|
||||||
|
result.append(
|
||||||
|
Location(
|
||||||
|
id=location_id,
|
||||||
|
name=name,
|
||||||
|
provider=self.provider,
|
||||||
|
lat=0,
|
||||||
|
lon=0,
|
||||||
|
country=country,
|
||||||
|
country_code="ru", # TODO: contry_code from country
|
||||||
|
district=district,
|
||||||
|
subdistrict=subdistrict,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
return result
|
||||||
|
|
||||||
@cached(
|
@cached(
|
||||||
key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
|
key_builder=lambda fun, self, location_id: f"api.weather.{self.provider}.source.{location_id}.forecast",
|
||||||
@@ -40,7 +63,8 @@ class RP5WeatherApi(WeatherApi):
|
|||||||
async def _get_location_forecast(self, location_id: str) -> list[WeatherResponse]:
|
async def _get_location_forecast(self, location_id: str) -> list[WeatherResponse]:
|
||||||
endpoint = f"{location_id}"
|
endpoint = f"{location_id}"
|
||||||
content = await self.source.request(endpoint)
|
content = await self.source.request(endpoint)
|
||||||
return self.forecast_parser.parse(content)
|
soup = BeautifulSoup(content, features="html.parser")
|
||||||
|
return parse_page(soup)
|
||||||
|
|
||||||
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
||||||
forecast = await self._get_location_forecast(location_id)
|
forecast = await self._get_location_forecast(location_id)
|
||||||
|
|||||||
@@ -1,63 +1,16 @@
|
|||||||
import datetime
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from bs4 import Tag
|
import dateparser
|
||||||
|
from bs4 import BeautifulSoup, Tag
|
||||||
|
|
||||||
from gallery.sketch.parse.core import ParseError
|
|
||||||
from gallery.sketch.parse.date import DATE_PARSER
|
|
||||||
from gallery.sketch.parse.html import (
|
|
||||||
HTMLParser,
|
|
||||||
TableParser,
|
|
||||||
TableValueParser,
|
|
||||||
TagIterParser,
|
|
||||||
TagParser,
|
|
||||||
)
|
|
||||||
from gallery.sketch.weather.model import (
|
from gallery.sketch.weather.model import (
|
||||||
Cloudness,
|
Cloudness,
|
||||||
Location,
|
|
||||||
Precipitation,
|
Precipitation,
|
||||||
WeatherResponse,
|
WeatherResponse,
|
||||||
WeatherValue,
|
WeatherValue,
|
||||||
WindDirection,
|
|
||||||
)
|
)
|
||||||
from gallery.sketch.weather.parse.wind import WIND_DIRECTION_PARSER
|
from gallery.sketch.weather.parser import ParseError, parse_wind_direction
|
||||||
from gallery.sketch.weather.util import fix_dates_sequence
|
from gallery.sketch.weather.util import build_weather_value
|
||||||
|
|
||||||
from . import PROVIDER
|
|
||||||
|
|
||||||
|
|
||||||
class LocationNameParser(TagParser[str]):
|
|
||||||
selector = ".intoLeftNavi > .verticalBottom > a"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> str:
|
|
||||||
return data.text.strip()
|
|
||||||
|
|
||||||
|
|
||||||
class DatesParser(TagIterParser[tuple[datetime.datetime, int]]):
|
|
||||||
selector = "#forecastTable > tr.forecastDate > td"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> tuple[datetime.datetime, int]:
|
|
||||||
colspan = int(data.attrs["colspan"])
|
|
||||||
index = data.parent.index(data)
|
|
||||||
if index == 1:
|
|
||||||
colspan -= 1
|
|
||||||
date_str = ",".join(data.text.strip().split(",")[-2:])
|
|
||||||
date = DATE_PARSER.parse(date_str)
|
|
||||||
return (date, colspan)
|
|
||||||
|
|
||||||
|
|
||||||
class TimeParser(TableValueParser[datetime.datetime]):
|
|
||||||
selector = "tr.forecastTime > td:not(:first-of-type)"
|
|
||||||
model_key = "date"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> datetime.datetime:
|
|
||||||
hour = int(data.text.strip())
|
|
||||||
return datetime.datetime.min.replace(hour=hour)
|
|
||||||
|
|
||||||
|
|
||||||
class CloudnessParser(TableValueParser[Cloudness]):
|
|
||||||
selector = "tr:nth-of-type(3) > td:not(:first-of-type)"
|
|
||||||
model_key = "sky.cloudness"
|
|
||||||
|
|
||||||
CLOUDNESS_MAP = {
|
CLOUDNESS_MAP = {
|
||||||
"Ясно": Cloudness.CLEAR,
|
"Ясно": Cloudness.CLEAR,
|
||||||
@@ -70,154 +23,85 @@ class CloudnessParser(TableValueParser[Cloudness]):
|
|||||||
"Пасмурная погода": Cloudness.MAINLY_CLOUDY,
|
"Пасмурная погода": Cloudness.MAINLY_CLOUDY,
|
||||||
}
|
}
|
||||||
|
|
||||||
def extract(self, data: Tag) -> Cloudness:
|
|
||||||
onmouseover = data.select_one(".cc_0").next_element.attrs["onmouseover"]
|
|
||||||
cloudness_str = re.compile("<b>(.*?)</b>").search(onmouseover).group(1).strip()
|
|
||||||
if cloudness_str not in self.CLOUDNESS_MAP:
|
|
||||||
raise ParseError("Unknown cloudness value", cloudness_str)
|
|
||||||
return self.CLOUDNESS_MAP[cloudness_str]
|
|
||||||
|
|
||||||
|
|
||||||
class PrecipitationParser(TableValueParser[tuple[Precipitation, float]]):
|
|
||||||
selector = "tr:nth-of-type(4) > td:not(:first-of-type)"
|
|
||||||
model_key = ["sky.precipitation", "precipitation"]
|
|
||||||
|
|
||||||
PRECIPITATION_MAP = {
|
PRECIPITATION_MAP = {
|
||||||
"Явления погоды отсутствуют": Precipitation.NO,
|
"Явления погоды отсутствуют": Precipitation.NO,
|
||||||
"Cлабый дождь": Precipitation.SMALL_RAIN,
|
"Cлабый дождь": Precipitation.SMALL_RAIN,
|
||||||
"Умеренный дождь": Precipitation.RAIN,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def extract(self, data: Tag) -> tuple[Precipitation, float]:
|
|
||||||
onmouseover = data.select_one(".pr_0").attrs["onmouseover"]
|
|
||||||
precipitation_str = onmouseover.split(",")[1].strip(" '")
|
|
||||||
precipitation_value_matched = re.compile("(\\d+\\.\\d+) мм").search(precipitation_str)
|
|
||||||
precipitation_value = 0
|
|
||||||
if precipitation_value_matched:
|
|
||||||
# one hour value
|
|
||||||
precipitation_value = float(precipitation_value_matched.group(1)) * 6
|
|
||||||
if " (" in precipitation_str:
|
|
||||||
precipitation_str = precipitation_str.split(" (")[0]
|
|
||||||
if precipitation_str not in self.PRECIPITATION_MAP:
|
|
||||||
raise ParseError("Unknown precipitation value", precipitation_str)
|
|
||||||
return self.PRECIPITATION_MAP[precipitation_str], precipitation_value
|
|
||||||
|
|
||||||
|
def _parse_wind_speed(cell: Tag) -> int:
|
||||||
class TemperatureParser(TableValueParser[list[int]]):
|
element = cell.select_one(".wv_0")
|
||||||
selector = "tr:nth-of-type(5) > td:not(:first-of-type)"
|
|
||||||
model_key = "temperature"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[int]:
|
|
||||||
return [int(data.select_one(".t_0").text.lstrip("+").strip())]
|
|
||||||
|
|
||||||
|
|
||||||
class PressureParser(TableValueParser[list[int]]):
|
|
||||||
selector = "tr:nth-last-of-type(8) > td:not(:first-of-type)"
|
|
||||||
model_key = "pressure"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[int]:
|
|
||||||
return [int(data.select_one(".p_0").text.strip())]
|
|
||||||
|
|
||||||
|
|
||||||
class WindSpeedParser(TableValueParser[int]):
|
|
||||||
selector = "tr:nth-last-of-type(7) > td:not(:first-of-type)"
|
|
||||||
model_key = "wind.speed"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> int:
|
|
||||||
element = data.select_one(".wv_0")
|
|
||||||
if element:
|
if element:
|
||||||
return int(element.text.strip() or "0")
|
return int(element.text.strip() or "0")
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
class WindGustParser(WindSpeedParser):
|
# pylint:disable=too-many-branches
|
||||||
selector = "tr:nth-last-of-type(6) > td:not(:first-of-type)"
|
def parse_page(page: BeautifulSoup) -> list[WeatherResponse]:
|
||||||
model_key = "wind.gust"
|
location = page.select(".intoLeftNavi > .verticalBottom > a")[-1].text.strip()
|
||||||
|
table = page.select_one("#forecastTable")
|
||||||
|
if table is None:
|
||||||
class WindDirectionParser(TableValueParser[WindDirection | None]):
|
raise ParseError("#forecastTable not found")
|
||||||
selector = "tr:nth-last-of-type(5) > td:not(:first-of-type)"
|
(
|
||||||
model_key = "wind.direction"
|
date_row,
|
||||||
|
time_row,
|
||||||
def extract(self, data: Tag) -> WindDirection | None:
|
cloudness_row,
|
||||||
return WIND_DIRECTION_PARSER.parse(data.text.strip())
|
precipitation_row,
|
||||||
|
temperature_row,
|
||||||
|
pressure_row,
|
||||||
class HumidityParser(TableValueParser[int]):
|
wind_speed_row,
|
||||||
selector = "tr:nth-last-of-type(4) > td:not(:first-of-type)"
|
wind_gust_row,
|
||||||
model_key = "humidity"
|
wind_direction_row,
|
||||||
|
humidity_row,
|
||||||
def extract(self, data: Tag) -> int:
|
*_,
|
||||||
return int(data.text.strip())
|
) = table.select("tr")
|
||||||
|
result: list[WeatherResponse] = []
|
||||||
|
values: list[WeatherValue] = []
|
||||||
class RP5TableParser(TableParser[WeatherValue]):
|
for index, cell in enumerate(date_row.select("td")):
|
||||||
selector = "#forecastTable"
|
colspan = int(cell.attrs["colspan"])
|
||||||
value_parsers = [
|
if index == 0:
|
||||||
TimeParser(),
|
colspan -= 1
|
||||||
CloudnessParser(),
|
date_str = ",".join(cell.text.strip().split(",")[-2:])
|
||||||
PrecipitationParser(),
|
date = dateparser.parse(date_str, languages=["ru"])
|
||||||
TemperatureParser(),
|
if date is None:
|
||||||
PressureParser(),
|
raise ParseError.invalid_date(date_str)
|
||||||
WindSpeedParser(),
|
item_values = [build_weather_value(date) for _ in range(colspan)]
|
||||||
WindGustParser(),
|
result.append(
|
||||||
WindDirectionParser(),
|
|
||||||
HumidityParser(),
|
|
||||||
]
|
|
||||||
|
|
||||||
def create_model(self, data: dict) -> WeatherValue:
|
|
||||||
return WeatherValue.model_validate(data)
|
|
||||||
|
|
||||||
|
|
||||||
class RP5ForecastParser(HTMLParser[list[WeatherResponse]]):
|
|
||||||
location_parser = LocationNameParser()
|
|
||||||
dates_parser = DatesParser()
|
|
||||||
table_parser = RP5TableParser()
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[WeatherResponse]:
|
|
||||||
location = self.location_parser.parse(data)
|
|
||||||
dates = self.dates_parser.parse(data)
|
|
||||||
values = self.table_parser.parse(data)
|
|
||||||
responses = []
|
|
||||||
for date, count in dates:
|
|
||||||
item_values, values = values[:count], values[count:]
|
|
||||||
for value in item_values:
|
|
||||||
value.date = date.replace(hour=value.date.hour)
|
|
||||||
responses.append(
|
|
||||||
WeatherResponse(
|
WeatherResponse(
|
||||||
location=location,
|
location=location,
|
||||||
date=date,
|
date=date.date(),
|
||||||
period="day",
|
period="day",
|
||||||
values=item_values,
|
values=item_values,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
fix_dates_sequence(responses)
|
values += item_values
|
||||||
return responses
|
for index, cell in enumerate(time_row.select("td")[1:]):
|
||||||
|
hour = int(cell.text.strip())
|
||||||
|
values[index].date = values[index].date.replace(hour=hour)
|
||||||
class RP5LocationParser(HTMLParser[list[Location]]):
|
for index, cell in enumerate(cloudness_row.select("td")[1:]):
|
||||||
selector = ".searchResults"
|
onmouseover = cell.select_one(".cc_0").next_element.attrs["onmouseover"]
|
||||||
|
cloudness_str = re.compile("<b>(.*?)</b>").search(onmouseover).group(1).strip()
|
||||||
def extract(self, data: Tag) -> list[Location]:
|
values[index].sky.cloudness = CLOUDNESS_MAP[cloudness_str]
|
||||||
result = []
|
for index, cell in enumerate(precipitation_row.select("td")[1:]):
|
||||||
for row in data.select("tr")[1:]:
|
onmouseover = cell.select_one(".pr_0").attrs["onmouseover"]
|
||||||
cells = row.select("td")
|
precipitation_str = onmouseover.split(",")[1].strip(" '")
|
||||||
name = cells[0].text.strip()
|
precipitation_value_matched = re.compile("(\\d+\\.\\d+) мм").search(precipitation_str)
|
||||||
location_id = cells[0].select_one("a").attrs["href"].lstrip("/")
|
if precipitation_value_matched:
|
||||||
country = cells[1].text.strip()
|
# one hour value
|
||||||
district = cells[2].text.strip()
|
values[index].precipitation = float(precipitation_value_matched.group(1)) * 6
|
||||||
subdistrict = cells[3].text.strip()
|
if "(" in precipitation_str:
|
||||||
result.append(
|
precipitation_str = precipitation_str.split(" (")[0]
|
||||||
Location(
|
values[index].sky.precipitation = PRECIPITATION_MAP[precipitation_str]
|
||||||
id=location_id,
|
for index, cell in enumerate(temperature_row.select("td")[1:]):
|
||||||
name=name,
|
values[index].temperature = [int(cell.select_one(".t_0").text.lstrip("+").strip())]
|
||||||
provider=PROVIDER,
|
for index, cell in enumerate(pressure_row.select("td")[1:]):
|
||||||
lat=0,
|
values[index].pressure = [int(cell.select_one(".p_0").text.strip())]
|
||||||
lon=0,
|
for index, cell in enumerate(wind_speed_row.select("td")[1:]):
|
||||||
country=country,
|
values[index].wind_speed = _parse_wind_speed(cell)
|
||||||
country_code="ru", # TODO: contry_code from country
|
for index, cell in enumerate(wind_gust_row.select("td")[1:]):
|
||||||
district=district,
|
values[index].wind_gust = _parse_wind_speed(cell)
|
||||||
subdistrict=subdistrict,
|
for index, cell in enumerate(wind_direction_row.select("td")[1:]):
|
||||||
)
|
values[index].wind_direction = parse_wind_direction(cell.text.strip())
|
||||||
)
|
for index, cell in enumerate(humidity_row.select("td")[1:]):
|
||||||
|
values[index].humidity = int(cell.text.strip())
|
||||||
return result
|
return result
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
PROVIDER = "yandex"
|
|
||||||
|
|||||||
@@ -1,21 +1,20 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from gallery.sketch.headers import build_headers
|
|
||||||
from gallery.sketch.schedule.api import ScheduleApi
|
from gallery.sketch.schedule.api import ScheduleApi
|
||||||
from gallery.sketch.schedule.model import Channel, Schedule
|
from gallery.sketch.schedule.model import Channel, Schedule, ScheduleValue
|
||||||
from gallery.sketch.source import ApiSource
|
from gallery.sketch.source import ApiSource
|
||||||
|
|
||||||
from . import PROVIDER
|
from ...sketch.headers import build_headers
|
||||||
from .parser import ScheduleData, YandexTVChannelParser, YandexTVScheduleParser
|
|
||||||
|
logger = logging.getLogger("matchtv")
|
||||||
|
|
||||||
|
|
||||||
class YandexTVApi(ScheduleApi):
|
class YandexTvApi(ScheduleApi):
|
||||||
PROVIDER = PROVIDER
|
PROVIDER = "yandextv"
|
||||||
|
|
||||||
schedule_parser = YandexTVScheduleParser()
|
|
||||||
channel_parser = YandexTVChannelParser()
|
|
||||||
|
|
||||||
lr = 213 # magic id
|
|
||||||
|
|
||||||
def _build_source(self) -> ApiSource:
|
def _build_source(self) -> ApiSource:
|
||||||
return ApiSource("https://tv.yandex.ru", headers=build_headers("tv.yandex.ru"))
|
return ApiSource("https://tv.yandex.ru", headers=build_headers("tv.yandex.ru"))
|
||||||
@@ -23,13 +22,43 @@ class YandexTVApi(ScheduleApi):
|
|||||||
async def find_channels(self, query: str) -> list[Channel]:
|
async def find_channels(self, query: str) -> list[Channel]:
|
||||||
url = (
|
url = (
|
||||||
"https://suggest-multi.yandex.ru/suggest-tv2?"
|
"https://suggest-multi.yandex.ru/suggest-tv2?"
|
||||||
f"v=4&uil=ru&lr={self.lr}&count_channels=4&count_programs=4&sn=50&part={query}"
|
f"v=4&uil=ru&lr=10&count_channels=4&count_programs=4&sn=50&part={query}"
|
||||||
)
|
)
|
||||||
data = await self.source.request(url)
|
_, values = json.loads(await self.source.request(url))
|
||||||
return self.channel_parser.parse(data)
|
result = []
|
||||||
|
for _, name, content in values:
|
||||||
|
if content["label"] == "Каналы":
|
||||||
|
channel_id = content["url"].split("/")[-1]
|
||||||
|
result.append(Channel(id=channel_id, name=name, provider=self.provider))
|
||||||
|
return result
|
||||||
|
|
||||||
async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
|
async def get_schedule(self, channel_id: str, date: datetime.date) -> Schedule:
|
||||||
channel_path_part = "channel" if "-" in channel_id else "channels"
|
endpoint = f"channels/{channel_id}?date={date:%Y-%m-%d}"
|
||||||
endpoint = f"{self.lr}/{channel_path_part}/{channel_id}?date={date:%Y-%m-%d}"
|
|
||||||
data = await self.source.request(endpoint)
|
data = await self.source.request(endpoint)
|
||||||
return self.schedule_parser.parse(ScheduleData(date, channel_id, data))
|
soup = BeautifulSoup(data, features="html.parser")
|
||||||
|
if soup.select_one(".CheckboxCaptcha") is not None:
|
||||||
|
raise RuntimeError("Captcha")
|
||||||
|
values = []
|
||||||
|
channel_name = soup.select_one(".channel-header__text").text.strip()
|
||||||
|
current_day = datetime.datetime.combine(date.today(), datetime.datetime.min.time())
|
||||||
|
end = current_day + datetime.timedelta(days=1, hours=6)
|
||||||
|
prev_value: ScheduleValue | None = None
|
||||||
|
for item in soup.select(".channel-schedule .channel-schedule__event"):
|
||||||
|
title = item.select_one(".channel-schedule__title").text.strip()
|
||||||
|
time_str = item.select_one(".channel-schedule__time").text.strip()
|
||||||
|
hours, minutes = map(int, time_str.split(":"))
|
||||||
|
item_date = current_day.replace(hour=hours, minute=minutes)
|
||||||
|
if prev_value is not None and item_date.hour < prev_value.start.hour:
|
||||||
|
current_day += datetime.timedelta(days=1)
|
||||||
|
item_date += datetime.timedelta(days=1)
|
||||||
|
live = item.select_one(".channel-schedule__info .icon_live") is not None
|
||||||
|
value = ScheduleValue(start=item_date, end=end, label=title, live=live)
|
||||||
|
values.append(value)
|
||||||
|
if prev_value is not None:
|
||||||
|
prev_value.end = item_date
|
||||||
|
prev_value = value
|
||||||
|
return Schedule(
|
||||||
|
channel=Channel(id=channel_id, name=channel_name, provider=self.provider),
|
||||||
|
date=date,
|
||||||
|
values=values,
|
||||||
|
)
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
import datetime
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from bs4 import Tag
|
|
||||||
|
|
||||||
from gallery.sketch.parse.core import ParsedContext, ParseError
|
|
||||||
from gallery.sketch.parse.html import HTMLContextParser
|
|
||||||
from gallery.sketch.parse.json import JSONParser
|
|
||||||
from gallery.sketch.schedule.model import Channel, Schedule, ScheduleValue
|
|
||||||
from gallery.sketch.schedule.parse.category import CATEGORY_PARSER
|
|
||||||
|
|
||||||
from . import PROVIDER
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class ScheduleData:
|
|
||||||
date: datetime.date
|
|
||||||
channel_id: str
|
|
||||||
data: str
|
|
||||||
|
|
||||||
|
|
||||||
class YandexTVScheduleParser(HTMLContextParser[ScheduleData, Schedule]):
|
|
||||||
def extract(self, data: ParsedContext[ScheduleData, Tag]) -> Schedule:
|
|
||||||
if data.data.select_one(".CheckboxCaptcha") is not None:
|
|
||||||
raise ParseError("Captcha")
|
|
||||||
values = []
|
|
||||||
channel_name = data.data.select_one(".channel-header__text").text.strip()
|
|
||||||
current_day = datetime.datetime.combine(data.context.date, datetime.datetime.min.time())
|
|
||||||
end = current_day + datetime.timedelta(days=1, hours=6)
|
|
||||||
prev_value: ScheduleValue | None = None
|
|
||||||
for item in data.data.select(".channel-schedule .channel-schedule__event"):
|
|
||||||
title = item.select_one(".channel-schedule__title").text.strip()
|
|
||||||
time_str = item.select_one(".channel-schedule__time").text.strip()
|
|
||||||
hours, minutes = map(int, time_str.split(":"))
|
|
||||||
item_date = current_day.replace(hour=hours, minute=minutes)
|
|
||||||
if prev_value is not None and item_date.hour < prev_value.start.hour:
|
|
||||||
current_day += datetime.timedelta(days=1)
|
|
||||||
item_date += datetime.timedelta(days=1)
|
|
||||||
live = item.select_one(".channel-schedule__info .icon_live") is not None
|
|
||||||
category = CATEGORY_PARSER.parse(title)
|
|
||||||
value = ScheduleValue(start=item_date, end=end, label=title, category=category, live=live)
|
|
||||||
values.append(value)
|
|
||||||
if prev_value is not None:
|
|
||||||
prev_value.end = item_date
|
|
||||||
prev_value = value
|
|
||||||
return Schedule(
|
|
||||||
channel=Channel(id=data.context.channel_id, name=channel_name, provider=PROVIDER),
|
|
||||||
date=data.context.date,
|
|
||||||
values=values,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class YandexTVChannelParser(JSONParser[list[Channel]]):
|
|
||||||
def extract(self, data: Any) -> list[Channel]:
|
|
||||||
_, values = data
|
|
||||||
result = []
|
|
||||||
for _, name, content in values:
|
|
||||||
if content["label"] == "Каналы":
|
|
||||||
channel_id = content["url"].split("/")[-1]
|
|
||||||
result.append(Channel(id=channel_id, name=name, provider=PROVIDER))
|
|
||||||
return result
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
PROVIDER = "yandex"
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
|
||||||
from aiocache import cached
|
from aiocache import cached
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from gallery.sketch.source import ApiSource
|
from gallery.sketch.source import ApiSource
|
||||||
from gallery.sketch.weather.api import WeatherApi
|
from gallery.sketch.weather.api import WeatherApi
|
||||||
@@ -11,15 +14,13 @@ from gallery.sketch.weather.model import (
|
|||||||
from gallery.sketch.weather.util import merge_weather_values
|
from gallery.sketch.weather.util import merge_weather_values
|
||||||
from gallery.util import TimeUnit
|
from gallery.util import TimeUnit
|
||||||
|
|
||||||
from . import PROVIDER
|
from .parser import parse_article
|
||||||
from .parser import YandexForecastParser, YandexLocationParser
|
|
||||||
|
logger = logging.getLogger("yandexweather")
|
||||||
|
|
||||||
|
|
||||||
class YandexWeatherApi(WeatherApi):
|
class YandexWeatherApi(WeatherApi):
|
||||||
PROVIDER = PROVIDER
|
PROVIDER = "yandex"
|
||||||
|
|
||||||
forecast_parser = YandexForecastParser()
|
|
||||||
location_parser = YandexLocationParser()
|
|
||||||
|
|
||||||
def _build_source(self) -> ApiSource:
|
def _build_source(self) -> ApiSource:
|
||||||
return ApiSource("https://yandex.ru")
|
return ApiSource("https://yandex.ru")
|
||||||
@@ -32,12 +33,29 @@ class YandexWeatherApi(WeatherApi):
|
|||||||
async def _get_location_forecast(self, location_id: str) -> list[WeatherResponse]:
|
async def _get_location_forecast(self, location_id: str) -> list[WeatherResponse]:
|
||||||
endpoint = f"pogoda/ru/{location_id}/details"
|
endpoint = f"pogoda/ru/{location_id}/details"
|
||||||
content = await self.source.request(endpoint, mode="browser")
|
content = await self.source.request(endpoint, mode="browser")
|
||||||
return self.forecast_parser.parse(content)
|
soup = BeautifulSoup(content, features="html.parser")
|
||||||
|
location = soup.select_one("[class^=Suggest_placeholder]").text.strip()
|
||||||
|
articles = soup.select("article[class^=AppForecastDay]")
|
||||||
|
return [parse_article(article, location) for article in articles]
|
||||||
|
|
||||||
async def find_locations(self, query: str) -> list[Location]:
|
async def find_locations(self, query: str) -> list[Location]:
|
||||||
endpoint = f"weather/api/suggest?part={query}&lang=ru&type=weather"
|
endpoint = f"weather/api/suggest?part={query}&lang=ru&type=weather"
|
||||||
response = await self.source.request(endpoint)
|
response = await self.source.request(endpoint)
|
||||||
return self.location_parser.parse(response)
|
data = json.loads(response)
|
||||||
|
return [
|
||||||
|
Location(
|
||||||
|
id=str(item["geoId"]),
|
||||||
|
name=item["title"],
|
||||||
|
provider=self.provider,
|
||||||
|
lat=item["coords"]["lat"],
|
||||||
|
lon=item["coords"]["lon"],
|
||||||
|
country="ru",
|
||||||
|
country_code="ru",
|
||||||
|
district=item["description"],
|
||||||
|
subdistrict="",
|
||||||
|
)
|
||||||
|
for item in data
|
||||||
|
]
|
||||||
|
|
||||||
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
async def get_day(self, location_id: str, date: datetime.date) -> WeatherResponse:
|
||||||
forecast = await self._get_location_forecast(location_id)
|
forecast = await self._get_location_forecast(location_id)
|
||||||
|
|||||||
@@ -1,98 +1,49 @@
|
|||||||
import datetime
|
import logging
|
||||||
from typing import Any
|
from enum import Enum
|
||||||
|
|
||||||
|
import dateparser
|
||||||
from bs4 import Tag
|
from bs4 import Tag
|
||||||
|
|
||||||
from gallery.sketch.parse.core import ParseError
|
from gallery.sketch.weather.model import Cloudness, Precipitation, Sky, WeatherResponse
|
||||||
from gallery.sketch.parse.date import DATE_PARSER
|
from gallery.sketch.weather.parser import ParseError, parse_wind_direction
|
||||||
from gallery.sketch.parse.html import (
|
from gallery.sketch.weather.util import build_weather_value
|
||||||
HTMLParser,
|
|
||||||
TableParser,
|
|
||||||
TableValueParser,
|
|
||||||
TagParser,
|
|
||||||
)
|
|
||||||
from gallery.sketch.parse.json import JSONParser
|
|
||||||
from gallery.sketch.weather.model import (
|
|
||||||
Cloudness,
|
|
||||||
Location,
|
|
||||||
Precipitation,
|
|
||||||
Sky,
|
|
||||||
WeatherResponse,
|
|
||||||
WeatherValue,
|
|
||||||
WindDirection,
|
|
||||||
)
|
|
||||||
from gallery.sketch.weather.parse.wind import WIND_DIRECTION_PARSER
|
|
||||||
|
|
||||||
from . import PROVIDER
|
logger = logging.getLogger("yandexweather")
|
||||||
|
|
||||||
|
|
||||||
class LocationNameParser(TagParser[str]):
|
class DayPart(Enum):
|
||||||
selector = "[class^=Suggest_placeholder]"
|
MORNING = ("Утром", 6)
|
||||||
|
AFTERNOON = ("Днём", 12)
|
||||||
|
EVENING = ("Вечером", 18)
|
||||||
|
NIGHT = ("Ночью", 0)
|
||||||
|
|
||||||
def extract(self, data: Tag) -> str:
|
def __init__(self, title: str, hour: int):
|
||||||
return data.text.strip()
|
super().__init__()
|
||||||
|
self.title = title
|
||||||
|
self.hour = hour
|
||||||
|
|
||||||
|
|
||||||
class DateParser(TagParser[datetime.date]):
|
def parse_sky(sky: str) -> Sky:
|
||||||
selector = "[class^=AppForecastDayHeader_dayTitle]"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> datetime.date:
|
|
||||||
return DATE_PARSER.parse(data.text.split(",")[-1].strip())
|
|
||||||
|
|
||||||
|
|
||||||
class TimeParser(TableValueParser[datetime.datetime]):
|
|
||||||
selector = "[style$='-part']"
|
|
||||||
model_key = "date"
|
|
||||||
|
|
||||||
HOUR_MAP = {
|
|
||||||
"Утром": 6,
|
|
||||||
"Днём": 12,
|
|
||||||
"Вечером": 18,
|
|
||||||
"Ночью": 0,
|
|
||||||
}
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> datetime.datetime:
|
|
||||||
hour = self.HOUR_MAP[data.text.strip()]
|
|
||||||
return datetime.datetime.min.replace(hour=hour)
|
|
||||||
|
|
||||||
|
|
||||||
class TemperatureParser(TableValueParser[list[int]]):
|
|
||||||
selector = "[style$='-temp']"
|
|
||||||
model_key = "temperature"
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[int]:
|
|
||||||
return [int(data.text.strip().rstrip("°"))]
|
|
||||||
|
|
||||||
|
|
||||||
class SkyParser(TableValueParser[Sky]):
|
|
||||||
selector = "[style$='-text']"
|
|
||||||
model_key = "sky"
|
|
||||||
|
|
||||||
CLOUDNESS_MAP = {
|
|
||||||
"ясно": Cloudness.CLEAR,
|
|
||||||
"облачно с прояснениями": Cloudness.CLOUDY,
|
|
||||||
"малооблачно": Cloudness.CLOUDY,
|
|
||||||
"пасмурно": Cloudness.MAINLY_CLOUDY,
|
|
||||||
}
|
|
||||||
|
|
||||||
PRECIPITATION_MAP = {
|
|
||||||
"небольшой дождь": Precipitation.SMALL_RAIN,
|
|
||||||
"дождь": Precipitation.RAIN,
|
|
||||||
"ливень": Precipitation.SHOWER,
|
|
||||||
}
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> Sky:
|
|
||||||
sky = data.text.strip()
|
|
||||||
cloudness = Cloudness.CLEAR
|
cloudness = Cloudness.CLEAR
|
||||||
precipitation = Precipitation.NO
|
precipitation = Precipitation.NO
|
||||||
thunder = False
|
thunder = False
|
||||||
fog = False
|
fog = False
|
||||||
if sky in self.CLOUDNESS_MAP:
|
if sky == "ясно":
|
||||||
cloudness = self.CLOUDNESS_MAP[sky]
|
pass
|
||||||
elif sky in self.PRECIPITATION_MAP:
|
elif sky == "облачно с прояснениями":
|
||||||
precipitation = self.PRECIPITATION_MAP[sky]
|
cloudness = Cloudness.PARTLY_CLOUDY
|
||||||
|
elif sky == "малооблачно":
|
||||||
|
cloudness = Cloudness.CLOUDY
|
||||||
|
elif sky == "пасмурно":
|
||||||
|
cloudness = Cloudness.MAINLY_CLOUDY
|
||||||
|
elif sky == "небольшой дождь":
|
||||||
|
precipitation = Precipitation.SMALL_RAIN
|
||||||
|
elif sky == "дождь":
|
||||||
|
precipitation = Precipitation.RAIN
|
||||||
|
elif sky == "ливень":
|
||||||
|
precipitation = Precipitation.SHOWER
|
||||||
else:
|
else:
|
||||||
raise ParseError("Unknown sky value", sky)
|
logger.warning("unknown sky value: %s", sky)
|
||||||
return Sky(
|
return Sky(
|
||||||
cloudness=cloudness,
|
cloudness=cloudness,
|
||||||
precipitation=precipitation,
|
precipitation=precipitation,
|
||||||
@@ -101,87 +52,40 @@ class SkyParser(TableValueParser[Sky]):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class WindSpeedParser(TableValueParser[int]):
|
def parse_article(article: Tag, location: str) -> WeatherResponse:
|
||||||
selector = "[style$='-wind']:not([class*=AppForecastDayPart_wind_formatted])"
|
date_str = article.select_one("[class^=AppForecastDayHeader_dayTitle]").text.split(",")[-1].strip()
|
||||||
model_key = "wind.speed"
|
date = dateparser.parse(date_str, languages=["ru"])
|
||||||
|
if date is None:
|
||||||
def extract(self, data: Tag) -> int:
|
raise ParseError.invalid_date(date_str)
|
||||||
return int(data.text.strip())
|
values = []
|
||||||
|
for day_part in DayPart:
|
||||||
|
value = build_weather_value(date.replace(hour=day_part.hour))
|
||||||
class WindDirectionParser(TableValueParser[WindDirection | None]):
|
day_part_tag = article.find(string=day_part.title)
|
||||||
selector = "[style$='-dir']"
|
temperature_tag = day_part_tag.next_element
|
||||||
model_key = "wind.direction"
|
temperature = int(temperature_tag.text.strip().rstrip("°"))
|
||||||
|
value.temperature.append(temperature)
|
||||||
def extract(self, data: Tag) -> WindDirection | None:
|
sky_tag = temperature_tag.next_element.next_element.next_element
|
||||||
return WIND_DIRECTION_PARSER.parse(data.text.strip())
|
sky_str = sky_tag.text.strip()
|
||||||
|
value.sky = parse_sky(sky_str)
|
||||||
|
temperature_tag = sky_tag.next_element.next_element
|
||||||
class HumidityParser(TableValueParser[int]):
|
temperature = int(temperature_tag.text.strip().rstrip("°"))
|
||||||
selector = "[style$='-hum']"
|
value.temperature.append(temperature)
|
||||||
model_key = "humidity"
|
wind_speed_tag = temperature_tag.next_element.next_element
|
||||||
|
wind_speed = int(wind_speed_tag.text.strip())
|
||||||
def extract(self, data: Tag) -> int:
|
value.wind_speed = wind_speed
|
||||||
return int(data.text.strip().rstrip("%"))
|
wind_direction_tag = wind_speed_tag.next_element.next_element.next_element.next_element
|
||||||
|
wind_direction_str = wind_direction_tag.text.strip()
|
||||||
|
value.wind_direction = parse_wind_direction(wind_direction_str)
|
||||||
class PressureParser(TableValueParser[list[int]]):
|
humidity_tag = wind_direction_tag.next_element.next_element.next_element.next_element
|
||||||
selector = "[style$='-press']"
|
humidity = int(humidity_tag.text.strip().rstrip("%"))
|
||||||
model_key = "pressure"
|
value.humidity = humidity
|
||||||
|
pressure_tag = humidity_tag.next_element.next_element
|
||||||
def extract(self, data: Tag) -> list[int]:
|
pressure = int(pressure_tag.text.strip())
|
||||||
return [int(data.text.strip().rstrip("%"))]
|
value.pressure.append(pressure)
|
||||||
|
values.append(value)
|
||||||
|
return WeatherResponse(
|
||||||
class YandexTableParser(TableParser[WeatherValue]):
|
|
||||||
selector = ""
|
|
||||||
value_parsers = [
|
|
||||||
TimeParser(),
|
|
||||||
TemperatureParser(),
|
|
||||||
SkyParser(),
|
|
||||||
WindSpeedParser(),
|
|
||||||
WindDirectionParser(),
|
|
||||||
HumidityParser(),
|
|
||||||
PressureParser(),
|
|
||||||
]
|
|
||||||
|
|
||||||
def create_model(self, data: dict) -> WeatherValue:
|
|
||||||
return WeatherValue.model_validate(data)
|
|
||||||
|
|
||||||
|
|
||||||
class YandexForecastParser(HTMLParser[list[WeatherResponse]]):
|
|
||||||
table_parser = YandexTableParser()
|
|
||||||
date_parser = DateParser()
|
|
||||||
location_parser = LocationNameParser()
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[WeatherResponse]:
|
|
||||||
location = self.location_parser.parse(data)
|
|
||||||
articles = data.select("article[class^=AppForecastDay]")
|
|
||||||
return [
|
|
||||||
WeatherResponse(
|
|
||||||
location=location,
|
location=location,
|
||||||
date=self.date_parser.parse(item),
|
date=date,
|
||||||
period="day",
|
period="day",
|
||||||
values=self.table_parser.parse(item),
|
values=values,
|
||||||
)
|
)
|
||||||
for item in articles
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class YandexLocationParser(JSONParser[list[Location]]):
|
|
||||||
|
|
||||||
def extract(self, data: Any) -> list[Location]:
|
|
||||||
return [
|
|
||||||
Location(
|
|
||||||
id=str(item["geoId"]),
|
|
||||||
name=item["title"],
|
|
||||||
provider=PROVIDER,
|
|
||||||
lat=item["coords"]["lat"],
|
|
||||||
lon=item["coords"]["lon"],
|
|
||||||
country="ru",
|
|
||||||
country_code="ru",
|
|
||||||
district=item["description"],
|
|
||||||
subdistrict="",
|
|
||||||
)
|
|
||||||
for item in data
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
from abc import ABC, abstractmethod
|
|
||||||
from typing import Generic, NamedTuple, Protocol, TypeVar
|
|
||||||
|
|
||||||
|
|
||||||
class ParseError(Exception):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
D = TypeVar("D")
|
|
||||||
R = TypeVar("R")
|
|
||||||
|
|
||||||
|
|
||||||
class Parser[D, R](Protocol):
|
|
||||||
def parse(self, data: D) -> R: ...
|
|
||||||
|
|
||||||
|
|
||||||
P = TypeVar("P")
|
|
||||||
|
|
||||||
|
|
||||||
class PrepareParser(ABC, Parser[D, R], Generic[D, P, R]):
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def prepare(self, data: D) -> P: ...
|
|
||||||
|
|
||||||
@abstractmethod
|
|
||||||
def extract(self, data: P) -> R: ...
|
|
||||||
|
|
||||||
def parse(self, data: D) -> R:
|
|
||||||
return self.extract(self.prepare(data))
|
|
||||||
|
|
||||||
|
|
||||||
class Context(Protocol):
|
|
||||||
data: str
|
|
||||||
|
|
||||||
|
|
||||||
C = TypeVar("C", bound=Context)
|
|
||||||
|
|
||||||
|
|
||||||
class ParsedContext(NamedTuple, Generic[C, D]):
|
|
||||||
context: C
|
|
||||||
data: D
|
|
||||||
|
|
||||||
|
|
||||||
class ContextParser(PrepareParser[C, ParsedContext[C, P], R], Generic[C, P, R]):
|
|
||||||
@abstractmethod
|
|
||||||
def prepare_context(self, data: str) -> P: ...
|
|
||||||
|
|
||||||
def prepare(self, data: C) -> ParsedContext[C, P]:
|
|
||||||
return ParsedContext(context=data, data=self.prepare_context(data.data))
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
import datetime
|
|
||||||
|
|
||||||
import dateparser
|
|
||||||
|
|
||||||
from .core import ParseError, Parser
|
|
||||||
|
|
||||||
|
|
||||||
class DateParser(Parser[str, datetime.datetime]):
|
|
||||||
def parse(self, data: str) -> datetime.datetime:
|
|
||||||
date = dateparser.parse(data, languages=["ru"])
|
|
||||||
if date is None:
|
|
||||||
raise ParseError("Invalid date", data)
|
|
||||||
return date
|
|
||||||
|
|
||||||
|
|
||||||
DATE_PARSER = DateParser()
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
from typing import Generic, Iterable
|
|
||||||
|
|
||||||
from bs4 import BeautifulSoup, Tag
|
|
||||||
|
|
||||||
from .core import C, ContextParser, ParseError, Parser, PrepareParser, R
|
|
||||||
from .util import set_dict_nested_value
|
|
||||||
|
|
||||||
|
|
||||||
def _resolve_tag(source: Tag, selector: str | None = None) -> Tag:
|
|
||||||
if selector:
|
|
||||||
tag = source.select_one(selector)
|
|
||||||
if tag is None:
|
|
||||||
raise ParseError("Tag not found", selector)
|
|
||||||
return tag
|
|
||||||
return source
|
|
||||||
|
|
||||||
|
|
||||||
class _HTMLParser(Parser[str, BeautifulSoup]):
|
|
||||||
def parse(self, data: str) -> BeautifulSoup:
|
|
||||||
return BeautifulSoup(data, features="html.parser")
|
|
||||||
|
|
||||||
|
|
||||||
HTML_PARSER = _HTMLParser()
|
|
||||||
|
|
||||||
|
|
||||||
class HTMLParser(PrepareParser[str, Tag, R], Generic[R]):
|
|
||||||
selector: str | None = None
|
|
||||||
|
|
||||||
def prepare(self, data: str) -> Tag:
|
|
||||||
return _resolve_tag(HTML_PARSER.parse(data), self.selector)
|
|
||||||
|
|
||||||
|
|
||||||
class HTMLContextParser(ContextParser[C, Tag, R], Generic[C, R]):
|
|
||||||
selector: str | None = None
|
|
||||||
|
|
||||||
def prepare_context(self, data: str) -> Tag:
|
|
||||||
return _resolve_tag(HTML_PARSER.parse(data), self.selector)
|
|
||||||
|
|
||||||
|
|
||||||
class TagParser(PrepareParser[Tag, Tag, R], Generic[R]):
|
|
||||||
selector: str | None = None
|
|
||||||
|
|
||||||
def prepare(self, data: Tag) -> Tag:
|
|
||||||
return _resolve_tag(data, self.selector)
|
|
||||||
|
|
||||||
|
|
||||||
class TagIterParser(Parser[Tag, Iterable[R]], Generic[R]):
|
|
||||||
selector: str
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> R:
|
|
||||||
raise NotImplementedError
|
|
||||||
|
|
||||||
def parse(self, data: Tag) -> Iterable[R]:
|
|
||||||
tags = data.select(self.selector)
|
|
||||||
for tag in tags:
|
|
||||||
yield self.extract(tag)
|
|
||||||
|
|
||||||
|
|
||||||
class TableValueParser(TagIterParser[R], Generic[R]):
|
|
||||||
model_key: str | list[str]
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> R:
|
|
||||||
raise NotImplementedError
|
|
||||||
|
|
||||||
|
|
||||||
class TableParser(TagParser[list[R]], Generic[R]):
|
|
||||||
value_parsers: list[TableValueParser]
|
|
||||||
|
|
||||||
def create_model(self, data: dict) -> R:
|
|
||||||
raise NotImplementedError
|
|
||||||
|
|
||||||
def extract(self, data: Tag) -> list[R]:
|
|
||||||
results = []
|
|
||||||
for parser in self.value_parsers:
|
|
||||||
for index, value in enumerate(parser.parse(data)):
|
|
||||||
while index > len(results) - 1:
|
|
||||||
results.append({})
|
|
||||||
if isinstance(parser.model_key, list):
|
|
||||||
for model_key_index, model_key in enumerate(parser.model_key):
|
|
||||||
set_dict_nested_value(results[index], model_key, value[model_key_index])
|
|
||||||
else:
|
|
||||||
set_dict_nested_value(results[index], parser.model_key, value)
|
|
||||||
return [self.create_model(item) for item in results]
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import json
|
|
||||||
from typing import Any, Generic
|
|
||||||
|
|
||||||
from .core import C, ContextParser, Parser, PrepareParser, R
|
|
||||||
|
|
||||||
|
|
||||||
class _JSONParser(Parser[str, Any]):
|
|
||||||
def parse(self, data: str) -> Any:
|
|
||||||
return json.loads(data)
|
|
||||||
|
|
||||||
|
|
||||||
JSON_PARSER = _JSONParser()
|
|
||||||
|
|
||||||
|
|
||||||
class JSONParser(PrepareParser[str, Any, R], Generic[R]):
|
|
||||||
def prepare(self, data: str) -> Any:
|
|
||||||
return JSON_PARSER.parse(data)
|
|
||||||
|
|
||||||
|
|
||||||
class JSONContextParser(ContextParser[C, Any, R], Generic[C, R]):
|
|
||||||
def prepare_context(self, data: str) -> Any:
|
|
||||||
return JSON_PARSER.parse(data)
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
from typing import Any
|
|
||||||
|
|
||||||
|
|
||||||
def set_nested_attr(target: Any, key: str, value: Any):
|
|
||||||
parts = key.split(".")
|
|
||||||
for part in parts[:-1]:
|
|
||||||
target = getattr(target, part)
|
|
||||||
setattr(target, parts[-1], value)
|
|
||||||
|
|
||||||
|
|
||||||
def set_dict_nested_value(target: dict, key: str, value: Any):
|
|
||||||
parts = key.split(".")
|
|
||||||
for part in parts[:-1]:
|
|
||||||
if part not in target:
|
|
||||||
target[part] = {}
|
|
||||||
target = target[part]
|
|
||||||
target[parts[-1]] = value
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
from gallery.sketch.parse.core import Parser
|
|
||||||
|
|
||||||
|
|
||||||
class CategoryParser(Parser[str, str | None]):
|
|
||||||
CATEGORY_MAP = {
|
|
||||||
"гандбол": "handball",
|
|
||||||
"хоккей": "hockey",
|
|
||||||
"бильярд": "billiards",
|
|
||||||
"волейбол": "volleyball",
|
|
||||||
"футбол": "soccer",
|
|
||||||
"футзал": "futsal",
|
|
||||||
"баскетбол": "basketball",
|
|
||||||
"плавание": "swimming",
|
|
||||||
"автоспорт": "motorsport",
|
|
||||||
"регби": "rugby",
|
|
||||||
"велоспорт": "cycling",
|
|
||||||
"гимнастика": "gymnastics",
|
|
||||||
}
|
|
||||||
|
|
||||||
def parse(self, data: str) -> str | None:
|
|
||||||
data = data.lower()
|
|
||||||
for k, v in self.CATEGORY_MAP.items():
|
|
||||||
if k in data:
|
|
||||||
return v
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
CATEGORY_PARSER = CategoryParser()
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import datetime
|
import datetime
|
||||||
from enum import StrEnum, auto
|
from enum import StrEnum, auto
|
||||||
from typing import Literal, Self
|
from typing import Self
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
@@ -51,13 +51,14 @@ Precipitation.values = list(Precipitation)
|
|||||||
|
|
||||||
|
|
||||||
class Sky(Model):
|
class Sky(Model):
|
||||||
cloudness: Cloudness = Cloudness.CLEAR
|
cloudness: Cloudness
|
||||||
precipitation: Precipitation = Precipitation.NO
|
precipitation: Precipitation
|
||||||
thunder: bool = False
|
thunder: bool
|
||||||
fog: bool = False
|
fog: bool
|
||||||
|
|
||||||
|
|
||||||
class WindDirection(StrEnum):
|
class WindDirection(StrEnum):
|
||||||
|
CALM = auto()
|
||||||
N = auto()
|
N = auto()
|
||||||
NE = auto()
|
NE = auto()
|
||||||
E = auto()
|
E = auto()
|
||||||
@@ -68,24 +69,69 @@ class WindDirection(StrEnum):
|
|||||||
NW = auto()
|
NW = auto()
|
||||||
|
|
||||||
|
|
||||||
class Wind(Model):
|
class WindDirectionDeg(float):
|
||||||
speed: int = 0
|
@property
|
||||||
gust: int = 0
|
def direction(self) -> WindDirection:
|
||||||
direction: WindDirection | None = None
|
return self.to_direction()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def value(self) -> float:
|
||||||
|
return self
|
||||||
|
|
||||||
|
# pylint:disable=too-many-return-statements
|
||||||
|
def to_direction(self) -> WindDirection:
|
||||||
|
if self == -1:
|
||||||
|
return WindDirection.CALM
|
||||||
|
elif self > 337.5 or self <= 22.25:
|
||||||
|
return WindDirection.N
|
||||||
|
elif self <= 67.5:
|
||||||
|
return WindDirection.NE
|
||||||
|
elif self <= 112.5:
|
||||||
|
return WindDirection.E
|
||||||
|
elif self <= 157.5:
|
||||||
|
return WindDirection.SE
|
||||||
|
elif self <= 202.5:
|
||||||
|
return WindDirection.S
|
||||||
|
elif self <= 247.5:
|
||||||
|
return WindDirection.SW
|
||||||
|
elif self <= 292.5:
|
||||||
|
return WindDirection.W
|
||||||
|
elif self <= 337.5:
|
||||||
|
return WindDirection.NW
|
||||||
|
else:
|
||||||
|
raise ValueError(self)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_direction(cls, direction: WindDirection) -> Self:
|
||||||
|
return cls(
|
||||||
|
{
|
||||||
|
WindDirection.CALM: -1,
|
||||||
|
WindDirection.N: 0,
|
||||||
|
WindDirection.NE: 45,
|
||||||
|
WindDirection.E: 90,
|
||||||
|
WindDirection.SE: 135,
|
||||||
|
WindDirection.S: 180,
|
||||||
|
WindDirection.SW: 225,
|
||||||
|
WindDirection.W: 270,
|
||||||
|
WindDirection.NW: 315,
|
||||||
|
}[direction]
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class WeatherValue(Model):
|
class WeatherValue(Model):
|
||||||
date: datetime.datetime
|
date: datetime.datetime
|
||||||
sky: Sky = Field(default_factory=Sky)
|
sky: Sky
|
||||||
wind: Wind = Field(default_factory=Wind)
|
temperature: list[int]
|
||||||
temperature: list[int] = Field(default_factory=list)
|
wind_speed: int
|
||||||
precipitation: float = 0
|
wind_gust: int
|
||||||
pressure: list[int] = Field(default_factory=list)
|
wind_direction: float
|
||||||
humidity: int = -1
|
precipitation: float
|
||||||
|
pressure: list[int] = Field(default=[])
|
||||||
|
humidity: int = Field(default=-1)
|
||||||
|
|
||||||
|
|
||||||
class WeatherResponse(Model):
|
class WeatherResponse(Model):
|
||||||
location: str
|
location: str
|
||||||
date: datetime.date
|
date: datetime.date
|
||||||
period: Literal["day", "days"] = "day"
|
period: str
|
||||||
values: list[WeatherValue]
|
values: list[WeatherValue]
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
from gallery.sketch.parse.core import Parser
|
|
||||||
|
|
||||||
from ..model import WindDirection
|
|
||||||
|
|
||||||
|
|
||||||
class WindDirectionParser(Parser[str | int | float, WindDirection | None]):
|
|
||||||
WIND_DIRECTION_MAP: dict[str, WindDirection | None] = {
|
|
||||||
"с": WindDirection.N,
|
|
||||||
"св": WindDirection.NE,
|
|
||||||
"в": WindDirection.E,
|
|
||||||
"юв": WindDirection.SE,
|
|
||||||
"ю": WindDirection.S,
|
|
||||||
"юз": WindDirection.SW,
|
|
||||||
"з": WindDirection.W,
|
|
||||||
"сз": WindDirection.NW,
|
|
||||||
}
|
|
||||||
|
|
||||||
# pylint:disable=too-many-return-statements
|
|
||||||
def _parse_number(self, value: int | float) -> WindDirection | None:
|
|
||||||
if value > 337.5 or value <= 22.25:
|
|
||||||
return WindDirection.N
|
|
||||||
elif value <= 67.5:
|
|
||||||
return WindDirection.NE
|
|
||||||
elif value <= 112.5:
|
|
||||||
return WindDirection.E
|
|
||||||
elif value <= 157.5:
|
|
||||||
return WindDirection.SE
|
|
||||||
elif value <= 202.5:
|
|
||||||
return WindDirection.S
|
|
||||||
elif value <= 247.5:
|
|
||||||
return WindDirection.SW
|
|
||||||
elif value <= 292.5:
|
|
||||||
return WindDirection.W
|
|
||||||
elif value <= 337.5:
|
|
||||||
return WindDirection.NW
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
def _parse_str(self, value: str) -> WindDirection | None:
|
|
||||||
return self.WIND_DIRECTION_MAP.get(value.replace("-", "").lower())
|
|
||||||
|
|
||||||
def parse(self, data: str | int | float) -> WindDirection | None:
|
|
||||||
if isinstance(data, str):
|
|
||||||
return self._parse_str(data)
|
|
||||||
else:
|
|
||||||
return self._parse_number(data)
|
|
||||||
|
|
||||||
|
|
||||||
WIND_DIRECTION_PARSER = WindDirectionParser()
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
from typing import Self
|
||||||
|
|
||||||
|
from gallery.sketch.weather.model import WindDirection, WindDirectionDeg
|
||||||
|
|
||||||
|
|
||||||
|
class ParseError(Exception):
|
||||||
|
@classmethod
|
||||||
|
def invalid_date(cls, date_str: str) -> Self:
|
||||||
|
return cls("Invalid date string", date_str)
|
||||||
|
|
||||||
|
|
||||||
|
WIND_DIRECTION_MAP: dict[str, WindDirection] = {
|
||||||
|
"—": WindDirection.CALM,
|
||||||
|
"": WindDirection.CALM,
|
||||||
|
"штиль": WindDirection.CALM,
|
||||||
|
"штл": WindDirection.CALM,
|
||||||
|
"с": WindDirection.N,
|
||||||
|
"св": WindDirection.NE,
|
||||||
|
"в": WindDirection.E,
|
||||||
|
"юв": WindDirection.SE,
|
||||||
|
"ю": WindDirection.S,
|
||||||
|
"юз": WindDirection.SW,
|
||||||
|
"з": WindDirection.W,
|
||||||
|
"сз": WindDirection.NW,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def parse_wind_direction(value: str) -> WindDirectionDeg:
|
||||||
|
return WindDirectionDeg.from_direction(WIND_DIRECTION_MAP[value.replace("-", "").lower()])
|
||||||
@@ -1,12 +1,31 @@
|
|||||||
import datetime
|
import datetime
|
||||||
import statistics
|
import statistics
|
||||||
from typing import Counter, Literal, overload
|
from typing import Literal
|
||||||
|
|
||||||
from .model import Cloudness, Precipitation, WeatherResponse, WeatherValue
|
from .model import Cloudness, Precipitation, Sky, WeatherValue, WindDirectionDeg
|
||||||
|
|
||||||
MergeMode = Literal["interval", "average"]
|
MergeMode = Literal["interval", "average"]
|
||||||
|
|
||||||
|
|
||||||
|
def build_weather_value(date: datetime.datetime) -> WeatherValue:
|
||||||
|
return WeatherValue(
|
||||||
|
date=date,
|
||||||
|
sky=Sky(
|
||||||
|
cloudness=Cloudness.CLEAR,
|
||||||
|
precipitation=Precipitation.NO,
|
||||||
|
thunder=False,
|
||||||
|
fog=False,
|
||||||
|
),
|
||||||
|
temperature=[],
|
||||||
|
wind_speed=0,
|
||||||
|
wind_gust=0,
|
||||||
|
wind_direction=WindDirectionDeg(-1),
|
||||||
|
precipitation=0,
|
||||||
|
pressure=[],
|
||||||
|
humidity=-1,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _merge_values(values: list[int], mode: MergeMode) -> list[int]:
|
def _merge_values(values: list[int], mode: MergeMode) -> list[int]:
|
||||||
if mode == "interval":
|
if mode == "interval":
|
||||||
if (max_value := max(values)) == (min_value := min(values)):
|
if (max_value := max(values)) == (min_value := min(values)):
|
||||||
@@ -22,7 +41,7 @@ def merge_weather_values(
|
|||||||
values: list[WeatherValue],
|
values: list[WeatherValue],
|
||||||
mode: MergeMode = "interval",
|
mode: MergeMode = "interval",
|
||||||
) -> WeatherValue:
|
) -> WeatherValue:
|
||||||
result = WeatherValue(date=date)
|
result = build_weather_value(date)
|
||||||
temperatures = []
|
temperatures = []
|
||||||
pressures = []
|
pressures = []
|
||||||
humidities = []
|
humidities = []
|
||||||
@@ -36,43 +55,23 @@ def merge_weather_values(
|
|||||||
temperatures += value.temperature
|
temperatures += value.temperature
|
||||||
pressures += value.pressure
|
pressures += value.pressure
|
||||||
humidities.append(value.humidity)
|
humidities.append(value.humidity)
|
||||||
wind_speeds.append(value.wind.speed)
|
wind_speeds.append(value.wind_speed)
|
||||||
wind_gusts.append(value.wind.gust)
|
wind_gusts.append(value.wind_gust)
|
||||||
wind_directions.append(value.wind.direction)
|
wind_directions.append(value.wind_direction)
|
||||||
cloudnesses.append(value.sky.cloudness)
|
cloudnesses.append(value.sky.cloudness)
|
||||||
precipitations.append(value.sky.precipitation)
|
precipitations.append(value.sky.precipitation)
|
||||||
precipitation += value.precipitation
|
precipitation += value.precipitation
|
||||||
result.temperature = _merge_values(temperatures, mode)
|
result.temperature = _merge_values(temperatures, mode)
|
||||||
result.pressure = _merge_values(pressures, mode)
|
result.pressure = _merge_values(pressures, mode)
|
||||||
result.humidity = round(statistics.mean(humidities))
|
result.humidity = round(statistics.mean(humidities))
|
||||||
result.wind.speed = round(statistics.mean(wind_speeds))
|
result.wind_speed = round(statistics.mean(wind_speeds))
|
||||||
result.wind.gust = round(statistics.mean(wind_gusts))
|
result.wind_gust = round(statistics.mean(wind_gusts))
|
||||||
result.wind.direction = Counter(wind_directions).most_common(1)[0][0]
|
result.wind_direction = statistics.mean(wind_directions)
|
||||||
for item in cloudnesses:
|
for item in cloudnesses:
|
||||||
# TODO: Instance of 'FieldInfo' has no 'cloudness' member (no-member)
|
|
||||||
# pylint:disable=no-member
|
|
||||||
if Cloudness.values.index(item) > Cloudness.values.index(result.sky.cloudness):
|
if Cloudness.values.index(item) > Cloudness.values.index(result.sky.cloudness):
|
||||||
result.sky.cloudness = item
|
result.sky.cloudness = item
|
||||||
for item in precipitations:
|
for item in precipitations:
|
||||||
# TODO: Instance of 'FieldInfo' has no 'precipitation' member (no-member)
|
|
||||||
# pylint:disable=no-member
|
|
||||||
if Precipitation.values.index(item) > Precipitation.values.index(result.sky.precipitation):
|
if Precipitation.values.index(item) > Precipitation.values.index(result.sky.precipitation):
|
||||||
result.sky.precipitation = item
|
result.sky.precipitation = item
|
||||||
result.precipitation = precipitation
|
result.precipitation = precipitation
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
def convert_hPa_to_mmHg(value: int) -> int:
|
|
||||||
return round(value / 1.333)
|
|
||||||
|
|
||||||
|
|
||||||
@overload
|
|
||||||
def fix_dates_sequence(items: list[WeatherValue]): ...
|
|
||||||
@overload
|
|
||||||
def fix_dates_sequence(items: list[WeatherResponse]): ...
|
|
||||||
def fix_dates_sequence(items):
|
|
||||||
date = None
|
|
||||||
for item in items:
|
|
||||||
if date and (item.date - date).total_seconds() < 0:
|
|
||||||
item.date = date + datetime.timedelta(days=1)
|
|
||||||
date = item.date
|
|
||||||
|
|||||||
@@ -388,140 +388,6 @@ files = [
|
|||||||
]
|
]
|
||||||
markers = {main = "extra == \"app\" and (platform_system == \"Windows\" or sys_platform == \"win32\")", dev = "platform_system == \"Windows\" or sys_platform == \"win32\"", test = "sys_platform == \"win32\""}
|
markers = {main = "extra == \"app\" and (platform_system == \"Windows\" or sys_platform == \"win32\")", dev = "platform_system == \"Windows\" or sys_platform == \"win32\"", test = "sys_platform == \"win32\""}
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "coverage"
|
|
||||||
version = "7.16.1"
|
|
||||||
description = "Code coverage measurement for Python"
|
|
||||||
optional = false
|
|
||||||
python-versions = ">=3.10"
|
|
||||||
groups = ["test"]
|
|
||||||
files = [
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4f12a9e27ca7b65e40a8475d27899b2d45064d9020e6a89148939e01987b5853"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8f590d46c30d9e4c1fda3efefe5443f4c2f6a4192c5ca2ba403653e9ebadf097"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3df82f0a3cef4e1bcfc799436056f0b978dda319d0bfd4460c6e479b2802d98a"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bb462d59146656e278d1e8ed913ce374d0ba68a4e081acde1867f6d3377fc881"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d7db888dd0a1df1a653cae7f99d4047430d2187a3626eda51bc847b0fd6b9b43"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:38a7e16f061504ac2b45370bf5bf97e8250d8d3f25e37385bae884978166554b"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2b26b55b18e1a53e1a159dd743728c4ddbbef28ba19000a91aaff5ce023197ec"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:fdb2f528b50953e29d22033b3256c396a700193c6e45b2490222ef9c333cbbf9"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:3284754371dc78592aa3ae4d661d30ee20e02b2b6b0de3590a181a936d0d3b38"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:802d1246c540e07486d4ee1adfa19a797e4b33529ffc371dc140644e8f27da0a"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:6fc735d6fe6d57f803e7ba021be4dde48e43e6aff94e6954350555d5332b0594"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ed5ade1bb18f62edace1bd198c66f9d4c75a8385d5fd24e87d917ea1a5958773"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-win32.whl", hash = "sha256:0c309096926b119543dc16438a11ef4c80783d2f4e59ff94f7f462651a944cdc"},
|
|
||||||
{file = "coverage-7.16.1-cp310-cp310-win_amd64.whl", hash = "sha256:7562f8067ed9360e8b9739e5703403a7686dd1b36bf0f89fc538047c54cdea90"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:72e013665e25cf9d44779f01f340af26319756f9a76822b7c94ce6b1d93813da"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:cb05c0ff98b56ba6969adf35556bc43bcb8d094df8bc9cb403acff53460c4e07"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:0d0ececb32090e3fbb03e0d352b973a0485879b4de6c58daf47227b9988b99e5"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f0ba3892d81aacf36996c52f16bca04e39af31a6c5de930b7688ab617f4a6475"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a6410b75fe07d5271eaa95fc24bd0a9177ed588d9d1c10c0cf67829adb8f0567"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d1039cb2de093225d597109342ce1675626bd127565e80b3044f4eca07c15b2e"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:cf047bc39fde5425be2628666d0f435ed8817859111c3aacc84b32d858069f5d"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2c05913d0d5badf7ac83200f35dcf9514cce5df16a7cc89e7d1d7fff0461813b"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:4027bf6d7bc0a16df058ce913b69f10c5687f8e1ca668f08caa659ce101744bf"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:4f48b345f831eaf4402ab6333c2dc3e2e2b5bc7b9c1b8fe12680dee3f0538f01"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:8643baeb590726c558b2faed6cd59b0917480f9367fcc692026f1a86d824fd08"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d06dcc420b570bf683cdb647cc8fe62b672d9e429ef711c3cbbb7a6880ca1572"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-win32.whl", hash = "sha256:946f58aa59b08bcd6afcc6a7bd0ff54ed5eee844f32ad69fe6814836d15856a2"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-win_amd64.whl", hash = "sha256:684c7ee9b4c04358fe6ac8b517ab51ec35fcd79d08ff0f105dd8bcd96885bbb7"},
|
|
||||||
{file = "coverage-7.16.1-cp311-cp311-win_arm64.whl", hash = "sha256:1b24f79e25bcf6c73931aeca7a3dfc7595c0cb5e9364aba3fdf387a3de4b1c22"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b7f2c26ce6ce0b1e0ca0d5fae96ea510e3a2e78b7207f06e76b7f2c87fa3d0af"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:070acb9da788dff743a4d36fc015feee12d68f0349959017542017c79f59c21c"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e366587b370bc9b8b51b7b7272c610c56db5d5b4795b9e4a29d28ff2f440f809"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:e82e10b9d290f60b63459cfb245a841aec347603997206296b93881463a93dcf"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3d73bb1f85c4150ac208fb0755beb04b2e44897bad81414de9380f98dd74729f"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3397b9032553d281ad6a9253b12675b65e0cc8cd7a3b0633cf48872c9eb13360"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:77890395cf37026a5907d3ad32376aa51f41c0f163b7477fdbd4f94966cc1d08"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b0944dc3bee3091039bf970d73caaf930c906013128a421bdc132e797494d941"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b89d22a89d5bc05dd95b64e08295b8394aa96dc88e08f8ba210c9ebfebbe0489"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:550a2a1faf7559f13d5344f12d1eb886ad87955155d7dfab2a3fe5c8ec8fe776"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:55eb268e5b81aefac759766c9162625b06c1bedb7b77d936225bafc4f038a6f6"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:65a8fc80898c9ce59f04349fe8b4849b1f9787f14e52ead990e5f849ff4727a0"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-win32.whl", hash = "sha256:528a61be40977c340cf201d23b69bd6a6bab507da60e9dbda85f8b30e935d70d"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-win_amd64.whl", hash = "sha256:d0f02c633630e2b74522108ee95a84ad6e1204a8016a6cca5297f335ea27147e"},
|
|
||||||
{file = "coverage-7.16.1-cp312-cp312-win_arm64.whl", hash = "sha256:2959978f9d1d20a2c0c15d0a68baaeccf615ac1aa214cf4a05a10d6f568926c8"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ee5465db6e9152a7d09f3215309326878c6aa3ac509195a369f9d264ff4bfbd9"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2b8256f8b525ba233d2e4cdcdce0d6673c66fc9bf70df1fd5e67c54a74e2d245"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:d57cc400275b9a2892e905fc893f732b21ddb95271bf96406c88e2f6367848b5"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:6b3fd0f3435ebb7a7183b32a6062a8b755f08242ced1f3f22761d30b56b3c2a5"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e5eb1762e7eb5fad34ef913e8107c7788a66f19d328e598ce95bf7217f9e5c8f"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:46cd3a73e9140410de62cceb66214bce0e08fb3922b9176fbfc1522fec151b41"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d1ba5142d68dd2cb775cbd0ac8601819298152047803c8efe4eec6d7d7aa7878"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:c389c6f9d1d518e1249ddcb8a7f158135644ce2c508fa6cc17b680777dad5bf2"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:cdc57746c7ac0ea063351b4d651c3bb4dd4fd35e64dbb8e90c10e14eb03c4080"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:5597180ed7670cc94c04c65347418a467d3a43d5f0cf52fcac647f5425f42037"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:a9647a0ac46255b8fef59a433a2161f03e5483f3a35e1cbd9dfe4600baff0c6b"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e306e98186b9cd109121f3583aeb7978797ad21d948f22944c5c08845cd554d0"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-win32.whl", hash = "sha256:48a78a66fcce49d7f6156524bf979c0ac633d584199717c68c6ffa949fc14e6a"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-win_amd64.whl", hash = "sha256:7af03247d598a353bbbbe1b925deb735276e4d845e7197c4073dc89352b236fa"},
|
|
||||||
{file = "coverage-7.16.1-cp313-cp313-win_arm64.whl", hash = "sha256:166adae25b05b04c9a84135912066d9c97482115af38df1a419a38aacc6b6f5d"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:cc0b37fe6f5ce5f1ccc62ad4fa9b1ad201d8e9b6027fd5e0170877beee4b2d15"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:6618f481053b63fc6121faf8fc676bd9b7163c2a19d9e984a2e850002c28ab57"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:fa02d561eb1d8d2f8ba43ba6e3cef4c6c402a3b632a9460fa329fcadcd5df6a3"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bc5354a124799f1f87b7637bbe6f18cd4bc66a1f37f6aa2b5db40f9adad531dc"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:34bafe9f4094315248573e6223e11af0ec1b25f9cbca43bf0e9a26a189ba2751"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:29c4d3e32a3b5efa420a3dc627c7e570deb80ef997def52c7686a474f5edc7ab"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f2066c447fdd0bca39a9633a082d8ce67bf9a539a203b85059a364a405dc9fe9"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:fd8ac10cd2458b3c6343aac082fb9bd0e3fa806cb2c4975f2280153474b88412"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:9d8c54ec32e5c102b9241f75d88ae26538b53662868ca491736611db448d9c7a"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:6dd8dda3402a01a1a8fe8b753a282466f615128574a5590a9108acd07b1f8540"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:79afa9726438912e5cddd1fe541815cea9763c92935f594835e4c432565b68a9"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:3db3978211c3cead5437a80136ca0556bab8bc7828de15a762884b0598c41361"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-win32.whl", hash = "sha256:49c39c7068a494f8eb427155f5682f44feee43f9b3107fd54b1e52465379c54b"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-win_amd64.whl", hash = "sha256:c510dad19552d912058e4c3e3cbec3fb155dbe8d0ce0ceb7e7dbf5c5822bae0b"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314-win_arm64.whl", hash = "sha256:b7d4d7e6dcaf33e85f1919f03346403bdcc27437c420a78835f3805bca0ab71f"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:3d0a3681c12d3e0bcdea3d9414b04087828d6c1a482802d6f7f42c37ed530152"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3f3b4469d3da3ecced775d1a8c9c5d9fc80f259e30b7b89f9fed0700d6035ecb"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:c08ae35c1be2fe1ce4b4c628df5c6fc0dc9a87f8e5fe8e20238d249678984741"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8ee71a38c54bb2676bbe762b8b0943a79ccb1c2fd6a52054f66e63eda392f8c1"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:76491917771f179f9772efe218c5ccc65950dbdb35f4439298d8a8dfc6ec1f72"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f4aa0b0a6f81fa3deb211e643f6954e78b4376b62b9c218271236cfa757664e8"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:756ba2d96d073c5a2a55d67fa22784763710fadbe22c41adde2d9cfa4dd78a8c"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:99bf9ea435cefcefd220f8687c3ddbbf78dc2de0bd11b57c3ae9fbbdf8d5561a"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:35cbc81f937fc402971df45c897d2df2bfb2014efcd990360032aa0a651635da"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:8fae08e85b334ac6ac886002b5041396a31bcf805225bbe19847627203da99e2"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:83362b64e215ef00b0ba33fcf13655ace6c9fdd144d5ad2ab59ac86c2daf166e"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:33300f2e140ccf26af3d8152e62bff71993f9310cfc63ba7a20940b0d246a0ae"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-win32.whl", hash = "sha256:5539304fdbb2cc144df684d35a33b81145334d23e1c2367b5a923d25107f70b2"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-win_amd64.whl", hash = "sha256:715dcb72c3280c428c3a20134b87e42c29acec9669136e899ab2de69ca86218d"},
|
|
||||||
{file = "coverage-7.16.1-cp314-cp314t-win_arm64.whl", hash = "sha256:dac8b84c03e6029d272b8249c77018db83de59ca009a9adef7c144b4a62ee5e6"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-macosx_10_15_x86_64.whl", hash = "sha256:a337dc2d54c74430cd2febb8ee04f7c508ba8b3b412bf0463f077a66cfc73743"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:3acd1d78397dead78dd1b011b5fc19cc823c190349acd549e63856dff649c80e"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:73a32694603a34ad01d7e51a481a4023410d8099e1d0757e067945695c10f0ae"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fbbe8265736659a6be2e6042b6a35be13545d14b243cc1d7ecf65f90d788a370"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4b0359eb4c62f9993e176bc8f50450fc736a6b90dbcc05bb8584e948812699ae"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:da506e669a8a851b59e122b4b219ea70996a6296f44f3a9348a852526ff961de"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:64a2a5985d81810ed605ff0dc4ccd6555efcb5700353825532a9a0aea65826e1"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:66d70132b69b861805dc1ca46cdd733e54c416890e8f1371d2fd103f70b59c9c"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-musllinux_1_2_i686.whl", hash = "sha256:db651a9cf325a542bc2b7b8cc8f1b2bdc6492739bae3103731b2f1c85b96cff6"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-musllinux_1_2_ppc64le.whl", hash = "sha256:4184e78a4465dcda359fb403172b8951dd220929cb0984c02fabca1742fff06f"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-musllinux_1_2_riscv64.whl", hash = "sha256:bc53c3f3adaa939b7a063533ffe0ae1259e7073393c618043a99a6970a87e3df"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:b44308854ef210b9b78df9cdfd4e159513382a859f5ef8464306d14a54c2a040"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-win32.whl", hash = "sha256:dccc142614d3419ed71857deb43f1d757829a4c7fce9994464b71e7e38309827"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-win_amd64.whl", hash = "sha256:961fc424e9d5229a99f8f1189942d8e7f4e1519147c3af64842f944aca03914d"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315-win_arm64.whl", hash = "sha256:681a9488c5a234397c4f013da065aa9e53eb7af4c78f1f80c6f15e7208acb855"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-macosx_10_15_x86_64.whl", hash = "sha256:8bb09a2d19b04db1fa0e087a7ca4f12458f7e0e7364cfcd838441d86fb1c61f6"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:2270a794600b635ca9452ce4c32e2fe81a35f9caa17ffac0eba99f14f275bd4d"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:a4eff405b545dfcf79cf0d9d3ff750e5c5a887aa066114175193a81d249c5ee6"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ee1d5fc9e3bd6a217906929cc97880239a91d20dae7746f538eb0eefee705ab1"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d4ec944947de098ad5a1738413f9364689a57067ecbc328e9de37218aa1e5cc1"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3f73ee3956fde2d461c9e2955dd48166e4821fc8587d135e8780fb84da2a098b"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:1ec9a4ee989c0d06ad95add0dbfdbb72b00ef53f43431ca0b612384e7878e5de"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:7e5727b2508f817f3126d6c33327dda32fe69d15514badfcd61db8bc4209ecef"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-musllinux_1_2_i686.whl", hash = "sha256:19a3ea2f364012ef06678118fffdc92442a16bef4a5c8ad4f4019dd8f9ac8876"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-musllinux_1_2_ppc64le.whl", hash = "sha256:996c2b891b441ec2b39725ee3e8386e2f11b4894b92be225fdfd54a3eeada2c8"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-musllinux_1_2_riscv64.whl", hash = "sha256:a125fac1f6b1e88488d208a86b578e1790e3c4937f2e1568d23356141d236220"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:b10095528b866d322d33d6bf1709b7f8cbf959f12e8cb2ba22fc59c8717866b0"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-win32.whl", hash = "sha256:531d9be377fdcc05593b974656872eb82e808ebeb42a72515e3aaeb8bb7166f5"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-win_amd64.whl", hash = "sha256:46a88f51770df7c9bc376bd57d3f86cdc7624b8e16ac4b585a655c22b7a1b4db"},
|
|
||||||
{file = "coverage-7.16.1-cp315-cp315t-win_arm64.whl", hash = "sha256:7580432cbe1e8b762660ae5806f04f869e1c02e519836a43f8094437e561e9f0"},
|
|
||||||
{file = "coverage-7.16.1-py3-none-any.whl", hash = "sha256:3d8bd4e58b6a5c2018d808f297905393c6c61da466a48c3f0596a76a4900ebe4"},
|
|
||||||
{file = "coverage-7.16.1.tar.gz", hash = "sha256:f83981779bcf9dfa06fa0a8d4cb43e0faec1706328ce07aa3e7b665b4ac0f210"},
|
|
||||||
]
|
|
||||||
|
|
||||||
[package.extras]
|
|
||||||
toml = ["tomli ; python_full_version <= \"3.11.0a6\""]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dateparser"
|
name = "dateparser"
|
||||||
version = "1.4.1"
|
version = "1.4.1"
|
||||||
@@ -3282,4 +3148,4 @@ app = ["babel", "fastapi", "jinja2"]
|
|||||||
[metadata]
|
[metadata]
|
||||||
lock-version = "2.1"
|
lock-version = "2.1"
|
||||||
python-versions = ">=3.14,<4.0"
|
python-versions = ">=3.14,<4.0"
|
||||||
content-hash = "1494c77fcc28f6899d0fd2101647cb880e793805898472a96e2a66b125dd6c72"
|
content-hash = "b0c7f9c6c9fbb20ada45e7d27601920b0ba42716a1a70b4e317e7295de230376"
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "gallery"
|
name = "gallery"
|
||||||
description = ""
|
description = ""
|
||||||
version = "0.10.6"
|
version = "0.7.0"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
|
authors = [{ name = "shmyga", email = "shmyga.z@gmail.com" }]
|
||||||
requires-python = ">=3.14,<4.0"
|
requires-python = '>=3.14,<4.0'
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aiohttp (>=3.14,<4.0)",
|
'aiohttp (>=3.14,<4.0)',
|
||||||
"beautifulsoup4 (>=4.15,<5.0)",
|
'beautifulsoup4 (>=4.15,<5.0)',
|
||||||
"dateparser (>=1.4,<2.0)",
|
'dateparser (>=1.4,<2.0)',
|
||||||
"pydantic (>=2.13,<3.0)",
|
'pydantic (>=2.13,<3.0)',
|
||||||
"aiocache[redis] (>=0.12,<0.13)",
|
'aiocache[redis] (>=0.12,<0.13)',
|
||||||
"playwright (>=1.62.0,<2.0.0)",
|
"playwright (>=1.62.0,<2.0.0)",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ app = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[dependency-groups]
|
[dependency-groups]
|
||||||
test = ["pytest (>=9.1,<10.0)", "pytest-asyncio (>=1.4,<2.0)", "coverage (>=7.16.1,<8.0.0)"]
|
test = ["pytest (>=9.1,<10.0)", "pytest-asyncio (>=1.4,<2.0)"]
|
||||||
dev = ["pylint (>=4.0.6,<5.0.0)", "black (>=26.5,<27.0)", "isort (>=8.0,<9.0)"]
|
dev = ["pylint (>=4.0.6,<5.0.0)", "black (>=26.5,<27.0)", "isort (>=8.0,<9.0)"]
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
@@ -30,10 +30,10 @@ gallery = "gallery.main:run"
|
|||||||
|
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
packages = [{ include = "gallery" }]
|
packages = [{ include = "gallery" }]
|
||||||
requires-poetry = ">=2.0.0,<3.0.0"
|
requires-poetry = '>=2.0.0,<3.0.0'
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
requires = ["poetry-core (>=2.0.0,<3.0.0)"]
|
requires = ['poetry-core (>=2.0.0,<3.0.0)']
|
||||||
build-backend = "poetry.core.masonry.api"
|
build-backend = "poetry.core.masonry.api"
|
||||||
|
|
||||||
[tool.black]
|
[tool.black]
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
docker compose -f docker-compose-develop.yaml up --build --watch
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
. .env
|
||||||
|
|
||||||
|
build () {
|
||||||
|
echo "build: $1"
|
||||||
|
. "$1/.env"
|
||||||
|
for PROJECT in "${DOCKER_PROJECTS[@]}"; do
|
||||||
|
IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
|
||||||
|
ARGS=("build")
|
||||||
|
for ARG in ${DOCKER_ARGS[@]}; do
|
||||||
|
ARGS+=("--build-arg" "$ARG")
|
||||||
|
done
|
||||||
|
if [ -n "$PROJECT_TARGET" ]; then
|
||||||
|
ARGS+=("--target" "$PROJECT_TARGET")
|
||||||
|
fi
|
||||||
|
ARGS+=("-t" "$DOCKER_GROUP/$PROJECT_NAME" ".")
|
||||||
|
ARGS+=("-f" "$1/Dockerfile")
|
||||||
|
echo "${ARGS[@]}"
|
||||||
|
docker "${ARGS[@]}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
publish () {
|
||||||
|
echo "publish: $1"
|
||||||
|
. "$1/.env"
|
||||||
|
for PROJECT in "${DOCKER_PROJECTS[@]}"; do
|
||||||
|
IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
|
||||||
|
docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$VERSION
|
||||||
|
docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG
|
||||||
|
docker push $DOCKER_ROOT/$PROJECT_NAME:$VERSION
|
||||||
|
docker push $DOCKER_ROOT/$PROJECT_NAME:$DOCKER_TAG
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
save () {
|
||||||
|
echo "save: $1"
|
||||||
|
. "$1/.env"
|
||||||
|
mkdir -p "$1/dist"
|
||||||
|
for PROJECT in "${DOCKER_PROJECTS[@]}"; do
|
||||||
|
IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
|
||||||
|
docker save --output "$1/dist/$PROJECT_NAME-$VERSION.tar" "$DOCKER_GROUP/$PROJECT_NAME"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
DEFAULT_TARGETS="."
|
||||||
|
TARGETS="${@-$DEFAULT_TARGETS}"
|
||||||
|
|
||||||
|
DOCKER_ACTION="${DOCKER_ACTION-build}"
|
||||||
|
|
||||||
|
for TARGET in $TARGETS; do
|
||||||
|
$DOCKER_ACTION "$TARGET"
|
||||||
|
done
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
TARGET="gallery"
|
||||||
|
|
||||||
|
poetry run isort $TARGET
|
||||||
|
poetry run black $TARGET -q
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
TARGET="gallery"
|
||||||
|
|
||||||
|
poetry run pylint $TARGET -sn
|
||||||
|
poetry run isort $TARGET --check-only
|
||||||
|
poetry run black $TARGET -q --check --diff
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
cd locales/ru/LC_MESSAGES || exit
|
||||||
|
msgfmt messages.po
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
# env
|
||||||
|
if [[ ! -f .env ]]; then
|
||||||
|
cp .env-base .env
|
||||||
|
fi
|
||||||
|
source .env
|
||||||
|
|
||||||
|
# python
|
||||||
|
poetry env use ${PYTHON_VERSION}
|
||||||
|
poetry install
|
||||||
|
.venv/bin/playwright install chromium --with-deps --only-shell
|
||||||
|
|
||||||
|
# static
|
||||||
|
cd static || exit
|
||||||
|
|
||||||
|
if [[ -f $HOME/.nvm/nvm.sh ]]; then
|
||||||
|
source "$HOME/.nvm/nvm.sh"
|
||||||
|
nvm use
|
||||||
|
fi
|
||||||
|
npm ci
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
OPENWEATHER_KEY="" poetry run pytest tests
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname $(dirname "$0"))" || exit
|
||||||
|
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
echo "Usage: $0 [version]"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -z "$(git status -s)" ]]; then
|
||||||
|
echo "Uncomitted changes"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
poetry version $1
|
||||||
|
(cd static && npm version $1 --allow-same-version)
|
||||||
|
git add .
|
||||||
|
git commit -m "ci(version): $1"
|
||||||
|
git tag $1
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "gallery",
|
"name": "gallery",
|
||||||
"version": "0.10.6",
|
"version": "0.7.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "gallery",
|
"name": "gallery",
|
||||||
"version": "0.10.6",
|
"version": "0.7.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@popperjs/core": "^2.11.8",
|
"@popperjs/core": "^2.11.8",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "gallery",
|
"name": "gallery",
|
||||||
"version": "0.10.6",
|
"version": "0.7.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "webpack --mode production",
|
"build": "webpack --mode production",
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ export class ScheduleChannelItem extends ListItemElement<Channel> {
|
|||||||
<span class="text-primary">${value.name}</span>
|
<span class="text-primary">${value.name}</span>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getBadge(value: Channel): string | null {
|
||||||
|
return value.provider;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ScheduleChannelList extends ListElement<Channel, ScheduleChannelItem> {
|
export class ScheduleChannelList extends ListElement<Channel, ScheduleChannelItem> {
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ export class WheatherLocationItem extends ListItemElement<Location> {
|
|||||||
</span>
|
</span>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getBadge(value: Location): string | null {
|
||||||
|
return value.provider;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class WeatherLocationList extends ListElement<Location, WheatherLocationItem> {
|
export class WeatherLocationList extends ListElement<Location, WheatherLocationItem> {
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 15 KiB |
@@ -4,7 +4,5 @@ import "./app/common/tooltips";
|
|||||||
import "./app/components/app-link";
|
import "./app/components/app-link";
|
||||||
import "./app/schedule";
|
import "./app/schedule";
|
||||||
import "./app/weather";
|
import "./app/weather";
|
||||||
import { init as scheduleIconsInit } from "./lib/schedule-icons";
|
import { init } from "./lib/weather-icons";
|
||||||
import { init as weatherIconsInit } from "./lib/weather-icons";
|
init("/static/weather-icons/icons");
|
||||||
weatherIconsInit("/static/weather-icons/icons");
|
|
||||||
scheduleIconsInit("/static/schedule-icons/icons");
|
|
||||||
|
|||||||
@@ -48,7 +48,4 @@
|
|||||||
&.bi-cast {
|
&.bi-cast {
|
||||||
mask-image: url(bootstrap-icons/icons/cast.svg);
|
mask-image: url(bootstrap-icons/icons/cast.svg);
|
||||||
}
|
}
|
||||||
&.bi-filetype-json {
|
|
||||||
mask-image: url(bootstrap-icons/icons/filetype-json.svg);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2.34,14.63C2.94,14.41 3.56,14.3 4.22,14.3C5.56,14.3 6.73,14.72 7.73,15.56L4.59,18.7C3.53,17.5 2.78,16.13 2.34,14.63M15.56,9.8C17.53,11.27 19.66,11.63 21.94,10.88C21.97,11.09 22,11.47 22,12C22,13.03 21.75,14.18 21.28,15.45C20.81,16.71 20.23,17.73 19.55,18.5L13.22,12.19L15.56,9.8M8.77,16.64C9.83,18.17 10.05,19.84 9.42,21.66C8,21.25 6.73,20.61 5.67,19.73L8.77,16.64M12.19,13.22L18.5,19.55C16.33,21.45 13.78,22.25 10.88,21.94C11.09,21.28 11.2,20.56 11.2,19.78C11.2,19.16 11.06,18.43 10.78,17.6C10.5,16.77 10.17,16.09 9.8,15.56L12.19,13.22M8.81,14.5C7.88,13.67 6.8,13.15 5.58,12.91C4.36,12.68 3.19,12.75 2.06,13.13C2.03,12.91 2,12.53 2,12C2,10.97 2.25,9.82 2.72,8.55C3.19,7.29 3.77,6.27 4.45,5.5L11.11,12.19L8.81,14.5M15.56,7.73C14.22,6.08 13.91,4.28 14.63,2.34C15.25,2.5 15.96,2.8 16.76,3.26C17.55,3.71 18.2,4.16 18.7,4.59L15.56,7.73M21.66,9.38C21.06,9.59 20.44,9.7 19.78,9.7C18.69,9.7 17.64,9.38 16.64,8.72L19.73,5.67C20.61,6.77 21.25,8 21.66,9.38M12.19,11.11L5.5,4.45C7.67,2.55 10.22,1.75 13.13,2.06C12.91,2.72 12.8,3.44 12.8,4.22C12.8,4.94 12.96,5.75 13.29,6.66C13.62,7.56 14,8.28 14.5,8.81L12.19,11.11Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.2 KiB |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11,13H13V15H11M11,9H13V11H11M11,17H13A2,2 0 0,0 15,15V13.5A1.5,1.5 0 0,0 13.5,12A1.5,1.5 0 0,0 15,10.5V9A2,2 0 0,0 13,7H11A2,2 0 0,0 9,9V10.5A1.5,1.5 0 0,0 10.5,12A1.5,1.5 0 0,0 9,13.5V15A2,2 0 0,0 11,17M12,1C5.92,1 1,5.92 1,12C1,18.08 5.92,23 12,23C18.08,23 23,18.08 23,12C23,5.92 18.08,1 12,1M12,19A7,7 0 0,1 5,12A7,7 0 0,1 12,5A7,7 0 0,1 19,12A7,7 0 0,1 12,19Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 443 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5,20.5A3.5,3.5 0 0,1 1.5,17A3.5,3.5 0 0,1 5,13.5A3.5,3.5 0 0,1 8.5,17A3.5,3.5 0 0,1 5,20.5M5,12A5,5 0 0,0 0,17A5,5 0 0,0 5,22A5,5 0 0,0 10,17A5,5 0 0,0 5,12M14.8,10H19V8.2H15.8L13.86,4.93C13.57,4.43 13,4.1 12.4,4.1C11.93,4.1 11.5,4.29 11.2,4.6L7.5,8.29C7.19,8.6 7,9 7,9.5C7,10.13 7.33,10.66 7.85,10.97L11.2,13V18H13V11.5L10.75,9.85L13.07,7.5M19,20.5A3.5,3.5 0 0,1 15.5,17A3.5,3.5 0 0,1 19,13.5A3.5,3.5 0 0,1 22.5,17A3.5,3.5 0 0,1 19,20.5M19,12A5,5 0 0,0 14,17A5,5 0 0,0 19,22A5,5 0 0,0 24,17A5,5 0 0,0 19,12M16,4.8C17,4.8 17.8,4 17.8,3C17.8,2 17,1.2 16,1.2C15,1.2 14.2,2 14.2,3C14.2,4 15,4.8 16,4.8Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 679 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16.93 17.12L16.13 15.76L17.59 11.39L19 10.92L20 11.67C20 11.7 20 11.75 20 11.81C20 11.88 20.03 11.94 20.03 12C20.03 13.97 19.37 15.71 18.06 17.21L16.93 17.12M9.75 15L8.38 10.97L12 8.43L15.62 10.97L14.25 15H9.75M12 20.03C11.12 20.03 10.29 19.89 9.5 19.61L8.81 18.1L9.47 17H14.58L15.19 18.1L14.5 19.61C13.71 19.89 12.88 20.03 12 20.03M5.94 17.21C5.41 16.59 4.95 15.76 4.56 14.75C4.17 13.73 3.97 12.81 3.97 12C3.97 11.94 4 11.88 4 11.81C4 11.75 4 11.7 4 11.67L5 10.92L6.41 11.39L7.87 15.76L7.07 17.12L5.94 17.21M11 5.29V6.69L7 9.46L5.66 9.04L5.24 7.68C5.68 7 6.33 6.32 7.19 5.66S8.87 4.57 9.65 4.35L11 5.29M14.35 4.35C15.13 4.57 15.95 5 16.81 5.66C17.67 6.32 18.32 7 18.76 7.68L18.34 9.04L17 9.47L13 6.7V5.29L14.35 4.35M4.93 4.93C3 6.89 2 9.25 2 12S3 17.11 4.93 19.07 9.25 22 12 22 17.11 21 19.07 19.07 22 14.75 22 12 21 6.89 19.07 4.93 14.75 2 12 2 6.89 3 4.93 4.93Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 944 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M4 6C4 4.9 4.9 4 6 4S8 4.9 8 6 7.1 8 6 8 4 7.1 4 6M1 9H7L14 4L15.31 5.5L11.14 8.5H14L21.8 4L23 5.4L14.5 12L14 22H12L11.5 12L8 11H1V9Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 212 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.83 10.43A6.93 6.93 0 0 1 18.39 14.86A6.64 6.64 0 0 1 17.5 19.5L15.78 18.5A5 5 0 0 0 16.44 16A5.22 5.22 0 0 0 15.46 13.06L9.18 23.93L7.44 22.95L10.44 17.75L8.71 16.76L7.21 19.34L5.5 18.36L10.63 9.45A7 7 0 0 1 8.8 5.46A6.91 6.91 0 0 1 9.69 1.1L11.43 2.13A4.84 4.84 0 0 0 10.91 5.9A4.74 4.74 0 0 0 13.21 8.93M16 5A2 2 0 1 0 18 7A2 2 0 0 0 16 5M13.5 1A1.5 1.5 0 1 0 15 2.5A1.5 1.5 0 0 0 13.5 1Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 473 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,5C6.5,5 2,6.57 2,8.5C2,10.43 6.5,12 12,12C17.5,12 22,10.43 22,8.5C22,6.57 17.5,5 12,5M2,11.76V16.5C2,18.43 6.5,20 12,20C17.5,20 22,18.43 22,16.5V11.76C21.33,12.22 20.58,12.57 19.73,12.86C17.62,13.6 14.95,14 12,14C9.05,14 6.38,13.6 4.27,12.86C3.42,12.57 2.67,12.22 2,11.76Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 355 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,16A3,3 0 0,1 9,13C9,11.88 9.61,10.9 10.5,10.39L20.21,4.77L14.68,14.35C14.18,15.33 13.17,16 12,16M12,3C13.81,3 15.5,3.5 16.97,4.32L14.87,5.53C14,5.19 13,5 12,5A8,8 0 0,0 4,13C4,15.21 4.89,17.21 6.34,18.65H6.35C6.74,19.04 6.74,19.67 6.35,20.06C5.96,20.45 5.32,20.45 4.93,20.07V20.07C3.12,18.26 2,15.76 2,13A10,10 0 0,1 12,3M22,13C22,15.76 20.88,18.26 19.07,20.07V20.07C18.68,20.45 18.05,20.45 17.66,20.06C17.27,19.67 17.27,19.04 17.66,18.65V18.65C19.11,17.2 20,15.21 20,13C20,12 19.81,11 19.46,10.1L20.67,8C21.5,9.5 22,11.18 22,13Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 612 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16.22,16.22C18.25,14.19 19.33,11.5 19.45,8.2C18.36,10.61 16.81,12.81 14.81,14.81C12.81,16.81 10.61,18.36 8.2,19.45C11.5,19.36 14.16,18.28 16.22,16.22M7.78,7.78C5.75,9.81 4.67,12.5 4.55,15.8C5,14.8 5.7,13.65 6.61,12.35C7.5,11.05 8.38,10 9.19,9.19C11.19,7.19 13.39,5.64 15.8,4.55C12.5,4.64 9.84,5.72 7.78,7.78M20.5,3.5C21,4.05 21.34,5.11 21.47,6.7C21.59,8.3 21.35,10.16 20.74,12.3C20.13,14.45 19.11,16.23 17.67,17.67C16.36,19 14.8,19.95 13,20.55C11.21,21.16 9.44,21.47 7.69,21.47C5.56,21.47 4.17,21.14 3.5,20.5C3,19.95 2.66,18.89 2.53,17.3C2.41,15.7 2.65,13.84 3.26,11.7C3.87,9.55 4.89,7.77 6.33,6.33C7.64,5 9.2,4.05 11,3.45C12.79,2.84 14.56,2.53 16.31,2.53C18.44,2.53 19.83,2.86 20.5,3.5Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 767 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M16.93 17.12L16.13 15.76L17.59 11.39L19 10.92L20 11.67C20 11.7 20 11.75 20 11.81C20 11.88 20.03 11.94 20.03 12C20.03 13.97 19.37 15.71 18.06 17.21L16.93 17.12M9.75 15L8.38 10.97L12 8.43L15.62 10.97L14.25 15H9.75M12 20.03C11.12 20.03 10.29 19.89 9.5 19.61L8.81 18.1L9.47 17H14.58L15.19 18.1L14.5 19.61C13.71 19.89 12.88 20.03 12 20.03M5.94 17.21C5.41 16.59 4.95 15.76 4.56 14.75C4.17 13.73 3.97 12.81 3.97 12C3.97 11.94 4 11.88 4 11.81C4 11.75 4 11.7 4 11.67L5 10.92L6.41 11.39L7.87 15.76L7.07 17.12L5.94 17.21M11 5.29V6.69L7 9.46L5.66 9.04L5.24 7.68C5.68 7 6.33 6.32 7.19 5.66S8.87 4.57 9.65 4.35L11 5.29M14.35 4.35C15.13 4.57 15.95 5 16.81 5.66C17.67 6.32 18.32 7 18.76 7.68L18.34 9.04L17 9.47L13 6.7V5.29L14.35 4.35M4.93 4.93C3 6.89 2 9.25 2 12S3 17.11 4.93 19.07 9.25 22 12 22 17.11 21 19.07 19.07 22 14.75 22 12 21 6.89 19.07 4.93 14.75 2 12 2 6.89 3 4.93 4.93Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 944 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2,15C3.67,14.25 5.33,13.5 7,13.17V5A3,3 0 0,1 10,2C11.31,2 12.42,2.83 12.83,4H10A1,1 0 0,0 9,5V6H14V5A3,3 0 0,1 17,2C18.31,2 19.42,2.83 19.83,4H17A1,1 0 0,0 16,5V14.94C18,14.62 20,13 22,13V15C19.78,15 17.56,17 15.33,17C13.11,17 10.89,15 8.67,15C6.44,15 4.22,16 2,17V15M14,8H9V10H14V8M14,12H9V13C10.67,13.16 12.33,14.31 14,14.79V12M2,19C4.22,18 6.44,17 8.67,17C10.89,17 13.11,19 15.33,19C17.56,19 19.78,17 22,17V19C19.78,19 17.56,21 15.33,21C13.11,21 10.89,19 8.67,19C6.44,19 4.22,20 2,21V19Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 571 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19.04 4.85C17.34 3.2 15.33 2.25 13 2V5.62L22 10.8C21.72 8.5 20.73 6.5 19.04 4.85M12 22C15.44 22 18.16 20.62 20.17 17.86L17.06 16L8.07 21.2C9.32 21.73 10.64 22 12 22M13 11.41L21.15 16.07C21.59 15.13 21.88 14.14 22 13.11L13 7.93V11.41M3.88 17.81C4.54 18.72 5.26 19.46 6.05 20L15.04 14.9L12 13.15L3.88 17.81M11.04 2C10 2.09 9 2.36 8 2.8V13.15L11.04 11.41V2M2 12C2 13.39 2.3 14.77 2.89 16.12L6 14.28V4C3.33 6 2 8.65 2 12Z" /></svg>
|
|
||||||
|
Before Width: | Height: | Size: 497 B |
@@ -1,6 +0,0 @@
|
|||||||
import { ScheduleIconElement } from "./schedule-icons";
|
|
||||||
|
|
||||||
export const init = (iconsPath: string) => {
|
|
||||||
ScheduleIconElement.iconsPath = iconsPath;
|
|
||||||
customElements.define("schedule-icon", ScheduleIconElement);
|
|
||||||
};
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
schedule-icon {
|
|
||||||
display: inline-block;
|
|
||||||
text-transform: none;
|
|
||||||
line-height: 1;
|
|
||||||
vertical-align: 0.125em;
|
|
||||||
width: 1em;
|
|
||||||
height: 1em;
|
|
||||||
|
|
||||||
mask-size: contain;
|
|
||||||
mask-position: 50%;
|
|
||||||
mask-repeat: no-repeat;
|
|
||||||
color: currentColor;
|
|
||||||
|
|
||||||
> svg {
|
|
||||||
path {
|
|
||||||
fill: currentColor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
export class ScheduleIconElement extends HTMLElement {
|
|
||||||
static iconsPath = "./icons";
|
|
||||||
static observedAttributes = ["icon"];
|
|
||||||
|
|
||||||
constructor() {
|
|
||||||
super();
|
|
||||||
const icon = this.getAttribute("icon");
|
|
||||||
if (icon) {
|
|
||||||
this.icon = icon;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
set icon(value: string) {
|
|
||||||
const src = `${ScheduleIconElement.iconsPath}/${value}.svg`;
|
|
||||||
fetch(src)
|
|
||||||
.then((response) => (response.ok ? response.text() : ""))
|
|
||||||
.then((data) => (this.innerHTML = data));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -11,6 +11,7 @@ export class WeatherIconElement extends HTMLElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
set icon(value: string) {
|
set icon(value: string) {
|
||||||
|
console.log('!', WeatherIconElement.iconsPath);
|
||||||
const src = `${WeatherIconElement.iconsPath}/wi-${value}.svg`;
|
const src = `${WeatherIconElement.iconsPath}/wi-${value}.svg`;
|
||||||
fetch(src)
|
fetch(src)
|
||||||
.then((response) => response.text())
|
.then((response) => response.text())
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
@import "./lib/bootstrap";
|
@import "./lib/bootstrap";
|
||||||
@import "./lib/bootstrap-icons";
|
@import "./lib/bootstrap-icons";
|
||||||
@import "./lib/weather-icons";
|
@import "./lib/weather-icons";
|
||||||
@import "./lib/schedule-icons/sass/schedule-icons.scss";
|
|
||||||
|
|
||||||
@import "./styles/weather.scss";
|
@import "./styles/weather.scss";
|
||||||
@import "./styles/app";
|
@import "./styles/app";
|
||||||
|
|||||||
@@ -56,22 +56,14 @@ const config: webpack.Configuration = {
|
|||||||
new MiniCssExtractPlugin({ filename: `${packageInfo.name}.css` }),
|
new MiniCssExtractPlugin({ filename: `${packageInfo.name}.css` }),
|
||||||
new CopyPlugin({
|
new CopyPlugin({
|
||||||
patterns: [
|
patterns: [
|
||||||
// weather icons
|
|
||||||
{
|
{
|
||||||
from: "./src/lib/weather-icons/icons/*.svg",
|
from: "./src/lib/weather-icons/icons/*.svg",
|
||||||
to: "weather-icons/icons/[name][ext]",
|
to: "weather-icons/icons/[name][ext]",
|
||||||
},
|
},
|
||||||
// schedule icons
|
|
||||||
{
|
|
||||||
from: "./src/lib/schedule-icons/icons/*.svg",
|
|
||||||
to: "schedule-icons/icons/[name][ext]",
|
|
||||||
},
|
|
||||||
// bootstrap icons
|
|
||||||
{
|
{
|
||||||
from: "./node_modules/bootstrap-icons/icons/*.svg",
|
from: "./node_modules/bootstrap-icons/icons/*.svg",
|
||||||
to: "bootstrap-icons/icons/[name][ext]",
|
to: "bootstrap-icons/icons/[name][ext]",
|
||||||
},
|
},
|
||||||
// flag icons
|
|
||||||
{
|
{
|
||||||
from: "./node_modules/flag-icons/flags/1x1/*.svg",
|
from: "./node_modules/flag-icons/flags/1x1/*.svg",
|
||||||
to: "flag-icons/flags/1x1/[name][ext]",
|
to: "flag-icons/flags/1x1/[name][ext]",
|
||||||
@@ -80,11 +72,6 @@ const config: webpack.Configuration = {
|
|||||||
from: "./node_modules/flag-icons/flags/4x3/*.svg",
|
from: "./node_modules/flag-icons/flags/4x3/*.svg",
|
||||||
to: "flag-icons/flags/4x3/[name][ext]",
|
to: "flag-icons/flags/4x3/[name][ext]",
|
||||||
},
|
},
|
||||||
// favicon
|
|
||||||
{
|
|
||||||
from: "./src/favicon.ico",
|
|
||||||
to: "favicon.ico",
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -2,22 +2,22 @@ import datetime
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from gallery.painting.matchtv.api import MatchTVApi
|
from gallery.painting.matchtv.api import MatchTvApi
|
||||||
from tests.common.mock import create_mock_api
|
from tests.common.mock import create_mock_api
|
||||||
from tests.data.matchtv import MATCHTV_MOCK_SOURCE
|
from tests.data.matchtv import MATCHTV_MOCK_SOURCE
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(name="matchtv_api", scope="module")
|
@pytest.fixture(name="matchtv_api", scope="module")
|
||||||
def matchtv_api_fixture() -> MatchTVApi:
|
def matchtv_api_fixture() -> MatchTvApi:
|
||||||
return create_mock_api(MatchTVApi, MATCHTV_MOCK_SOURCE)
|
return create_mock_api(MatchTvApi, MATCHTV_MOCK_SOURCE)
|
||||||
|
|
||||||
|
|
||||||
async def test_search(matchtv_api: MatchTVApi):
|
async def test_search(matchtv_api: MatchTvApi):
|
||||||
result = await matchtv_api.find_channels("матч")
|
result = await matchtv_api.find_channels("матч")
|
||||||
assert len(result) == 6
|
assert len(result) == 6
|
||||||
|
|
||||||
|
|
||||||
async def test_channel(matchtv_api: MatchTVApi):
|
async def test_channel(matchtv_api: MatchTvApi):
|
||||||
result = await matchtv_api.get_schedule("test", datetime.date.today())
|
result = await matchtv_api.get_schedule("test", datetime.date.today())
|
||||||
assert result is not None
|
assert result is not None
|
||||||
assert len(result.values) > 0
|
assert len(result.values) > 0
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ async def test_search(rp5_api: RP5WeatherApi):
|
|||||||
|
|
||||||
|
|
||||||
async def test_day(rp5_api: RP5WeatherApi):
|
async def test_day(rp5_api: RP5WeatherApi):
|
||||||
result = await rp5_api.get_day("test", datetime.date(2026, 9, 11))
|
result = await rp5_api.get_day("test", datetime.date(2026, 9, 2))
|
||||||
assert len(result.values) == 4
|
assert len(result.values) == 4
|
||||||
|
|
||||||
|
|
||||||
async def test_days(rp5_api: RP5WeatherApi):
|
async def test_days(rp5_api: RP5WeatherApi):
|
||||||
result = await rp5_api.get_days("test", 10)
|
result = await rp5_api.get_days("test", 10)
|
||||||
assert len(result.values) == 8
|
assert len(result.values) == 7
|
||||||
|
|||||||
@@ -2,22 +2,22 @@ import datetime
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from gallery.painting.yandextv.api import YandexTVApi
|
from gallery.painting.yandextv.api import YandexTvApi
|
||||||
from tests.common.mock import create_mock_api
|
from tests.common.mock import create_mock_api
|
||||||
from tests.data.yandextv import YANDEXTV_MOCK_SOURCE
|
from tests.data.yandextv import YANDEXTV_MOCK_SOURCE
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(name="yandextv_api", scope="module")
|
@pytest.fixture(name="yandextv_api", scope="module")
|
||||||
def yandextv_api_fixture() -> YandexTVApi:
|
def yandextv_api_fixture() -> YandexTvApi:
|
||||||
return create_mock_api(YandexTVApi, YANDEXTV_MOCK_SOURCE)
|
return create_mock_api(YandexTvApi, YANDEXTV_MOCK_SOURCE)
|
||||||
|
|
||||||
|
|
||||||
async def test_search(yandextv_api: YandexTVApi):
|
async def test_search(yandextv_api: YandexTvApi):
|
||||||
result = await yandextv_api.find_channels("матч")
|
result = await yandextv_api.find_channels("матч")
|
||||||
assert len(result) == 4
|
assert len(result) == 4
|
||||||
|
|
||||||
|
|
||||||
async def test_channel(yandextv_api: YandexTVApi):
|
async def test_channel(yandextv_api: YandexTvApi):
|
||||||
result = await yandextv_api.get_schedule("test", datetime.date.today())
|
result = await yandextv_api.get_schedule("test", datetime.date.today())
|
||||||
assert result is not None
|
assert result is not None
|
||||||
assert len(result.values) > 0
|
assert len(result.values) > 0
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ async def test_search(yandexweather_api: YandexWeatherApi):
|
|||||||
|
|
||||||
|
|
||||||
async def test_day(yandexweather_api: YandexWeatherApi):
|
async def test_day(yandexweather_api: YandexWeatherApi):
|
||||||
result = await yandexweather_api.get_day("test", datetime.date(2026, 9, 1))
|
result = await yandexweather_api.get_day("test", datetime.date.today())
|
||||||
assert len(result.values) == 4
|
assert len(result.values) == 4
|
||||||
|
|
||||||
|
|
||||||
|
|||||||