fix: build errors

This commit is contained in:
Carl-Robert Linnupuu 2024-09-05 15:50:26 +03:00
parent 15d3423d92
commit e26034367e
7 changed files with 19 additions and 188 deletions

View file

@ -23,13 +23,13 @@ class CodeCompletionEventListener implements CompletionEventListener<String> {
private final Editor editor;
private final int caretOffset;
private final InfillRequestDetails requestDetails;
private final InfillRequest requestDetails;
private final BackgroundableProcessIndicator progressIndicator;
public CodeCompletionEventListener(
Editor editor,
int caretOffset,
InfillRequestDetails requestDetails,
InfillRequest requestDetails,
@Nullable BackgroundableProcessIndicator progressIndicator) {
this.editor = editor;
this.caretOffset = caretOffset;

View file

@ -9,15 +9,15 @@ public class CodeCompletionRequestProvider {
private static final int MAX_TOKENS = 128;
private final InfillRequestDetails details;
private final InfillRequest request;
public CodeCompletionRequestProvider(InfillRequestDetails details) {
this.details = details;
public CodeCompletionRequestProvider(InfillRequest request) {
this.request = request;
}
public OpenAITextCompletionRequest buildOpenAIRequest() {
return new OpenAITextCompletionRequest.Builder(details.getPrefix())
.setSuffix(details.getSuffix())
return new OpenAITextCompletionRequest.Builder(request.getPrefix())
.setSuffix(request.getSuffix())
.setStream(true)
.setMaxTokens(MAX_TOKENS)
.setTemperature(0.1)
@ -26,8 +26,7 @@ public class CodeCompletionRequestProvider {
public LlamaCompletionRequest buildLlamaRequest() {
InfillPromptTemplate promptTemplate = getLlamaInfillPromptTemplate();
String prompt = promptTemplate.buildPrompt(
new InfillRequestDetails(details.getPrefix(), details.getSuffix(), null));
String prompt = promptTemplate.buildPrompt(request);
return new LlamaCompletionRequest.Builder(prompt)
.setN_predict(MAX_TOKENS)
.setStream(true)

View file

@ -91,7 +91,7 @@ public final class CodeCompletionServiceOld implements Disposable {
var prefix = document.getText(new TextRange(0, offset));
var suffix = document.getText(new TextRange(offset, document.getTextLength()));
var request = InfillRequestDetails.Companion.withoutContext(prefix, suffix);
var request = InfillRequest.Companion.builder(prefix, suffix).build();
if (Stream.of(request.getSuffix(), request.getPrefix()).anyMatch(String::isEmpty)) {
return;
}

View file

@ -5,7 +5,7 @@ import com.intellij.openapi.components.Service;
import com.intellij.openapi.diagnostic.Logger;
import ee.carlrobert.codegpt.codecompletions.CodeCompletionRequestFactory;
import ee.carlrobert.codegpt.codecompletions.CodeCompletionRequestProvider;
import ee.carlrobert.codegpt.codecompletions.InfillRequestDetails;
import ee.carlrobert.codegpt.codecompletions.InfillRequest;
import ee.carlrobert.codegpt.completions.llama.LlamaModel;
import ee.carlrobert.codegpt.completions.llama.PromptTemplate;
import ee.carlrobert.codegpt.credentials.CredentialsStore;
@ -133,13 +133,13 @@ public final class CompletionRequestService {
}
public EventSource getCodeCompletionAsync(
InfillRequestDetails requestDetails,
InfillRequest requestDetails,
CompletionEventListener<String> eventListener) {
var httpClient = CompletionClientProvider.getDefaultClientBuilder().build();
var requestProvider = new CodeCompletionRequestProvider(requestDetails);
return switch (GeneralSettings.getCurrentState().getSelectedService()) {
case CODEGPT -> CompletionClientProvider.getCodeGPTClient()
.getCompletionAsync(
.getCodeCompletionAsync(
CodeCompletionRequestFactory.buildCodeGPTRequest(requestDetails),
eventListener);
case OPENAI -> CompletionClientProvider.getOpenAIClient()