From 319e97d677ae82baa0f23bcc1fc765ce2cd3bb8a Mon Sep 17 00:00:00 2001
From: CaIon <1808837298@qq.com>
Date: Tue, 26 Mar 2024 19:27:11 +0800
Subject: [PATCH] fix: ollama channel test

---
 controller/channel-test.go           | 1 +
 relay/channel/ollama/adaptor.go      | 3 +--
 relay/channel/ollama/relay-ollama.go | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/controller/channel-test.go b/controller/channel-test.go
index 2eee554..6d64a24 100644
--- a/controller/channel-test.go
+++ b/controller/channel-test.go
@@ -108,6 +108,7 @@ func buildTestRequest() *dto.GeneralOpenAIRequest {
 	testRequest := &dto.GeneralOpenAIRequest{
 		Model:     "", // this will be set later
 		MaxTokens: 1,
+		Stream:    false,
 	}
 	content, _ := json.Marshal("hi")
 	testMessage := dto.Message{
diff --git a/relay/channel/ollama/adaptor.go b/relay/channel/ollama/adaptor.go
index 69a97e3..4c17252 100644
--- a/relay/channel/ollama/adaptor.go
+++ b/relay/channel/ollama/adaptor.go
@@ -2,7 +2,6 @@ package ollama
 
 import (
 	"errors"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"io"
 	"net/http"
@@ -20,7 +19,7 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo, request dto.GeneralOpenAIReq
 }
 
 func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
-	return fmt.Sprintf("%s/api/chat", info.BaseUrl), nil
+	return relaycommon.GetFullRequestURL(info.BaseUrl, info.RequestURLPath, info.ChannelType), nil
 }
 
 func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, info *relaycommon.RelayInfo) error {
diff --git a/relay/channel/ollama/relay-ollama.go b/relay/channel/ollama/relay-ollama.go
index 0662ddd..41a2a15 100644
--- a/relay/channel/ollama/relay-ollama.go
+++ b/relay/channel/ollama/relay-ollama.go
@@ -1,6 +1,8 @@
 package ollama
 
-import "one-api/dto"
+import (
+	"one-api/dto"
+)
 
 func requestOpenAI2Ollama(request dto.GeneralOpenAIRequest) *OllamaRequest {
 	messages := make([]dto.Message, 0, len(request.Messages))