Merge pull request #4253 from ethereum/improve_model

Improve model
pull/4282/head
yann300 11 months ago committed by GitHub
commit 86db390790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      apps/remix-ide/src/app/plugins/copilot/suggestion-service/copilot-suggestion.ts
  2. 49
      libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts

@ -6,7 +6,7 @@ const profile = {
name: 'copilot-suggestion',
displayName: 'copilot-suggestion',
description: 'copilot-suggestion',
methods: ['suggest', 'init', 'uninstall', 'status']
methods: ['suggest', 'init', 'uninstall', 'status', 'isActivate']
}
export class CopilotSuggestion extends Plugin {
@ -31,6 +31,15 @@ export class CopilotSuggestion extends Plugin {
return this.ready
}
async isActivate () {
try {
return await this.call('settings', 'get', 'settings/copilot/suggest/activate')
} catch (e) {
console.error(e)
return false
}
}
async suggest(content: string) {
if (!await this.call('settings', 'get', 'settings/copilot/suggest/activate')) return { output: [{ generated_text: ''}]}

@ -1,4 +1,6 @@
/* eslint-disable no-control-regex */
import { EditorUIProps, monacoTypes } from '@remix-ui/editor';
import axios, {AxiosResponse} from 'axios'
const controller = new AbortController();
const { signal } = controller;
const result: string = ''
@ -8,7 +10,7 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli
monaco: any
constructor(props: any, monaco: any) {
this.props = props
this.monaco = monaco
this.monaco = monaco
}
async provideInlineCompletions(model: monacoTypes.editor.ITextModel, position: monacoTypes.Position, context: monacoTypes.languages.InlineCompletionContext, token: monacoTypes.CancellationToken): Promise<monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>> {
@ -29,6 +31,34 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli
return;
}
try {
const isActivate = await this.props.plugin.call('copilot-suggestion', 'isActivate')
if (!isActivate) return
} catch (err) {
return;
}
try {
const split = word.split('\n')
if (!split.length) return
const ask = split[split.length - 2].trimStart()
if (split[split.length - 1].trim() === '' && ask.startsWith('///')) {
// use the code generation model
const {data} = await axios.post('https://gpt-chat.remixproject.org/infer', {comment: ask.replace('///', '')})
const parsedData = JSON.parse(data).trimStart()
console.log('parsedData', parsedData)
const item: monacoTypes.languages.InlineCompletion = {
insertText: parsedData
};
return {
items: [item],
enableForwardStability: true
}
}
} catch (e) {
console.error(e)
}
// abort if there is a signal
if (token.isCancellationRequested) {
console.log('aborted')
@ -38,18 +68,17 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli
let result
try {
result = await this.props.plugin.call('copilot-suggestion', 'suggest', word)
} catch (err) {
} catch (err) {
return
}
const generatedText = (result as any).output[0].generated_text as string
// the generated text remove a space from the context. that why we need to remove all the spaces
const clean = generatedText.replace(/ /g, '').replace(word.replace(/ /g, ''), '')
console.log('suggest result', clean)
// the generated text remove a space from the context...
const clean = generatedText.replace('@custom:dev-run-script', '@custom:dev-run-script ').replace(word, '')
const item: monacoTypes.languages.InlineCompletion = {
insertText: clean
};
// abort if there is a signal
if (token.isCancellationRequested) {
console.log('aborted')
@ -62,17 +91,17 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli
}
handleItemDidShow?(completions: monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>, item: monacoTypes.languages.InlineCompletion, updatedInsertText: string): void {
}
handlePartialAccept?(completions: monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>, item: monacoTypes.languages.InlineCompletion, acceptedCharacters: number): void {
}
freeInlineCompletions(completions: monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>): void {
}
groupId?: string;
yieldsToGroupIds?: string[];
toString?(): string {
throw new Error('Method not implemented.');
}
}
}

Loading…
Cancel
Save