@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsViewModel.js

@@ -4,19 +4,15 @@ import { distinct } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arr
 import { or, matchesBaseContiguousSubString, matchesWords, matchesCamelCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
 const MODEL_ENTRY_TEMPLATE_ID = "model.entry.template";
 const VENDOR_ENTRY_TEMPLATE_ID = "vendor.entry.template";
-const GROUP_ENTRY_TEMPLATE_ID = "group.entry.template";
 const wordFilter = or(matchesBaseContiguousSubString, matchesWords);
 const CAPABILITY_REGEX = /@capability:\s*([^\s]+)/gi;
-const VISIBLE_REGEX = /@visible:\s*(true|false)/i;
 const PROVIDER_REGEX = /@provider:\s*((".+?")|([^\s]+))/gi;
 const SEARCH_SUGGESTIONS = {
-    CAPABILITIES: ["@capability:tools", "@capability:vision", "@capability:agent"],
-    VISIBILITY: ["@visible:true", "@visible:false"]
+    CAPABILITIES: ["@capability:tools", "@capability:vision", "@capability:agent"]
 };
 function isLanguageModelProviderEntry(entry) {
     return entry.type === "vendor";
@@ -30,7 +26,6 @@ function isStatusEntry(entry) {
 var ChatModelGroup;
 (function(ChatModelGroup) {
     ChatModelGroup["Vendor"] = "vendor";
-    ChatModelGroup["Visibility"] = "visibility";
 })(ChatModelGroup || (ChatModelGroup = {}));
 let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
     get groupBy() {
@@ -119,12 +114,6 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
         this.splice(0, this._viewModelEntries.length, viewModelEntries);
     }
     filterModels(modelEntries, searchValue) {
-        let visible;
-        const visibleMatches = VISIBLE_REGEX.exec(searchValue);
-        if (visibleMatches && visibleMatches[1]) {
-            visible = visibleMatches[1].toLowerCase() === "true";
-            searchValue = searchValue.replace(VISIBLE_REGEX, "");
-        }
         const providerNames = [];
         let providerMatch;
         PROVIDER_REGEX.lastIndex = 0;
@@ -158,11 +147,6 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
         const words = searchValue.split(" ");
         const lowerProviders = ( providerNames.map(p => p.toLowerCase().trim()));
         for (const modelEntry of modelEntries) {
-            if (visible !== undefined) {
-                if (modelEntry.visible !== visible) {
-                    continue;
-                }
-            }
             if (lowerProviders.length > 0) {
                 const matchesProvider = ( lowerProviders.some(
                     provider => modelEntry.provider.vendor.vendor.toLowerCase() === provider || modelEntry.provider.vendor.displayName.toLowerCase() === provider
@@ -248,36 +232,7 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
     }
     groupModels(languageModels) {
         const result = [];
-        if (this.groupBy === ChatModelGroup.Visibility) {
-            const visible = [], hidden = [];
-            for (const model of languageModels) {
-                if (model.visible) {
-                    visible.push(model);
-                } else {
-                    hidden.push(model);
-                }
-            }
-            result.push({
-                group: {
-                    type: "group",
-                    id: "visible",
-                    label: ( localize(6162, "Visible")),
-                    templateId: GROUP_ENTRY_TEMPLATE_ID,
-                    collapsed: ( this.collapsedGroups.has("visible"))
-                },
-                models: visible
-            });
-            result.push({
-                group: {
-                    type: "group",
-                    id: "hidden",
-                    label: ( localize(6163, "Hidden")),
-                    templateId: GROUP_ENTRY_TEMPLATE_ID,
-                    collapsed: ( this.collapsedGroups.has("hidden"))
-                },
-                models: hidden
-            });
-        } else if (this.groupBy === ChatModelGroup.Vendor) {
+        if (this.groupBy === ChatModelGroup.Vendor) {
             for (const model of languageModels) {
                 const groupId = this.getProviderGroupId(model.provider.group);
                 let group = result.find(group => group.group.id === groupId);
@@ -416,56 +371,20 @@ let ChatModelsViewModel = class ChatModelsViewModel extends Disposable {
                 models.push({
                     identifier,
                     metadata,
-                    provider,
-                    visible: metadata.isUserSelectable ?? false
+                    provider
                 });
             }
         }
         this.languageModels.push(...models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name)));
     }
-    toggleVisibility(model) {
-        const newVisibility = !model.model.visible;
-        this.languageModelsService.updateModelPickerPreference(model.model.identifier, newVisibility);
-        const metadata = this.languageModelsService.lookupLanguageModel(model.model.identifier);
-        const index = this.viewModelEntries.indexOf(model);
-        if (metadata && index !== -1) {
-            model.model.visible = newVisibility;
-            model.model.metadata = metadata;
-            model.id = this.getModelId(model.model);
-            if (this.groupBy === ChatModelGroup.Visibility) {
-                this.modelsSorted = false;
-            }
-            this.splice(index, 1, [model]);
-        }
-    }
-    setModelsVisibility(models, visible) {
-        for (const model of models) {
-            this.languageModelsService.updateModelPickerPreference(model.model.identifier, visible);
-            model.model.visible = visible;
-        }
-        this.languageModelGroups = this.groupModels(this.languageModels);
-        this.doFilter();
-    }
-    setGroupVisibility(group, visible) {
-        const models = this.getModelsForGroup(group);
-        for (const model of models) {
-            this.languageModelsService.updateModelPickerPreference(model.identifier, visible);
-            model.visible = visible;
-        }
-        this.languageModelGroups = this.groupModels(this.languageModels);
-        this.doFilter();
-    }
     getModelsForGroup(group) {
         if (isLanguageModelProviderEntry(group)) {
             return this.languageModels.filter(m => this.getProviderGroupId(m.provider.group) === group.id);
-        } else {
-            return this.languageModels.filter(
-                m => (group.id === "visible" && m.visible) || (group.id === "hidden" && !m.visible)
-            );
         }
+        return this.languageModels;
     }
     getModelId(modelEntry) {
-        return `${modelEntry.provider.group.name}.${modelEntry.identifier}.${modelEntry.metadata.version}-visible:${modelEntry.visible}`;
+        return `${modelEntry.provider.group.name}.${modelEntry.identifier}.${modelEntry.metadata.version}`;
     }
     getProviderGroupId(group) {
         return `${group.vendor}-${group.name}`;
@@ -579,4 +498,4 @@ class ModelItemMatches {
     }
 }
 
-export { ChatModelGroup, ChatModelsViewModel, GROUP_ENTRY_TEMPLATE_ID, MODEL_ENTRY_TEMPLATE_ID, SEARCH_SUGGESTIONS, VENDOR_ENTRY_TEMPLATE_ID, isLanguageModelGroupEntry, isLanguageModelProviderEntry, isStatusEntry };
+export { ChatModelGroup, ChatModelsViewModel, MODEL_ENTRY_TEMPLATE_ID, SEARCH_SUGGESTIONS, VENDOR_ENTRY_TEMPLATE_ID, isLanguageModelGroupEntry, isLanguageModelProviderEntry, isStatusEntry };

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.d.ts

@@ -33,7 +33,7 @@ export declare class ChatModelsWidget extends Disposable {
     private viewModel;
     private delayedFiltering;
     private readonly searchFocusContextKey;
-    private tableDisposables;
+    private readonly tableDisposables;
     constructor(languageModelsService: ILanguageModelsService, instantiationService: IInstantiationService, extensionService: IExtensionService, contextMenuService: IContextMenuService, chatEntitlementService: IChatEntitlementService, editorProgressService: IEditorProgressService, commandService: ICommandService, contextKeyService: IContextKeyService);
     private create;
     private createTable;