Clean up API (#878)

* Get running * fixes in sdk * Add in more fixes
SciPhi-AI · Aug 16, 2024 · de8e1aa · de8e1aa
1 parent 123a44d
commit de8e1aa
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 414 deletions.
diff --git a/alembic.ini b/alembic.ini
diff --git a/alembic/env.py b/alembic/env.py
diff --git a/alembic/script.py.mako b/alembic/script.py.mako
diff --git a/alembic/versions/7423a09421e9_add_user_id_to_logs.py b/alembic/versions/7423a09421e9_add_user_id_to_logs.py
diff --git a/r2r/base/abstractions/search.py b/r2r/base/abstractions/search.py
@@ -40,7 +40,7 @@ def dict(self) -> dict:
         }
 
     class Config:
-        schema_extra = [
+        json_schema_extra = [
             {
                 "fragment_id": "c68dc72e-fc23-5452-8f49-d7bd46088a96",
                 "extraction_id": "3f3d47f3-8baf-58eb-8bc2-0171fb1c6e09",

diff --git a/r2r/base/api/models/__init__.py b/r2r/base/api/models/__init__.py
@@ -8,7 +8,6 @@
 from .management.responses import (
     AnalyticsResponse,
     AppSettingsResponse,
-    DeleteResponse,
     DocumentChunkResponse,
     DocumentOverviewResponse,
     GroupOverviewResponse,
@@ -22,7 +21,6 @@
     WrappedAddUserResponse,
     WrappedAnalyticsResponse,
     WrappedAppSettingsResponse,
-    WrappedDeleteResponse,
     WrappedDocumentChunkResponse,
     WrappedDocumentOverviewResponse,
     WrappedGroupListResponse,
@@ -62,7 +60,6 @@
     "AppSettingsResponse",
     "ScoreCompletionResponse",
     "UserOverviewResponse",
-    "DeleteResponse",
     "DocumentOverviewResponse",
     "DocumentChunkResponse",
     "KnowledgeGraphResponse",
@@ -75,7 +72,6 @@
     "WrappedAppSettingsResponse",
     "WrappedScoreCompletionResponse",
     "WrappedUserOverviewResponse",
-    "WrappedDeleteResponse",
     "WrappedDocumentOverviewResponse",
     "WrappedDocumentChunkResponse",
     "WrappedKnowledgeGraphResponse",

diff --git a/r2r/base/api/models/ingestion/responses.py b/r2r/base/api/models/ingestion/responses.py
@@ -50,7 +50,7 @@ class IngestionResponse(BaseModel):
     )
 
     class Config:
-        schema_extra = {
+        json_schema_extra = {
             "example": {
                 "processed_documents": [
                     {

diff --git a/r2r/base/api/models/management/responses.py b/r2r/base/api/models/management/responses.py
@@ -53,13 +53,6 @@ class UserOverviewResponse(BaseModel):
     document_ids: List[UUID]
 
 
-class DeleteResponse(BaseModel):
-    fragment_id: UUID
-    document_id: UUID
-    extraction_id: UUID
-    text: str
-
-
 class DocumentOverviewResponse(BaseModel):
     id: UUID
     title: str
@@ -114,7 +107,6 @@ class AddUserResponse(BaseModel):
 WrappedAppSettingsResponse = ResultsWrapper[AppSettingsResponse]
 WrappedScoreCompletionResponse = ResultsWrapper[ScoreCompletionResponse]
 WrappedUserOverviewResponse = ResultsWrapper[List[UserOverviewResponse]]
-WrappedDeleteResponse = ResultsWrapper[dict[str, DeleteResponse]]
 WrappedDocumentOverviewResponse = ResultsWrapper[
     List[DocumentOverviewResponse]
 ]

diff --git a/r2r/base/api/models/retrieval/responses.py b/r2r/base/api/models/retrieval/responses.py
@@ -17,7 +17,7 @@ class SearchResponse(BaseModel):
     )
 
     class Config:
-        schema_extra = {
+        json_schema_extra = {
             "example": {
                 "vector_search_results": [
                     {
@@ -50,7 +50,7 @@ class RAGResponse(BaseModel):
     )
 
     class Config:
-        schema_extra = {
+        json_schema_extra = {
             "example": {
                 "completion": {
                     "id": "chatcmpl-example123",
@@ -104,7 +104,7 @@ class RAGAgentResponse(BaseModel):
     )
 
     class Config:
-        schema_extra = {
+        json_schema_extra = {
             "example": {
                 "completion": {
                     "id": "chatcmpl-example456",

diff --git a/r2r/cli/cli.py b/r2r/cli/cli.py
@@ -12,7 +12,6 @@
 cli.add_command(server_operations.docker_down)
 cli.add_command(server_operations.generate_report)
 cli.add_command(server_operations.health)
-cli.add_command(server_operations.migrate)
 cli.add_command(server_operations.serve)
 cli.add_command(server_operations.update)
 cli.add_command(server_operations.version)