♻️ refactor(documents): fix route path

Added view in path Remove obsoleted code
helsingborg-stad · Aug 29, 2024 · 7eccb88 · 7eccb88
1 parent e1d5360
commit 7eccb88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 50 deletions.
diff --git a/fai-rag-app/fai-backend/fai_backend/documents/menu.py b/fai-rag-app/fai-backend/fai_backend/documents/menu.py
@@ -14,13 +14,13 @@ def menu_items() -> list:
             components=[
                 c.Link(
                     text=_('show_all', 'Show all'),
-                    url='/documents',
-                    active='/documents'
+                    url='/view/documents',
+                    active='/view/documents'
                 ),
                 c.Link(
                     text=_('upload_new', 'Upload new'),
-                    url='/documents/upload',
-                    active='/documents/upload'
+                    url='/view/documents/upload_form',
+                    active='/view/documents/upload_form'
                 ),
             ],
             icon_src='data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGNsYXNzPSJsdWNpZGUgbHVjaWRlLWZpbGUtdGV4dCI+PHBhdGggZD0iTTE1IDJINmEyIDIgMCAwIDAtMiAydjE2YTIgMiAwIDAgMCAyIDJoMTJhMiAyIDAgMCAwIDItMlY3WiIvPjxwYXRoIGQ9Ik0xNCAydjRhMiAyIDAgMCAwIDIgMmg0Ii8+PHBhdGggZD0iTTEwIDlIOCIvPjxwYXRoIGQ9Ik0xNiAxM0g4Ii8+PHBhdGggZD0iTTE2IDE3SDgiLz48L3N2Zz4='

diff --git a/fai-rag-app/fai-backend/fai_backend/documents/routes.py b/fai-rag-app/fai-backend/fai_backend/documents/routes.py
@@ -14,9 +14,7 @@
 from fai_backend.projects.schema import ProjectResponse, ProjectUpdateRequest
 from fai_backend.projects.service import ProjectService
 from fai_backend.schema import ProjectUser
-from fai_backend.vector.dependencies import get_vector_service
 from fai_backend.vector.schema import VectorizeFilesModel
-from fai_backend.vector.service import VectorService
 
 router = APIRouter(
     prefix='/api',
@@ -25,7 +23,7 @@
 )
 
 
-@router.get('/documents', response_model=list, response_model_exclude_none=True)
+@router.get('/view/documents', response_model=list, response_model_exclude_none=True)
 def list_view(
         file_service: FileUploadService = Depends(get_file_upload_service),
         project_user: ProjectUser = Depends(get_project_user),
@@ -65,7 +63,7 @@ def list_view(
     )
 
 
-@router.get('/documents/upload', response_model=list, response_model_exclude_none=True)
+@router.get('/view/documents/upload_form', response_model=list, response_model_exclude_none=True)
 def upload_view(view=Depends(get_page_template_for_logged_in_users)) -> list:
     return view(
         c.Form(
@@ -90,47 +88,6 @@ def upload_view(view=Depends(get_page_template_for_logged_in_users)) -> list:
     )
 
 
-@router.post('/documents/upload_and_vectorize', response_model=list, response_model_exclude_none=True)
-async def upload_and_vectorize_handler(
-        files: list[UploadFile],
-        project_user: ProjectUser = Depends(get_project_user),
-        file_service: FileUploadService = Depends(get_file_upload_service),
-        vector_service: VectorService = Depends(get_vector_service),
-        view=Depends(get_page_template_for_logged_in_users),
-        projects: list[ProjectResponse] = Depends(list_projects_request),
-        project_service: ProjectService = Depends(get_project_service),
-) -> list:
-    """
-    DEPRECATED
-    use upload_files_handler instead
-    """
-    upload_path = file_service.save_files(project_user.project_id, files)
-
-    upload_directory_name = upload_path.split('/')[-1]
-    await vector_service.create_collection(collection_name=upload_directory_name)
-
-    parsed_files = file_service.parse_files(upload_path)
-    await vector_service.add_documents_without_id_to_empty_collection(
-        collection_name=upload_directory_name,
-        documents=parsed_files,
-    )
-
-    # Fix/workaround for updating assistant file collection id until assistant editor ui is done
-    for project in projects:
-        for assistant in project.assistants:
-            if assistant.files_collection_id is not None:
-                assistant.files_collection_id = upload_directory_name
-                await update_project_request(
-                    body=ProjectUpdateRequest(**project.model_dump()),
-                    existing_project=project,
-                    project_service=project_service)
-
-    return view(
-        c.FireEvent(event=e.GoToEvent(url='/documents')),
-        _('submit_a_question', 'Create Question'),
-    )
-
-
 @router.post('/documents/upload_files', response_model=list, response_model_exclude_none=True)
 async def upload_files_handler(files: list[UploadFile],
                                project_user: ProjectUser = Depends(get_project_user),
@@ -158,5 +115,5 @@ async def upload_files_handler(files: list[UploadFile],
                                              existing_project=project,
                                              project_service=project_service)
 
-    return view(c.FireEvent(event=e.GoToEvent(url='/documents')),
+    return view(c.FireEvent(event=e.GoToEvent(url='/view/documents')),
                 _('submit_a_question', 'Create Question'))