Merge branch 'main' into Nolan/Conflicts

SciPhi-AI · Nov 18, 2024 · 0cc05fd · 0cc05fd
2 parents c5a7541 + b963121
commit 0cc05fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/py/core/main/services/management_service.py b/py/core/main/services/management_service.py
@@ -693,7 +693,7 @@ async def get_conversation(
         conversation_id: str,
         branch_id: Optional[str] = None,
         auth_user=None,
-    ) -> dict:
+    ) -> Tuple[str, list[Message], list[dict]]:
         return await self.logging_connection.get_conversation(
             conversation_id, branch_id
         )

diff --git a/py/shared/api/models/management/responses.py b/py/shared/api/models/management/responses.py
@@ -167,5 +167,12 @@ class AddUserResponse(BaseModel):
 WrappedServerStatsResponse = ResultsWrapper[ServerStats]
 WrappedLogResponse = ResultsWrapper[list[LogResponse]]
 WrappedAnalyticsResponse = ResultsWrapper[AnalyticsResponse]
+WrappedCollectionResponse = ResultsWrapper[CollectionResponse]
+WrappedCollectionListResponse = ResultsWrapper[list[CollectionResponse]]
+WrappedAddUserResponse = ResultsWrapper[None]
+WrappedUsersInCollectionResponse = PaginatedResultsWrapper[list[UserResponse]]
+WrappedUserCollectionResponse = PaginatedResultsWrapper[
+    list[CollectionResponse]
+]
+WrappedDeleteResponse = ResultsWrapper[None]
 WrappedVerificationResult = ResultsWrapper[VerificationResult]
-WrappedResetDataResult = ResultsWrapper[ResetDataResult]