Skip to content

Commit 7f071cd

Browse files
VinayGuthalVinayGuthal
committed
small fixes
1 parent 485e521 commit 7f071cd

File tree

3 files changed

+34
-23
lines changed

3 files changed

+34
-23
lines changed

‎firebase-vertexai/api.txt‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ package com.google.firebase.vertexai {
2929
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.ImagenModel imagenModel(String modelName, com.google.firebase.vertexai.type.ImagenGenerationConfig? generationConfig = null);
3030
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.ImagenModel imagenModel(String modelName, com.google.firebase.vertexai.type.ImagenGenerationConfig? generationConfig = null, com.google.firebase.vertexai.type.ImagenSafetySettings? safetySettings = null);
3131
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.ImagenModel imagenModel(String modelName, com.google.firebase.vertexai.type.ImagenGenerationConfig? generationConfig = null, com.google.firebase.vertexai.type.ImagenSafetySettings? safetySettings = null, com.google.firebase.vertexai.type.RequestOptions requestOptions = com.google.firebase.vertexai.type.RequestOptions());
32-
method public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName);
33-
method public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null);
34-
method public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null);
35-
method public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null, com.google.firebase.vertexai.type.Content? systemInstruction = null);
36-
method public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null, com.google.firebase.vertexai.type.Content? systemInstruction = null, com.google.firebase.vertexai.type.RequestOptions requestOptions = com.google.firebase.vertexai.type.RequestOptions());
32+
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName);
33+
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null);
34+
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null);
35+
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null, com.google.firebase.vertexai.type.Content? systemInstruction = null);
36+
method @com.google.firebase.vertexai.type.PublicPreviewAPI public com.google.firebase.vertexai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.vertexai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.vertexai.type.Tool>? tools = null, com.google.firebase.vertexai.type.Content? systemInstruction = null, com.google.firebase.vertexai.type.RequestOptions requestOptions = com.google.firebase.vertexai.type.RequestOptions());
3737
property public static final com.google.firebase.vertexai.FirebaseVertexAI instance;
3838
field public static final com.google.firebase.vertexai.FirebaseVertexAI.Companion Companion;
3939
}
@@ -148,15 +148,7 @@ package com.google.firebase.vertexai.java {
148148
package com.google.firebase.vertexai.type {
149149

150150
public final class AudioRecordInitializationFailedException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
151-
ctor public AudioRecordInitializationFailedException();
152-
}
153-
154-
public final class AudioRecordInvalidBufferSizeException extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
155-
ctor public AudioRecordInvalidBufferSizeException();
156-
}
157-
158-
public final class BidiServerHandshakeFailed extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
159-
ctor public BidiServerHandshakeFailed();
151+
ctor public AudioRecordInitializationFailedException(String message);
160152
}
161153

162154
public final class BlockReason {
@@ -334,6 +326,10 @@ package com.google.firebase.vertexai.type {
334326
property public final kotlinx.serialization.json.JsonObject response;
335327
}
336328

329+
public final class GeminiConnectionHandshakeFailed extends com.google.firebase.vertexai.type.FirebaseVertexAIException {
330+
ctor public GeminiConnectionHandshakeFailed();
331+
}
332+
337333
public final class GenerateContentResponse {
338334
ctor public GenerateContentResponse(java.util.List<com.google.firebase.vertexai.type.Candidate> candidates, com.google.firebase.vertexai.type.PromptFeedback? promptFeedback, com.google.firebase.vertexai.type.UsageMetadata? usageMetadata);
339335
method public java.util.List<com.google.firebase.vertexai.type.Candidate> getCandidates();
@@ -573,18 +569,25 @@ package com.google.firebase.vertexai.type {
573569
public final class LiveContentResponse {
574570
method public com.google.firebase.vertexai.type.Content? getData();
575571
method public java.util.List<com.google.firebase.vertexai.type.FunctionCallPart>? getFunctionCalls();
576-
method public com.google.firebase.vertexai.type.LiveContentResponse.Status getStatus();
572+
method public int getStatus();
577573
method public String? getText();
578574
property public final com.google.firebase.vertexai.type.Content? data;
579575
property public final java.util.List<com.google.firebase.vertexai.type.FunctionCallPart>? functionCalls;
580-
property public final com.google.firebase.vertexai.type.LiveContentResponse.Status status;
576+
property public final int status;
581577
property public final String? text;
582578
}
583579

584-
public enum LiveContentResponse.Status {
585-
enum_constant public static final com.google.firebase.vertexai.type.LiveContentResponse.Status INTERRUPTED;
586-
enum_constant public static final com.google.firebase.vertexai.type.LiveContentResponse.Status NORMAL;
587-
enum_constant public static final com.google.firebase.vertexai.type.LiveContentResponse.Status TURN_COMPLETE;
580+
@kotlin.jvm.JvmInline public static final value class LiveContentResponse.Status {
581+
field public static final com.google.firebase.vertexai.type.LiveContentResponse.Status.Companion Companion;
582+
}
583+
584+
public static final class LiveContentResponse.Status.Companion {
585+
method public int getINTERRUPTED();
586+
method public int getNORMAL();
587+
method public int getTURN_COMPLETE();
588+
property public final int INTERRUPTED;
589+
property public final int NORMAL;
590+
property public final int TURN_COMPLETE;
588591
}
589592

590593
public final class LiveGenerationConfig {
@@ -815,6 +818,14 @@ package com.google.firebase.vertexai.type {
815818
property public final com.google.firebase.vertexai.type.Voices voice;
816819
}
817820

821+
public final class StreamOutput {
822+
ctor public StreamOutput(boolean interrupted, com.google.firebase.vertexai.type.Content? data);
823+
method public com.google.firebase.vertexai.type.Content? getData();
824+
method public boolean getInterrupted();
825+
property public final com.google.firebase.vertexai.type.Content? data;
826+
property public final boolean interrupted;
827+
}
828+
818829
public abstract class StringFormat {
819830
}
820831

‎firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/APIController.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import io.ktor.client.engine.okhttp.OkHttp
3737
import io.ktor.client.plugins.HttpTimeout
3838
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
3939
import io.ktor.client.plugins.websocket.ClientWebSocketSession
40+
import io.ktor.client.plugins.websocket.WebSockets
4041
import io.ktor.client.plugins.websocket.webSocketSession
4142
import io.ktor.client.request.HttpRequestBuilder
4243
import io.ktor.client.request.header
@@ -128,6 +129,7 @@ internal constructor(
128129
socketTimeoutMillis =
129130
max(180.seconds.inWholeMilliseconds, requestOptions.timeout.inWholeMilliseconds)
130131
}
132+
install(WebSockets)
131133
install(ContentNegotiation) { json(JSON) }
132134
}
133135

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jsonassert = "1.5.0"
4545
kotest = "5.9.0" # Do not use 5.9.1 because it reverts the fix for https://github.com/kotest/kotest/issues/3981
4646
kotestAssertionsCore = "5.8.1"
4747
kotlin = "1.8.22"
48-
ktorClientCio = "2.0.0"
4948
ktorVersion = "2.3.2"
5049
legacySupportV4 = "1.0.0"
5150
lifecycleProcess = "2.3.1"
@@ -149,13 +148,12 @@ kotlinx-coroutines-reactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutin
149148
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.1" }
150149
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
151150
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
152-
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktorClientCio" }
153151
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" }
154152
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorVersion" }
155153
ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktorVersion" }
156154
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktorVersion" }
157155
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktorVersion" }
158-
ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktorClientCio" }
156+
ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktorVersion" }
159157
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
160158
material = { module = "com.google.android.material:material", version.ref = "material" }
161159
maven-resolver-api = { module = "org.apache.maven.resolver:maven-resolver-api", version.ref = "mavenResolverApi" }

0 commit comments

Comments
 (0)