Merge pull request #759 from jaginn/regional-inference-config

Regional inference config

Author: stephanj

src/main/java/com/devoxx/genie/chatmodel/cloud/bedrock/BedrockModelFactory.java

@@ -203,12 +203,18 @@ public Region getRegion() {
     private @NotNull String getModelId(String modelName) {
         Region userProvidedRegion = getRegion();
         String strRegion = userProvidedRegion.toString().toLowerCase();
-        if (strRegion.startsWith("eu")) {
-            return "eu." + modelName;
-        } else if (strRegion.startsWith("ap")) {
-            return "apac." + modelName;
-        } else {
-            return "us." + modelName;
+        String strPrefix = "";
+
+        if (DevoxxGenieStateService.getInstance().getShouldEnableAWSRegionalInference()) {
+            if (strRegion.startsWith("eu")) {
+                strPrefix = "eu.";
+            } else if (strRegion.startsWith("ap")) {
+                strPrefix = "apac.";
+            } else if (strRegion.startsWith("us")) {
+                strPrefix = "us.";
+            }
         }
+
+        return strPrefix + modelName;
     }
 }

src/main/java/com/devoxx/genie/service/models/LLMModelRegistryService.java

@@ -838,6 +838,18 @@ private void addBedrockModels() {
                         .inputMaxTokens(200_000)
                         .build());
 
+        // Anthropic - Claude 3.5 Sonnet v2 - anthropic.claude-3-5-sonnet-20241022-v2:0
+        String claude3dot5v2 = "anthropic.claude-3-5-sonnet-20241022-v2:0";
+        models.put(ModelProvider.Bedrock.getName() + ":" + claude3dot5v2,
+                LanguageModel.builder()
+                        .provider(ModelProvider.Bedrock)
+                        .modelName(claude3dot5v2)
+                        .displayName("Claude 3.5 Sonnet v2")
+                        .inputCost(3)
+                        .outputCost(15)
+                        .inputMaxTokens(200_000)
+                        .build());
+
         // Anthropic - Claude 3.5 Sonnet - anthropic.claude-3-5-sonnet-20240620-v1:0
         String claude3dot5v1 = "anthropic.claude-3-5-sonnet-20240620-v1:0";
         models.put(ModelProvider.Bedrock.getName() + ":" + claude3dot5v1,

src/main/java/com/devoxx/genie/ui/settings/DevoxxGenieStateService.java

@@ -172,6 +172,7 @@ public static DevoxxGenieStateService getInstance() {
     private Boolean showAzureOpenAIFields = false;
     private Boolean showAwsFields = false;
     private Boolean shouldPowerFromAWSProfile = false;
+    private Boolean shouldEnableAWSRegionalInference = true;
 
     @Setter
     private Boolean useGitIgnore = true;

src/main/java/com/devoxx/genie/ui/settings/llm/LLMProvidersComponent.java

@@ -109,6 +109,8 @@ public class LLMProvidersComponent extends AbstractSettingsComponent {
     private final JCheckBox enableAWSCheckBox = new JCheckBox("", stateService.getShowAwsFields());
     @Getter
     private final JCheckBox enableAWSProfileCheckBox = new JCheckBox("", stateService.getShouldPowerFromAWSProfile());
+    @Getter
+    private final JCheckBox enableAWSRegionalInferenceCheckBox = new JCheckBox("", stateService.getShouldEnableAWSRegionalInference());
 
     private final List<JComponent> azureComponents = new ArrayList<>();
 
@@ -248,6 +250,7 @@ private void addAWSPanel(JPanel panel, GridBagConstraints gbc) {
         addSettingRow(panel, gbc, "Enable AWS Bedrock", enableAWSCheckBox);
 
         addNestedSettingsRow(panel, gbc, "Power from AWS Profile", enableAWSProfileCheckBox, awsCommonComponents);
+        addNestedSettingsRow(panel, gbc, "Enable Regional Inference", enableAWSRegionalInferenceCheckBox, awsCommonComponents);
         addNestedSettingsRow(panel, gbc, "AWS region", createTextWithPasswordButton(awsRegion, bedrockURL), awsCommonComponents);
 
         addNestedSettingsRow(panel, gbc, "AWS Access Key ID", createTextWithLinkButton(awsAccessKeyIdField, bedrockURL), awsDirectCredentialsComponents);

src/main/java/com/devoxx/genie/ui/settings/llm/LLMProvidersConfigurable.java

@@ -86,6 +86,7 @@ public boolean isModified() {
         isModified |= isFieldModified(llmSettingsComponent.getAwsSecretKeyField(), stateService.getAwsSecretKey());
         isModified |= isFieldModified(llmSettingsComponent.getAwsAccessKeyIdField(), stateService.getAwsAccessKeyId());
         isModified |= !stateService.getShouldPowerFromAWSProfile().equals(llmSettingsComponent.getEnableAWSProfileCheckBox().isSelected());
+        isModified |= !stateService.getShouldEnableAWSRegionalInference().equals(llmSettingsComponent.getEnableAWSRegionalInferenceCheckBox().isSelected());
         isModified |= isFieldModified(llmSettingsComponent.getAwsProfileName(), stateService.getAwsProfileName());
         isModified |= isFieldModified(llmSettingsComponent.getAwsRegion(), stateService.getAwsRegion());
 
@@ -156,6 +157,7 @@ public void apply() {
         settings.setAwsSecretKey(new String(llmSettingsComponent.getAwsSecretKeyField().getPassword()));
         settings.setAwsRegion(llmSettingsComponent.getAwsRegion().getText());
         settings.setShouldPowerFromAWSProfile(llmSettingsComponent.getEnableAWSProfileCheckBox().isSelected());
+        settings.setShouldEnableAWSRegionalInference(llmSettingsComponent.getEnableAWSRegionalInferenceCheckBox().isSelected());
         settings.setAwsProfileName(llmSettingsComponent.getAwsProfileName().getText());
 
         settings.setOllamaEnabled(llmSettingsComponent.getOllamaEnabledCheckBox().isSelected());