Merge pull request #978 from tisnik/lcore-1051-optional-type-in-sources

LCORE-1051: Updated Optional type in LCORE sources

Author: tisnik

src/a2a_storage/context_store.py

@@ -1,6 +1,7 @@
 """Abstract base class for A2A context-to-conversation mapping storage."""
 
 from abc import ABC, abstractmethod
+from typing import Optional
 
 
 class A2AContextStore(ABC):
@@ -14,7 +15,7 @@ class A2AContextStore(ABC):
     """
 
     @abstractmethod
-    async def get(self, context_id: str) -> str | None:
+    async def get(self, context_id: str) -> Optional[str]:
         """Retrieve the conversation ID for an A2A context.
 
         Args:

src/a2a_storage/in_memory_context_store.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import logging
+from typing import Optional
 
 from a2a_storage.context_store import A2AContextStore
 
@@ -26,7 +27,7 @@ def __init__(self) -> None:
         self._lock = asyncio.Lock()
         self._initialized = True
 
-    async def get(self, context_id: str) -> str | None:
+    async def get(self, context_id: str) -> Optional[str]:
         """Retrieve the conversation ID for an A2A context.
 
         Args:

src/a2a_storage/postgres_context_store.py

@@ -1,6 +1,7 @@
 """PostgreSQL implementation of A2A context store."""
 
 import logging
+from typing import Optional
 
 from sqlalchemy import Column, String, Table, MetaData, select, delete
 from sqlalchemy.dialects.postgresql import insert as pg_insert
@@ -66,7 +67,7 @@ async def _ensure_initialized(self) -> None:
         if not self._initialized:
             await self.initialize()
 
-    async def get(self, context_id: str) -> str | None:
+    async def get(self, context_id: str) -> Optional[str]:
         """Retrieve the conversation ID for an A2A context.
 
         Args:

src/a2a_storage/sqlite_context_store.py

@@ -1,6 +1,7 @@
 """SQLite implementation of A2A context store."""
 
 import logging
+from typing import Optional
 
 from sqlalchemy import Column, String, Table, MetaData, select, delete
 from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker
@@ -65,7 +66,7 @@ async def _ensure_initialized(self) -> None:
         if not self._initialized:
             await self.initialize()
 
-    async def get(self, context_id: str) -> str | None:
+    async def get(self, context_id: str) -> Optional[str]:
         """Retrieve the conversation ID for an A2A context.
 
         Args:

src/a2a_storage/storage_factory.py

@@ -2,6 +2,7 @@
 
 import logging
 from urllib.parse import quote_plus
+from typing import Optional
 
 from sqlalchemy.ext.asyncio import create_async_engine, AsyncEngine
 
@@ -24,9 +25,9 @@ class A2AStorageFactory:
     creates database-backed stores that share state across workers.
     """
 
-    _engine: AsyncEngine | None = None
-    _task_store: TaskStore | None = None
-    _context_store: A2AContextStore | None = None
+    _engine: Optional[AsyncEngine] = None
+    _task_store: Optional[TaskStore] = None
+    _context_store: Optional[A2AContextStore] = None
 
     @classmethod
     async def create_task_store(cls, config: A2AStateConfiguration) -> TaskStore:

src/app/database.py

@@ -1,7 +1,7 @@
 """Database engine management."""
 
 from pathlib import Path
-from typing import Any
+from typing import Any, Optional
 
 from sqlalchemy import create_engine, text
 from sqlalchemy.engine.base import Engine
@@ -14,8 +14,8 @@
 logger = get_logger(__name__)
 
 # pylint: disable=invalid-name
-engine: Engine | None = None
-session_local: sessionmaker | None = None
+engine: Optional[Engine] = None
+session_local: Optional[sessionmaker] = None
 
 
 def get_engine() -> Engine:

src/authorization/middleware.py

@@ -2,7 +2,7 @@
 
 import logging
 from functools import lru_cache, wraps
-from typing import Any, Callable, Tuple
+from typing import Any, Callable, Optional, Tuple
 
 from fastapi import HTTPException
 from starlette.requests import Request
@@ -107,7 +107,7 @@ async def _perform_authorization_check(
 
     authorized_actions = access_resolver.get_actions(user_roles)
 
-    req: Request | None = None
+    req: Optional[Request] = None
     if "request" in kwargs and isinstance(kwargs["request"], Request):
         req = kwargs["request"]
     else:

src/configuration.py

@@ -324,7 +324,7 @@ def token_usage_history(self) -> Optional[TokenUsageHistory]:
         token history is disabled, returns None.
 
         Returns:
-            TokenUsageHistory | None: The cached TokenUsageHistory instance
+            Optional[TokenUsageHistory]: The cached TokenUsageHistory instance
             when enabled, otherwise `None`.
 
         Raises:

src/models/cache_entry.py

@@ -1,5 +1,6 @@
 """Model for conversation history cache entry."""
 
+from typing import Optional
 from pydantic import BaseModel
 from models.responses import ReferencedDocument
 
@@ -21,4 +22,4 @@ class CacheEntry(BaseModel):
     model: str
     started_at: str
     completed_at: str
-    referenced_documents: list[ReferencedDocument] | None = None
+    referenced_documents: Optional[list[ReferencedDocument]] = None

src/models/config.py

@@ -1178,7 +1178,7 @@ def check_default_model_and_provider(self) -> Self:
 class ConversationHistoryConfiguration(ConfigurationBase):
     """Conversation history configuration."""
 
-    type: Literal["noop", "memory", "sqlite", "postgres"] | None = Field(
+    type: Optional[Literal["noop", "memory", "sqlite", "postgres"]] = Field(
         None,
         title="Conversation history database type",
         description="Type of database where the conversation history is to be stored.",
@@ -1298,7 +1298,7 @@ def storage_type(self) -> Literal["memory", "sqlite", "postgres"]:
     @property
     def config(
         self,
-    ) -> SQLiteDatabaseConfiguration | PostgreSQLDatabaseConfiguration | None:
+    ) -> Optional[SQLiteDatabaseConfiguration | PostgreSQLDatabaseConfiguration]:
         """Return the active storage configuration, or None for memory storage."""
         if self.sqlite is not None:
             return self.sqlite