Skip to content

Commit 079637e

Browse files
mq200mq200
committed
cloud region customization
1 parent a02bde3 commit 079637e

File tree

5 files changed

+38
-3
lines changed

5 files changed

+38
-3
lines changed

‎build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ changelog {
5151
}
5252

5353
dependencies {
54+
implementation(files("/Users/melisandequentzel/Documents/Dillard/llm-client-fork/llm-client/build/libs/llm-client-0.8.16.jar"))
55+
56+
implementation("com.squareup.okhttp3:okhttp:4.12.0")
57+
implementation("com.squareup.okhttp3:okhttp-sse:4.9.3")
58+
59+
5460
implementation(project(":codegpt-telemetry"))
5561
implementation(project(":codegpt-treesitter"))
5662

‎src/main/java/ee/carlrobert/codegpt/completions/CompletionClientProvider.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,18 @@ public static CodeGPTClient getCodeGPTClient() {
3535
}
3636

3737
public static WatsonxClient getWatsonxClient() {
38+
String regionCode = switch(WatsonxSettings.getCurrentState().getRegion()) {
39+
case "Dallas" -> "us-south";
40+
case "Frankfurt" -> "eu-de";
41+
case "London" -> "eu-gb";
42+
case "Tokyo" -> "jp-tok";
43+
default -> "us-south";
44+
};
45+
String host = WatsonxSettings.getCurrentState().isOnPrem() ? WatsonxSettings.getCurrentState().getOnPremHost() : "https://" + regionCode + ".ml.cloud.ibm.com";
3846
return new WatsonxClient.Builder(getCredential(CredentialKey.WATSONX_API_KEY))
3947
.setApiVersion(WatsonxSettings.getCurrentState().getApiVersion())
4048
.setIsOnPrem(WatsonxSettings.getCurrentState().isOnPrem())
41-
.setHost(WatsonxSettings.getCurrentState().getOnPremHost())
49+
.setHost(host)
4250
.setUsername(WatsonxSettings.getCurrentState().getUsername())
4351
.setIsZenApiKey(WatsonxSettings.getCurrentState().isZenApiKey())
4452
.build(getDefaultClientBuilder());

‎src/main/java/ee/carlrobert/codegpt/settings/service/watsonx/WatsonxSettingsForm.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,15 @@
2626
import java.awt.*;
2727
import java.awt.event.ActionEvent;
2828
import java.awt.event.ActionListener;
29+
30+
import org.jetbrains.annotations.NotNull;
2931
import org.jetbrains.annotations.Nullable;
3032

3133
public class WatsonxSettingsForm {
3234

3335
private final JBCheckBox onPremCheckbox;
3436
private final JBPasswordField apiKeyField;
37+
private final ComboBox regionComboBox;
3538
private final JBPasswordField onPremApiKeyField;
3639
private final JBTextField onPremHostField;
3740
private final JBTextField usernameField;
@@ -43,6 +46,7 @@ public class WatsonxSettingsForm {
4346
private final String getStartedText = "Click here to get started with IBM watsonx.ai as a Service";
4447
private final String getStartedUrl = "https://dataplatform.cloud.ibm.com/registration/stepone?context=wx";
4548
private final JButton getStartedLink;
49+
4650
private final JBTextField apiVersionField;
4751
private final JBTextField projectIdField;
4852
private final JBTextField spaceIdField;
@@ -82,6 +86,8 @@ class OpenUrlAction implements ActionListener {
8286
getStartedLink.setToolTipText(getStartedUrl);
8387
getStartedLink.addActionListener(new OpenUrlAction());
8488

89+
regionComboBox = new ComboBox(new String[] {"Dallas", "Frankfurt", "London", "Tokyo"});
90+
regionComboBox.setSelectedItem(settings.getRegion());
8591
apiKeyField = new JBPasswordField();
8692
apiKeyField.setColumns(35);
8793
ApplicationManager.getApplication().executeOnPooledThread(() -> {
@@ -117,6 +123,10 @@ class OpenUrlAction implements ActionListener {
117123

118124
onCloudAuthenticationFieldPanel = new UI.PanelFactory().grid()
119125
.add(UI.PanelFactory.panel(getStartedLink))
126+
.add(UI.PanelFactory.panel(regionComboBox)
127+
.withLabel(CodeGPTBundle.get("settingsConfigurable.service.watsonx.cloudRegion.label"))
128+
.withComment(CodeGPTBundle.get("settingsConfigurable.service.watsonx.cloudRegion.comment"))
129+
.resizeX(false))
120130
.add(UI.PanelFactory.panel(apiKeyField)
121131
.withLabel(CodeGPTBundle.get("settingsConfigurable.service.watsonx.onCloudApiKey.label"))
122132
.withComment(CodeGPTBundle.get(
@@ -258,6 +268,7 @@ public WatsonxSettingsState getCurrentState() {
258268
state.setOnPremHost(onPremHostField.getText());
259269
state.setUsername(usernameField.getText());
260270
state.setZenApiKey(zenApiKeyCheckbox.isSelected());
271+
state.setRegion((String)regionComboBox.getSelectedItem());
261272
state.setApiVersion(apiVersionField.getText());
262273
state.setSpaceId(spaceIdField.getText());
263274
state.setProjectId(projectIdField.getText());
@@ -281,6 +292,7 @@ public void resetForm() {
281292
usernameField.setText(state.getUsername());
282293
zenApiKeyCheckbox.setSelected(state.isZenApiKey());
283294
apiKeyField.setText(CredentialsStore.getCredential(WATSONX_API_KEY));
295+
regionComboBox.setSelectedItem(state.getRegion());
284296
apiVersionField.setText(state.getApiVersion());
285297
spaceIdField.setText(state.getSpaceId());
286298
projectIdField.setText(state.getProjectId());

‎src/main/java/ee/carlrobert/codegpt/settings/service/watsonx/WatsonxSettingsState.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class WatsonxSettingsState {
88
private String username;
99
private boolean isOnPrem = false;
1010
private boolean isZenApiKey = false;
11+
private String region = "us-south";
1112
private String apiVersion = "2024-03-14";
1213
// use this model as default
1314
private String model = "ibm/granite-3b-code-instruct";
@@ -57,6 +58,12 @@ public void setUsername(String username) {
5758
this.username = username;
5859
}
5960

61+
public String getRegion() {return region;}
62+
63+
public void setRegion(String region) {
64+
this.region = region;
65+
}
66+
6067
public String getApiVersion() {
6168
return apiVersion;
6269
}
@@ -170,12 +177,12 @@ public boolean equals(Object o) {
170177
return false;
171178
}
172179
ee.carlrobert.codegpt.settings.service.watsonx.WatsonxSettingsState that = (ee.carlrobert.codegpt.settings.service.watsonx.WatsonxSettingsState) o;
173-
return Objects.equals(apiVersion, that.apiVersion) && Objects.equals(spaceId, that.spaceId) && Objects.equals(projectId, that.projectId) && Objects.equals(model, that.model) && Objects.equals(temperature,that.temperature) && Objects.equals(topP,that.topP) && Objects.equals(topK,that.topK) && Objects.equals(randomSeed,that.randomSeed) && Objects.equals(repetitionPenalty,that.repetitionPenalty) && Objects.equals(maxNewTokens, that.maxNewTokens) && Objects.equals(minNewTokens,that.minNewTokens) && Objects.equals(isGreedyDecoding,that.isGreedyDecoding) && Objects.equals(isOnPrem,that.isOnPrem) && Objects.equals(isZenApiKey,that.isZenApiKey);
180+
return Objects.equals(apiVersion, that.apiVersion) && Objects.equals(region, that.region) && Objects.equals(spaceId, that.spaceId) && Objects.equals(projectId, that.projectId) && Objects.equals(model, that.model) && Objects.equals(temperature,that.temperature) && Objects.equals(topP,that.topP) && Objects.equals(topK,that.topK) && Objects.equals(randomSeed,that.randomSeed) && Objects.equals(repetitionPenalty,that.repetitionPenalty) && Objects.equals(maxNewTokens, that.maxNewTokens) && Objects.equals(minNewTokens,that.minNewTokens) && Objects.equals(isGreedyDecoding,that.isGreedyDecoding) && Objects.equals(isOnPrem,that.isOnPrem) && Objects.equals(isZenApiKey,that.isZenApiKey);
174181

175182
}
176183

177184
@Override
178185
public int hashCode() {
179-
return Objects.hash(apiVersion, model, apiVersion, projectId, spaceId,temperature,topP,topK,randomSeed,includeStopSequence,stopSequences,repetitionPenalty, maxNewTokens,minNewTokens,isGreedyDecoding,isOnPrem,isZenApiKey);
186+
return Objects.hash(apiVersion, region, model, apiVersion, projectId, spaceId,temperature,topP,topK,randomSeed,includeStopSequence,stopSequences,repetitionPenalty, maxNewTokens,minNewTokens,isGreedyDecoding,isOnPrem,isZenApiKey);
180187
}
181188
}

‎src/main/resources/messages/codegpt.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ settingsConfigurable.service.watsonx.minNewTokens.label=Min completion tokens:
164164
settingsConfigurable.service.watsonx.stopSequences.label=Stop sequences
165165
settingsConfigurable.service.watsonx.stopSequences.comment=Comma-separated list of stop sequences
166166
settingsConfigurable.service.watsonx.repetitionPenalty.comment=
167+
settingsConfigurable.service.watsonx.cloudRegion.label=IBM Cloud region:
168+
settingsConfigurable.service.watsonx.cloudRegion.comment=
167169
configurationConfigurable.section.commitMessage.title=Commit Message Template
168170
configurationConfigurable.section.commitMessage.systemPromptField.label=Prompt template:
169171
configurationConfigurable.section.inlineCompletion.title=Inline Completion

0 commit comments

Comments
 (0)