From fc29744db8eba827802bdb5c5932f91ae79ea152 Mon Sep 17 00:00:00 2001 From: Stas Medvedev Date: Tue, 11 Jun 2024 02:13:28 +0300 Subject: =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20ip?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D0=BF=D0=BE=D0=B4=20=D0=BF=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=20=D1=85=D0=B5=D0=B4=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/main.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'app/main.py') diff --git a/app/main.py b/app/main.py index d643447..7cf756c 100644 --- a/app/main.py +++ b/app/main.py @@ -1,9 +1,11 @@ -from fastapi import FastAPI, Request +from typing import Annotated + +from fastapi import FastAPI, Request, Depends from fastapi.responses import HTMLResponse from fastapi.staticfiles import StaticFiles from starlette.templating import Jinja2Templates -from app.utils import get_avatar_urls, get_client_geo, get_client_host +from app.utils import get_avatar_urls, get_client_geo from app.logging import logger templates = Jinja2Templates(directory="templates") @@ -13,17 +15,15 @@ app.mount("/static", StaticFiles(directory="static"), name="static") @app.get("/", response_class=HTMLResponse) -async def index(request: Request): +async def index( + request: Request, + client_geo: Annotated[dict, Depends(get_client_geo)], + avatar_urls: Annotated[list[str], Depends(get_avatar_urls)], +): logger.info(str(dict(request.headers))) return templates.TemplateResponse( "index.html", - { - "request": request, - "client_geo": await get_client_geo( - get_client_host(request) - ), - "avatar_urls": get_avatar_urls() - } + {"request": request, "client_geo": client_geo, "avatar_urls": avatar_urls}, ) -- cgit v1.2.3