From 01a9161153e3af120bb7f4eca8ced4f4f531cc0c Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 20 Jun 2025 16:35:30 +0800 Subject: [PATCH] fix(ai-proxy): Unify the naming convention & fix api name mapping (#2441) --- plugins/wasm-go/extensions/ai-proxy/main.go | 14 +++++++------- .../extensions/ai-proxy/provider/openai.go | 8 ++++---- .../extensions/ai-proxy/provider/provider.go | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/plugins/wasm-go/extensions/ai-proxy/main.go b/plugins/wasm-go/extensions/ai-proxy/main.go index c7e045140..3ca3a65ec 100644 --- a/plugins/wasm-go/extensions/ai-proxy/main.go +++ b/plugins/wasm-go/extensions/ai-proxy/main.go @@ -383,28 +383,28 @@ func getApiName(path string) provider.ApiName { return provider.ApiNameFineTuningJobs } if util.RegRetrieveFineTuningJobPath.MatchString(path) { - return provider.ApiNameFineTuningRetrieveJob + return provider.ApiNameRetrieveFineTuningJob } if util.RegRetrieveFineTuningJobEventsPath.MatchString(path) { - return provider.PathOpenAIFineTuningJobEvents + return provider.ApiNameFineTuningJobEvents } if util.RegRetrieveFineTuningJobCheckpointsPath.MatchString(path) { - return provider.PathOpenAIFineTuningJobCheckpoints + return provider.ApiNameFineTuningJobCheckpoints } if util.RegCancelFineTuningJobPath.MatchString(path) { - return provider.ApiNameFineTuningCancelJob + return provider.ApiNameCancelFineTuningJob } if util.RegResumeFineTuningJobPath.MatchString(path) { - return provider.ApiNameFineTuningResumeJob + return provider.ApiNameResumeFineTuningJob } if util.RegPauseFineTuningJobPath.MatchString(path) { - return provider.ApiNameFineTuningPauseJob + return provider.ApiNamePauseFineTuningJob } if util.RegFineTuningCheckpointPermissionPath.MatchString(path) { return provider.ApiNameFineTuningCheckpointPermissions } if util.RegDeleteFineTuningCheckpointPermissionPath.MatchString(path) { - return provider.PathOpenAIFineDeleteTuningCheckpointPermission + return provider.ApiNameDeleteFineTuningCheckpointPermission } // cohere style if strings.HasSuffix(path, "/v1/rerank") { diff --git a/plugins/wasm-go/extensions/ai-proxy/provider/openai.go b/plugins/wasm-go/extensions/ai-proxy/provider/openai.go index 2a9a81e56..a987e8967 100644 --- a/plugins/wasm-go/extensions/ai-proxy/provider/openai.go +++ b/plugins/wasm-go/extensions/ai-proxy/provider/openai.go @@ -42,12 +42,12 @@ func (m *openaiProviderInitializer) DefaultCapabilities() map[string]string { string(ApiNameCancelBatch): PathOpenAICancelBatch, string(ApiNameResponses): PathOpenAIResponses, string(ApiNameFineTuningJobs): PathOpenAIFineTuningJobs, - string(ApiNameFineTuningRetrieveJob): PathOpenAIFineTuningRetrieveJob, + string(ApiNameRetrieveFineTuningJob): PathOpenAIRetrieveFineTuningJob, string(ApiNameFineTuningJobEvents): PathOpenAIFineTuningJobEvents, string(ApiNameFineTuningJobCheckpoints): PathOpenAIFineTuningJobCheckpoints, - string(ApiNameFineTuningCancelJob): PathOpenAIFineTuningCancelJob, - string(ApiNameFineTuningResumeJob): PathOpenAIFineTuningResumeJob, - string(ApiNameFineTuningPauseJob): PathOpenAIFineTuningPauseJob, + string(ApiNameCancelFineTuningJob): PathOpenAICancelFineTuningJob, + string(ApiNameResumeFineTuningJob): PathOpenAIResumeFineTuningJob, + string(ApiNamePauseFineTuningJob): PathOpenAIPauseFineTuningJob, string(ApiNameFineTuningCheckpointPermissions): PathOpenAIFineTuningCheckpointPermissions, string(ApiNameDeleteFineTuningCheckpointPermission): PathOpenAIFineDeleteTuningCheckpointPermission, } diff --git a/plugins/wasm-go/extensions/ai-proxy/provider/provider.go b/plugins/wasm-go/extensions/ai-proxy/provider/provider.go index 42f780d56..e487d679c 100644 --- a/plugins/wasm-go/extensions/ai-proxy/provider/provider.go +++ b/plugins/wasm-go/extensions/ai-proxy/provider/provider.go @@ -43,12 +43,12 @@ const ( ApiNameModels ApiName = "openai/v1/models" ApiNameResponses ApiName = "openai/v1/responses" ApiNameFineTuningJobs ApiName = "openai/v1/fine-tuningjobs" - ApiNameFineTuningRetrieveJob ApiName = "openai/v1/retrievefine-tuningjob" + ApiNameRetrieveFineTuningJob ApiName = "openai/v1/retrievefine-tuningjob" ApiNameFineTuningJobEvents ApiName = "openai/v1/fine-tuningjobsevents" ApiNameFineTuningJobCheckpoints ApiName = "openai/v1/fine-tuningjobcheckpoints" - ApiNameFineTuningCancelJob ApiName = "openai/v1/cancelfine-tuningjob" - ApiNameFineTuningResumeJob ApiName = "openai/v1/resumefine-tuningjob" - ApiNameFineTuningPauseJob ApiName = "openai/v1/pausefine-tuningjob" + ApiNameCancelFineTuningJob ApiName = "openai/v1/cancelfine-tuningjob" + ApiNameResumeFineTuningJob ApiName = "openai/v1/resumefine-tuningjob" + ApiNamePauseFineTuningJob ApiName = "openai/v1/pausefine-tuningjob" ApiNameFineTuningCheckpointPermissions ApiName = "openai/v1/fine-tuningjobcheckpointpermissions" ApiNameDeleteFineTuningCheckpointPermission ApiName = "openai/v1/deletefine-tuningjobcheckpointpermission" @@ -68,12 +68,12 @@ const ( PathOpenAIAudioSpeech = "/v1/audio/speech" PathOpenAIResponses = "/v1/responses" PathOpenAIFineTuningJobs = "/v1/fine_tuning/jobs" - PathOpenAIFineTuningRetrieveJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}" + PathOpenAIRetrieveFineTuningJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}" PathOpenAIFineTuningJobEvents = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/events" PathOpenAIFineTuningJobCheckpoints = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/checkpoints" - PathOpenAIFineTuningCancelJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/cancel" - PathOpenAIFineTuningResumeJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/resume" - PathOpenAIFineTuningPauseJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/pause" + PathOpenAICancelFineTuningJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/cancel" + PathOpenAIResumeFineTuningJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/resume" + PathOpenAIPauseFineTuningJob = "/v1/fine_tuning/jobs/{fine_tuning_job_id}/pause" PathOpenAIFineTuningCheckpointPermissions = "/v1/fine_tuning/checkpoints/{fine_tuned_model_checkpoint}/permissions" PathOpenAIFineDeleteTuningCheckpointPermission = "/v1/fine_tuning/checkpoints/{fine_tuned_model_checkpoint}/permissions/{permission_id}"