diff --git a/litellm/llms/ollama/completion/transformation.py b/litellm/llms/ollama/completion/transformation.py index a1340ba1952..97408f011bd 100644 --- a/litellm/llms/ollama/completion/transformation.py +++ b/litellm/llms/ollama/completion/transformation.py @@ -384,8 +384,10 @@ class OllamaConfig(BaseConfig): model_prompt_details: Final = custom_prompt_dict[model] ollama_prompt = custom_prompt( role_dict=model_prompt_details["roles"], - initial_prompt_value=model_prompt_details["initial_prompt_value"], - final_prompt_value=model_prompt_details["final_prompt_value"], + initial_prompt_value=model_prompt_details.get("initial_prompt_value", ""), + final_prompt_value=model_prompt_details.get("final_prompt_value", ""), + bos_token=model_prompt_details.get("bos_token", ""), + eos_token=model_prompt_details.get("eos_token", ""), messages=messages, ) elif text_completion_request: # handle `/completions` requests diff --git a/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py b/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py index b2071155f3f..514b79ec394 100644 --- a/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py +++ b/tests/test_litellm/llms/ollama/test_ollama_completion_transformation.py @@ -544,3 +544,47 @@ async def test_ollama_async_completion_inlines_remote_images_off_the_event_loop( assert response.choices[0].message.content == "Green" assert async_only_image_fetch.fetched == [image_url] assert captured["body"]["images"] == [async_only_image_fetch.base64_png] + + +def test_ollama_transform_request_custom_prompt_optional_values(): + config = OllamaConfig() + model = "custom-ollama-model" + messages = [{"role": "user", "content": "hello world"}] + + litellm_params = { + "custom_prompt_dict": { + model: { + "roles": { + "user": {"pre_message": "[INST] ", "post_message": " [/INST]"} + } + } + } + } + result = config.transform_request( + model=model, + messages=messages, + optional_params={}, + litellm_params=litellm_params, + headers={}, + ) + assert result["prompt"] == "[INST] hello world [/INST]" + + litellm_params_initial_only = { + "custom_prompt_dict": { + model: { + "roles": { + "user": {"pre_message": "Human: ", "post_message": "\n"} + }, + "initial_prompt_value": "Instructions:\n", + } + } + } + result_initial = config.transform_request( + model=model, + messages=messages, + optional_params={}, + litellm_params=litellm_params_initial_only, + headers={}, + ) + assert result_initial["prompt"] == "Instructions:\nHuman: hello world\n" +