wip

Author: jennywong2129

README.md

@@ -34,7 +34,9 @@ given Access Token:
 ```
 // Initialize your client with your Rev AI access token
 String accessToken = "Your Access Token";
-ApiClient apiClient = new ApiClient(accessToken);
+// Optionally set the Rev AI deployment base url to use
+String baseUrl = RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl();
+ApiClient apiClient = new ApiClient(accessToken, baseUrl);
 ```
 
 ### Checking credits remaining

src/main/java/ai/rev/helpers/ClientHelper.java

@@ -1,5 +1,6 @@
 package ai.rev.helpers;
 
+import ai.rev.helpers.RevAiApiDeploymentConfiguration;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -19,10 +20,16 @@ public static OkHttpClient createOkHttpClient(String accessToken) {
   public static Retrofit createRetrofitInstance(
     OkHttpClient client,
     String apiName,
-    String apiVersion
+    String apiVersion,
+    String baseUrl
     ) {
     return new Retrofit.Builder()
-        .baseUrl(String.format("https://api.rev.ai/%s/%s/", apiName, apiVersion))
+        .baseUrl(String.format(
+          "%s/%s/%s/",
+          baseUrl != null ? baseUrl : RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl(),
+          apiName,
+          apiVersion
+        ))
         .addConverterFactory(ScalarsConverterFactory.create())
         .addConverterFactory(GsonConverterFactory.create())
         .client(client)

src/main/java/ai/rev/helpers/RevAiApiDeploymentConfiguration.java

@@ -0,0 +1,62 @@
+package ai.rev.helpers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RevAiApiDeploymentConfiguration {
+
+    // Enum for API deployment regions
+    public enum RevAiApiDeployment {
+        US("US"),
+        EU("EU");
+
+        private final String value;
+
+        RevAiApiDeployment(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    // Configuration map for deployment URLs
+    private static final Map<RevAiApiDeployment, DeploymentConfig> RevAiApiDeploymentConfigMap;
+
+    static {
+        RevAiApiDeploymentConfigMap = new HashMap<>();
+        RevAiApiDeploymentConfigMap.put(
+            RevAiApiDeployment.US,
+            new DeploymentConfig("https://api.rev.ai", "wss://api.rev.ai")
+        );
+        RevAiApiDeploymentConfigMap.put(
+            RevAiApiDeployment.EU,
+            new DeploymentConfig("https://ec1.api.rev.ai", "wss://ec1.api.rev.ai")
+        );
+    }
+
+    // Inner class for deployment configurations
+    public static class DeploymentConfig {
+        private final String baseUrl;
+        private final String baseWebsocketUrl;
+
+        public DeploymentConfig(String baseUrl, String baseWebsocketUrl) {
+            this.baseUrl = baseUrl;
+            this.baseWebsocketUrl = baseWebsocketUrl;
+        }
+
+        public String getBaseUrl() {
+            return baseUrl;
+        }
+
+        public String getBaseWebsocketUrl() {
+            return baseWebsocketUrl;
+        }
+    }
+
+    // Method to get the configuration for a specific deployment
+    public static DeploymentConfig getConfig(RevAiApiDeployment deployment) {
+        return RevAiApiDeploymentConfigMap.get(deployment);
+    }
+}

src/main/java/ai/rev/languageid/LanguageIdClient.java

@@ -1,6 +1,7 @@
 package ai.rev.languageid;
 
 import ai.rev.helpers.ClientHelper;
+import ai.rev.helpers.RevAiApiDeploymentConfiguration;
 import ai.rev.languageid.models.LanguageIdJob;
 import ai.rev.languageid.models.LanguageIdJobOptions;
 import ai.rev.languageid.models.LanguageIdResult;
@@ -38,14 +39,22 @@ public class LanguageIdClient {
    * href="https://www.rev.ai/access_token">https://www.rev.ai/access_token</a>.
    *
    * @param accessToken Rev AI authorization token associate with the account.
+   * @param baseUrl Optional url of the Rev AI API deployment to use, defaults to the US
+      deployement, i.e. 'https://api.rev.ai', which can be referenced as
+      RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl().
    * @throws IllegalArgumentException If the access token is null or empty.
    */
-  public LanguageIdClient(String accessToken) {
+  public LanguageIdClient(String accessToken, String baseUrl) {
     if (accessToken == null || accessToken.isEmpty()) {
       throw new IllegalArgumentException("Access token must be provided");
     }
     this.client = ClientHelper.createOkHttpClient(accessToken);
-    Retrofit retrofit = ClientHelper.createRetrofitInstance(client, "languageid", "v1");
+    Retrofit retrofit = ClientHelper.createRetrofitInstance(
+      client,
+      "languageid",
+      "v1",
+      baseUrl != null ? baseUrl : RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl()
+    );
     this.apiInterface = retrofit.create(LanguageIdInterface.class);
   }
 

src/main/java/ai/rev/speechtotext/ApiClient.java

@@ -1,6 +1,7 @@
 package ai.rev.speechtotext;
 
 import ai.rev.helpers.ClientHelper;
+import ai.rev.helpers.RevAiApiDeploymentConfiguration;
 import ai.rev.speechtotext.models.asynchronous.*;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
@@ -33,14 +34,22 @@ public class ApiClient {
    * href="https://www.rev.ai/access_token">https://www.rev.ai/access_token</a>.
    *
    * @param accessToken Rev AI authorization token associate with the account.
+   * @param baseUrl Optional url of the Rev AI API deployment to use, defaults to the US
+        deployement, i.e. 'https://api.rev.ai', which can be referenced as
+        RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl().
    * @throws IllegalArgumentException If the access token is null or empty.
    */
-  public ApiClient(String accessToken) {
+  public ApiClient(String accessToken, String baseUrl) {
     if (accessToken == null || accessToken.isEmpty()) {
       throw new IllegalArgumentException("Access token must be provided");
     }
     this.client = ClientHelper.createOkHttpClient(accessToken);
-    Retrofit retrofit = ClientHelper.createRetrofitInstance(client, "speechtotext", "v1");
+    Retrofit retrofit = ClientHelper.createRetrofitInstance(
+      client,
+      "speechtotext",
+      "v1",
+      baseUrl != null ? baseUrl : RevAiApiDeploymentConfiguration.getConfig(RevAiApiDeploymentConfiguration.RevAiApiDeployment.US).getBaseUrl()
+    );
     this.apiInterface = retrofit.create(ApiInterface.class);
   }