mirror of
https://github.com/facefusion/facefusion.git
synced 2026-11-16 23:21:21 +01:00
allow to config the upload limit (#1274)
* allow to config the upload limit * allow to config the upload limit * allow to config the upload limit
This commit is contained in:
1 parent
0a24245f14
commit
d625340b40
18 files changed
+51
-3
No files matched your search
@@ -150,6 +150,7 @@ api_host =
|
||||
api_port =
|
||||
api_security_strategy =
|
||||
api_session_limit =
|
||||
api_upload_limit =
|
||||
|
||||
[cors]
|
||||
cors_origins =
|
||||
|
||||
@@ -44,6 +44,7 @@ def pre_check() -> bool:
|
||||
|
||||
def create_api() -> Starlette:
|
||||
cors_origins = state_manager.get_item('cors_origins')
|
||||
api_upload_limit = state_manager.get_item('api_upload_limit')
|
||||
session_guard = Middleware(create_session_guard)
|
||||
routes =\
|
||||
[
|
||||
@@ -82,7 +83,9 @@ def create_api() -> Starlette:
|
||||
api = Starlette(routes = routes)
|
||||
api.add_middleware(create_exception_guard)
|
||||
api.add_middleware(create_security_guard)
|
||||
api.add_middleware(RequestBodyLimitMiddleware, max_body_size = 512 * 1024 * 1024)
|
||||
|
||||
if api_upload_limit > 0:
|
||||
api.add_middleware(RequestBodyLimitMiddleware, max_body_size = api_upload_limit * 1024 * 1024)
|
||||
|
||||
if cors_origins:
|
||||
api.add_middleware(CORSMiddleware, allow_origins = cors_origins, allow_methods = [ 'GET', 'POST', 'PUT', 'PATCH', 'DELETE' ], allow_headers = [ 'Authorization', 'Content-Type' ], expose_headers = [ 'Location' ])
|
||||
|
||||
@@ -83,6 +83,7 @@ def apply_args(args : Args, apply_state_item : ApplyStateItem) -> None:
|
||||
apply_state_item('api_port', args.get('api_port'))
|
||||
apply_state_item('api_security_strategy', args.get('api_security_strategy'))
|
||||
apply_state_item('api_session_limit', args.get('api_session_limit'))
|
||||
apply_state_item('api_upload_limit', args.get('api_upload_limit'))
|
||||
apply_state_item('cors_origins', args.get('cors_origins'))
|
||||
apply_state_item('video_memory_strategy', args.get('video_memory_strategy'))
|
||||
apply_state_item('log_level', args.get('log_level'))
|
||||
|
||||
@@ -162,6 +162,7 @@ progress_action_set : ProgressActionSet =\
|
||||
job_statuses : List[JobStatus] = list(get_args(JobStatus))
|
||||
|
||||
api_session_limit_range : Sequence[int] = create_int_range(1, 32, 1)
|
||||
api_upload_limit_range : Sequence[int] = create_int_range(32, 1024, 32)
|
||||
benchmark_cycle_count_range : Sequence[int] = create_int_range(1, 10, 1)
|
||||
execution_thread_count_range : Sequence[int] = create_int_range(1, 32, 1)
|
||||
face_detector_margin_range : Sequence[int] = create_int_range(0, 100, 1)
|
||||
|
||||
@@ -160,6 +160,7 @@ LOCALES : Locales =\
|
||||
'api_port': 'specify the API port',
|
||||
'api_security_strategy': 'specify the API security strategy used for sanitizing uploaded assets',
|
||||
'api_session_limit': 'specify the maximum amount of concurrent sessions',
|
||||
'api_upload_limit': 'specify the maximum size of an upload',
|
||||
'cors_origins': 'specify the CORS origins',
|
||||
'execution_device_ids': 'specify the devices used for processing',
|
||||
'execution_providers': 'inference using different providers (choices: {choices}, ...)',
|
||||
|
||||
@@ -955,6 +955,14 @@ def create_api_program() -> ArgumentParser:
|
||||
choices = facefusion.choices.api_session_limit_range,
|
||||
metavar = create_int_metavar(facefusion.choices.api_session_limit_range)
|
||||
)
|
||||
group_api.add_argument(
|
||||
'--api-upload-limit',
|
||||
help = translator.get('help.api_upload_limit'),
|
||||
type = int,
|
||||
default = config.get_int_value('api', 'api_upload_limit', '512'),
|
||||
choices = facefusion.choices.api_upload_limit_range,
|
||||
metavar = create_int_metavar(facefusion.choices.api_upload_limit_range)
|
||||
)
|
||||
|
||||
return program
|
||||
|
||||
|
||||
@@ -662,6 +662,7 @@ StateKey = Literal\
|
||||
'api_key',
|
||||
'api_security_strategy',
|
||||
'api_session_limit',
|
||||
'api_upload_limit',
|
||||
'cors_origins',
|
||||
'job_id',
|
||||
'job_status',
|
||||
@@ -738,6 +739,7 @@ State = TypedDict('State',
|
||||
'api_key' : str,
|
||||
'api_security_strategy' : ApiSecurityStrategy,
|
||||
'api_session_limit' : int,
|
||||
'api_upload_limit' : int,
|
||||
'cors_origins' : List[CorsOrigin],
|
||||
'job_id' : JobId,
|
||||
'job_status' : JobStatus,
|
||||
|
||||
@@ -17,6 +17,7 @@ from tests.assert_helper import get_test_example_file, get_test_examples_directo
|
||||
@pytest.fixture(scope = 'module', autouse = True)
|
||||
def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
process_manager.start()
|
||||
conditional_download(get_test_examples_directory(),
|
||||
|
||||
@@ -4,7 +4,7 @@ from typing import Iterator
|
||||
import pytest
|
||||
from starlette.testclient import TestClient
|
||||
|
||||
from facefusion import capability_store, session_manager
|
||||
from facefusion import capability_store, session_manager, state_manager
|
||||
from facefusion.apis.core import create_api
|
||||
|
||||
|
||||
@@ -33,6 +33,9 @@ def before_all() -> None:
|
||||
groups = [ 'paths' ]
|
||||
)
|
||||
|
||||
state_manager.init()
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
|
||||
@pytest.fixture(scope = 'function', autouse = True)
|
||||
def before_each() -> None:
|
||||
|
||||
@@ -17,6 +17,7 @@ from tests.assert_helper import get_test_example_file, get_test_examples_directo
|
||||
@pytest.fixture(scope = 'module', autouse = True)
|
||||
def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
create_program()
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('jobs_path', get_test_jobs_directory())
|
||||
state_manager.init_item('api_session_limit', 10)
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
|
||||
@pytest.fixture(scope = 'function', autouse = True)
|
||||
|
||||
@@ -14,6 +14,7 @@ def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('jobs_path', get_test_jobs_directory())
|
||||
state_manager.init_item('api_session_limit', 10)
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
|
||||
@pytest.fixture(scope = 'function', autouse = True)
|
||||
|
||||
@@ -15,6 +15,7 @@ def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('jobs_path', get_test_jobs_directory())
|
||||
state_manager.init_item('api_session_limit', 10)
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
|
||||
@pytest.fixture(scope = 'function', autouse = True)
|
||||
|
||||
@@ -3,10 +3,16 @@ from typing import Iterator
|
||||
import pytest
|
||||
from starlette.testclient import TestClient
|
||||
|
||||
from facefusion import metadata, session_manager
|
||||
from facefusion import metadata, session_manager, state_manager
|
||||
from facefusion.apis.core import create_api
|
||||
|
||||
|
||||
@pytest.fixture(scope = 'module', autouse = True)
|
||||
def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
|
||||
@pytest.fixture(scope = 'function', autouse = True)
|
||||
def before_each() -> None:
|
||||
session_manager.API_SESSIONS.clear()
|
||||
|
||||
@@ -20,6 +20,7 @@ from tests.assert_helper import get_test_example_file, get_test_examples_directo
|
||||
@pytest.fixture(scope = 'module', autouse = True)
|
||||
def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
datachannel_module.pre_check()
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ def before_all() -> None:
|
||||
state_manager.init()
|
||||
state_manager.init_item('jobs_path', get_test_jobs_directory())
|
||||
state_manager.init_item('api_session_limit', 10)
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
process_manager.start()
|
||||
program = ArgumentParser()
|
||||
|
||||
@@ -26,6 +26,7 @@ def before_all() -> None:
|
||||
state_manager.init_item('temp_path', tempfile.gettempdir())
|
||||
state_manager.init_item('jobs_path', get_test_jobs_directory())
|
||||
state_manager.init_item('api_session_limit', 10)
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
state_manager.init_item('processors', [])
|
||||
|
||||
pre_check()
|
||||
|
||||
@@ -16,6 +16,7 @@ def before_all() -> None:
|
||||
state_manager.init_item('api_host', '127.0.0.1')
|
||||
state_manager.init_item('api_port', 7000)
|
||||
state_manager.init_item('api_session_limit', 4)
|
||||
state_manager.init_item('api_upload_limit', 512)
|
||||
|
||||
local_id = session_context.resolve_local_id()
|
||||
session_context.set_session_id(local_id)
|
||||
@@ -57,6 +58,19 @@ def test_create_api(test_client : TestClient) -> None:
|
||||
assert root_response.headers.get('access-control-expose-headers') == 'Location'
|
||||
assert root_response.status_code == 200
|
||||
|
||||
state_manager.set_item('api_upload_limit', 1)
|
||||
|
||||
with TestClient(create_api()) as upload_limit_client:
|
||||
session_response = upload_limit_client.post('/session', content = bytes(1024 * 1024))
|
||||
|
||||
assert not session_response.status_code == 413
|
||||
|
||||
session_response = upload_limit_client.post('/session', content = bytes(1024 * 1024 + 1))
|
||||
|
||||
assert session_response.status_code == 413
|
||||
|
||||
state_manager.set_item('api_upload_limit', 512)
|
||||
|
||||
|
||||
def test_create_server() -> None:
|
||||
server = create_server()
|
||||
|
||||
Reference in new issue
Block a user