| @@ -49,7 +49,6 @@ class FileApi(Resource): | |||
| @marshal_with(file_fields) | |||
| @cloud_edition_billing_resource_check("documents") | |||
| def post(self): | |||
| file = request.files["file"] | |||
| source_str = request.form.get("source") | |||
| source: Literal["datasets"] | None = "datasets" if source_str == "datasets" else None | |||
| @@ -58,6 +57,7 @@ class FileApi(Resource): | |||
| if len(request.files) > 1: | |||
| raise TooManyFilesError() | |||
| file = request.files["file"] | |||
| if not file.filename: | |||
| raise FilenameNotExistsError | |||
| @@ -191,9 +191,6 @@ class WebappLogoWorkspaceApi(Resource): | |||
| @account_initialization_required | |||
| @cloud_edition_billing_resource_check("workspace_custom") | |||
| def post(self): | |||
| # get file from request | |||
| file = request.files["file"] | |||
| # check file | |||
| if "file" not in request.files: | |||
| raise NoFileUploadedError() | |||
| @@ -201,6 +198,8 @@ class WebappLogoWorkspaceApi(Resource): | |||
| if len(request.files) > 1: | |||
| raise TooManyFilesError() | |||
| # get file from request | |||
| file = request.files["file"] | |||
| if not file.filename: | |||
| raise FilenameNotExistsError | |||
| @@ -20,18 +20,17 @@ class FileApi(Resource): | |||
| @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.FORM)) | |||
| @marshal_with(file_fields) | |||
| def post(self, app_model: App, end_user: EndUser): | |||
| file = request.files["file"] | |||
| # check file | |||
| if "file" not in request.files: | |||
| raise NoFileUploadedError() | |||
| if not file.mimetype: | |||
| raise UnsupportedFileTypeError() | |||
| if len(request.files) > 1: | |||
| raise TooManyFilesError() | |||
| file = request.files["file"] | |||
| if not file.mimetype: | |||
| raise UnsupportedFileTypeError() | |||
| if not file.filename: | |||
| raise FilenameNotExistsError | |||
| @@ -234,8 +234,6 @@ class DocumentAddByFileApi(DatasetApiResource): | |||
| args["retrieval_model"].get("reranking_model").get("reranking_model_name"), | |||
| ) | |||
| # save file info | |||
| file = request.files["file"] | |||
| # check file | |||
| if "file" not in request.files: | |||
| raise NoFileUploadedError() | |||
| @@ -243,6 +241,8 @@ class DocumentAddByFileApi(DatasetApiResource): | |||
| if len(request.files) > 1: | |||
| raise TooManyFilesError() | |||
| # save file info | |||
| file = request.files["file"] | |||
| if not file.filename: | |||
| raise FilenameNotExistsError | |||
| @@ -12,18 +12,17 @@ from services.file_service import FileService | |||
| class FileApi(WebApiResource): | |||
| @marshal_with(file_fields) | |||
| def post(self, app_model, end_user): | |||
| file = request.files["file"] | |||
| source = request.form.get("source") | |||
| if "file" not in request.files: | |||
| raise NoFileUploadedError() | |||
| if len(request.files) > 1: | |||
| raise TooManyFilesError() | |||
| file = request.files["file"] | |||
| if not file.filename: | |||
| raise FilenameNotExistsError | |||
| source = request.form.get("source") | |||
| if source not in ("datasets", None): | |||
| source = None | |||
| @@ -121,9 +121,8 @@ class TokenBufferMemory: | |||
| curr_message_tokens = self.model_instance.get_llm_num_tokens(prompt_messages) | |||
| if curr_message_tokens > max_token_limit: | |||
| pruned_memory = [] | |||
| while curr_message_tokens > max_token_limit and len(prompt_messages) > 1: | |||
| pruned_memory.append(prompt_messages.pop(0)) | |||
| prompt_messages.pop(0) | |||
| curr_message_tokens = self.model_instance.get_llm_num_tokens(prompt_messages) | |||
| return prompt_messages | |||