Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-24 09:58:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-added autocomplete

Browse source
This commit is contained in:
mp 2024-11-26 15:15:05 -08:00
parent 4ea1bfa9c3
commit 48426403f3
16 changed files with 873 additions and 633 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -123,7 +123,7 @@ protocol.registerSchemesAsPrivileged([
},
{
scheme: 'vscode-file',
privileges: { secure: true, standard: true, supportFetchAPI: true, corsEnabled: true, codeCache: true }
privileges: { secure: true, standard: true, supportFetchAPI: true, corsEnabled: true, codeCache: true, }
}
]);

1
src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.esm.html
View file

@ -25,6 +25,7 @@
connect-src
'self'
https:
*
;
font-src
'self'

1
src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html
View file

@ -23,6 +23,7 @@
connect-src
'self'
https:
*
;
font-src
'self'

1
src/vs/code/electron-sandbox/processExplorer/processExplorer.esm.html
View file

@ -25,6 +25,7 @@
connect-src
'self'
https:
*
;
font-src
'self'

1
src/vs/code/electron-sandbox/processExplorer/processExplorer.html
View file

@ -23,6 +23,7 @@
connect-src
'self'
https:
*
;
font-src
'self'

1
src/vs/code/electron-sandbox/workbench/workbench-dev.esm.html
View file

@ -38,6 +38,7 @@
'self'
https:
ws:
*
;
font-src
'self'

1
src/vs/code/electron-sandbox/workbench/workbench-dev.html
View file

@ -37,6 +37,7 @@
'self'
https:
ws:
*
;
font-src
'self'

1
src/vs/code/electron-sandbox/workbench/workbench.esm.html
View file

@ -37,6 +37,7 @@
'self'
https:
ws:
*
;
font-src
'self'

1
src/vs/code/electron-sandbox/workbench/workbench.html
View file

@ -37,6 +37,7 @@
'self'
https:
ws:
*
;
font-src
'self'

1
src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.esm.html
View file

@ -25,6 +25,7 @@
connect-src
'self'
https:
*
;
font-src
'self'

1
src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
View file

@ -237,6 +237,7 @@ export const SidebarChat = () => {
},
voidConfig,
abortRef: abortFnRef,
options: {},
})

329
src/vs/workbench/contrib/void/browser/react/src/util/sendLLMMessage.tsx
View file

@ -21,8 +21,15 @@ export type LLMMessage = {
content: string;
}
export type LLMMessageOptions = {
stopTokens?: string[],
prefix?: string,
suffix?: string,
}
type SendLLMMessageFnTypeInternal = (params: {
messages: LLMMessage[];
options: LLMMessageOptions;
onText: OnText;
onFinalMessage: OnFinalMessage;
onError: (error: string) => void;
@ -33,6 +40,7 @@ type SendLLMMessageFnTypeInternal = (params: {
type SendLLMMessageFnTypeExternal = (params: {
messages: LLMMessage[];
options: LLMMessageOptions;
onText: OnText;
onFinalMessage: (fullText: string) => void;
onError: (error: string) => void;
@ -213,34 +221,65 @@ const sendOpenAIMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinal
};
// Ollama
export const sendOllamaMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
export const sendOllamaMsg: SendLLMMessageFnTypeInternal = ({ messages, options, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
let fullText = ''
const ollama = new Ollama({ host: voidConfig.ollama.endpoint })
ollama.chat({
model: voidConfig.ollama.model,
messages: messages,
stream: true,
options: { num_predict: parseMaxTokensStr(voidConfig.default.maxTokens) } // this is max_tokens
})
.then(async stream => {
_setAborter(() => stream.abort())
// iterate through the stream
for await (const chunk of stream) {
const newText = chunk.message.content;
fullText += newText;
onText(newText, fullText);
if (options.prefix !== '' || options.suffix !== '') {
ollama.generate({
model: voidConfig.ollama.model,
prompt: options.prefix ?? '',
suffix: options.suffix ?? '',
stream: true,
options: {
num_predict: parseMaxTokensStr(voidConfig.default.maxTokens),
stop: options.stopTokens,
}
onFinalMessage(fullText);
})
// when error/fail
.catch(error => {
onError(error)
})
.then(async stream => {
_setAborter(() => stream.abort())
for await (const chunk of stream) {
const newText = chunk.response;
fullText += newText;
onText(newText, fullText);
}
onFinalMessage(fullText);
})
// when error/fail
.catch(error => {
onError(error)
})
} else {
ollama.chat({
model: voidConfig.ollama.model,
messages: messages,
stream: true,
options: {
num_predict: parseMaxTokensStr(voidConfig.default.maxTokens), // this is max_tokens
stop: options.stopTokens,
}
})
.then(async stream => {
_setAborter(() => stream.abort())
// iterate through the stream
for await (const chunk of stream) {
const newText = chunk.message.content;
fullText += newText;
onText(newText, fullText);
}
onFinalMessage(fullText);
})
// when error/fail
.catch(error => {
onError(error)
})
}
};
// Greptile
@ -309,15 +348,29 @@ const sendGreptileMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFin
export const sendLLMMessage: SendLLMMessageFnTypeExternal = ({
messages,
options,
onText: onText_,
onFinalMessage: onFinalMessage_,
onError: onError_,
abortRef: abortRef_,
voidConfig,
logging: { loggingName }
logging: { loggingName },
}) => {
if (!voidConfig) return;
// set messages appropriately if fill in middle mode
if (options.prefix || options.suffix) {
const prefix = (options.prefix ?? '').split('\n').slice(-20).join('\n')
const suffix = (options.suffix ?? '').split('\n').slice(0, 20).join('\n')
options.prefix = prefix
options.suffix = suffix
if (!prefix.trim() && !suffix.trim()) return;
const system = getFimSystem({ voidConfig, prefix, suffix })
const prompt = getFimPrompt({ voidConfig, prefix, suffix })
if (system) messages.push({ role: 'system', content: system })
if (prompt) messages.push({ role: 'user', content: prompt })
}
// trim message content (Anthropic and other providers give an error if there is trailing whitespace)
messages = messages.map(m => ({ ...m, content: m.content.trim() }))
@ -368,21 +421,21 @@ export const sendLLMMessage: SendLLMMessageFnTypeExternal = ({
try {
switch (voidConfig.default.whichApi) {
case 'anthropic':
sendAnthropicMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
sendAnthropicMsg({ messages, options, onText, onFinalMessage, onError, voidConfig, _setAborter, });
break;
case 'openAI':
case 'openRouter':
case 'openAICompatible':
sendOpenAIMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
sendOpenAIMsg({ messages, options, onText, onFinalMessage, onError, voidConfig, _setAborter, });
break;
case 'gemini':
sendGeminiMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
sendGeminiMsg({ messages, options, onText, onFinalMessage, onError, voidConfig, _setAborter, });
break;
case 'ollama':
sendOllamaMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
sendOllamaMsg({ messages, options, onText, onFinalMessage, onError, voidConfig, _setAborter, });
break;
case 'greptile':
sendGreptileMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
sendGreptileMsg({ messages, options, onText, onFinalMessage, onError, voidConfig, _setAborter, });
break;
default:
onError(`Error: whichApi was ${voidConfig.default.whichApi}, which is not recognized!`)
@ -405,16 +458,101 @@ export const sendLLMMessage: SendLLMMessageFnTypeExternal = ({
type getFimPrompt = ({ voidConfig, prefix, suffix }: { voidConfig: VoidConfig, prefix: string, suffix: string, }) => string | undefined
export const getFimSystem: getFimPrompt = ({ voidConfig, prefix, suffix }) => {
switch (voidConfig.default.whichApi) {
case 'ollama':
return undefined
case 'anthropic':
case 'openAI':
case 'gemini':
case 'greptile':
case 'openRouter':
case 'openAICompatible':
case 'azure':
default:
return `\
You are given the START and END to a piece of code. Please FILL IN THE MIDDLE between the START and END.
Instruction summary:
1. Return the MIDDLE of the code between the START and END.
2. Do not give an explanation, description, or any other code besides the middle.
3. Do not return duplicate code from either START or END.
4. Make sure the MIDDLE piece of code has balanced brackets that match the START and END.
5. The MIDDLE begins on the same line as START. Please include a newline character if you want to begin on the next line.
6. Around 90% of the time, you should return just one or a few lines of code. You should keep your outputs short unless you are confident the user is trying to write boilderplate code.
# EXAMPLE
## START:
\`\`\` python
def add(a,b):
return a + b
def subtract(a,b):
return a - b
\`\`\`
## END:
\`\`\` python
def divide(a,b):
return a / b
\`\`\`
## EXPECTED OUTPUT:
\`\`\` python
def multiply(a,b):
return a * b
\`\`\`
# EXAMPLE
## START:
\`\`\` javascript
const x = 1
const y
\`\`\`
## END:
\`\`\` javascript
const z = 3
\`\`\`
## EXPECTED OUTPUT:
\`\`\` javascript
= 2
\`\`\`
`
}
}
export const getFimPrompt: getFimPrompt = ({ voidConfig, prefix, suffix }) => {
switch (voidConfig.default.whichApi) {
case 'ollama':
return undefined
case 'anthropic':
case 'openAI':
case 'gemini':
case 'greptile':
case 'openRouter':
case 'openAICompatible':
case 'azure':
default:
return `\
## START:
\`\`\`
${prefix}
\`\`\`
## END:
\`\`\`
${suffix}
\`\`\`
`
}
}
// // 6. Autocomplete
@ -439,135 +577,6 @@ export const sendLLMMessage: SendLLMMessageFnTypeExternal = ({
// import { configFields, VoidConfig } from "../webviews/common/contextForConfig"
// import { FimInfo } from "./sendLLMMessage"
// type GetFIMPrompt = ({ voidConfig, fimInfo }: { voidConfig: VoidConfig, fimInfo: FimInfo, }) => string
// export const getFIMSystem: GetFIMPrompt = ({ voidConfig, fimInfo }) => {
// switch (voidConfig.default.whichApi) {
// case 'ollama':
// return ''
// case 'anthropic':
// case 'openAI':
// case 'gemini':
// case 'greptile':
// case 'openRouter':
// case 'openAICompatible':
// case 'azure':
// default:
// return `You are given the START and END to a piece of code. Please FILL IN THE MIDDLE between the START and END.
// Instruction summary:
// 1. Return the MIDDLE of the code between the START and END.
// 2. Do not give an explanation, description, or any other code besides the middle.
// 3. Do not return duplicate code from either START or END.
// 4. Make sure the MIDDLE piece of code has balanced brackets that match the START and END.
// 5. The MIDDLE begins on the same line as START. Please include a newline character if you want to begin on the next line.
// 6. Around 90% of the time, you should return just one or a few lines of code. You should keep your outputs short unless you are confident the user is trying to write boilderplate code.
// # EXAMPLE
// ## START:
// \`\`\` python
// def add(a,b):
// return a + b
// def subtract(a,b):
// return a - b
// \`\`\`
// ## END:
// \`\`\` python
// def divide(a,b):
// return a / b
// \`\`\`
// ## EXPECTED OUTPUT:
// \`\`\` python
// def multiply(a,b):
// return a * b
// \`\`\`
// # EXAMPLE
// ## START:
// \`\`\` javascript
// const x = 1
// const y
// \`\`\`
// ## END:
// \`\`\` javascript
// const z = 3
// \`\`\`
// ## EXPECTED OUTPUT:
// \`\`\` javascript
// = 2
// \`\`\`
// `
// }
// }
// export const getFIMPrompt: GetFIMPrompt = ({ voidConfig, fimInfo }) => {
// const { prefix: fullPrefix, suffix: fullSuffix } = fimInfo
// const prefix = fullPrefix.split('\n').slice(-20).join('\n')
// const suffix = fullSuffix.split('\n').slice(0, 20).join('\n')
// console.log('prefix', JSON.stringify(prefix))
// console.log('suffix', JSON.stringify(suffix))
// if (!prefix.trim() && !suffix.trim()) return ''
// // TODO may want to trim the prefix and suffix
// switch (voidConfig.default.whichApi) {
// case 'ollama':
// if (voidConfig.ollama.model === 'codestral') {
// return `[SUFFIX]${suffix}[PREFIX] ${prefix}`
// } else if (voidConfig.ollama.model.includes('qwen')) {
// return `<|fim_prefix|>${prefix}<|fim_suffix|>${suffix}<|fim_middle|>`
// }
// return ''
// case 'anthropic':
// case 'openAI':
// case 'gemini':
// case 'greptile':
// case 'openRouter':
// case 'openAICompatible':
// case 'azure':
// default:
// return `## START:
// \`\`\`
// ${prefix}
// \`\`\`
// ## END:
// \`\`\`
// ${suffix}
// \`\`\`
// `
// }
// }
// Mathew - sendLLMMessage

1159
src/vs/workbench/contrib/void/browser/registerAutocomplete.ts
View file

File diff suppressed because it is too large Load diff

1
src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts
View file

@ -763,6 +763,7 @@ Please finish writing the new file by applying the diff to the original file. Re
},
voidConfig,
abortRef,
options: {},
})
})

3
src/vs/workbench/contrib/void/browser/registerThreads.ts
View file

@ -10,6 +10,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
import { URI } from '../../../../base/common/uri.js';
import { Emitter, Event } from '../../../../base/common/event.js';
import { IAutocompleteService } from './registerAutocomplete.js';
// if selectionStr is null, it means just send the whole file
export type CodeSelection = {
@ -97,8 +98,10 @@ class ThreadHistoryService extends Disposable implements IThreadHistoryService {
constructor(
@IStorageService private readonly _storageService: IStorageService,
@IAutocompleteService private readonly _autocomplete: IAutocompleteService,
) {
super()
this._autocomplete
this.state = {
allThreads: this._readAllThreads(),

2
src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html
View file

@ -5,7 +5,7 @@
default-src 'none';
child-src 'self' data: blob:;
script-src 'self' 'unsafe-eval' 'sha256-YVBiNCLDtlDv8TpTuATV/fJ9rcBWIq9O9zBL2ndqAgw=' https: http://localhost:* blob:;
connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:* *;"/>
</head>
<body>
<script>