git.iko.soy/crush
on main help sign in
chore: small update
commitce298256499e36162376a6d36f5352285ece2823 authorKujtim Hoxha <kujtimii.h@gmail.com> dateMon 7 Jul 2025, 18:28 (1 year ago) parent99e6b99
7 files changed+16−10
compare with main
unifiedsplit
internal/config/load.go+6 internal/config/load_test.go+3−3 internal/fur/provider/provider.go+1−1 internal/tui/components/chat/messages/messages.go+1−1 internal/tui/components/chat/sidebar/sidebar.go+1−1 internal/tui/components/dialogs/models/models.go+3−3 internal/tui/page/chat/chat.go+1−1
internal/config/load.go+6
@@ -145,6 +145,9 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
145145 continue
146146 }
147147 seen[model.ID] = true
148+ if model.Model == "" {
149+ model.Model = model.ID
150+ }
148151 models = append(models, model)
149152 }
150153 for _, model := range p.Models {
@@ -152,6 +155,9 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
152155 continue
153156 }
154157 seen[model.ID] = true
158+ if model.Model == "" {
159+ model.Model = model.ID
160+ }
155161 models = append(models, model)
156162 }
157163
internal/config/load_test.go+3−3
@@ -98,8 +98,8 @@ func TestConfig_configureProvidersWithOverride(t *testing.T) {
9898 BaseURL: "https://api.openai.com/v2",
9999 Models: []provider.Model{
100100 {
101− ID: "test-model",
102− Name: "Updated",
101+ ID: "test-model",
102+ Model: "Updated",
103103 },
104104 {
105105 ID: "another-model",
@@ -122,7 +122,7 @@ func TestConfig_configureProvidersWithOverride(t *testing.T) {
122122 assert.Equal(t, "xyz", cfg.Providers["openai"].APIKey)
123123 assert.Equal(t, "https://api.openai.com/v2", cfg.Providers["openai"].BaseURL)
124124 assert.Len(t, cfg.Providers["openai"].Models, 2)
125− assert.Equal(t, "Updated", cfg.Providers["openai"].Models[0].Name)
125+ assert.Equal(t, "Updated", cfg.Providers["openai"].Models[0].Model)
126126}
127127
128128func TestConfig_configureProvidersWithNewProvider(t *testing.T) {
internal/fur/provider/provider.go+1−1
@@ -45,7 +45,7 @@ type Provider struct {
4545// Model represents an AI model configuration.
4646type Model struct {
4747 ID string `json:"id"`
48− Name string `json:"model"`
48+ Model string `json:"model"`
4949 CostPer1MIn float64 `json:"cost_per_1m_in"`
5050 CostPer1MOut float64 `json:"cost_per_1m_out"`
5151 CostPer1MInCached float64 `json:"cost_per_1m_in_cached"`
internal/tui/components/chat/messages/messages.go+1−1
@@ -296,7 +296,7 @@ func (m *assistantSectionModel) View() string {
296296 infoMsg := t.S().Subtle.Render(duration.String())
297297 icon := t.S().Subtle.Render(styles.ModelIcon)
298298 model := config.Get().GetModel(m.message.Provider, m.message.Model)
299− modelFormatted := t.S().Muted.Render(model.Name)
299+ modelFormatted := t.S().Muted.Render(model.Model)
300300 assistant := fmt.Sprintf("%s %s %s", icon, modelFormatted, infoMsg)
301301 return t.S().Base.PaddingLeft(2).Render(
302302 core.Section(assistant, m.width-2),
internal/tui/components/chat/sidebar/sidebar.go+1−1
@@ -481,7 +481,7 @@ func (s *sidebarCmp) currentModelBlock() string {
481481 t := styles.CurrentTheme()
482482
483483 modelIcon := t.S().Base.Foreground(t.FgSubtle).Render(styles.ModelIcon)
484− modelName := t.S().Text.Render(model.Name)
484+ modelName := t.S().Text.Render(model.Model)
485485 modelInfo := fmt.Sprintf("%s %s", modelIcon, modelName)
486486 parts := []string{
487487 modelInfo,
internal/tui/components/dialogs/models/models.go+3−3
@@ -264,7 +264,7 @@ func (m *modelDialogCmp) SetModelType(modelType int) tea.Cmd {
264264 for i, model := range providerConfig.Models {
265265 configProvider.Models[i] = provider.Model{
266266 ID: model.ID,
267− Name: model.Name,
267+ Model: model.Model,
268268 CostPer1MIn: model.CostPer1MIn,
269269 CostPer1MOut: model.CostPer1MOut,
270270 CostPer1MInCached: model.CostPer1MInCached,
@@ -285,7 +285,7 @@ func (m *modelDialogCmp) SetModelType(modelType int) tea.Cmd {
285285 }
286286 modelItems = append(modelItems, commands.NewItemSection(name))
287287 for _, model := range configProvider.Models {
288− modelItems = append(modelItems, completions.NewCompletionItem(model.Name, ModelOption{
288+ modelItems = append(modelItems, completions.NewCompletionItem(model.Model, ModelOption{
289289 Provider: configProvider,
290290 Model: model,
291291 }))
@@ -315,7 +315,7 @@ func (m *modelDialogCmp) SetModelType(modelType int) tea.Cmd {
315315 }
316316 modelItems = append(modelItems, commands.NewItemSection(name))
317317 for _, model := range provider.Models {
318− modelItems = append(modelItems, completions.NewCompletionItem(model.Name, ModelOption{
318+ modelItems = append(modelItems, completions.NewCompletionItem(model.Model, ModelOption{
319319 Provider: provider,
320320 Model: model,
321321 }))
internal/tui/page/chat/chat.go+1−1
@@ -175,7 +175,7 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
175175 if model.SupportsImages {
176176 return p, util.CmdHandler(OpenFilePickerMsg{})
177177 } else {
178− return p, util.ReportWarn("File attachments are not supported by the current model: " + model.Name)
178+ return p, util.ReportWarn("File attachments are not supported by the current model: " + model.Model)
179179 }
180180 case key.Matches(msg, p.keyMap.Tab):
181181 if p.session.ID == "" {