switch to swift 6 -- prevent concurrency issues, fix concurrency issues #165
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,13 @@ | |
| import Foundation | ||
| import MLX | ||
| import MLXLLM | ||
| import MLXNN | ||
| import MLXOptimizers | ||
| import Tokenizers | ||
| import XCTest | ||
|
|
||
| @testable import MLXLMCommon | ||
|
|
||
| /// See also ChatSessionIntegrationTests | ||
| public class ChatSessionTests: XCTestCase { | ||
|
|
||
|
|
@@ -162,36 +163,43 @@ public class ChatSessionTests: XCTestCase { | |
| // MARK: - KV Cache | ||
|
|
||
| func testCurrentCacheNilBeforeGeneration() async throws { | ||
| let session = ChatSession(model(), generateParameters: generationParameters) | ||
| await session.withCache { cache in | ||
| XCTAssertNil(cache) | ||
| } | ||
|
Collaborator
Author
There was a problem hiding this comment. This is the pattern to fix the tests -- just use the visitor. |
||
| } | ||
|
|
||
| func testCurrentCacheAfterGeneration() async throws { | ||
| let session = ChatSession(model(), generateParameters: generationParameters) | ||
|
Collaborator
Author
There was a problem hiding this comment. See #128, those changes were in flight while these calls were added. This just syncs everything up -- this is needed to make the random weight token generation stop. |
||
| _ = try await session.respond(to: "hello") | ||
| await session.withCache { cache in | ||
| XCTAssertNotNil(cache) | ||
| } | ||
| } | ||
|
|
||
| func testInitWithKVCache() async throws { | ||
| // build a cache from an initial session | ||
| let container = ModelContainer(context: model()) | ||
| let initial = ChatSession(container, generateParameters: generationParameters) | ||
| _ = try await initial.respond(to: "hello") | ||
|
|
||
| try await initial.withCache { [targetLength, generationParameters] cache in | ||
| XCTAssertNotNil(cache) | ||
|
|
||
| if let cache { | ||
| // restore the cache into a new session and verify generation continues | ||
| let restored = ChatSession( | ||
| container, | ||
| cache: cache.map { $0.copy() }, | ||
| generateParameters: generationParameters) | ||
| let result = try await restored.respond(to: "hello again") | ||
| XCTAssertGreaterThan(result.count, targetLength, result) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func testSaveCacheThrowsBeforeGeneration() async throws { | ||
| let session = ChatSession(model(), generateParameters: generationParameters) | ||
| let url = FileManager.default.temporaryDirectory | ||
| .appendingPathComponent(UUID().uuidString) | ||
| .appendingPathExtension("safetensors") | ||
|
|
@@ -205,7 +213,7 @@ public class ChatSessionTests: XCTestCase { | |
|
|
||
| func testSaveAndRestoreCache() async throws { | ||
| let ctx = model() | ||
| let initial = ChatSession(ctx, generateParameters: generationParameters) | ||
| _ = try await initial.respond(to: "hello") | ||
|
|
||
| let url = FileManager.default.temporaryDirectory | ||
|
|
@@ -214,37 +222,46 @@ public class ChatSessionTests: XCTestCase { | |
| try await initial.saveCache(to: url) | ||
|
|
||
| let (loadedCache, _) = try loadPromptCache(url: url) | ||
| let restored = ChatSession( | ||
| ctx, cache: loadedCache, generateParameters: generationParameters) | ||
| let result = try await restored.respond(to: "hello again") | ||
| XCTAssertGreaterThan(result.count, targetLength, result) | ||
| } | ||
|
|
||
| func testCurrentCacheNilForHistorySessionBeforeGeneration() async throws { | ||
| // .history state should behave like .empty: no cache until first generation | ||
| let history: [Chat.Message] = [.user("hello"), .assistant("hi")] | ||
| let session = ChatSession( | ||
| model(), history: history, generateParameters: generationParameters) | ||
| await session.withCache { cache in | ||
| XCTAssertNil(cache) | ||
| } | ||
| } | ||
|
|
||
| func testCurrentCacheNonNilForHistorySessionAfterGeneration() async throws { | ||
| // after generation from .history state, cache transitions to .kvcache | ||
| let history: [Chat.Message] = [.user("hello"), .assistant("hi")] | ||
| let session = ChatSession( | ||
| model(), | ||
| history: history, | ||
| generateParameters: generationParameters) | ||
| _ = try await session.respond(to: "hello again") | ||
| await session.withCache { cache in | ||
| XCTAssertNotNil(cache) | ||
| } | ||
| } | ||
|
|
||
| func testCurrentCacheNilAfterClear() async throws { | ||
| // clear() resets to .empty; currentCache() should return nil again | ||
| let session = ChatSession(model(), generateParameters: generationParameters) | ||
| _ = try await session.respond(to: "hello") | ||
| await session.withCache { cache in | ||
| XCTAssertNotNil(cache) | ||
| } | ||
| await session.clear() | ||
| await session.withCache { cache in | ||
| XCTAssertNil(cache) | ||
| } | ||
| } | ||
|
|
||
| /// something that looks like a view model | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was a little too permissive -- it is added for test support so we can just switch it to an internal scoped visitor.