Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JSON structured outputs to Ollama Provider #680

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add JSON structured outputs to Ollama Provider #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da82fb2
Add JSON structured outputs to Ollama
aidando73 Dec 22, 2024
0ffcbb8
uncomment
aidando73 Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions llama_stack/providers/remote/inference/ollama/ollama.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ async def chat_completion(
tool_prompt_format=tool_prompt_format,
stream=stream,
logprobs=logprobs,
response_format=response_format,
)
if stream:
return self._stream_chat_completion(request)
Expand Down Expand Up @@ -257,6 +258,14 @@ async def _get_params(
)
input_dict["raw"] = True

if fmt := request.response_format:
if fmt.type == "json_schema":
input_dict["format"] = fmt.json_schema
elif fmt.type == "grammar":
raise NotImplementedError("Grammar response format is not supported")
else:
raise ValueError(f"Unknown response format type: {fmt.type}")

return {
"model": request.model,
**input_dict,
Expand Down
2 changes: 2 additions & 0 deletions llama_stack/providers/tests/inference/test_text_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ async def test_completion_structured_output(self, inference_model, inference_sta
provider = inference_impl.routing_table.get_provider_impl(inference_model)
if provider.__provider_spec__.provider_type not in (
"inline::meta-reference",
"remote::ollama",
"remote::tgi",
"remote::together",
"remote::fireworks",
Expand Down Expand Up @@ -253,6 +254,7 @@ async def test_structured_output(
provider = inference_impl.routing_table.get_provider_impl(inference_model)
if provider.__provider_spec__.provider_type not in (
"inline::meta-reference",
"remote::ollama",
"remote::fireworks",
"remote::tgi",
"remote::together",
Expand Down
Loading