vrr/ProxyAI
2
0
Fork 0
mirror of https://github.com/carlrobertoh/ProxyAI.git synced 2026-05-12 05:51:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: improve llama server logging

Browse source
This commit is contained in:
Carl-Robert Linnupuu 2023-12-03 18:10:39 +02:00
parent 1392775940
commit 0e61bee0f8
4 changed files with 112 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/main/java/ee/carlrobert/codegpt/completions/llama/LlamaServerAgent.java
View file

@ -1,5 +1,7 @@
package ee.carlrobert.codegpt.completions.llama;
import static java.lang.String.format;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.configurations.GeneralCommandLine;
@ -9,18 +11,21 @@ import com.intellij.execution.process.ProcessEvent;
import com.intellij.execution.process.ProcessListener;
import com.intellij.execution.process.ProcessOutputType;
import com.intellij.icons.AllIcons.Actions;
import com.intellij.notification.NotificationType;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.Service;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Key;
import com.intellij.ui.components.JBLabel;
import ee.carlrobert.codegpt.CodeGPTBundle;
import ee.carlrobert.codegpt.CodeGPTPlugin;
import ee.carlrobert.codegpt.settings.service.LlamaServiceSelectionForm;
import ee.carlrobert.codegpt.settings.service.ServerProgressPanel;
import ee.carlrobert.codegpt.settings.state.LlamaSettingsState;
import ee.carlrobert.codegpt.util.OverlayUtil;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.SwingConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -30,19 +35,20 @@ public final class LlamaServerAgent implements Disposable {
private static final Logger LOG = Logger.getInstance(LlamaServerAgent.class);
private static @Nullable OSProcessHandler makeProcessHandler;
private static @Nullable OSProcessHandler startServerProcessHandler;
private @Nullable OSProcessHandler makeProcessHandler;
private @Nullable OSProcessHandler startServerProcessHandler;
public void startAgent(
LlamaServiceSelectionForm llamaServiceSelectionForm,
LlamaServerStartupParams params,
ServerProgressPanel serverProgressPanel,
Runnable onSuccess) {
ApplicationManager.getApplication().invokeLater(() -> {
try {
serverProgressPanel.updateText("Building llama.cpp...");
serverProgressPanel.updateText(
CodeGPTBundle.get("llamaServerAgent.buildingProject.description"));
makeProcessHandler = new OSProcessHandler(getMakeCommandLinde());
makeProcessHandler.addProcessListener(
getMakeProcessListener(llamaServiceSelectionForm, serverProgressPanel, onSuccess));
getMakeProcessListener(params, serverProgressPanel, onSuccess));
makeProcessHandler.startNotify();
} catch (ExecutionException e) {
throw new RuntimeException(e);
@ -63,9 +69,11 @@ public final class LlamaServerAgent implements Disposable {
}
private ProcessListener getMakeProcessListener(
LlamaServiceSelectionForm serviceSelectionForm,
LlamaServerStartupParams params,
ServerProgressPanel serverProgressPanel,
Runnable onSuccess) {
LOG.info("Building llama project");
return new ProcessAdapter() {
@Override
public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) {
@ -75,21 +83,16 @@ public final class LlamaServerAgent implements Disposable {
@Override
public void processTerminated(@NotNull ProcessEvent event) {
try {
serverProgressPanel.updateText("Booting up server...");
startServerProcessHandler = new OSProcessHandler.Silent(
getServerCommandLine(
serviceSelectionForm.getLlamaModelPreferencesForm().getActualModelPath(),
serviceSelectionForm.getContextSize(),
serviceSelectionForm.getThreads(),
serviceSelectionForm.getServerPort(),
serviceSelectionForm.getListOfAdditionalParameters()));
startServerProcessHandler.addProcessListener(getProcessListener(
serviceSelectionForm.getServerPort(),
serverProgressPanel,
onSuccess));
LOG.info("Booting up llama server");
serverProgressPanel.updateText(
CodeGPTBundle.get("llamaServerAgent.serverBootup.description"));
startServerProcessHandler = new OSProcessHandler.Silent(getServerCommandLine(params));
startServerProcessHandler.addProcessListener(
getProcessListener(params.getPort(), serverProgressPanel, onSuccess));
startServerProcessHandler.startNotify();
} catch (ExecutionException ex) {
LOG.error("Unable to start the server", ex);
LOG.error("Unable to start llama server", ex);
throw new RuntimeException(ex);
}
}
@ -102,9 +105,18 @@ public final class LlamaServerAgent implements Disposable {
Runnable onSuccess) {
return new ProcessAdapter() {
private final ObjectMapper objectMapper = new ObjectMapper();
private final List<String> errorLines = new CopyOnWriteArrayList<>();
@Override
public void processTerminated(@NotNull ProcessEvent event) {
if (errorLines.isEmpty()) {
LOG.info(format("Server terminated with code %d", event.getExitCode()));
} else {
var error = String.join("", errorLines);
OverlayUtil.showNotification(error, NotificationType.ERROR);
LOG.error(error);
}
serverProgressPanel.displayComponent(new JBLabel(
"Server terminated",
Actions.Cancel,
@ -113,12 +125,19 @@ public final class LlamaServerAgent implements Disposable {
@Override
public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) {
LOG.debug(event.getText());
if (ProcessOutputType.isStderr(outputType)) {
errorLines.add(event.getText());
return;
}
if (ProcessOutputType.isStdout(outputType)) {
LOG.info(event.getText());
if (outputType == ProcessOutputType.STDOUT) {
try {
var serverMessage = objectMapper.readValue(event.getText(), LlamaServerMessage.class);
if ("HTTP server listening".equals(serverMessage.getMessage())) {
LOG.info("Server up and running!");
LlamaSettingsState.getInstance().setServerPort(port);
onSuccess.run();
}
@ -139,21 +158,16 @@ public final class LlamaServerAgent implements Disposable {
return commandLine;
}
private GeneralCommandLine getServerCommandLine(
String modelPath,
int contextLength,
int threads,
int port,
List<String> additionalParameters) {
private GeneralCommandLine getServerCommandLine(LlamaServerStartupParams params) {
GeneralCommandLine commandLine = new GeneralCommandLine().withCharset(StandardCharsets.UTF_8);
commandLine.setExePath("./server");
commandLine.withWorkDirectory(CodeGPTPlugin.getLlamaSourcePath());
commandLine.addParameters(
"-m", modelPath,
"-c", String.valueOf(contextLength),
"--port", String.valueOf(port),
"-t", String.valueOf(threads));
commandLine.addParameters(additionalParameters);
"-m", params.getModelPath(),
"-c", String.valueOf(params.getContextLength()),
"--port", String.valueOf(params.getPort()),
"-t", String.valueOf(params.getThreads()));
commandLine.addParameters(params.getAdditionalParameters());
commandLine.setRedirectErrorStream(false);
return commandLine;
}

45
src/main/java/ee/carlrobert/codegpt/completions/llama/LlamaServerStartupParams.java Normal file
View file

@ -0,0 +1,45 @@
package ee.carlrobert.codegpt.completions.llama;
import java.util.List;
public class LlamaServerStartupParams {
private final String modelPath;
private final int contextLength;
private final int threads;
private final int port;
private final List<String> additionalParameters;
public LlamaServerStartupParams(
String modelPath,
int contextLength,
int threads,
int port,
List<String> additionalParameters) {
this.modelPath = modelPath;
this.contextLength = contextLength;
this.threads = threads;
this.port = port;
this.additionalParameters = additionalParameters;
}
public String getModelPath() {
return modelPath;
}
public int getContextLength() {
return contextLength;
}
public int getThreads() {
return threads;
}
public int getPort() {
return port;
}
public List<String> getAdditionalParameters() {
return additionalParameters;
}
}

21
src/main/java/ee/carlrobert/codegpt/settings/service/LlamaServiceSelectionForm.java
View file

@ -18,6 +18,7 @@ import ee.carlrobert.codegpt.CodeGPTBundle;
import ee.carlrobert.codegpt.CodeGPTPlugin;
import ee.carlrobert.codegpt.completions.HuggingFaceModel;
import ee.carlrobert.codegpt.completions.llama.LlamaServerAgent;
import ee.carlrobert.codegpt.completions.llama.LlamaServerStartupParams;
import ee.carlrobert.codegpt.settings.state.LlamaSettingsState;
import ee.carlrobert.codegpt.util.OverlayUtil;
import java.awt.BorderLayout;
@ -179,11 +180,21 @@ public class LlamaServiceSelectionForm extends JPanel {
llamaServerAgent.stopAgent();
} else {
disableForm(serverButton, serverProgressPanel);
llamaServerAgent.startAgent(this, serverProgressPanel, () -> {
setFormEnabled(false);
serverProgressPanel.displayComponent(
new JBLabel("Server running", Actions.Checked, SwingConstants.LEADING));
});
llamaServerAgent.startAgent(
new LlamaServerStartupParams(
llamaModelPreferencesForm.getActualModelPath(),
getContextSize(),
getThreads(),
getServerPort(),
getListOfAdditionalParameters()),
serverProgressPanel,
() -> {
setFormEnabled(false);
serverProgressPanel.displayComponent(new JBLabel(
CodeGPTBundle.get("settingsConfigurable.service.llama.progress.serverRunning"),
Actions.Checked,
SwingConstants.LEADING));
});
}
});
return serverButton;