diff --git a/facefusion/apis/endpoints/state.py b/facefusion/apis/endpoints/state.py index a108f66b..d186a496 100644 --- a/facefusion/apis/endpoints/state.py +++ b/facefusion/apis/endpoints/state.py @@ -30,8 +30,8 @@ async def set_state(request : Request) -> JSONResponse: if key in api_args: state_manager.set_item(key, value) - api_args = args_store.filter_api_args(state_manager.get_state()) #type:ignore[arg-type,assignment] - return JSONResponse(state_manager.collect_state(api_args), status_code = HTTP_200_OK) #type:ignore[arg-type] + __api_args__ = args_store.filter_api_args(state_manager.get_state()) #type:ignore[arg-type] + return JSONResponse(state_manager.collect_state(__api_args__), status_code = HTTP_200_OK) #type:ignore[arg-type] async def select_source(request : Request) -> JSONResponse: @@ -49,8 +49,8 @@ async def select_source(request : Request) -> JSONResponse: state_manager.set_item('source_paths', source_paths) - api_args = args_store.filter_api_args(state_manager.get_state()) #type:ignore[arg-type] - return JSONResponse(state_manager.collect_state(api_args), status_code = HTTP_200_OK) + __api_args__ = args_store.filter_api_args(state_manager.get_state()) #type:ignore[arg-type] + return JSONResponse(state_manager.collect_state(__api_args__), status_code = HTTP_200_OK) return JSONResponse( { @@ -68,8 +68,8 @@ async def select_target(request : Request) -> JSONResponse: if asset: state_manager.set_item('target_path', asset.get('path')) - api_args = args_store.filter_api_args(state_manager.get_state()) #type:ignore[arg-type] - return JSONResponse(state_manager.collect_state(api_args), status_code = HTTP_200_OK) + __api_args__ = args_store.filter_api_args(state_manager.get_state()) #type:ignore[arg-type] + return JSONResponse(state_manager.collect_state(__api_args__), status_code = HTTP_200_OK) return JSONResponse( { diff --git a/tests/test_api_state.py b/tests/test_api_state.py index 45cfd751..4bad1270 100644 --- a/tests/test_api_state.py +++ b/tests/test_api_state.py @@ -85,12 +85,11 @@ def test_set_state(test_client : TestClient) -> None: def test_select_source_assets(test_client : TestClient) -> None: - asset_id_1 = asset_store.register_asset('/path/to/source1.jpg') - asset_id_2 = asset_store.register_asset('/path/to/source2.jpg') + asset_ids = [ asset_store.register_asset('/path/to/source1.jpg'), asset_store.register_asset('/path/to/source2.jpg') ] select_response = test_client.put('/state?action=select&type=source', json = { - 'asset_ids': [ asset_id_1, asset_id_2 ] + 'asset_ids': asset_ids }) assert select_response.status_code == 401 @@ -103,7 +102,7 @@ def test_select_source_assets(test_client : TestClient) -> None: select_response = test_client.put('/state?action=select&type=source', json = { - 'asset_ids': 'invalid_string_not_list' + 'asset_ids': 'invalid' }, headers = { 'Authorization': 'Bearer ' + create_session_body.get('access_token') @@ -113,7 +112,7 @@ def test_select_source_assets(test_client : TestClient) -> None: select_response = test_client.put('/state?action=select&type=source', json = { - 'asset_ids': [ asset_id_1, asset_id_2 ] + 'asset_ids': asset_ids }, headers = { 'Authorization': 'Bearer ' + create_session_body.get('access_token') @@ -125,11 +124,11 @@ def test_select_source_assets(test_client : TestClient) -> None: def test_select_target_assets(test_client : TestClient) -> None: - asset_id_1 = asset_store.register_asset('/path/to/target1.jpg') + asset_id = asset_store.register_asset('/path/to/target.jpg') select_response = test_client.put('/state?action=select&type=target', json = { - 'asset_id': asset_id_1 + 'asset_id': asset_id }) assert select_response.status_code == 401 @@ -142,7 +141,7 @@ def test_select_target_assets(test_client : TestClient) -> None: select_response = test_client.put('/state?action=select&type=target', json = { - 'asset_id': 'invalid_asset_id' + 'asset_id': 'invalid' }, headers = { 'Authorization': 'Bearer ' + create_session_body.get('access_token') @@ -152,12 +151,12 @@ def test_select_target_assets(test_client : TestClient) -> None: select_response = test_client.put('/state?action=select&type=target', json = { - 'asset_id': asset_id_1 + 'asset_id': asset_id }, headers = { 'Authorization': 'Bearer ' + create_session_body.get('access_token') }) select_body = select_response.json() - assert select_body.get('target_path') == '/path/to/target1.jpg' + assert select_body.get('target_path') == '/path/to/target.jpg' assert select_response.status_code == 200