Skip to content

[pull] main from intitni:main #85

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

Merged
pull merged 5 commits into from
Nov 18, 2024
Merged

[pull] main from intitni:main #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8043cd6
Fix that a tab can be registered to an empty id
intitni Oct 30, 2024
df2423b
Fix that command w is not closing a chat tab
intitni Oct 30, 2024
59cdc22
Update claude models to use -latest alias if possible
intitni Oct 30, 2024
42b1b8f
Bump version to 0.34.3
intitni Oct 30, 2024
35a955f
Merge branch 'hotfix/0.34.3'
intitni Oct 30, 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
4 changes: 2 additions & 2 deletions Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ extension ChatTabPool {
let id = id
let info = ChatTabInfo(id: id, title: "")
guard let chatTap = await builder.build(store: createStore(id)) else { return nil }
setTab(chatTap)
setTab(chatTap, forId: id)
return (chatTap, info)
}

Expand All @@ -379,7 +379,7 @@ extension ChatTabPool {
let info = ChatTabInfo(id: id, title: "")
let builder = kind?.builder ?? ChatGPTChatTab.defaultBuilder()
guard let chatTap = await builder.build(store: createStore(id)) else { return nil }
setTab(chatTap)
setTab(chatTap, forId: id)
return (chatTap, info)
}

Expand Down
10 changes: 7 additions & 3 deletions Core/Sources/SuggestionWidget/ChatPanelWindow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ final class ChatPanelWindow: WidgetWindow {
private let store: StoreOf<ChatPanel>

var minimizeWindow: () -> Void = {}

var isDetached: Bool {
store.withState({$0.isDetached})
store.withState { $0.isDetached }
}

override var defaultCollectionBehavior: NSWindow.CollectionBehavior {
Expand All @@ -35,7 +35,7 @@ final class ChatPanelWindow: WidgetWindow {
self.minimizeWindow = minimizeWindow
super.init(
contentRect: .init(x: 0, y: 0, width: 300, height: 400),
styleMask: [.resizable, .titled, .miniaturizable, .fullSizeContentView],
styleMask: [.resizable, .titled, .miniaturizable, .fullSizeContentView, .closable],
backing: .buffered,
defer: false
)
Expand Down Expand Up @@ -121,5 +121,9 @@ final class ChatPanelWindow: WidgetWindow {
override func miniaturize(_: Any?) {
minimizeWindow()
}

override func close() {
store.send(.closeActiveTabClicked)
}
}

4 changes: 2 additions & 2 deletions Tool/Sources/ChatTab/ChatTabPool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public final class ChatTabPool {
pool[id]
}

public func setTab(_ tab: any ChatTab) {
pool[tab.id] = tab
public func setTab(_ tab: any ChatTab, forId id: String) {
pool[id] = tab
}

public func removeTab(of id: String) {
Expand Down
5 changes: 3 additions & 2 deletions Tool/Sources/OpenAIService/APIs/ClaudeChatCompletionsService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import Preferences

/// https://docs.anthropic.com/claude/reference/messages_post
public actor ClaudeChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI {
/// https://docs.anthropic.com/en/docs/about-claude/models
public enum KnownModel: String, CaseIterable {
case claude35Sonnet = "claude-3-5-sonnet-20240620"
case claude3Opus = "claude-3-opus-20240229"
case claude35Sonnet = "claude-3-5-sonnet-latest"
case claude3Opus = "claude-3-opus-latest"
case claude3Sonnet = "claude-3-sonnet-20240229"
case claude3Haiku = "claude-3-haiku-20240307"

Expand Down
4 changes: 2 additions & 2 deletions Version.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
APP_VERSION = 0.34.2
APP_BUILD = 415
APP_VERSION = 0.34.3
APP_BUILD = 416