From 5fcbd66e922968fdec5743f846b846f56442c385 Mon Sep 17 00:00:00 2001 From: John Blackwell Date: Wed, 15 Jan 2025 14:40:44 -0500 Subject: [PATCH] Cleanup openai naming conventions --- go/ai-proxy/api/openai/openai.go | 3 ++- go/ai-proxy/api/openai_standard/openai_standard.go | 7 ------- go/ai-proxy/api/provider.go | 2 +- go/ai-proxy/main.go | 4 ++-- go/ai-proxy/proxy/openai/openai.go | 4 ++-- go/ai-proxy/proxy/provider/openai.go | 4 ++-- go/ai-proxy/proxy/proxy.go | 2 +- go/ai-proxy/test/helpers/common.go | 4 ++-- 8 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 go/ai-proxy/api/openai_standard/openai_standard.go diff --git a/go/ai-proxy/api/openai/openai.go b/go/ai-proxy/api/openai/openai.go index 5ea7ffa818..ae7dbf0560 100644 --- a/go/ai-proxy/api/openai/openai.go +++ b/go/ai-proxy/api/openai/openai.go @@ -13,7 +13,8 @@ import ( type Endpoint string const ( - EndpointChat = "/v1/chat/completions" + EndpointChat = "/openai/chat/completions" + EndpointChatCompletions = "/v1/chat/completions" ) type ChatCompletionRequest struct { diff --git a/go/ai-proxy/api/openai_standard/openai_standard.go b/go/ai-proxy/api/openai_standard/openai_standard.go deleted file mode 100644 index a9c2ad88da..0000000000 --- a/go/ai-proxy/api/openai_standard/openai_standard.go +++ /dev/null @@ -1,7 +0,0 @@ -package openai_standard - -type Endpoint string - -const ( - EndpointChat = "/openai/chat/completions" -) diff --git a/go/ai-proxy/api/provider.go b/go/ai-proxy/api/provider.go index 79ff56d4f1..dc07e10bc8 100644 --- a/go/ai-proxy/api/provider.go +++ b/go/ai-proxy/api/provider.go @@ -42,7 +42,7 @@ type ProviderAPIMapping map[string]string var ( ollamaToOpenAI ProviderAPIMapping = map[string]string{ - ollama.EndpointChat: openai.EndpointChat, + ollama.EndpointChat: openai.EndpointChatCompletions, } ollamaToVertex ProviderAPIMapping = map[string]string{ ollama.EndpointChat: vertex.EndpointChat, diff --git a/go/ai-proxy/main.go b/go/ai-proxy/main.go index 63c39aeb19..0b66ed4403 100644 --- a/go/ai-proxy/main.go +++ b/go/ai-proxy/main.go @@ -9,7 +9,7 @@ import ( "github.com/pluralsh/console/go/ai-proxy/api" "github.com/pluralsh/console/go/ai-proxy/api/ollama" - "github.com/pluralsh/console/go/ai-proxy/api/openai_standard" + "github.com/pluralsh/console/go/ai-proxy/api/openai" "github.com/pluralsh/console/go/ai-proxy/args" "github.com/pluralsh/console/go/ai-proxy/environment" "github.com/pluralsh/console/go/ai-proxy/internal/log" @@ -33,7 +33,7 @@ func main() { router := mux.NewRouter() router.HandleFunc(ollama.EndpointChat, p.Proxy()) - router.HandleFunc(openai_standard.EndpointChat, op.Proxy()) + router.HandleFunc(openai.EndpointChat, op.Proxy()) klog.V(log.LogLevelMinimal).InfoS("Listening and serving HTTP", "address", args.Address()) if err := http.ListenAndServe(args.Address(), router); err != nil { diff --git a/go/ai-proxy/proxy/openai/openai.go b/go/ai-proxy/proxy/openai/openai.go index 91da7becbb..364ae5b200 100644 --- a/go/ai-proxy/proxy/openai/openai.go +++ b/go/ai-proxy/proxy/openai/openai.go @@ -24,7 +24,7 @@ func (o *OpenAIProxy) Proxy() http.HandlerFunc { } } -func NewOpenAIStandardProxy(host, token string) (api.OpenAIProxy, error) { +func NewOpenAIProxy(host, token string) (api.OpenAIProxy, error) { parsedURL, err := url.Parse(host) if err != nil { return nil, err @@ -36,7 +36,7 @@ func NewOpenAIStandardProxy(host, token string) (api.OpenAIProxy, error) { r.SetXForwarded() - targetURL, err := url.Parse(openai.EndpointChat) + targetURL, err := url.Parse(openai.EndpointChatCompletions) if err != nil { klog.ErrorS(err, "failed to parse target url") return diff --git a/go/ai-proxy/proxy/provider/openai.go b/go/ai-proxy/proxy/provider/openai.go index 825077f04d..6c36ad84f1 100644 --- a/go/ai-proxy/proxy/provider/openai.go +++ b/go/ai-proxy/proxy/provider/openai.go @@ -46,7 +46,7 @@ func (in *OpenAIProxy) ModifyResponse(r *http.Response) error { func (in *OpenAIProxy) modifyRequestBody(r *httputil.ProxyRequest) error { endpoint := r.Out.URL.Path switch endpoint { - case openai.EndpointChat: + case openai.EndpointChatCompletions: return replaceRequestBody(r, openai.ToChatCompletionRequest) } @@ -60,7 +60,7 @@ func (in *OpenAIProxy) modifyResponseBody(r *http.Response) error { endpoint := r.Request.URL.Path switch endpoint { - case openai.EndpointChat: + case openai.EndpointChatCompletions: return replaceResponseBody(r, openai.FromChatCompletionResponse) } diff --git a/go/ai-proxy/proxy/proxy.go b/go/ai-proxy/proxy/proxy.go index 6c13096773..695d194085 100644 --- a/go/ai-proxy/proxy/proxy.go +++ b/go/ai-proxy/proxy/proxy.go @@ -26,7 +26,7 @@ func NewOllamaTranslationProxy(p api.Provider, host string, credentials string) func NewOpenAIProxy(p api.Provider, host, token string) (api.OpenAIProxy, error) { switch p { case api.ProviderOpenAI: - return openai.NewOpenAIStandardProxy(host, token) + return openai.NewOpenAIProxy(host, token) } return nil, fmt.Errorf("invalid provider: %s", p) } diff --git a/go/ai-proxy/test/helpers/common.go b/go/ai-proxy/test/helpers/common.go index 63935f050b..10485fc5a6 100644 --- a/go/ai-proxy/test/helpers/common.go +++ b/go/ai-proxy/test/helpers/common.go @@ -14,7 +14,7 @@ import ( "github.com/pluralsh/console/go/ai-proxy/api" "github.com/pluralsh/console/go/ai-proxy/api/ollama" - "github.com/pluralsh/console/go/ai-proxy/api/openai_standard" + "github.com/pluralsh/console/go/ai-proxy/api/openai" "github.com/pluralsh/console/go/ai-proxy/args" "github.com/pluralsh/console/go/ai-proxy/proxy" ) @@ -31,7 +31,7 @@ func SetupServer() (*httptest.Server, error) { } router := mux.NewRouter() router.HandleFunc(ollama.EndpointChat, p.Proxy()) - router.HandleFunc(openai_standard.EndpointChat, op.Proxy()) + router.HandleFunc(openai.EndpointChat, op.Proxy()) return httptest.NewServer(router), nil }