Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/authentication/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

import constants
from authentication import (
api_key_token,
jwk_token,
k8s,
noop,
noop_with_token,
rh_identity,
api_key_token,
)
from authentication.interface import AuthInterface
from configuration import LogicError, configuration
Expand Down
8 changes: 4 additions & 4 deletions src/authentication/api_key_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

import secrets

from fastapi import Request, HTTPException, status
from fastapi import HTTPException, Request, status

from authentication.interface import AuthInterface
from authentication.utils import extract_user_token
from constants import (
DEFAULT_USER_NAME,
DEFAULT_VIRTUAL_PATH,
DEFAULT_USER_UID,
DEFAULT_VIRTUAL_PATH,
)
from authentication.interface import AuthInterface
from authentication.utils import extract_user_token
from log import get_logger
from models.config import APIKeyTokenConfiguration

Expand Down
2 changes: 1 addition & 1 deletion src/authentication/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from fastapi import Request

from constants import (
DEFAULT_USER_NAME,
DEFAULT_SKIP_USER_ID_CHECK,
DEFAULT_USER_NAME,
DEFAULT_USER_UID,
NO_USER_TOKEN,
)
Expand Down
4 changes: 2 additions & 2 deletions src/authentication/jwk_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import json
from asyncio import Lock
from typing import Any
from collections.abc import Callable
from typing import Any

import aiohttp
from authlib.jose import JsonWebKey, Key, KeySet, jwt
Expand All @@ -21,9 +21,9 @@
from constants import (
DEFAULT_VIRTUAL_PATH,
)
from log import get_logger
from models.config import JwkConfiguration
from models.responses import UnauthorizedResponse
from log import get_logger

logger = get_logger(__name__)

Expand Down
4 changes: 2 additions & 2 deletions src/authentication/noop.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

from fastapi import HTTPException, Request

from authentication.interface import AuthInterface
from constants import (
DEFAULT_USER_NAME,
DEFAULT_USER_UID,
NO_USER_TOKEN,
DEFAULT_VIRTUAL_PATH,
NO_USER_TOKEN,
)
from authentication.interface import AuthInterface
from log import get_logger

logger = get_logger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions src/authentication/noop_with_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

from fastapi import HTTPException, Request

from authentication.interface import AuthInterface
from authentication.utils import extract_user_token
from constants import (
DEFAULT_USER_NAME,
DEFAULT_USER_UID,
DEFAULT_VIRTUAL_PATH,
)
from authentication.interface import AuthInterface
from authentication.utils import extract_user_token
from log import get_logger

logger = get_logger(__name__)
Expand Down
1 change: 1 addition & 0 deletions src/authentication/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from fastapi import HTTPException
from starlette.datastructures import Headers

from models.responses import UnauthorizedResponse


Expand Down
2 changes: 1 addition & 1 deletion src/authorization/azure_token_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from pydantic import SecretStr

from configuration import AzureEntraIdConfiguration
from utils.types import Singleton
from log import get_logger
from utils.types import Singleton

logger = get_logger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion src/authorization/middleware.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Authorization middleware and decorators."""

from collections.abc import Callable
from functools import lru_cache, wraps
from typing import Any, Optional
from collections.abc import Callable

from fastapi import HTTPException
from starlette.requests import Request
Expand Down
6 changes: 3 additions & 3 deletions src/authorization/resolvers.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"""Authorization resolvers for role evaluation and access control."""

from abc import ABC, abstractmethod
import base64
import json
from abc import ABC, abstractmethod
from typing import Any

from jsonpath_ng import parse

from authentication.interface import AuthTuple
from models.config import JwtRoleRule, AccessRule, JsonPathOperator, Action
import constants
from authentication.interface import AuthTuple
from log import get_logger
from models.config import AccessRule, Action, JsonPathOperator, JwtRoleRule

logger = get_logger(__name__)

Expand Down
4 changes: 2 additions & 2 deletions src/cache/cache_factory.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"""Cache factory class."""

import constants
from models.config import ConversationHistoryConfiguration
from cache.cache import Cache
from cache.noop_cache import NoopCache
from cache.in_memory_cache import InMemoryCache
from cache.noop_cache import NoopCache
from cache.postgres_cache import PostgresCache
from cache.sqlite_cache import SQLiteCache
from log import get_logger
from models.config import ConversationHistoryConfiguration

logger = get_logger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion src/cache/in_memory_cache.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""In-memory cache implementation."""

from cache.cache import Cache
from log import get_logger
from models.cache_entry import CacheEntry
from models.config import InMemoryCacheConfig
from models.responses import ConversationData
from log import get_logger
from utils.connection_decorator import connection

logger = get_logger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion src/cache/noop_cache.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""No-operation cache implementation."""

from cache.cache import Cache
from log import get_logger
from models.cache_entry import CacheEntry
from models.responses import ConversationData
from log import get_logger
from utils.connection_decorator import connection

logger = get_logger(__name__)
Expand Down
3 changes: 2 additions & 1 deletion src/cache/postgres_cache.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
"""PostgreSQL cache implementation."""

import json

import psycopg2
from psycopg2.extensions import AsIs

from cache.cache import Cache
from cache.cache_error import CacheError
from log import get_logger
from models.cache_entry import CacheEntry
from models.config import PostgreSQLDatabaseConfiguration
from models.responses import ConversationData
from utils.connection_decorator import connection
from utils.types import ReferencedDocument, ToolCallSummary, ToolResultSummary
from log import get_logger

logger = get_logger(__name__)

Expand Down
7 changes: 3 additions & 4 deletions src/cache/sqlite_cache.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
"""Cache that uses SQLite to store cached values."""

from time import time

import sqlite3
import json
import sqlite3
from time import time

from cache.cache import Cache
from cache.cache_error import CacheError
from log import get_logger
from models.cache_entry import CacheEntry
from models.config import SQLiteDatabaseConfiguration
from models.responses import ConversationData
from utils.connection_decorator import connection
from utils.types import ReferencedDocument, ToolCallSummary, ToolResultSummary
from log import get_logger

logger = get_logger(__name__)

Expand Down
Loading