Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ollama/ollama
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.11.3
Choose a base ref
...
head repository: ollama/ollama
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.11.4
Choose a head ref
  • 10 commits
  • 6 files changed
  • 5 contributors

Commits on Aug 6, 2025

  1. Configuration menu
    Copy the full SHA
    8a75e9e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa8be9e View commit details
    Browse the repository at this point in the history
  3. openai: allow for content _and_ tool calls in the same message

    Previously our OpenAI chat completions compat layer assumed that tool
    calls and content would never be provided together, but this is not a
    correct assumption. Content is only optional when tool calls are
    present, but tool calls and content can be provided together
    
    Fixes: #11704
    drifkin committed Aug 6, 2025
    Configuration menu
    Copy the full SHA
    203c137 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #11759 from ollama/drifkin/oai-tool-calling

    openai: allow for content _and_ tool calls in the same message
    drifkin authored Aug 6, 2025
    Configuration menu
    Copy the full SHA
    8f14e1f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    44bc36d View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2025

  1. openai: when converting role=tool messages, propagate the tool name

    Added support for converting both `name` and `tool_call_id` fields,
    which different clients might provide. `name` is a legacy field from the
    OpenAI completions API. For `tool_call_id` we inspect previous messages
    and look for a matching tool call ID and grab its name
    
    Issue: #11704
    drifkin committed Aug 7, 2025
    Configuration menu
    Copy the full SHA
    759dd78 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11761 from ollama/drifkin/openai-tool-names

    openai: when converting role=tool messages, propagate the tool name
    drifkin authored Aug 7, 2025
    Configuration menu
    Copy the full SHA
    223a619 View commit details
    Browse the repository at this point in the history
  3. openai: always provide reasoning

    We were missing passing along thinking if content was nil (as opposed
    to empty string)
    
    Also added a test for content not being passed, which was the real cause
    of <#11704>, since with the way
    `Content` is typed, not passing it and empty string are distinct
    drifkin committed Aug 7, 2025
    Configuration menu
    Copy the full SHA
    735c41f View commit details
    Browse the repository at this point in the history
  4. Merge pull request #11765 from ollama/drifkin/thinking-without-content

    openai: always provide reasoning
    drifkin authored Aug 7, 2025
    Configuration menu
    Copy the full SHA
    aa9d889 View commit details
    Browse the repository at this point in the history
  5. server: Reduce gpt-oss context length for small VRAM GPUs

    gpt-oss works best with a context length of at least 8k. However,
    for GPUs with limited amount of VRAM, there is a significant
    performance hit to this increased context. In these cases, we
    switch to the Ollama default of 4k
    jessegross committed Aug 7, 2025
    Configuration menu
    Copy the full SHA
    f2e9c9a View commit details
    Browse the repository at this point in the history
Loading