arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2026-04-01 06:03:39 +00:00
Code Issues Projects Releases Wiki Activity

PEP-585 complaint: remove type aliases (#93)

Browse Source
This commit is contained in:
Evgenii Alekseev
2023-04-12 04:09:28 +03:00
committed by GitHub
parent 7e0d12b8b1
commit 10fbc31d2a
137 changed files with 807 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ahriman/web/views/api/docs.py
View File

@@ -19,7 +19,7 @@
#
import aiohttp_jinja2
from typing import Any, Dict
from typing import Any
from ahriman.models.user_access import UserAccess
from ahriman.web.views.base import BaseView
@@ -36,11 +36,11 @@ class DocsView(BaseView):
GET_PERMISSION = UserAccess.Unauthorized
@aiohttp_jinja2.template("api.jinja2")
async def get(self) -> Dict[str, Any]:
async def get(self) -> dict[str, Any]:
"""
return static docs html
Returns:
Dict[str, Any]: parameters for jinja template
dict[str, Any]: parameters for jinja template
"""
return {}

4
src/ahriman/web/views/api/swagger.py
View File

@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
from aiohttp.web import Response, json_response
from typing import Callable, Dict
from collections.abc import Callable
from ahriman.core.util import partition
from ahriman.models.user_access import UserAccess
@@ -43,7 +43,7 @@ class SwaggerView(BaseView):
Response: 200 with json api specification
"""
spec = self.request.app["swagger_dict"]
is_body_parameter: Callable[[Dict[str, str]], bool] = lambda p: p["in"] == "body"
is_body_parameter: Callable[[dict[str, str]], bool] = lambda p: p["in"] == "body"
# special workaround because it writes request body to parameters section
paths = spec["paths"]

30
src/ahriman/web/views/base.py
View File

@@ -21,7 +21,8 @@ from __future__ import annotations
from aiohttp_cors import CorsViewMixin # type: ignore
from aiohttp.web import Request, StreamResponse, View
from typing import Any, Awaitable, Callable, Dict, List, Optional, Type, TypeVar
from collections.abc import Awaitable, Callable
from typing import Any, TypeVar
from ahriman.core.auth import Auth
from ahriman.core.configuration import Configuration
@@ -29,7 +30,8 @@ from ahriman.core.spawn import Spawn
from ahriman.core.status.watcher import Watcher
from ahriman.models.user_access import UserAccess
T = TypeVar("T", str, List[str])
T = TypeVar("T", str, list[str])
class BaseView(View, CorsViewMixin):
@@ -87,7 +89,7 @@ class BaseView(View, CorsViewMixin):
return validator
@classmethod
async def get_permission(cls: Type[BaseView], request: Request) -> UserAccess:
async def get_permission(cls: type[BaseView], request: Request) -> UserAccess:
"""
retrieve user permission from the request
@@ -102,12 +104,12 @@ class BaseView(View, CorsViewMixin):
return permission
@staticmethod
def get_non_empty(extractor: Callable[[str], Optional[T]], key: str) -> T:
def get_non_empty(extractor: Callable[[str], T | None], key: str) -> T:
"""
get non-empty value from request parameters
Args:
extractor(Callable[[str], T]): function to get value by the specified key
extractor(Callable[[str], T | None]): function to get value by the specified key
key(str): key to extract value
Returns:
@@ -124,19 +126,19 @@ class BaseView(View, CorsViewMixin):
raise KeyError(f"Key {key} is missing or empty")
return value
async def data_as_json(self, list_keys: List[str]) -> Dict[str, Any]:
async def data_as_json(self, list_keys: list[str]) -> dict[str, Any]:
"""
extract form data and convert it to json object
Args:
list_keys(List[str]): list of keys which must be forced to list from form data
list_keys(list[str]): list of keys which must be forced to list from form data
Returns:
Dict[str, Any]: form data converted to json. In case if a key is found multiple times
dict[str, Any]: form data converted to json. In case if a key is found multiple times
it will be returned as list
"""
raw = await self.request.post()
json: Dict[str, Any] = {}
json: dict[str, Any] = {}
for key, value in raw.items():
if key in json and isinstance(json[key], list):
json[key].append(value)
@@ -148,19 +150,19 @@ class BaseView(View, CorsViewMixin):
json[key] = value
return json
async def extract_data(self, list_keys: Optional[List[str]] = None) -> Dict[str, Any]:
async def extract_data(self, list_keys: list[str] | None = None) -> dict[str, Any]:
"""
extract json data from either json or form data
Args:
list_keys(Optional[List[str]], optional): optional list of keys which must be forced to list from form data
list_keys(list[str] | None, optional): optional list of keys which must be forced to list from form data
(Default value = None)
Returns:
Dict[str, Any]: raw json object or form data converted to json
dict[str, Any]: raw json object or form data converted to json
"""
try:
json: Dict[str, Any] = await self.request.json()
json: dict[str, Any] = await self.request.json()
return json
except ValueError:
return await self.data_as_json(list_keys or [])
@@ -173,7 +175,7 @@ class BaseView(View, CorsViewMixin):
Raises:
HTTPMethodNotAllowed: in case if there is no GET method implemented
"""
get_method: Optional[Callable[..., Awaitable[StreamResponse]]] = getattr(self, "get", None)
get_method: Callable[..., Awaitable[StreamResponse]] | None = getattr(self, "get", None)
# using if/else in order to suppress mypy warning which doesn't know that
# ``_raise_allowed_methods`` raises exception
if get_method is not None:

6
src/ahriman/web/views/index.py
View File

@@ -19,7 +19,7 @@
#
import aiohttp_jinja2
from typing import Any, Dict
from typing import Any
from ahriman.core.auth.helpers import authorized_userid
from ahriman.models.user_access import UserAccess
@@ -46,12 +46,12 @@ class IndexView(BaseView):
GET_PERMISSION = UserAccess.Unauthorized
@aiohttp_jinja2.template("build-status.jinja2")
async def get(self) -> Dict[str, Any]:
async def get(self) -> dict[str, Any]:
"""
process get request. No parameters supported here
Returns:
Dict[str, Any]: parameters for jinja template
dict[str, Any]: parameters for jinja template
"""
auth_username = await authorized_userid(self.request)
auth = {

4
src/ahriman/web/views/service/search.py
View File

@@ -20,7 +20,7 @@
import aiohttp_apispec # type: ignore
from aiohttp.web import HTTPBadRequest, HTTPNotFound, Response, json_response
from typing import Callable, List
from collections.abc import Callable
from ahriman.core.alpm.remote import AUR
from ahriman.models.aur_package import AURPackage
@@ -70,7 +70,7 @@ class SearchView(BaseView):
HTTPNotFound: if no packages found
"""
try:
search: List[str] = self.get_non_empty(lambda key: self.request.query.getall(key, default=[]), "for")
search: list[str] = self.get_non_empty(lambda key: self.request.query.getall(key, default=[]), "for")
packages = AUR.multisearch(*search, pacman=self.service.repository.pacman)
except Exception as e:
raise HTTPBadRequest(reason=str(e))