CalvinBackup/facefusion
1
0
Fork 0
mirror of https://github.com/facefusion/facefusion.git synced 2026-09-16 04:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

split api and cli sessions (#1244)

Browse Source 
Claude-Session: https://claude.ai/code/session_014VuiA4Yfhy78naZK5UtfX5

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Henry Ruhs
2026-09-12 22:40:25 +02:00
committed by GitHub
co-authored by Claude Fable 5.1
parent eb9e4ad416
commit e5d30e7df3
15 changed files with 232 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_api_assets.py
+4 -4
View File
@@ -44,7 +44,7 @@ def before_each() -> Iterator[None]:
state_manager.init_item('temp_path', tempfile.gettempdir())
state_manager.init_item('jobs_path', get_test_jobs_directory())
state_manager.init_item('temp_frame_format', 'png')
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
asset_store.delete_assets()
yield
@@ -77,7 +77,7 @@ def test_upload_assets(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
with open(source_path, 'rb') as source_file:
@@ -281,7 +281,7 @@ def test_delete_assets(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
source_path = get_test_example_file('source.jpg')
@@ -351,7 +351,7 @@ def test_delete_asset(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
source_path = get_test_example_file('source.jpg')
tests/test_api_capabilities.py
+1 -1
View File
@@ -36,7 +36,7 @@ def before_all() -> None:
@pytest.fixture(scope = 'function', autouse = True)
def before_each() -> None:
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
@pytest.fixture(scope = 'module')
tests/test_api_jobs.py
+15 -15
View File
@@ -32,7 +32,7 @@ def before_each() -> Iterator[None]:
local_id = session_context.resolve_local_id()
session_context.set_session_id(local_id)
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
asset_store.delete_assets()
state_manager.init_item('source_paths', [ get_test_example_file('source.jpg') ])
state_manager.init_item('target_path', get_test_example_file('target-240p.mp4'))
@@ -63,7 +63,7 @@ def test_get_jobs(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
get_jobs_response = test_client.get('/jobs?status=invalid', headers =
@@ -114,7 +114,7 @@ def test_get_job(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
get_job_response = test_client.get('/jobs/job-test-unknown', headers =
@@ -165,7 +165,7 @@ def test_create_job(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
create_job_response = test_client.post('/jobs', headers =
@@ -206,7 +206,7 @@ def test_submit_jobs(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
submit_jobs_response = test_client.patch('/jobs?action=invalid', headers =
@@ -259,7 +259,7 @@ def test_submit_job(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
submit_job_response = test_client.patch('/jobs/job-test-submit-job?action=invalid', headers =
@@ -312,7 +312,7 @@ def test_run_jobs(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
run_jobs_response = test_client.patch('/jobs?action=run', headers =
@@ -360,7 +360,7 @@ def test_run_job(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
create_job('job-test-run-job')
@@ -409,7 +409,7 @@ def test_retry_jobs(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
retry_jobs_response = test_client.patch('/jobs?action=retry', headers =
@@ -459,7 +459,7 @@ def test_retry_job(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
retry_job_response = test_client.patch('/jobs/job-test-retry-job?action=retry', headers =
@@ -509,7 +509,7 @@ def test_delete_jobs(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
delete_jobs_response = test_client.delete('/jobs', headers =
@@ -544,7 +544,7 @@ def test_delete_job(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
delete_job_response = test_client.delete('/jobs/job-test-unknown', headers =
@@ -581,7 +581,7 @@ def test_create_step(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
create_job('job-test-create-step')
@@ -607,7 +607,7 @@ def test_create_step(test_client : TestClient) -> None:
get_job_body = get_job_response.json()
step_args = get_job_body.get('steps')[0].get('args')
access_session_id = session_manager.find_session_id(access_token)
access_session_id = session_manager.find_api_session_id(access_token)
assert step_args ==\
{
@@ -663,7 +663,7 @@ def test_delete_step(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
create_job('job-test-delete-step')
tests/test_api_metrics.py
+1 -1
View File
@@ -17,7 +17,7 @@ def before_all() -> None:
@pytest.fixture(scope = 'function', autouse = True)
def before_each() -> None:
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
@pytest.fixture(scope = 'module')
tests/test_api_ping.py
+1 -1
View File
@@ -16,7 +16,7 @@ def before_all() -> None:
@pytest.fixture(scope = 'function', autouse = True)
def before_each() -> None:
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
@pytest.fixture(scope = 'module')
tests/test_api_session.py
+23 -14
View File
@@ -13,7 +13,7 @@ from facefusion.apis import asset_store
from facefusion.apis.core import create_api
from facefusion.download import conditional_download
from facefusion.libraries import datachannel as datachannel_module
from facefusion.types import RtcPeer, Session
from facefusion.types import ApiSession, RtcPeer
from .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory
@@ -37,7 +37,7 @@ def before_each() -> Iterator[None]:
session_context.set_session_id(local_id)
state_manager.init_item('temp_path', tempfile.gettempdir())
state_manager.init_item('jobs_path', get_test_jobs_directory())
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
asset_store.delete_assets()
yield
@@ -117,9 +117,9 @@ def test_get_session(test_client : TestClient) -> None:
assert get_session_response.status_code == 200
session_id = session_manager.find_session_id(create_session_body.get('access_token'))
session : Session = session_manager.get_session(session_id)
session_manager.set_session(session_id,
session_id = session_manager.find_api_session_id(create_session_body.get('access_token'))
session : ApiSession = session_manager.get_api_session(session_id)
session_manager.set_api_session(session_id,
{
'access_token': session.get('access_token'),
'refresh_token': session.get('refresh_token'),
@@ -150,6 +150,15 @@ def test_refresh_session(test_client : TestClient) -> None:
assert refresh_session_response.status_code == 401
access_token = create_session_body.get('access_token')
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
session_manager.fork_session()
refresh_session_response = test_client.put('/session', json = {})
assert refresh_session_response.status_code == 401
session_manager.join_session()
refresh_session_response = test_client.put('/session', json =
{
@@ -159,7 +168,7 @@ def test_refresh_session(test_client : TestClient) -> None:
assert refresh_session_body.get('access_token')
assert refresh_session_body.get('refresh_token')
assert session_manager.find_session_id(access_token) is None
assert session_manager.find_api_session_id(access_token) is None
assert refresh_session_response.status_code == 200
refresh_session_response = test_client.put('/session', json =
@@ -175,9 +184,9 @@ def test_refresh_session(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
session_id = session_manager.find_session_id(create_session_body.get('access_token'))
session : Session = session_manager.get_session(session_id)
session_manager.set_session(session_id,
session_id = session_manager.find_api_session_id(create_session_body.get('access_token'))
session : ApiSession = session_manager.get_api_session(session_id)
session_manager.set_api_session(session_id,
{
'access_token': session.get('access_token'),
'refresh_token': session.get('refresh_token'),
@@ -199,7 +208,7 @@ def test_destroy_session(test_client : TestClient) -> None:
'client_version': metadata.get('version')
})
access_token = create_session_response.json().get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
jobs_path = os.path.join(get_test_jobs_directory(), session_id)
delete_session_response = test_client.delete('/session', headers =
@@ -216,7 +225,7 @@ def test_destroy_session(test_client : TestClient) -> None:
})
assert os.path.isdir(jobs_path) is False
assert session_manager.find_session_id(access_token) is None
assert session_manager.find_api_session_id(access_token) is None
assert delete_session_response.status_code == 200
create_session_response = test_client.post('/session', json =
@@ -224,7 +233,7 @@ def test_destroy_session(test_client : TestClient) -> None:
'client_version': metadata.get('version')
})
access_token = create_session_response.json().get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
source_path = get_test_example_file('source.jpg')
@@ -252,7 +261,7 @@ def test_destroy_session(test_client : TestClient) -> None:
assert os.path.exists(asset_path) is True
assert delete_session_response.json().get('message') == 'directory not removed'
assert session_manager.find_session_id(access_token) == session_id
assert session_manager.find_api_session_id(access_token) == session_id
assert delete_session_response.status_code == 404
peer_connection = rtc.create_peer_connection()
@@ -276,7 +285,7 @@ def test_destroy_session(test_client : TestClient) -> None:
'Authorization': 'Bearer ' + access_token
})
assert session_manager.find_session_id(access_token) is None
assert session_manager.find_api_session_id(access_token) is None
assert store_creator.has_content(asset_store.ASSET_STORE, session_id) is False
assert store_creator.has_content(rtc_store.RTC_STORE, session_id) is False
assert delete_session_response.status_code == 200
tests/test_api_state.py
+3 -3
View File
@@ -73,7 +73,7 @@ def before_each() -> Iterator[None]:
local_id = session_context.resolve_local_id()
session_context.set_session_id(local_id)
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
asset_store.delete_assets()
yield
@@ -176,7 +176,7 @@ def test_select_source_assets(test_client : TestClient) -> None:
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
source_paths =\
[
@@ -226,7 +226,7 @@ def test_select_target_assets(test_client : TestClient) -> None:
})
create_session_body = create_session_response.json()
access_token = create_session_body.get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
target_path = get_test_example_file('target-240p.jpg')
asset_id = asset_store.create_asset('target', target_path).get('id')
tests/test_api_stream.py
+2 -2
View File
@@ -38,7 +38,7 @@ def before_each() -> Iterator[None]:
local_id = session_context.resolve_local_id()
session_context.set_session_id(local_id)
session_manager.SESSIONS.clear()
session_manager.API_SESSIONS.clear()
asset_store.delete_assets()
rtc_store.delete_peer()
@@ -151,7 +151,7 @@ def test_delete_stream_video(test_client : TestClient) -> None:
'client_version': metadata.get('version')
})
access_token = create_session_response.json().get('access_token')
session_id = session_manager.find_session_id(access_token)
session_id = session_manager.find_api_session_id(access_token)
session_context.set_session_id(session_id)
peer_connection = rtc.create_peer_connection()
tests/test_session_manager.py
+101 -66
View File
@@ -1,11 +1,11 @@
import secrets
from datetime import datetime, timedelta
from datetime import timedelta
from typing import Iterator
import pytest
from facefusion.session_context import get_session_id, resolve_local_id, set_session_id
from facefusion.session_manager import clear_session, create_session, fork_session, get_session, join_session, resolve_owner_id, set_session, validate_session
from facefusion.session_manager import clear_api_session, clear_cli_session, create_api_session, create_cli_session, find_api_session_id, fork_session, get_api_session, get_cli_session, join_session, resolve_owner_id, set_api_session, set_cli_session, validate_api_session
@pytest.fixture(scope = 'function', autouse = True)
@@ -25,77 +25,112 @@ def test_fork_session() -> None:
assert get_session_id() == fork_id
assert resolve_owner_id() == local_id
assert get_session(fork_id).get('owner_id') == local_id
assert get_session(fork_id).get('access_token') is None
assert get_session(fork_id).get('expires_at') is None
assert get_cli_session(fork_id).get('owner_id') == local_id
join_session()
def test_get_and_set_session() -> None:
session = create_session()
session_id = secrets.token_urlsafe(16)
set_session(session_id, session)
assert get_session(session_id) == session
def test_resolve_owner_id() -> None:
local_id = resolve_local_id()
assert resolve_owner_id() == local_id
set_session('session-a', create_session())
set_session('session-a1', { 'owner_id': 'session-a', 'created_at': datetime.now() })
set_session_id('session-a')
assert resolve_owner_id() == 'session-a'
set_session_id('session-a1')
assert resolve_owner_id() == 'session-a'
clear_session('session-a1')
clear_session('session-a')
def test_validate_session() -> None:
session = create_session()
session_id = secrets.token_urlsafe(16)
set_session(session_id, session)
assert validate_session(session_id) is True
set_session(session_id,
{
'access_token': session.get('access_token'),
'refresh_token': session.get('refresh_token'),
'created_at': session.get('created_at'),
'expires_at': session.get('expires_at') - timedelta(hours = 1)
})
assert validate_session(session_id) is False
def test_clear_session() -> None:
session = create_session()
session_id = secrets.token_urlsafe(16)
set_session(session_id, session)
assert validate_session(session_id) is True
clear_session(session_id)
assert validate_session(session_id) is None
def test_join_session() -> None:
local_id = resolve_local_id()
fork_id = fork_session()
join_session()
assert get_session_id() == local_id
assert get_session(fork_id) is None
assert get_cli_session(fork_id) is None
def test_get_and_set_api_session() -> None:
api_session = create_api_session()
session_id = secrets.token_urlsafe(16)
set_api_session(session_id, api_session)
assert get_api_session(session_id) == api_session
clear_api_session(session_id)
def test_get_and_set_cli_session() -> None:
local_id = resolve_local_id()
cli_session = create_cli_session()
session_id = secrets.token_urlsafe(16)
set_cli_session(session_id, cli_session)
assert get_cli_session(session_id) == cli_session
assert get_cli_session(session_id).get('owner_id') == local_id
clear_cli_session(session_id)
def test_find_api_session_id() -> None:
api_session = create_api_session()
session_id = secrets.token_urlsafe(16)
set_api_session(session_id, api_session)
assert find_api_session_id(api_session.get('access_token')) == session_id
assert find_api_session_id('INVALID') is None
clear_api_session(session_id)
def test_resolve_owner_id() -> None:
local_id = resolve_local_id()
assert resolve_owner_id() == local_id
set_api_session('session-a', create_api_session())
set_session_id('session-a')
assert resolve_owner_id() == 'session-a'
fork_session()
assert resolve_owner_id() == 'session-a'
join_session()
clear_api_session('session-a')
def test_validate_api_session() -> None:
api_session = create_api_session()
session_id = secrets.token_urlsafe(16)
set_api_session(session_id, api_session)
assert validate_api_session(session_id) is True
set_api_session(session_id,
{
'access_token': api_session.get('access_token'),
'refresh_token': api_session.get('refresh_token'),
'created_at': api_session.get('created_at'),
'expires_at': api_session.get('expires_at') - timedelta(hours = 1)
})
assert validate_api_session(session_id) is False
clear_api_session(session_id)
assert validate_api_session(session_id) is False
def test_clear_api_session() -> None:
api_session = create_api_session()
session_id = secrets.token_urlsafe(16)
set_api_session(session_id, api_session)
clear_api_session(session_id)
assert get_api_session(session_id) is None
def test_clear_cli_session() -> None:
cli_session = create_cli_session()
session_id = secrets.token_urlsafe(16)
set_cli_session(session_id, cli_session)
clear_cli_session(session_id)
assert get_cli_session(session_id) is None
tests/test_state_manager.py
+6 -6
View File
@@ -1,10 +1,10 @@
from datetime import datetime
from typing import Iterator
import pytest
from facefusion import session_manager, store_creator
from facefusion import store_creator
from facefusion.session_context import resolve_local_id, set_session_id
from facefusion.session_manager import fork_session, join_session
from facefusion.state_manager import STATE_SET, clear, clone_state, get_item, get_state, init, init_item, set_item, set_state
@@ -16,7 +16,6 @@ def before_each() -> Iterator[None]:
clear()
store_creator.delete_content(STATE_SET, 'session-a')
store_creator.delete_content(STATE_SET, 'session-a1')
session_manager.clear_session('session-a1')
yield
@@ -53,17 +52,18 @@ def test_set_state() -> None:
def test_clone_state() -> None:
init_item('video_memory_strategy', 'tolerant')
session_manager.set_session('session-a1', { 'owner_id': resolve_local_id(), 'created_at': datetime.now() })
set_session_id('session-a1')
fork_id = fork_session()
clone_state()
set_item('video_memory_strategy', 'strict')
assert get_state() == { 'video_memory_strategy': 'strict' }
set_session_id(resolve_local_id())
join_session()
assert get_state() == { 'video_memory_strategy': 'tolerant' }
store_creator.delete_content(STATE_SET, fork_id)
def test_clear() -> None:
init_item('video_memory_strategy', 'tolerant')