Merge pull request #1629 from asimurka/move_error_responses

LCORE-1880: Restructured error response models

Author: tisnik

docs/openapi.json

@@ -7,13 +7,15 @@
 from authentication import get_auth_dependency
 from authentication.interface import AuthTuple
 from log import get_logger
-from models.responses import (
+from models.api.responses import (
     UNAUTHORIZED_OPENAPI_EXAMPLES,
-    AuthorizedResponse,
     ForbiddenResponse,
     ServiceUnavailableResponse,
     UnauthorizedResponse,
 )
+from models.responses import (
+    AuthorizedResponse,
+)
 
 logger = get_logger(__name__)
 router = APIRouter(tags=["authorized"])

src/app/endpoints/authorized.py

@@ -9,15 +9,17 @@
 from authorization.middleware import authorize
 from configuration import configuration
 from log import get_logger
-from models.config import Action
-from models.responses import (
+from models.api.responses import (
     UNAUTHORIZED_OPENAPI_EXAMPLES,
-    ConfigurationResponse,
     ForbiddenResponse,
     InternalServerErrorResponse,
     ServiceUnavailableResponse,
     UnauthorizedResponse,
 )
+from models.config import Action
+from models.responses import (
+    ConfigurationResponse,
+)
 from utils.endpoints import check_configuration_loaded
 
 logger = get_logger(__name__)

src/app/endpoints/config.py

@@ -16,24 +16,26 @@
 from client import AsyncLlamaStackClientHolder
 from configuration import configuration
 from log import get_logger
+from models.api.responses import (
+    UNAUTHORIZED_OPENAPI_EXAMPLES,
+    BadRequestResponse,
+    ForbiddenResponse,
+    InternalServerErrorResponse,
+    NotFoundResponse,
+    ServiceUnavailableResponse,
+    UnauthorizedResponse,
+)
 from models.config import Action
 from models.database.conversations import (
     UserConversation,
 )
 from models.requests import ConversationUpdateRequest
 from models.responses import (
-    UNAUTHORIZED_OPENAPI_EXAMPLES,
-    BadRequestResponse,
     ConversationDeleteResponse,
     ConversationDetails,
     ConversationResponse,
     ConversationsListResponse,
     ConversationUpdateResponse,
-    ForbiddenResponse,
-    InternalServerErrorResponse,
-    NotFoundResponse,
-    ServiceUnavailableResponse,
-    UnauthorizedResponse,
 )
 from utils.conversations import (
     build_conversation_turns_from_items,

src/app/endpoints/conversations_v1.py

@@ -8,23 +8,25 @@
 from authorization.middleware import authorize
 from configuration import configuration
 from log import get_logger
+from models.api.responses import (
+    UNAUTHORIZED_OPENAPI_EXAMPLES,
+    BadRequestResponse,
+    ForbiddenResponse,
+    InternalServerErrorResponse,
+    NotFoundResponse,
+    ServiceUnavailableResponse,
+    UnauthorizedResponse,
+)
 from models.cache_entry import CacheEntry
 from models.config import Action
 from models.requests import ConversationUpdateRequest
 from models.responses import (
-    UNAUTHORIZED_OPENAPI_EXAMPLES,
-    BadRequestResponse,
     ConversationDeleteResponse,
     ConversationResponse,
     ConversationsListResponseV2,
     ConversationTurn,
     ConversationUpdateResponse,
-    ForbiddenResponse,
-    InternalServerErrorResponse,
     Message,
-    NotFoundResponse,
-    ServiceUnavailableResponse,
-    UnauthorizedResponse,
 )
 from utils.endpoints import check_configuration_loaded
 from utils.suid import check_suid

src/app/endpoints/conversations_v2.py

@@ -13,19 +13,21 @@
 from authorization.middleware import authorize
 from configuration import configuration
 from log import get_logger
-from models.config import Action
-from models.requests import FeedbackRequest, FeedbackStatusUpdateRequest
-from models.responses import (
+from models.api.responses import (
     UNAUTHORIZED_OPENAPI_EXAMPLES,
-    FeedbackResponse,
-    FeedbackStatusUpdateResponse,
     ForbiddenResponse,
     InternalServerErrorResponse,
     NotFoundResponse,
     ServiceUnavailableResponse,
-    StatusResponse,
     UnauthorizedResponse,
 )
+from models.config import Action
+from models.requests import FeedbackRequest, FeedbackStatusUpdateRequest
+from models.responses import (
+    FeedbackResponse,
+    FeedbackStatusUpdateResponse,
+    StatusResponse,
+)
 from utils.endpoints import check_configuration_loaded, retrieve_conversation
 from utils.suid import get_suid
 

src/app/endpoints/feedback.py

@@ -17,15 +17,17 @@
 from client import AsyncLlamaStackClientHolder
 from configuration import configuration
 from log import get_logger
-from models.config import Action
-from models.responses import (
+from models.api.responses import (
     UNAUTHORIZED_OPENAPI_EXAMPLES,
     ForbiddenResponse,
+    ServiceUnavailableResponse,
+    UnauthorizedResponse,
+)
+from models.config import Action
+from models.responses import (
     LivenessResponse,
     ProviderHealthStatus,
     ReadinessResponse,
-    ServiceUnavailableResponse,
-    UnauthorizedResponse,
 )
 
 logger = get_logger(__name__)

src/app/endpoints/health.py

@@ -11,14 +11,16 @@
 from client import AsyncLlamaStackClientHolder
 from configuration import configuration
 from log import get_logger
-from models.config import Action
-from models.responses import (
+from models.api.responses import (
     UNAUTHORIZED_OPENAPI_EXAMPLES,
     ForbiddenResponse,
-    InfoResponse,
     ServiceUnavailableResponse,
     UnauthorizedResponse,
 )
+from models.config import Action
+from models.responses import (
+    InfoResponse,
+)
 from version import __version__
 
 logger = get_logger(__name__)

src/app/endpoints/info.py

@@ -10,16 +10,18 @@
 from authorization.middleware import authorize
 from configuration import configuration
 from log import get_logger
-from models.config import Action
-from models.responses import (
+from models.api.responses import (
     UNAUTHORIZED_OPENAPI_EXAMPLES,
     ForbiddenResponse,
     InternalServerErrorResponse,
-    MCPClientAuthOptionsResponse,
-    MCPServerAuthInfo,
     ServiceUnavailableResponse,
     UnauthorizedResponse,
 )
+from models.config import Action
+from models.responses import (
+    MCPClientAuthOptionsResponse,
+    MCPServerAuthInfo,
+)
 from utils.endpoints import check_configuration_loaded
 
 logger = get_logger(__name__)

src/app/endpoints/mcp_auth.py

@@ -11,20 +11,22 @@
 from client import AsyncLlamaStackClientHolder
 from configuration import configuration
 from log import get_logger
-from models.config import Action, ModelContextProtocolServer
-from models.requests import MCPServerRegistrationRequest
-from models.responses import (
+from models.api.responses import (
     UNAUTHORIZED_OPENAPI_EXAMPLES,
     ConflictResponse,
     ForbiddenResponse,
     InternalServerErrorResponse,
+    NotFoundResponse,
+    ServiceUnavailableResponse,
+    UnauthorizedResponse,
+)
+from models.config import Action, ModelContextProtocolServer
+from models.requests import MCPServerRegistrationRequest
+from models.responses import (
     MCPServerDeleteResponse,
     MCPServerInfo,
     MCPServerListResponse,
     MCPServerRegistrationResponse,
-    NotFoundResponse,
-    ServiceUnavailableResponse,
-    UnauthorizedResponse,
 )
 from utils.endpoints import check_configuration_loaded