Repository navigation
Conversation
…dynamic-profiles # Conflicts: # Sources/AnyLanguageModel/LanguageModelSession.swift # Sources/AnyLanguageModel/SessionProperties.swift # Sources/AnyLanguageModelMacros/SessionPropertyEntryMacro.swift # Tests/AnyLanguageModelTests/APICompatibilityAnyLanguageModelTests.swift # Tests/AnyLanguageModelTests/APICompatibilityFoundationModelsTests.swift # Tests/AnyLanguageModelTests/SessionPropertyTests.swift
…dynamic-profiles # Conflicts: # Sources/AnyLanguageModel/SessionProperties.swift # Tests/AnyLanguageModelTests/SessionPropertyTests.swift
…dynamic-profiles # Conflicts: # Sources/AnyLanguageModel/LanguageModelSession.swift
…ofile-tool-continuations # Conflicts: # Sources/AnyLanguageModel/DynamicProfile.swift # Sources/AnyLanguageModel/LanguageModelSession.swift
…ile-tool-continuations
…pstream-profile-ollama
…stream-session-properties
…stream-dynamic-profiles
…stream-profile-tool-continuations
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Scope
Ollama integration for #315's shared Compatibility SPI. Provider PRs are siblings, not a chain.
Depends on #315 cf4ad0d, transitively #314/#313 and main's #352. Isolated layer comparison.
Preserve upstream ChatReply.response() error validation. Tool definitions and execution lookup both honor the producing request's toolsOffered list, including disallowed mode. The reused-ID fixture sends actual call_0 values. Existing ordinary non-streaming continuation is retained; the requested separate PR remains an outstanding decision, not silently removed or created here.
Upstream 1.1 synchronization
Normal history-preserving merges synchronize upstream main 7d43219, including #357 per-request usage accounting, #341 Ollama reasoning, #358 host-scoped Chat Completions reasoning, #300 response-start timeouts, #362 cancellation collection, #364 partial structured snapshots and #366/#367 bounds/reasoning/system-Tool fixes. Earlier #336 final-request usage, #340 HTTPTransport, #297/#325/#331/#343/#352/#354/#356 remain intact. No force-push, new checkout, replacement PR or extra fallback.
Ollama thinking is preserved in ordinary/profile streaming and non-streaming continuations, canonical entries and Codable replay, with a typed .ollama origin. Reasoning callbacks run for the producing profile before Tool-output callbacks switch it; the round budget is checked before the unexecuted round's reasoning is appended. New request-body/Codable/callback and error-payload cases first failed, then passed. Existing ordinary non-streaming continuation, ChatReply.response() validation, toolsOffered execution filtering and actual reused call IDs remain unchanged; no standalone continuation PR is created here.
Fresh local verification (2026-10-23)
Head cad7b1b.
CI=1 GIT_CONFIG_GLOBAL=/dev/null swift test: 958 tests / 100 suites passed. The separate upstream macro test target also passed 2 tests / 1 suite. Strict formatting/diff checks passed. These are compile/offline tests, not live API, model-weight or Apple Intelligence inference acceptance.The existing ordinary/profile non-streaming final-usage regression remains covered, including a final request with no usage and the unchanged two-request continuation path. The offline suites retain streaming/non-streaming history, callback, reused-ID and handoff accounting regressions. Constructor visibility is still SPI; no new PR or force-push.