ollama兼容

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'
 
 

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'
 
 ```
 

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:

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'
 
 
 

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'
 
 
 

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'