@opensumi/ide-ai-native 3.2.4 → 3.2.5-next-1724062137.0

package/src/browser/contrib/inline-completions/completeProvider.ts

@@ -1,26 +1,12 @@
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
-import { AppConfig, PreferenceService } from '@opensumi/ide-core-browser';
-import { AI_INLINE_COMPLETION_REPORTER } from '@opensumi/ide-core-browser/lib/ai-native/command';
-import {
-  AINativeSettingSectionsId,
-  DisposableStore,
-  URI,
-  WithEventBus,
-  raceCancellation,
-  sleep,
-  uuid,
-} from '@opensumi/ide-core-common';
-import { IAICompletionOption, IAICompletionResultModel } from '@opensumi/ide-core-common/lib/types/ai-native';
-import { AISerivceType, IAIReporter } from '@opensumi/ide-core-common/lib/types/ai-native/reporter';
+import { PreferenceService } from '@opensumi/ide-core-browser';
+import { AINativeSettingSectionsId, WithEventBus, raceCancellation, sleep } from '@opensumi/ide-core-common';
 import { IEditor } from '@opensumi/ide-editor';
 import * as monaco from '@opensumi/ide-monaco';
 
-import { DEFAULT_COMPLECTION_MODEL } from './constants';
-import { IInlineCompletionCache, InlineCompletionItem } from './model/competionModel';
-import { PromptCache } from './promptCache';
-import { getPrefixPrompt, getSuffixPrompt, lineBasedPromptProcessor } from './provider';
+import { IInlineCompletionCache } from './model/competionModel';
+import { InlineCompletionRequestTask } from './model/inlineCompletionRequestTask';
 import { AICompletionsService } from './service/ai-completions.service';
-import { ICompletionContext } from './types';
 
 // 用来缓存最近一次的补全结果
 const inlineCompletionCache: IInlineCompletionCache = {
@@ -29,280 +15,12 @@ const inlineCompletionCache: IInlineCompletionCache = {
   last: null,
 };
 
-const makeHashSet = (str: string) => {
-  const set = new Set<string>();
-  for (const char of str) {
-    set.add(char);
-  }
-  return set;
-};
-
-const removeChars = (insertText: string, textAfterCursor: string) => {
-  let result = '';
-  const aSet = makeHashSet(insertText);
-  for (const char of textAfterCursor) {
-    // 如果是空格或者 insertText 中不存在的字符，就加入到结果中
-    if (char === ' ' || !aSet.has(char)) {
-      result += char;
-    }
-  }
-  return result;
-};
-
-@Injectable({ multiple: true })
-export class CompletionRequestTask {
-  private _disposables = new DisposableStore();
-
-  @Autowired(IAIReporter)
-  private aiReporter: IAIReporter;
-
-  @Autowired(INJECTOR_TOKEN)
-  private readonly injector: Injector;
-
-  @Autowired(PromptCache)
-  private promptCache: PromptCache;
-
-  @Autowired(AICompletionsService)
-  private aiCompletionsService: AICompletionsService;
-
-  @Autowired(PreferenceService)
-  private readonly preferenceService: PreferenceService;
-
-  @Autowired(AppConfig)
-  private appConfig: AppConfig;
-
-  isCancelFlag: boolean;
-
-  private isEnablePromptEngineering = true;
-
-  constructor(
-    public model: monaco.editor.ITextModel,
-    public position: monaco.Position,
-    public token: monaco.CancellationToken,
-    public _isManual: boolean,
-  ) {
-    this.isCancelFlag = false;
-
-    this.isEnablePromptEngineering = this.preferenceService.getValid(
-      AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled,
-      this.isEnablePromptEngineering,
-    );
-
-    this._disposables.add(
-      this.preferenceService.onSpecificPreferenceChange(
-        AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled,
-        ({ newValue }) => {
-          this.isEnablePromptEngineering = newValue;
-        },
-      ),
-    );
-  }
-
-  async constructRequestBean(
-    context: ICompletionContext,
-    token: monaco.CancellationToken,
-  ): Promise<IAICompletionOption> {
-    if (this.isEnablePromptEngineering) {
-      const prompt = await getPrefixPrompt(context, DEFAULT_COMPLECTION_MODEL, this.injector, token);
-      const suffix = await getSuffixPrompt(context, DEFAULT_COMPLECTION_MODEL, this.injector, token);
-
-      return {
-        prompt,
-        suffix,
-        sessionId: uuid(),
-        language: context.language,
-        fileUrl: context.fileUrl,
-        workspaceDir: context.workspaceDir,
-      };
-    }
-
-    const prompt = lineBasedPromptProcessor.processPrefix(context.prefix);
-    const suffix = lineBasedPromptProcessor.processSuffix(context.suffix);
-    return {
-      prompt,
-      suffix,
-      sessionId: uuid(),
-      language: context.language,
-      fileUrl: context.fileUrl,
-      workspaceDir: context.workspaceDir,
-    };
-  }
-
-  // 发送请求
-  async run() {
-    const { model, position, token } = this;
-    if (!model) {
-      return [];
-    }
-    if (token.isCancellationRequested) {
-      return [];
-    }
-
-    if (this.isCancelFlag) {
-      return [];
-    }
-
-    const startRange = new monaco.Range(0, 0, position.lineNumber, position.column);
-    let prefix = model.getValueInRange(startRange);
-    if (prefix === '') {
-      prefix += '\n';
-    }
-
-    const endRange = new monaco.Range(
-      position.lineNumber,
-      position.column,
-      model.getLineCount(),
-      Number.MAX_SAFE_INTEGER,
-    );
-
-    const suffix = model.getValueInRange(endRange);
-
-    const languageId = model.getLanguageId();
-    const context: ICompletionContext = {
-      fileUrl: model.uri.fsPath,
-      filename: model.uri.toString().split('/').pop()!,
-      language: languageId,
-      prefix,
-      suffix,
-      uri: URI.from(model.uri),
-      workspaceDir: this.appConfig.workspaceDir,
-    };
-
-    // 组装请求参数,向远程发起请求
-    const requestBean = await this.constructRequestBean(context, token);
-    if (this.isCancelFlag) {
-      return [];
-    }
-
-    this.aiCompletionsService.updateStatusBarItem('running', true);
-    const requestStartTime = Date.now();
-
-    let rs: IAICompletionResultModel | null;
-    const cacheData = this.promptCache.getCache(requestBean);
-    const relationId =
-      cacheData?.relationId || this.aiReporter.start(AISerivceType.Completion, { message: AISerivceType.Completion });
-
-    this.aiCompletionsService.setLastRelationId(relationId);
-    // 如果存在缓存
-    if (cacheData) {
-      rs = cacheData;
-    } else {
-      try {
-        rs = await this.aiCompletionsService.complete(requestBean, model, position, token);
-      } catch (error) {
-        this.aiCompletionsService.reporterEnd(relationId, {
-          success: false,
-          replytime: Date.now() - requestStartTime,
-          message: error.toString(),
-        });
-        this.aiCompletionsService.hideStatusBarItem();
-        return [];
-      }
-    }
-
-    if (!(rs && rs.sessionId)) {
-      this.aiCompletionsService.reporterEnd(relationId, { success: false, replytime: Date.now() - requestStartTime });
-      this.aiCompletionsService.hideStatusBarItem();
-      return [];
-    }
-
-    this.aiCompletionsService.setLastSessionId(rs.sessionId);
-
-    // 如果是取消直接返回
-    if ((rs && rs.isCancel) || token.isCancellationRequested || this.isCancelFlag) {
-      this.aiCompletionsService.reporterEnd(relationId, {
-        success: true,
-        replytime: Date.now() - requestStartTime,
-        isStop: true,
-        completionNum: 0,
-      });
-      this.aiCompletionsService.updateStatusBarItem('canceled', false);
-      return [];
-    }
-
-    // 返回补全结果为空直接返回
-    if (!rs || !rs.codeModelList || rs.codeModelList.length === 0) {
-      this.aiCompletionsService.reporterEnd(relationId, {
-        success: true,
-        replytime: Date.now() - requestStartTime,
-        completionNum: 0,
-      });
-      this.aiCompletionsService.updateStatusBarItem('no result', false);
-      return [];
-    }
-
-    if (rs.codeModelList.length > 0) {
-      this.promptCache.setCache(requestBean, { ...rs, relationId });
-    }
-
-    this.aiCompletionsService.updateStatusBarItem('completion result: ' + rs.codeModelList.length, false);
-
-    this.dispose();
-    return this.pushResultAndRegist(rs, position, relationId);
-  }
-  /**
-   * 将补全结果推给用户并注册{@link COMMAND_ACCEPT} 事件
-   * @param codeModelList
-   */
-  pushResultAndRegist(
-    rs: IAICompletionResultModel,
-    position: monaco.Position,
-    relationId: string,
-  ): Array<InlineCompletionItem> {
-    const result = new Array<InlineCompletionItem>();
-    for (const codeModel of rs.codeModelList) {
-      const contentText = codeModel.content;
-
-      const insertText = contentText.trimEnd();
-
-      const model = this.model;
-
-      const textAfterCursor = model.getValueInRange({
-        startLineNumber: position.lineNumber,
-        startColumn: position.column,
-        endLineNumber: position.lineNumber,
-        endColumn: model.getLineMaxColumn(position.lineNumber),
-      });
-
-      // 临时修复方案，用于解决补全后面多了几个括号的问题
-      const filteredString = removeChars(insertText, textAfterCursor);
-
-      result.push({
-        insertText: insertText + filteredString,
-        range: new monaco.Range(
-          position.lineNumber,
-          position.column,
-          position.lineNumber,
-          position.column + insertText.length + textAfterCursor.length,
-        ),
-        sessionId: rs.sessionId,
-        relationId,
-        command: {
-          id: AI_INLINE_COMPLETION_REPORTER.id,
-          title: '',
-          arguments: [relationId, rs.sessionId, true],
-        },
-      });
-    }
-    return result;
-  }
-
-  dispose() {
-    this._disposables.dispose();
-  }
-
-  cancelRequest() {
-    this.isCancelFlag = true;
-    this.dispose();
-  }
-}
-
 class ReqStack {
-  queue: CompletionRequestTask[];
+  queue: InlineCompletionRequestTask[];
   constructor() {
     this.queue = [];
   }
-  addReq(reqRequest: CompletionRequestTask) {
+  addReq(reqRequest: InlineCompletionRequestTask) {
     this.queue.push(reqRequest);
   }
   runReq() {
@@ -414,7 +132,7 @@ export class AIInlineCompletionsProvider extends WithEventBus {
     this.updateIsManual(false);
 
     // 放入队列
-    const requestImp = this.injector.get(CompletionRequestTask, [model, position, token, _isManual]);
+    const requestImp = this.injector.get(InlineCompletionRequestTask, [model, position, token]);
 
     this.reqStack.addReq(requestImp);
 

package/src/browser/contrib/inline-completions/inline-completions.handler.ts

@@ -3,15 +3,22 @@ import debounce from 'lodash/debounce';
 import { Autowired, Injectable } from '@opensumi/di';
 import { IDisposable } from '@opensumi/ide-core-browser';
 import { AI_INLINE_COMPLETION_VISIBLE } from '@opensumi/ide-core-browser/lib/ai-native/command';
-import { CommandServiceImpl, Disposable, IEventBus, Sequencer, runWhenIdle } from '@opensumi/ide-core-common';
-import { CommandRegistry, CommandRegistryImpl, CommandService } from '@opensumi/ide-core-common';
+import {
+  CommandService,
+  CommandServiceImpl,
+  Disposable,
+  IEventBus,
+  Sequencer,
+  runWhenIdle,
+} from '@opensumi/ide-core-common';
 import { EditorSelectionChangeEvent, IEditor } from '@opensumi/ide-editor/lib/browser';
 import { InlineCompletions, Position, Range } from '@opensumi/ide-monaco';
 import { monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 import { InlineCompletionContextKeys } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
 
-import { IAIMiddleware } from '../../types';
 import { IAIMonacoContribHandler } from '../base';
+import { IIntelligentCompletionsResult } from '../intelligent-completions/intelligent-completions';
+import { IntelligentCompletionsHandler } from '../intelligent-completions/intelligent-completions.handler';
 
 import { AIInlineCompletionsProvider } from './completeProvider';
 import { AICompletionsService } from './service/ai-completions.service';
@@ -24,12 +31,12 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
   @Autowired(CommandService)
   private commandService: CommandServiceImpl;
 
-  @Autowired(CommandRegistry)
-  private commandRegistry: CommandRegistryImpl;
-
   @Autowired(AIInlineCompletionsProvider)
   private readonly aiInlineCompletionsProvider: AIInlineCompletionsProvider;
 
+  @Autowired(IntelligentCompletionsHandler)
+  private readonly intelligentCompletionsHandler: IntelligentCompletionsHandler;
+
   @Autowired(AICompletionsService)
   private aiCompletionsService: AICompletionsService;
 
@@ -86,18 +93,6 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
     return this;
   }
 
-  updateConfig(middlewares: IAIMiddleware[]) {
-    const middleware = middlewares[middlewares.length - 1];
-    if (!middleware) {
-      return;
-    }
-
-    // currently only support one middleware
-    if (middleware?.language?.provideInlineCompletions) {
-      this.aiCompletionsService.setMiddlewareComplete(middleware?.language?.provideInlineCompletions);
-    }
-  }
-
   mountEditor(editor: IEditor) {
     const toDispose = new Disposable();
     this.aiInlineCompletionsProvider.mountEditor(editor);
@@ -135,8 +130,6 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
           return;
         }
 
-        let resultList: InlineCompletions;
-
         /**
          * 如果新字符在 inline completion 的 ghost text 内，则走缓存，不重新请求
          */
@@ -153,11 +146,11 @@ export class InlineCompletionHandler extends IAIMonacoContribHandler {
           }
         }
 
-        resultList = await this.sequencer.queue(() =>
+        const completionsResult: IIntelligentCompletionsResult = await this.sequencer.queue(() =>
           this.aiInlineCompletionsProvider.provideInlineCompletionItems(model, position, context, token),
         );
 
-        return resultList;
+        return completionsResult;
       },
       freeInlineCompletions() {},
       handleItemDidShow: (completions) => {

package/src/browser/contrib/inline-completions/model/competionModel.ts

@@ -1,6 +1,7 @@
-import { IAICompletionResultModel } from '@opensumi/ide-core-common';
 import * as monaco from '@opensumi/ide-monaco';
 
+import { IIntelligentCompletionsResult } from '../../intelligent-completions/intelligent-completions';
+
 /**
  * 缓存的结果
  */
@@ -48,7 +49,7 @@ export interface CompletionResultModelCache {
   /**
    * 缓存结果
    */
-  completionResultModel: IAICompletionResultModel | null;
+  completionResultModel: IIntelligentCompletionsResult | null;
 }
 
 /**

package/src/browser/contrib/inline-completions/model/inlineCompletionRequestTask.ts

@@ -0,0 +1,272 @@
+import { Autowired, Injectable } from '@opensumi/di';
+import { AppConfig, PreferenceService } from '@opensumi/ide-core-browser';
+import { AI_INLINE_COMPLETION_REPORTER } from '@opensumi/ide-core-browser/lib/ai-native/command';
+import { AINativeSettingSectionsId, Disposable, DisposableStore, URI } from '@opensumi/ide-core-common';
+import { IAICompletionOption, uuid } from '@opensumi/ide-core-common';
+import { IAICompletionResultModel } from '@opensumi/ide-core-common';
+import { AISerivceType, IAIReporter } from '@opensumi/ide-core-common/lib/types/ai-native/reporter';
+import * as monaco from '@opensumi/ide-monaco';
+
+import { IIntelligentCompletionsResult } from '../../intelligent-completions/intelligent-completions';
+import { InlineCompletionItem } from '../model/competionModel';
+import { PromptCache } from '../promptCache';
+import { lineBasedPromptProcessor } from '../provider';
+import { AICompletionsService } from '../service/ai-completions.service';
+import { ICompletionContext } from '../types';
+
+const makeHashSet = (str: string) => {
+  const set = new Set<string>();
+  for (const char of str) {
+    set.add(char);
+  }
+  return set;
+};
+
+const removeChars = (insertText: string, textAfterCursor: string) => {
+  let result = '';
+  const aSet = makeHashSet(insertText);
+  for (const char of textAfterCursor) {
+    // 如果是空格或者 insertText 中不存在的字符，就加入到结果中
+    if (char === ' ' || !aSet.has(char)) {
+      result += char;
+    }
+  }
+  return result;
+};
+
+@Injectable({ multiple: true })
+export class InlineCompletionRequestTask extends Disposable {
+  private _disposables = new DisposableStore();
+
+  @Autowired(IAIReporter)
+  private aiReporter: IAIReporter;
+
+  @Autowired(PromptCache)
+  private promptCache: PromptCache;
+
+  @Autowired(AICompletionsService)
+  private aiCompletionsService: AICompletionsService;
+
+  @Autowired(PreferenceService)
+  private readonly preferenceService: PreferenceService;
+
+  @Autowired(AppConfig)
+  private appConfig: AppConfig;
+
+  isCancelFlag: boolean;
+
+  private isEnablePromptEngineering = true;
+
+  constructor(
+    public model: monaco.editor.ITextModel,
+    public position: monaco.Position,
+    public token: monaco.CancellationToken,
+  ) {
+    super();
+
+    this.isCancelFlag = false;
+
+    this.isEnablePromptEngineering = this.preferenceService.getValid(
+      AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled,
+      this.isEnablePromptEngineering,
+    );
+
+    this._disposables.add(
+      this.preferenceService.onSpecificPreferenceChange(
+        AINativeSettingSectionsId.InlineCompletionsPromptEngineeringEnabled,
+        ({ newValue }) => {
+          this.isEnablePromptEngineering = newValue;
+        },
+      ),
+    );
+  }
+
+  protected async constructRequestBean(
+    context: ICompletionContext,
+    token: monaco.CancellationToken,
+  ): Promise<IAICompletionOption> {
+    const prompt = lineBasedPromptProcessor.processPrefix(context.prefix);
+    const suffix = lineBasedPromptProcessor.processSuffix(context.suffix);
+    return {
+      prompt,
+      suffix,
+      sessionId: uuid(),
+      language: context.language,
+      fileUrl: context.fileUrl,
+      workspaceDir: context.workspaceDir,
+    };
+  }
+
+  // 发送请求
+  async run() {
+    const { model, position, token } = this;
+    if (!model) {
+      return [];
+    }
+    if (token.isCancellationRequested) {
+      return [];
+    }
+
+    if (this.isCancelFlag) {
+      return [];
+    }
+
+    const startRange = new monaco.Range(0, 0, position.lineNumber, position.column);
+    let prefix = model.getValueInRange(startRange);
+    if (prefix === '') {
+      prefix += '\n';
+    }
+
+    const endRange = new monaco.Range(
+      position.lineNumber,
+      position.column,
+      model.getLineCount(),
+      Number.MAX_SAFE_INTEGER,
+    );
+
+    const suffix = model.getValueInRange(endRange);
+
+    const languageId = model.getLanguageId();
+    const context: ICompletionContext = {
+      fileUrl: model.uri.fsPath,
+      filename: model.uri.toString().split('/').pop()!,
+      language: languageId,
+      prefix,
+      suffix,
+      uri: URI.from(model.uri),
+      workspaceDir: this.appConfig.workspaceDir,
+    };
+
+    // 组装请求参数,向远程发起请求
+    const requestBean = await this.constructRequestBean(context, token);
+    if (this.isCancelFlag) {
+      return [];
+    }
+
+    this.aiCompletionsService.updateStatusBarItem('running', true);
+    const requestStartTime = Date.now();
+
+    let completeResult: IIntelligentCompletionsResult | undefined;
+    const cacheData = this.promptCache.getCache(requestBean);
+    const relationId =
+      cacheData?.relationId || this.aiReporter.start(AISerivceType.Completion, { message: AISerivceType.Completion });
+
+    this.aiCompletionsService.setLastRelationId(relationId);
+    // 如果存在缓存
+    if (cacheData) {
+      completeResult = cacheData;
+    } else {
+      try {
+        completeResult = await this.aiCompletionsService.complete(requestBean);
+      } catch (error) {
+        this.aiCompletionsService.reporterEnd(relationId, {
+          success: false,
+          replytime: Date.now() - requestStartTime,
+          message: error.toString(),
+        });
+        this.aiCompletionsService.hideStatusBarItem();
+        return [];
+      }
+    }
+
+    if (!completeResult) {
+      return [];
+    }
+
+    return this.pushLineCompletions(completeResult, requestBean, requestStartTime, relationId);
+  }
+
+  /**
+   * 将补全结果推给用户并注册{@link COMMAND_ACCEPT} 事件
+   */
+  private pushLineCompletions(
+    completeResult: IIntelligentCompletionsResult<IAICompletionResultModel> | undefined,
+    requestBean: IAICompletionOption,
+    requestStartTime: number,
+    relationId: string,
+  ): Array<InlineCompletionItem> {
+    const { position } = this;
+
+    this.aiCompletionsService.setLastSessionId(requestBean.sessionId);
+
+    // 如果是取消直接返回
+    if (completeResult?.extra?.isCancel || this.token.isCancellationRequested || this.isCancelFlag) {
+      this.aiCompletionsService.reporterEnd(relationId, {
+        success: true,
+        replytime: Date.now() - requestStartTime,
+        isStop: true,
+        completionNum: 0,
+      });
+      this.aiCompletionsService.updateStatusBarItem('canceled', false);
+      return [];
+    }
+
+    // 返回补全结果为空直接返回
+    if (!completeResult || !completeResult.items || completeResult.items.length === 0) {
+      this.aiCompletionsService.reporterEnd(relationId, {
+        success: true,
+        replytime: Date.now() - requestStartTime,
+        completionNum: 0,
+      });
+      this.aiCompletionsService.updateStatusBarItem('no result', false);
+      return [];
+    }
+
+    if (completeResult.items.length > 0) {
+      this.promptCache.setCache(requestBean, { ...completeResult, relationId });
+    }
+
+    this.aiCompletionsService.updateStatusBarItem('completion result: ' + completeResult.items.length, false);
+
+    this.dispose();
+
+    const result = new Array<InlineCompletionItem>();
+    for (const codeModel of completeResult.items) {
+      const contentText = codeModel.insertText.toString();
+
+      const insertText = contentText.trimEnd();
+
+      const model = this.model;
+
+      const textAfterCursor = model.getValueInRange({
+        startLineNumber: position.lineNumber,
+        startColumn: position.column,
+        endLineNumber: position.lineNumber,
+        endColumn: model.getLineMaxColumn(position.lineNumber),
+      });
+
+      // 临时修复方案，用于解决补全后面多了几个括号的问题
+      const filteredString = removeChars(insertText, textAfterCursor);
+
+      this.aiCompletionsService.setLastCompletionContent(filteredString);
+
+      result.push({
+        ...codeModel,
+        insertText: insertText + filteredString,
+        range: new monaco.Range(
+          position.lineNumber,
+          position.column,
+          position.lineNumber,
+          position.column + insertText.length + textAfterCursor.length,
+        ),
+        sessionId: requestBean.sessionId,
+        relationId,
+        command: {
+          id: AI_INLINE_COMPLETION_REPORTER.id,
+          title: '',
+          arguments: [relationId, requestBean.sessionId, true, filteredString],
+        },
+      });
+    }
+    return result;
+  }
+
+  dispose() {
+    this._disposables.dispose();
+  }
+
+  cancelRequest() {
+    this.isCancelFlag = true;
+    this.dispose();
+  }
+}