mirror of
https://github.com/langgenius/dify.git
synced 2025-12-21 06:54:41 +00:00
Compare commits
4 Commits
fix/conver
...
v0.8.3-fix
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2a046cc945 | ||
|
|
155cf297dd | ||
|
|
57a96a31bd | ||
|
|
37f3e0ac38 |
1
.github/workflows/build-push.yml
vendored
1
.github/workflows/build-push.yml
vendored
@@ -5,6 +5,7 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- "main"
|
- "main"
|
||||||
- "deploy/dev"
|
- "deploy/dev"
|
||||||
|
- "fix/0.8.3-upload-auth"
|
||||||
release:
|
release:
|
||||||
types: [published]
|
types: [published]
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ RUN apt-get update \
|
|||||||
&& echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list \
|
&& echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
# For Security
|
# For Security
|
||||||
&& apt-get install -y --no-install-recommends zlib1g=1:1.3.dfsg+really1.3.1-1 expat=2.6.3-1 libldap-2.5-0=2.5.18+dfsg-3 perl=5.38.2-5 libsqlite3-0=3.46.0-1 \
|
&& apt-get install -y --no-install-recommends expat=2.6.4-1 libldap-2.5-0=2.5.18+dfsg-3+b1 perl=5.40.0-8 libsqlite3-0=3.46.1-1 zlib1g=1:1.3.dfsg+really1.3.1-1+b1 \
|
||||||
&& apt-get autoremove -y \
|
&& apt-get autoremove -y \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
from flask import request
|
from flask import request
|
||||||
from flask_login import current_user
|
from flask_login import current_user
|
||||||
from flask_restful import Resource, marshal_with
|
from flask_restful import Resource, marshal_with
|
||||||
|
from werkzeug.exceptions import Forbidden
|
||||||
|
|
||||||
import services
|
import services
|
||||||
from configs import dify_config
|
from configs import dify_config
|
||||||
@@ -41,6 +42,9 @@ class FileApi(Resource):
|
|||||||
@marshal_with(file_fields)
|
@marshal_with(file_fields)
|
||||||
@cloud_edition_billing_resource_check("documents")
|
@cloud_edition_billing_resource_check("documents")
|
||||||
def post(self):
|
def post(self):
|
||||||
|
if not current_user.is_dataset_editor:
|
||||||
|
raise Forbidden()
|
||||||
|
|
||||||
# get file from request
|
# get file from request
|
||||||
file = request.files["file"]
|
file = request.files["file"]
|
||||||
|
|
||||||
|
|||||||
99
api/controllers/console/files.py
Normal file
99
api/controllers/console/files.py
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
from flask import request
|
||||||
|
from flask_login import current_user
|
||||||
|
from flask_restful import Resource, marshal_with
|
||||||
|
from werkzeug.exceptions import Forbidden
|
||||||
|
|
||||||
|
import services
|
||||||
|
from configs import dify_config
|
||||||
|
from constants import DOCUMENT_EXTENSIONS
|
||||||
|
from controllers.common.errors import FilenameNotExistsError
|
||||||
|
from controllers.console.wraps import (
|
||||||
|
account_initialization_required,
|
||||||
|
cloud_edition_billing_resource_check,
|
||||||
|
setup_required,
|
||||||
|
)
|
||||||
|
from fields.file_fields import file_fields, upload_config_fields
|
||||||
|
from libs.login import login_required
|
||||||
|
from services.file_service import FileService
|
||||||
|
|
||||||
|
from .error import (
|
||||||
|
FileTooLargeError,
|
||||||
|
NoFileUploadedError,
|
||||||
|
TooManyFilesError,
|
||||||
|
UnsupportedFileTypeError,
|
||||||
|
)
|
||||||
|
|
||||||
|
PREVIEW_WORDS_LIMIT = 3000
|
||||||
|
|
||||||
|
|
||||||
|
class FileApi(Resource):
|
||||||
|
@setup_required
|
||||||
|
@login_required
|
||||||
|
@account_initialization_required
|
||||||
|
@marshal_with(upload_config_fields)
|
||||||
|
def get(self):
|
||||||
|
return {
|
||||||
|
"file_size_limit": dify_config.UPLOAD_FILE_SIZE_LIMIT,
|
||||||
|
"batch_count_limit": dify_config.UPLOAD_FILE_BATCH_LIMIT,
|
||||||
|
"image_file_size_limit": dify_config.UPLOAD_IMAGE_FILE_SIZE_LIMIT,
|
||||||
|
"video_file_size_limit": dify_config.UPLOAD_VIDEO_FILE_SIZE_LIMIT,
|
||||||
|
"audio_file_size_limit": dify_config.UPLOAD_AUDIO_FILE_SIZE_LIMIT,
|
||||||
|
"workflow_file_upload_limit": dify_config.WORKFLOW_FILE_UPLOAD_LIMIT,
|
||||||
|
}, 200
|
||||||
|
|
||||||
|
@setup_required
|
||||||
|
@login_required
|
||||||
|
@account_initialization_required
|
||||||
|
@marshal_with(file_fields)
|
||||||
|
@cloud_edition_billing_resource_check("documents")
|
||||||
|
def post(self):
|
||||||
|
file = request.files["file"]
|
||||||
|
source = request.form.get("source")
|
||||||
|
|
||||||
|
if "file" not in request.files:
|
||||||
|
raise NoFileUploadedError()
|
||||||
|
|
||||||
|
if len(request.files) > 1:
|
||||||
|
raise TooManyFilesError()
|
||||||
|
|
||||||
|
if not file.filename:
|
||||||
|
raise FilenameNotExistsError
|
||||||
|
|
||||||
|
if source == "datasets" and not current_user.is_dataset_editor:
|
||||||
|
raise Forbidden()
|
||||||
|
|
||||||
|
if source not in {"datasets", None}:
|
||||||
|
source = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
upload_file = FileService.upload_file(
|
||||||
|
filename=file.filename,
|
||||||
|
content=file.read(),
|
||||||
|
mimetype=file.mimetype,
|
||||||
|
user=current_user,
|
||||||
|
source=source,
|
||||||
|
)
|
||||||
|
except services.errors.file.FileTooLargeError as file_too_large_error:
|
||||||
|
raise FileTooLargeError(file_too_large_error.description)
|
||||||
|
except services.errors.file.UnsupportedFileTypeError:
|
||||||
|
raise UnsupportedFileTypeError()
|
||||||
|
|
||||||
|
return upload_file, 201
|
||||||
|
|
||||||
|
|
||||||
|
class FilePreviewApi(Resource):
|
||||||
|
@setup_required
|
||||||
|
@login_required
|
||||||
|
@account_initialization_required
|
||||||
|
def get(self, file_id):
|
||||||
|
file_id = str(file_id)
|
||||||
|
text = FileService.get_file_preview(file_id)
|
||||||
|
return {"content": text}
|
||||||
|
|
||||||
|
|
||||||
|
class FileSupportTypeApi(Resource):
|
||||||
|
@setup_required
|
||||||
|
@login_required
|
||||||
|
@account_initialization_required
|
||||||
|
def get(self):
|
||||||
|
return {"allowed_extensions": DOCUMENT_EXTENSIONS}
|
||||||
Reference in New Issue
Block a user