Complete PR #4654 integration with manager migration

 Successfully integrated conflict detection with task queue system
 Both systems work together seamlessly
 All merge conflicts resolved
 Generated types and locales properly merged

Note: Test updates needed for API changes (to be addressed in semantic review)
This commit is contained in:
bymyself
2025-09-01 00:37:44 -07:00
86 changed files with 8262 additions and 1297 deletions

View File

@@ -27,6 +27,7 @@ enum ManagerRoute {
LIST_INSTALLED = 'v2/customnode/installed',
GET_NODES = 'v2/customnode/getmappings',
IMPORT_FAIL_INFO = 'v2/customnode/import_fail_info',
IMPORT_FAIL_INFO_BULK = 'v2/customnode/import_fail_info_bulk',
REBOOT = 'v2/manager/reboot',
IS_LEGACY_MANAGER_UI = 'v2/manager/is_legacy_manager_ui',
TASK_HISTORY = 'v2/manager/queue/history',
@@ -34,7 +35,7 @@ enum ManagerRoute {
}
const managerApiClient = axios.create({
baseURL: api.apiURL(''),
baseURL: api.apiURL('/v2/'),
headers: {
'Content-Type': 'application/json'
}
@@ -144,6 +145,21 @@ export const useComfyManagerService = () => {
)
}
const getImportFailInfoBulk = async (
params: components['schemas']['ImportFailInfoBulkRequest'] = {},
signal?: AbortSignal
) => {
const errorContext = 'Fetching bulk import failure information'
return executeRequest<components['schemas']['ImportFailInfoBulkResponse']>(
() =>
managerApiClient.post(ManagerRoute.IMPORT_FAIL_INFO_BULK, params, {
signal
}),
{ errorContext }
)
}
const queueTask = async (
kind: QueueTaskItem['kind'],
params: QueueTaskItem['params'],
@@ -283,6 +299,7 @@ export const useComfyManagerService = () => {
// Pack management
listInstalledPacks,
getImportFailInfo,
getImportFailInfoBulk,
installPack,
uninstallPack,
enablePack: installPack, // enable is done via install