From 2bb24d8b6deb29a71487afd59193e4c4f5ea93b2 Mon Sep 17 00:00:00 2001
From: glide-the <2533736852@qq.com>
Date: Mon, 20 May 2024 10:46:27 +0800
Subject: [PATCH] =?UTF-8?q?ollama=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chatchat-server/chatchat/configs/model_providers.yaml      | 2 +-
 model-providers/README.md                                  | 2 +-
 .../core/model_runtime/model_providers/ollama/llm/llm.py   | 7 +++++--
 .../ollama_providers_test/model_providers.yaml             | 2 +-
 .../openai_providers_test/model_providers.yaml             | 2 +-
 .../tests/unit_tests/ollama/model_providers.yaml           | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/chatchat-server/chatchat/configs/model_providers.yaml b/chatchat-server/chatchat/configs/model_providers.yaml
index 5d7a844c..9780eb72 100644
--- a/chatchat-server/chatchat/configs/model_providers.yaml
+++ b/chatchat-server/chatchat/configs/model_providers.yaml
@@ -31,7 +31,7 @@ ollama:
     - model: 'llama3'
       model_type: 'llm'
       model_credentials:
-        base_url: 'http://172.21.80.1:11434'
+        base_url: 'http://172.21.192.1:11434'
         mode: 'completion'
 
 
diff --git a/model-providers/README.md b/model-providers/README.md
index e180e297..918cd781 100644
--- a/model-providers/README.md
+++ b/model-providers/README.md
@@ -70,7 +70,7 @@ ollama:
     - model: 'llama3'
       model_type: 'llm'
       model_credentials:
-        base_url: 'http://172.21.80.1:11434/v1'
+        base_url: 'http://172.21.192.1:11434/v1'
 
 ```
 
diff --git a/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py
index 328a5e5e..59b0d666 100644
--- a/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py
+++ b/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py
@@ -652,13 +652,16 @@ class OllamaLargeLanguageModel(_CommonOllama, LargeLanguageModel):
         if user:
             extra_model_kwargs["user"] = user
 
+        extra_body = {
+            **model_parameters,
+            **extra_model_kwargs,
+        }
         # chat model
         response = client.chat.completions.create(
             messages=[self._convert_prompt_message_to_dict(m) for m in prompt_messages],
             model=model,
             stream=stream,
-            **model_parameters,
-            **extra_model_kwargs,
+            extra_body=extra_body
         )
 
         if stream:
diff --git a/model-providers/tests/integration_tests/ollama_providers_test/model_providers.yaml b/model-providers/tests/integration_tests/ollama_providers_test/model_providers.yaml
index a1d2278e..7fa452c5 100644
--- a/model-providers/tests/integration_tests/ollama_providers_test/model_providers.yaml
+++ b/model-providers/tests/integration_tests/ollama_providers_test/model_providers.yaml
@@ -4,7 +4,7 @@ ollama:
     - model: 'llama3'
       model_type: 'llm'
       model_credentials:
-        base_url: 'http://172.21.80.1:11434/v1'
+        base_url: 'http://172.21.192.1:11434/v1'
 
 
 
diff --git a/model-providers/tests/integration_tests/openai_providers_test/model_providers.yaml b/model-providers/tests/integration_tests/openai_providers_test/model_providers.yaml
index 9ef23a0d..9240274d 100644
--- a/model-providers/tests/integration_tests/openai_providers_test/model_providers.yaml
+++ b/model-providers/tests/integration_tests/openai_providers_test/model_providers.yaml
@@ -4,7 +4,7 @@ ollama:
     - model: 'llama3'
       model_type: 'llm'
       model_credentials:
-        openai_api_base: 'http://172.21.80.1:11434'
+        openai_api_base: 'http://172.21.192.1:11434'
 
 
 
diff --git a/model-providers/tests/unit_tests/ollama/model_providers.yaml b/model-providers/tests/unit_tests/ollama/model_providers.yaml
index a1d2278e..7fa452c5 100644
--- a/model-providers/tests/unit_tests/ollama/model_providers.yaml
+++ b/model-providers/tests/unit_tests/ollama/model_providers.yaml
@@ -4,7 +4,7 @@ ollama:
     - model: 'llama3'
       model_type: 'llm'
       model_credentials:
-        base_url: 'http://172.21.80.1:11434/v1'
+        base_url: 'http://172.21.192.1:11434/v1'