fix tests

tests/test_api_asset_store.py

@@ -0,0 +1,97 @@
+from typing import Iterator
+
+import pytest
+
+from facefusion import session_context, session_manager, state_manager
+from facefusion.apis.asset_store import create_asset, delete_asset, delete_assets, get_asset, get_assets, init
+from facefusion.download import conditional_download
+from .assert_helper import get_test_example_file, get_test_examples_directory
+
+
+@pytest.fixture(scope = 'module', autouse = True)
+def before_all() -> None:
+	state_manager.init()
+	state_manager.init_item('download_providers', [ 'github', 'huggingface' ])
+
+	conditional_download(get_test_examples_directory(),
+	[
+		'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/source.jpg'
+	])
+
+
+@pytest.fixture(scope = 'function', autouse = True)
+def before_each() -> Iterator[None]:
+	local_id = session_context.resolve_local_id()
+
+	session_context.set_session_id(local_id)
+	init()
+
+	yield
+
+	session_context.set_session_id(local_id)
+
+
+def test_init() -> None:
+	local_id = session_context.resolve_local_id()
+	asset_id = create_asset('source', get_test_example_file('source.jpg')).get('id')
+
+	session_context.set_session_id('session-a')
+	init()
+
+	assert get_asset(asset_id) is None
+
+	session_manager.fork_session()
+
+	assert get_assets() == {}
+
+	session_manager.join_session()
+	session_context.set_session_id(local_id)
+	session_manager.fork_session()
+
+	assert get_asset(asset_id).get('id') == asset_id
+
+	session_manager.join_session()
+
+
+def test_create_asset() -> None:
+	asset = create_asset('source', get_test_example_file('source.jpg'))
+
+	assert asset.get('type') == 'source'
+	assert asset.get('media') == 'image'
+	assert asset.get('name') == 'source'
+	assert asset.get('format') == 'jpeg'
+	assert asset.get('path') == get_test_example_file('source.jpg')
+
+
+def test_get_assets() -> None:
+	assert get_assets() == {}
+
+	asset_id = create_asset('source', get_test_example_file('source.jpg')).get('id')
+
+	assert list(get_assets().keys()) == [ asset_id ]
+
+
+def test_get_asset() -> None:
+	asset_id = create_asset('source', get_test_example_file('source.jpg')).get('id')
+
+	assert get_asset(asset_id).get('id') == asset_id
+	assert get_asset('invalid') is None
+
+
+def test_delete_asset() -> None:
+	asset_id = create_asset('source', get_test_example_file('source.jpg')).get('id')
+	delete_asset(asset_id)
+
+	assert get_asset(asset_id) is None
+
+	delete_asset(asset_id)
+
+	assert get_assets() == {}
+
+
+def test_delete_assets() -> None:
+	create_asset('source', get_test_example_file('source.jpg'))
+	create_asset('target', get_test_example_file('source.jpg'))
+	delete_assets()
+
+	assert get_assets() == {}

tests/test_api_assets.py

@@ -5,7 +5,7 @@ from typing import Iterator
 import pytest
 from starlette.testclient import TestClient
 
-from facefusion import ffmpeg, ffmpeg_builder, metadata, process_manager, session_manager, state_manager
+from facefusion import ffmpeg, ffmpeg_builder, metadata, process_manager, session_context, session_manager, state_manager
 from facefusion.apis import asset_store
 from facefusion.apis.core import create_api
 from facefusion.download import conditional_download
@@ -37,11 +37,18 @@ def before_all() -> None:
 
 
 @pytest.fixture(scope = 'function', autouse = True)
-def before_each() -> None:
+def before_each() -> Iterator[None]:
+	local_id = session_context.resolve_local_id()
+
+	session_context.set_session_id(local_id)
 	state_manager.init_item('temp_path', tempfile.gettempdir())
 	state_manager.init_item('temp_frame_format', 'png')
 	session_manager.SESSIONS.clear()
-	asset_store.clear()
+	asset_store.delete_assets()
+
+	yield
+
+	session_context.set_session_id(local_id)
 
 
 @pytest.fixture(scope = 'module')
@@ -70,6 +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_context.set_session_id(session_id)
 
 		with open(source_path, 'rb') as source_file:
 			upload_response = test_client.post('/assets?type=source', headers =
@@ -81,7 +89,7 @@ def test_upload_assets(test_client : TestClient) -> None:
 			])
 
 		asset_ids = upload_response.json().get('asset_ids')
-		asset = asset_store.get_asset(session_id, asset_ids[0])
+		asset = asset_store.get_asset(asset_ids[0])
 
 		assert asset.get('media') == 'image'
 		assert asset.get('type') == 'source'
@@ -100,12 +108,12 @@ def test_upload_assets(test_client : TestClient) -> None:
 
 		asset_ids = upload_response.json().get('asset_ids')
 
-		assert asset_store.get_asset(session_id, asset_ids[0]).get('media') == 'image'
-		assert asset_store.get_asset(session_id, asset_ids[0]).get('type') == 'target'
-		assert asset_store.get_asset(session_id, asset_ids[0]).get('format') == 'jpeg'
-		assert asset_store.get_asset(session_id, asset_ids[1]).get('media') == 'video'
-		assert asset_store.get_asset(session_id, asset_ids[1]).get('type') == 'target'
-		assert asset_store.get_asset(session_id, asset_ids[1]).get('format') == 'mp4'
+		assert asset_store.get_asset(asset_ids[0]).get('media') == 'image'
+		assert asset_store.get_asset(asset_ids[0]).get('type') == 'target'
+		assert asset_store.get_asset(asset_ids[0]).get('format') == 'jpeg'
+		assert asset_store.get_asset(asset_ids[1]).get('media') == 'video'
+		assert asset_store.get_asset(asset_ids[1]).get('type') == 'target'
+		assert asset_store.get_asset(asset_ids[1]).get('format') == 'mp4'
 		assert upload_response.status_code == 201
 
 		with open(audio_path, 'rb') as audio_file:
@@ -118,7 +126,7 @@ def test_upload_assets(test_client : TestClient) -> None:
 			])
 
 		asset_ids = upload_response.json().get('asset_ids')
-		asset = asset_store.get_asset(session_id, asset_ids[0])
+		asset = asset_store.get_asset(asset_ids[0])
 
 		assert asset.get('media') == 'audio'
 		assert asset.get('type') == 'source'
@@ -273,6 +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_context.set_session_id(session_id)
 
 	source_path = get_test_example_file('source.jpg')
 	target_image_path = get_test_example_file('target-240p.jpg')
@@ -299,7 +308,7 @@ def test_delete_assets(test_client : TestClient) -> None:
 
 	asset_paths = []
 
-	for asset in asset_store.get_assets(session_id).values():
+	for asset in asset_store.get_assets().values():
 		asset_paths.append(asset.get('path'))
 
 	for asset_path in asset_paths:
@@ -327,7 +336,7 @@ def test_delete_assets(test_client : TestClient) -> None:
 		'Authorization': 'Bearer ' + access_token
 	})
 
-	assert asset_store.get_assets(session_id) is None
+	assert asset_store.get_assets() == {}
 	assert delete_response.status_code == 200
 
 	for asset_path in asset_paths:
@@ -342,6 +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_context.set_session_id(session_id)
 
 	source_path = get_test_example_file('source.jpg')
 
@@ -355,7 +365,7 @@ def test_delete_asset(test_client : TestClient) -> None:
 		])
 
 	asset_ids = upload_response.json().get('asset_ids')
-	asset_path = asset_store.get_asset(session_id, asset_ids[0]).get('path')
+	asset_path = asset_store.get_asset(asset_ids[0]).get('path')
 
 	assert os.path.exists(asset_path) is True
 
@@ -380,7 +390,7 @@ def test_delete_asset(test_client : TestClient) -> None:
 	})
 
 	assert os.path.exists(asset_path) is False
-	assert asset_store.get_asset(session_id, asset_ids[0]) is None
+	assert asset_store.get_asset(asset_ids[0]) is None
 	assert delete_response.status_code == 200
 
 	delete_response = test_client.request('DELETE', '/assets/' + asset_ids[0], headers =

tests/test_api_jobs.py

@@ -5,7 +5,7 @@ from unittest.mock import patch
 import pytest
 from starlette.testclient import TestClient
 
-from facefusion import metadata, session_manager, state_manager
+from facefusion import metadata, session_context, session_manager, state_manager
 from facefusion.apis import asset_store
 from facefusion.apis.core import create_api
 from facefusion.download import conditional_download
@@ -28,15 +28,22 @@ def before_all() -> None:
 
 
 @pytest.fixture(scope = 'function', autouse = True)
-def before_each() -> None:
+def before_each() -> Iterator[None]:
+	local_id = session_context.resolve_local_id()
+
+	session_context.set_session_id(local_id)
 	session_manager.SESSIONS.clear()
-	asset_store.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'))
 	state_manager.init_item('temp_path', get_test_jobs_directory())
 	clear_jobs(get_test_jobs_directory())
 	init_jobs(get_test_jobs_directory())
 
+	yield
+
+	session_context.set_session_id(local_id)
+
 
 @pytest.fixture(scope = 'module')
 def test_client() -> Iterator[TestClient]:

tests/test_api_session.py

@@ -31,10 +31,17 @@ def before_all() -> None:
 
 
 @pytest.fixture(scope = 'function', autouse = True)
-def before_each() -> None:
+def before_each() -> Iterator[None]:
+	local_id = session_context.resolve_local_id()
+
+	session_context.set_session_id(local_id)
 	state_manager.init_item('temp_path', tempfile.gettempdir())
 	session_manager.SESSIONS.clear()
-	asset_store.clear()
+	asset_store.delete_assets()
+
+	yield
+
+	session_context.set_session_id(local_id)
 
 
 @pytest.fixture(scope = 'module')
@@ -213,6 +220,7 @@ def test_destroy_session(test_client : TestClient) -> None:
 	})
 	access_token = create_session_response.json().get('access_token')
 	session_id = session_manager.find_session_id(access_token)
+	session_context.set_session_id(session_id)
 	source_path = get_test_example_file('source.jpg')
 
 	with open(source_path, 'rb') as source_file:
@@ -226,7 +234,7 @@ def test_destroy_session(test_client : TestClient) -> None:
 
 	asset_paths = []
 
-	for asset in asset_store.get_assets(session_id).values():
+	for asset in asset_store.get_assets().values():
 		asset_paths.append(asset.get('path'))
 
 	with patch('facefusion.apis.endpoints.session.remove_directory', return_value = False):
@@ -264,7 +272,7 @@ def test_destroy_session(test_client : TestClient) -> None:
 	})
 
 	assert session_manager.find_session_id(access_token) is None
-	assert asset_store.get_assets(session_id) is None
+	assert asset_store.get_assets() == {}
 	assert rtc_store.has_peer() is False
 	assert delete_session_response.status_code == 200
 

tests/test_api_state.py

@@ -4,7 +4,7 @@ from typing import Iterator
 import pytest
 from starlette.testclient import TestClient
 
-from facefusion import capability_store, ffmpeg, ffmpeg_builder, metadata, process_manager, session_manager, state_manager
+from facefusion import capability_store, ffmpeg, ffmpeg_builder, metadata, process_manager, session_context, session_manager, state_manager
 from facefusion.apis import asset_store
 from facefusion.apis.core import create_api
 from facefusion.download import conditional_download
@@ -68,9 +68,16 @@ def before_all() -> None:
 
 
 @pytest.fixture(scope = 'function', autouse = True)
-def before_each() -> None:
+def before_each() -> Iterator[None]:
+	local_id = session_context.resolve_local_id()
+
+	session_context.set_session_id(local_id)
 	session_manager.SESSIONS.clear()
-	asset_store.clear()
+	asset_store.delete_assets()
+
+	yield
+
+	session_context.set_session_id(local_id)
 
 
 @pytest.fixture(scope = 'module')
@@ -169,6 +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_context.set_session_id(session_id)
 	source_paths =\
 	[
 		get_test_example_file('source.jpg'),
@@ -176,8 +184,8 @@ def test_select_source_assets(test_client : TestClient) -> None:
 	]
 	asset_ids =\
 	[
-		asset_store.create_asset(session_id, 'source', source_paths[0]).get('id'),
-		asset_store.create_asset(session_id, 'source', source_paths[1]).get('id')
+		asset_store.create_asset('source', source_paths[0]).get('id'),
+		asset_store.create_asset('source', source_paths[1]).get('id')
 	]
 
 	select_response = test_client.put('/state?action=select&type=source', json =
@@ -218,8 +226,9 @@ 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_context.set_session_id(session_id)
 	target_path = get_test_example_file('target-240p.jpg')
-	asset_id = asset_store.create_asset(session_id, 'target', target_path).get('id')
+	asset_id = asset_store.create_asset('target', target_path).get('id')
 
 	select_response = test_client.put('/state?action=select&type=target', json=
 	{

tests/test_api_stream.py

@@ -33,11 +33,18 @@ def before_all() -> None:
 
 
 @pytest.fixture(scope = 'function', autouse = True)
-def before_each() -> None:
+def before_each() -> Iterator[None]:
+	local_id = session_context.resolve_local_id()
+
+	session_context.set_session_id(local_id)
 	session_manager.SESSIONS.clear()
-	asset_store.clear()
+	asset_store.delete_assets()
 	rtc_store.delete_peer()
 
+	yield
+
+	session_context.set_session_id(local_id)
+
 
 @pytest.fixture(scope = 'module')
 def test_client() -> Iterator[TestClient]:
@@ -144,6 +151,7 @@ def test_delete_stream_video(test_client : TestClient) -> None:
 	})
 	access_token = create_session_response.json().get('access_token')
 	session_id = session_manager.find_session_id(access_token)
+	session_context.set_session_id(session_id)
 
 	peer_connection = rtc.create_peer_connection()
 	rtc.add_video_track(peer_connection, 'sendrecv', 'vp8', 96)

tests/test_api_stream_video.py

@@ -10,7 +10,7 @@ from unittest.mock import patch
 import cv2
 import pytest
 
-from facefusion import rtc, rtc_store, state_manager
+from facefusion import rtc, rtc_store, state_manager, video_manager
 from facefusion.apis.stream_video import create_video_decoder, create_video_encoder, decode_video_frame, destroy_video_decoder, destroy_video_encoder, encode_video_frame, handle_video_frame, process_video_frame, receive_video_frames, run_video_encode_loop, update_video_encoder_bitrate, update_video_encoder_resolution
 from facefusion.codecs import aom_encoder, vpx_encoder
 from facefusion.common_helper import is_linux, is_macos, is_windows
@@ -29,6 +29,8 @@ def before_all() -> None:
 	state_manager.init_item('execution_thread_count', 8)
 	state_manager.init_item('processors', [])
 
+	video_manager.init()
+
 	aom_module.pre_check()
 	vpx_module.pre_check()
 	datachannel_module.pre_check()

tests/test_cli_output_fps.py

@@ -4,7 +4,7 @@ import sys
 import numpy
 import pytest
 
-from facefusion import ffmpeg, ffmpeg_builder, process_manager, state_manager
+from facefusion import ffmpeg, ffmpeg_builder, process_manager, state_manager, video_manager
 from facefusion.download import conditional_download
 from facefusion.jobs.job_manager import clear_jobs, init_jobs
 from facefusion.types import Fps, WorkflowStrategy
@@ -17,6 +17,9 @@ def before_all() -> None:
 	state_manager.init()
 
 	process_manager.start()
+
+	video_manager.init()
+
 	conditional_download(get_test_examples_directory(),
 	[
 		'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/source.jpg',