diff --git a/.fern/metadata.json b/.fern/metadata.json index 5eded74..d935d6a 100644 --- a/.fern/metadata.json +++ b/.fern/metadata.json @@ -11,7 +11,7 @@ }, "enable-wire-tests": true }, - "originGitCommit": "0052a020a7becd03b349857664c9f4a89b6c449a", + "originGitCommit": "d228f82e93aaa8aa77f978d458cf912f3daaa8c1", "originGitCommitIsDirty": true, "invokedBy": "manual", "sdkVersion": "0.4.1" diff --git a/src/main/java/com/deepgram/core/Environment.java b/src/main/java/com/deepgram/core/Environment.java index ab2a5b6..e0b695d 100644 --- a/src/main/java/com/deepgram/core/Environment.java +++ b/src/main/java/com/deepgram/core/Environment.java @@ -4,11 +4,11 @@ package com.deepgram.core; public final class Environment { - public static final Environment PRODUCTION = - new Environment("https://api.deepgram.com", "wss://api.deepgram.com", "wss://agent.deepgram.com"); - - public static final Environment AGENT = - new Environment("https://agent.deepgram.com", "wss://api.deepgram.com", "wss://agent.deepgram.com"); + public static final Environment PRODUCTION = new Environment( + "https://api.deepgram.com", + "wss://api.deepgram.com", + "wss://agent.deepgram.com", + "https://agent.deepgram.com"); private final String base; @@ -16,10 +16,13 @@ public final class Environment { private final String agent; - Environment(String base, String production, String agent) { + private final String agentRest; + + Environment(String base, String production, String agent, String agentRest) { this.base = base; this.production = production; this.agent = agent; + this.agentRest = agentRest; } public String getBaseURL() { @@ -34,6 +37,10 @@ public String getAgentURL() { return this.agent; } + public String getAgentRestURL() { + return this.agentRest; + } + public static Builder custom() { return new Builder(); } @@ -45,6 +52,8 @@ public static class Builder { private String agent; + private String agentRest; + public Builder base(String base) { this.base = base; return this; @@ -60,8 +69,13 @@ public Builder agent(String agent) { return this; } + public Builder agentRest(String agentRest) { + this.agentRest = agentRest; + return this; + } + public Environment build() { - return new Environment(base, production, agent); + return new Environment(base, production, agent, agentRest); } } } diff --git a/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/AsyncRawModelsClient.java b/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/AsyncRawModelsClient.java index 50769cd..cb35a9a 100644 --- a/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/AsyncRawModelsClient.java +++ b/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/AsyncRawModelsClient.java @@ -42,7 +42,7 @@ public CompletableFuture> li * Retrieves the available think models that can be used for AI agent processing */ public CompletableFuture> list(RequestOptions requestOptions) { - HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getAgentURL()) + HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getAgentRestURL()) .newBuilder() .addPathSegments("v1/agent/settings/think/models"); if (requestOptions != null) { diff --git a/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/RawModelsClient.java b/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/RawModelsClient.java index f1f069b..51a486f 100644 --- a/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/RawModelsClient.java +++ b/src/main/java/com/deepgram/resources/agent/v1/settings/think/models/RawModelsClient.java @@ -38,7 +38,7 @@ public DeepgramApiHttpResponse list() { * Retrieves the available think models that can be used for AI agent processing */ public DeepgramApiHttpResponse list(RequestOptions requestOptions) { - HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getAgentURL()) + HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getAgentRestURL()) .newBuilder() .addPathSegments("v1/agent/settings/think/models"); if (requestOptions != null) { diff --git a/src/test/java/com/deepgram/ClientBuilderTest.java b/src/test/java/com/deepgram/ClientBuilderTest.java index 5d829a5..fd7dacd 100644 --- a/src/test/java/com/deepgram/ClientBuilderTest.java +++ b/src/test/java/com/deepgram/ClientBuilderTest.java @@ -47,11 +47,18 @@ void testDefaultEnvironment() { } @Test - @DisplayName("accepts AGENT environment") + @DisplayName("accepts an agent-shaped environment") void testAgentEnvironment() { + Environment agent = Environment.custom() + .base("https://agent.deepgram.com") + .agent("wss://agent.deepgram.com") + .production("wss://api.deepgram.com") + .agentRest("https://agent.deepgram.com") + .build(); + DeepgramClient client = DeepgramClient.builder() .apiKey("test-key") - .environment(Environment.AGENT) + .environment(agent) .build(); assertThat(client).isNotNull(); diff --git a/src/test/java/com/deepgram/core/EnvironmentTest.java b/src/test/java/com/deepgram/core/EnvironmentTest.java index 6c67a76..7f40ae6 100644 --- a/src/test/java/com/deepgram/core/EnvironmentTest.java +++ b/src/test/java/com/deepgram/core/EnvironmentTest.java @@ -33,25 +33,34 @@ void testProductionUrl() { } @Nested - @DisplayName("AGENT environment") + @DisplayName("Agent-shaped custom environment") class AgentEnvironment { + private Environment agent() { + return Environment.custom() + .base("https://agent.deepgram.com") + .agent("wss://agent.deepgram.com") + .production("wss://api.deepgram.com") + .agentRest("https://agent.deepgram.com") + .build(); + } + @Test @DisplayName("base URL points to agent.deepgram.com") void testBaseUrl() { - assertThat(Environment.AGENT.getBaseURL()).isEqualTo("https://agent.deepgram.com"); + assertThat(agent().getBaseURL()).isEqualTo("https://agent.deepgram.com"); } @Test @DisplayName("agent URL points to wss://agent.deepgram.com") void testAgentUrl() { - assertThat(Environment.AGENT.getAgentURL()).isEqualTo("wss://agent.deepgram.com"); + assertThat(agent().getAgentURL()).isEqualTo("wss://agent.deepgram.com"); } @Test @DisplayName("production URL uses wss://api.deepgram.com") void testProductionUrl() { - assertThat(Environment.AGENT.getProductionURL()).isEqualTo("wss://api.deepgram.com"); + assertThat(agent().getProductionURL()).isEqualTo("wss://api.deepgram.com"); } }