@@ -626,7 +626,9 @@ class OllamaLLMParameters(BaseChatCompletionParameters):
626626 @staticmethod
627627 def validate (adapter_metadata : dict [str , "Any" ]) -> dict [str , "Any" ]:
628628 adapter_metadata ["model" ] = OllamaLLMParameters .validate_model (adapter_metadata )
629- adapter_metadata ["api_base" ] = adapter_metadata .get ("base_url" , "" )
629+ adapter_metadata ["api_base" ] = adapter_metadata .get (
630+ "base_url" , adapter_metadata .get ("api_base" , "" )
631+ )
630632
631633 return OllamaLLMParameters (** adapter_metadata ).model_dump ()
632634
@@ -772,11 +774,16 @@ def validate(adapter_metadata: dict[str, "Any"]) -> dict[str, "Any"]:
772774 adapter_metadata ["model" ] = OllamaEmbeddingParameters .validate_model (
773775 adapter_metadata
774776 )
775- adapter_metadata ["api_base" ] = adapter_metadata .get ("base_url" , "" )
777+ adapter_metadata ["api_base" ] = adapter_metadata .get (
778+ "base_url" , adapter_metadata .get ("api_base" , "" )
779+ )
776780
777781 return OllamaEmbeddingParameters (** adapter_metadata ).model_dump ()
778782
779783 @staticmethod
780784 def validate_model (adapter_metadata : dict [str , "Any" ]) -> str :
781- model = adapter_metadata .get ("model_name" , "" )
782- return model
785+ model = adapter_metadata .get ("model_name" , adapter_metadata .get ("model" , "" ))
786+ if model .startswith ("ollama/" ):
787+ return model
788+ else :
789+ return f"ollama/{ model } "
0 commit comments