Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move core services and repositories #2793

Draft
wants to merge 21 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
core upload
  • Loading branch information
AmineDiro committed Jun 28, 2024
commit 251e26cfb212bb505335d62ea2120ccdfc413fe4
Original file line number Diff line number Diff line change
@@ -6,11 +6,7 @@

from quivr_core.api.celery_worker import process_file_and_notify
from quivr_core.api.logger import get_logger
from quivr_core.api.middlewares.auth import AuthBearer, get_current_user
from quivr_core.api.modules.brain.entity.brain_entity import RoleEnum
from quivr_core.api.modules.brain.service.brain_authorization_service import (
validate_brain_authorization,
)
from quivr_core.api.modules.dependencies import get_current_user
from quivr_core.api.modules.knowledge.dto.inputs import CreateKnowledgeProperties
from quivr_core.api.modules.knowledge.service.knowledge_service import KnowledgeService
from quivr_core.api.modules.notification.dto.inputs import (
@@ -25,8 +21,6 @@
)
from quivr_core.api.modules.upload.service.upload_file import upload_file_storage
from quivr_core.api.modules.user.entity.user_identity import UserIdentity
from quivr_core.api.modules.user.service.user_usage import UserUsage
from quivr_core.api.packages.files.file import convert_bytes, get_file_size
from quivr_core.api.packages.utils.telemetry import maybe_send_telemetry

logger = get_logger(__name__)
@@ -41,22 +35,13 @@ async def healthz():
return {"status": "ok"}


@upload_router.post("/upload", dependencies=[Depends(AuthBearer())], tags=["Upload"])
@upload_router.post("/upload", tags=["Upload"])
async def upload_file(
uploadFile: UploadFile,
brain_id: UUID = Query(..., description="The ID of the brain"),
chat_id: Optional[UUID] = Query(None, description="The ID of the chat"),
current_user: UserIdentity = Depends(get_current_user),
):
validate_brain_authorization(
brain_id, current_user.id, [RoleEnum.Editor, RoleEnum.Owner]
)
uploadFile.file.seek(0)
user_daily_usage = UserUsage(
id=current_user.id,
email=current_user.email,
)

upload_notification = notification_service.add_notification(
CreateNotification(
user_id=current_user.id,
@@ -65,17 +50,9 @@ async def upload_file(
)
)

user_settings = user_daily_usage.get_user_settings()

remaining_free_space = user_settings.get("max_brain_size", 1000000000)
maybe_send_telemetry("upload_file", {"file_name": uploadFile.filename})
file_size = get_file_size(uploadFile)
if remaining_free_space - file_size < 0:
message = f"Brain will exceed maximum capacity. Maximum file allowed is : {convert_bytes(remaining_free_space)}"
raise HTTPException(status_code=403, detail=message)

file_content = await uploadFile.read()

filename_with_brain_id = str(brain_id) + "/" + str(uploadFile.filename)

try:
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import json
import os
from multiprocessing import get_logger

from langchain.pydantic_v1 import Field
from langchain.schema import Document