Use abstract base classes in sources

Author: tisnik

src/app/endpoints/a2a.py

@@ -5,7 +5,8 @@
 import uuid
 from collections.abc import Mapping
 from datetime import datetime, timezone
-from typing import Annotated, Any, AsyncIterator, MutableMapping, Optional
+from typing import Annotated, Any, Optional
+from collections.abc import AsyncIterator, MutableMapping
 
 from a2a.server.agent_execution import AgentExecutor, RequestContext
 from a2a.server.apps import A2AStarletteApplication

src/app/endpoints/streaming_query.py

@@ -3,7 +3,8 @@
 import asyncio
 import datetime
 import json
-from typing import Annotated, Any, AsyncIterator, Optional, cast
+from typing import Annotated, Any, Optional, cast
+from collections.abc import AsyncIterator
 
 from fastapi import APIRouter, Depends, HTTPException, Request
 from fastapi.responses import StreamingResponse

src/app/main.py

@@ -2,7 +2,7 @@
 
 import os
 from contextlib import asynccontextmanager
-from typing import AsyncIterator
+from collections.abc import AsyncIterator
 
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware

src/authentication/jwk_token.py

@@ -2,7 +2,8 @@
 
 import json
 from asyncio import Lock
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 import aiohttp
 from authlib.jose import JsonWebKey, Key, KeySet, jwt

src/authorization/middleware.py

@@ -1,7 +1,8 @@
 """Authorization middleware and decorators."""
 
 from functools import lru_cache, wraps
-from typing import Any, Callable, Optional
+from typing import Any, Optional
+from collections.abc import Callable
 
 from fastapi import HTTPException
 from starlette.requests import Request

src/models/config.py

@@ -6,7 +6,8 @@
 from enum import Enum
 from functools import cached_property
 from pathlib import Path
-from typing import Any, Optional, Pattern
+from typing import Any, Optional
+from re import Pattern
 
 import jsonpath_ng
 import yaml
@@ -25,7 +26,7 @@
     model_validator,
 )
 from pydantic.dataclasses import dataclass
-from typing_extensions import Literal, Self
+from typing import Literal, Self
 
 import constants
 from log import get_logger

src/models/requests.py

@@ -2,7 +2,7 @@
 
 from enum import Enum
 from typing import Optional, Any
-from typing_extensions import Self
+from typing import Self
 
 from llama_stack_api.openai_responses import (
     OpenAIResponseInputToolChoice as ToolChoice,

src/utils/common.py

@@ -2,7 +2,8 @@
 
 import asyncio
 from functools import wraps
-from typing import Any, Callable, cast
+from typing import Any, cast
+from collections.abc import Callable
 from logging import Logger
 
 from llama_stack_client import AsyncLlamaStackClient

src/utils/connection_decorator.py

@@ -1,6 +1,7 @@
 """Decorator that makes sure the object is 'connected' according to it's connected predicate."""
 
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 
 def connection(f: Callable) -> Callable: