Skip to content

Improve speed and cancel behaviour #51

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

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

Improve speed and cancel behaviour #51

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8befeb
Do not adjust start index, to ensure we consume the whitespaces/newli…
pd95 Mar 21, 2025
4bcccb2
Make sure cancelation of Combine stream triggers cancellation of URLS…
pd95 Mar 21, 2025
ebdbc98
Fix warning
pd95 Mar 21, 2025
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
10 changes: 5 additions & 5 deletions Sources/OllamaKit/Utils/OKHTTPClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ internal extension OKHTTPClient {
.setFailureType(to: Error.self)
.eraseToAnyPublisher()
}
.handleEvents(receiveCancel: {
task.cancel()
})
.eraseToAnyPublisher()
}
}
Expand All @@ -131,8 +134,8 @@ private extension OKHTTPClient {
var isEscaped = false
var isWithinString = false
var nestingDepth = 0
var objectStartIndex = buffer.startIndex
let objectStartIndex = buffer.startIndex

for (index, byte) in buffer.enumerated() {
let character = Character(UnicodeScalar(byte))

Expand All @@ -146,9 +149,6 @@ private extension OKHTTPClient {
switch character {
case "{":
nestingDepth += 1
if nestingDepth == 1 {
objectStartIndex = index
}
case "}":
nestingDepth -= 1
if nestingDepth == 0 {
Expand Down