squashme: changes from PR conflicts resolution

Author: olevski

components/renku_data_services/notebooks/api.spec.yaml

@@ -439,7 +439,6 @@ components:
       - registered
       type: object
     ErrorResponse:
-      type: object
       properties:
         error:
           type: object

components/renku_data_services/notebooks/apispec.py

@@ -34,16 +34,10 @@ class DefaultCullingThresholds(BaseAPISpec):
     registered: CullingThreshold
 
 
-class Error(BaseAPISpec):
-    code: int = Field(..., example=1404, gt=0)
-    detail: Optional[str] = Field(
-        None, example="A more detailed optional message showing what the problem was"
-    )
-    message: str = Field(..., example="Something went wrong - please try again later")
-
-
-class ErrorResponse(BaseAPISpec):
-    error: Error
+class ErrorResponseNested(BaseAPISpec):
+    code: int
+    detail: Optional[str] = None
+    message: str
 
 
 class Generated(BaseAPISpec):
@@ -299,6 +293,10 @@ class SessionsImagesGetParametersQuery(BaseAPISpec):
     image_url: str
 
 
+class ErrorResponse(BaseAPISpec):
+    error: ErrorResponseNested
+
+
 class LaunchNotebookRequest(BaseAPISpec):
     project_id: str
     launcher_id: str