Skip to content

Commit f4bfc6e

Browse files
matthew29tangcopybara-github
matthew29tang
authored and
copybara-github
committed
feat: Add ImageResizeMode for GenerateVideos
FUTURE_COPYBARA_INTEGRATE_REVIEW=https://github.com/google-gemini/private-dotnet-genai/pull/75 from google-gemini:vertex b423641c927b1c5e587c4ddb533afec002844b2d PiperOrigin-RevId: 869306823
1 parent 75b52c7 commit f4bfc6e

91 files changed

Lines changed: 3755 additions & 4797 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DemoApp/Files/packages.lock.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"dependencies": {
5252
"Google.Apis.Auth": "[1.69.0, )",
5353
"Microsoft.Extensions.AI.Abstractions": "[10.4.0, )",
54-
"MimeTypes": "[2.5.2, )"
54+
"MimeTypes": "[2.5.2, )",
55+
"System.Collections.Immutable": "[9.0.0, )",
56+
"System.Net.ServerSentEvents": "[9.0.0, )"
5557
}
5658
},
5759
"Google.Apis.Auth": {
@@ -80,6 +82,18 @@
8082
"resolved": "2.5.2",
8183
"contentHash": "vm4xrNt+i6OVRQ8vhfCcmDIUg3qvjyCTkSTNVTDFohsG6CXEpMaVFkidECL6yRYpHDnz4TqXhDoEQAcnHCu/tw=="
8284
},
85+
"System.Collections.Immutable": {
86+
"type": "CentralTransitive",
87+
"requested": "[9.0.0, )",
88+
"resolved": "9.0.0",
89+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
90+
},
91+
"System.Net.ServerSentEvents": {
92+
"type": "CentralTransitive",
93+
"requested": "[9.0.0, )",
94+
"resolved": "9.0.0",
95+
"contentHash": "VTWjeyx9nPb4+hkjGcAaDw1nOckypMtvABmxSWm6PPYwrXoIiVG3jwtNlAGhaGVjDkBrERABox67wYTAcHxg7Q=="
96+
},
8397
"System.Text.Json": {
8498
"type": "CentralTransitive",
8599
"requested": "[10.0.4, )",

‎DemoApp/GenerateContentSimpleText/packages.lock.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"dependencies": {
5252
"Google.Apis.Auth": "[1.69.0, )",
5353
"Microsoft.Extensions.AI.Abstractions": "[10.4.0, )",
54-
"MimeTypes": "[2.5.2, )"
54+
"MimeTypes": "[2.5.2, )",
55+
"System.Collections.Immutable": "[9.0.0, )",
56+
"System.Net.ServerSentEvents": "[9.0.0, )"
5557
}
5658
},
5759
"Google.Apis.Auth": {
@@ -80,6 +82,18 @@
8082
"resolved": "2.5.2",
8183
"contentHash": "vm4xrNt+i6OVRQ8vhfCcmDIUg3qvjyCTkSTNVTDFohsG6CXEpMaVFkidECL6yRYpHDnz4TqXhDoEQAcnHCu/tw=="
8284
},
85+
"System.Collections.Immutable": {
86+
"type": "CentralTransitive",
87+
"requested": "[9.0.0, )",
88+
"resolved": "9.0.0",
89+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
90+
},
91+
"System.Net.ServerSentEvents": {
92+
"type": "CentralTransitive",
93+
"requested": "[9.0.0, )",
94+
"resolved": "9.0.0",
95+
"contentHash": "VTWjeyx9nPb4+hkjGcAaDw1nOckypMtvABmxSWm6PPYwrXoIiVG3jwtNlAGhaGVjDkBrERABox67wYTAcHxg7Q=="
96+
},
8397
"System.Text.Json": {
8498
"type": "CentralTransitive",
8599
"requested": "[10.0.4, )",

‎DemoApp/GenerateContentStreamSimpleText/packages.lock.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"dependencies": {
5252
"Google.Apis.Auth": "[1.69.0, )",
5353
"Microsoft.Extensions.AI.Abstractions": "[10.4.0, )",
54-
"MimeTypes": "[2.5.2, )"
54+
"MimeTypes": "[2.5.2, )",
55+
"System.Collections.Immutable": "[9.0.0, )",
56+
"System.Net.ServerSentEvents": "[9.0.0, )"
5557
}
5658
},
5759
"Google.Apis.Auth": {
@@ -80,6 +82,18 @@
8082
"resolved": "2.5.2",
8183
"contentHash": "vm4xrNt+i6OVRQ8vhfCcmDIUg3qvjyCTkSTNVTDFohsG6CXEpMaVFkidECL6yRYpHDnz4TqXhDoEQAcnHCu/tw=="
8284
},
85+
"System.Collections.Immutable": {
86+
"type": "CentralTransitive",
87+
"requested": "[9.0.0, )",
88+
"resolved": "9.0.0",
89+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
90+
},
91+
"System.Net.ServerSentEvents": {
92+
"type": "CentralTransitive",
93+
"requested": "[9.0.0, )",
94+
"resolved": "9.0.0",
95+
"contentHash": "VTWjeyx9nPb4+hkjGcAaDw1nOckypMtvABmxSWm6PPYwrXoIiVG3jwtNlAGhaGVjDkBrERABox67wYTAcHxg7Q=="
96+
},
8397
"System.Text.Json": {
8498
"type": "CentralTransitive",
8599
"requested": "[10.0.4, )",

‎DemoApp/JsonParser/packages.lock.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"dependencies": {
5252
"Google.Apis.Auth": "[1.69.0, )",
5353
"Microsoft.Extensions.AI.Abstractions": "[10.4.0, )",
54-
"MimeTypes": "[2.5.2, )"
54+
"MimeTypes": "[2.5.2, )",
55+
"System.Collections.Immutable": "[9.0.0, )",
56+
"System.Net.ServerSentEvents": "[9.0.0, )"
5557
}
5658
},
5759
"Google.Apis.Auth": {
@@ -80,6 +82,18 @@
8082
"resolved": "2.5.2",
8183
"contentHash": "vm4xrNt+i6OVRQ8vhfCcmDIUg3qvjyCTkSTNVTDFohsG6CXEpMaVFkidECL6yRYpHDnz4TqXhDoEQAcnHCu/tw=="
8284
},
85+
"System.Collections.Immutable": {
86+
"type": "CentralTransitive",
87+
"requested": "[9.0.0, )",
88+
"resolved": "9.0.0",
89+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
90+
},
91+
"System.Net.ServerSentEvents": {
92+
"type": "CentralTransitive",
93+
"requested": "[9.0.0, )",
94+
"resolved": "9.0.0",
95+
"contentHash": "VTWjeyx9nPb4+hkjGcAaDw1nOckypMtvABmxSWm6PPYwrXoIiVG3jwtNlAGhaGVjDkBrERABox67wYTAcHxg7Q=="
96+
},
8397
"System.Text.Json": {
8498
"type": "CentralTransitive",
8599
"requested": "[10.0.4, )",

‎DemoApp/LiveAudioToAudioRealtimeInput/packages.lock.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"dependencies": {
5252
"Google.Apis.Auth": "[1.69.0, )",
5353
"Microsoft.Extensions.AI.Abstractions": "[10.4.0, )",
54-
"MimeTypes": "[2.5.2, )"
54+
"MimeTypes": "[2.5.2, )",
55+
"System.Collections.Immutable": "[9.0.0, )",
56+
"System.Net.ServerSentEvents": "[9.0.0, )"
5557
}
5658
},
5759
"Google.Apis.Auth": {
@@ -80,6 +82,18 @@
8082
"resolved": "2.5.2",
8183
"contentHash": "vm4xrNt+i6OVRQ8vhfCcmDIUg3qvjyCTkSTNVTDFohsG6CXEpMaVFkidECL6yRYpHDnz4TqXhDoEQAcnHCu/tw=="
8284
},
85+
"System.Collections.Immutable": {
86+
"type": "CentralTransitive",
87+
"requested": "[9.0.0, )",
88+
"resolved": "9.0.0",
89+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
90+
},
91+
"System.Net.ServerSentEvents": {
92+
"type": "CentralTransitive",
93+
"requested": "[9.0.0, )",
94+
"resolved": "9.0.0",
95+
"contentHash": "VTWjeyx9nPb4+hkjGcAaDw1nOckypMtvABmxSWm6PPYwrXoIiVG3jwtNlAGhaGVjDkBrERABox67wYTAcHxg7Q=="
96+
},
8397
"System.Text.Json": {
8498
"type": "CentralTransitive",
8599
"requested": "[10.0.4, )",

‎DemoApp/LiveTextToTextClientContent/packages.lock.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"dependencies": {
5252
"Google.Apis.Auth": "[1.69.0, )",
5353
"Microsoft.Extensions.AI.Abstractions": "[10.4.0, )",
54-
"MimeTypes": "[2.5.2, )"
54+
"MimeTypes": "[2.5.2, )",
55+
"System.Collections.Immutable": "[9.0.0, )",
56+
"System.Net.ServerSentEvents": "[9.0.0, )"
5557
}
5658
},
5759
"Google.Apis.Auth": {
@@ -80,6 +82,18 @@
8082
"resolved": "2.5.2",
8183
"contentHash": "vm4xrNt+i6OVRQ8vhfCcmDIUg3qvjyCTkSTNVTDFohsG6CXEpMaVFkidECL6yRYpHDnz4TqXhDoEQAcnHCu/tw=="
8284
},
85+
"System.Collections.Immutable": {
86+
"type": "CentralTransitive",
87+
"requested": "[9.0.0, )",
88+
"resolved": "9.0.0",
89+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
90+
},
91+
"System.Net.ServerSentEvents": {
92+
"type": "CentralTransitive",
93+
"requested": "[9.0.0, )",
94+
"resolved": "9.0.0",
95+
"contentHash": "VTWjeyx9nPb4+hkjGcAaDw1nOckypMtvABmxSWm6PPYwrXoIiVG3jwtNlAGhaGVjDkBrERABox67wYTAcHxg7Q=="
96+
},
8397
"System.Text.Json": {
8498
"type": "CentralTransitive",
8599
"requested": "[10.0.4, )",

‎DemoApp/LiveToolCall/packages.lock.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"dependencies": {
5252
"Google.Apis.Auth": "[1.69.0, )",
5353
"Microsoft.Extensions.AI.Abstractions": "[10.4.0, )",
54-
"MimeTypes": "[2.5.2, )"
54+
"MimeTypes": "[2.5.2, )",
55+
"System.Collections.Immutable": "[9.0.0, )",
56+
"System.Net.ServerSentEvents": "[9.0.0, )"
5557
}
5658
},
5759
"Google.Apis.Auth": {
@@ -80,6 +82,18 @@
8082
"resolved": "2.5.2",
8183
"contentHash": "vm4xrNt+i6OVRQ8vhfCcmDIUg3qvjyCTkSTNVTDFohsG6CXEpMaVFkidECL6yRYpHDnz4TqXhDoEQAcnHCu/tw=="
8284
},
85+
"System.Collections.Immutable": {
86+
"type": "CentralTransitive",
87+
"requested": "[9.0.0, )",
88+
"resolved": "9.0.0",
89+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
90+
},
91+
"System.Net.ServerSentEvents": {
92+
"type": "CentralTransitive",
93+
"requested": "[9.0.0, )",
94+
"resolved": "9.0.0",
95+
"contentHash": "VTWjeyx9nPb4+hkjGcAaDw1nOckypMtvABmxSWm6PPYwrXoIiVG3jwtNlAGhaGVjDkBrERABox67wYTAcHxg7Q=="
96+
},
8397
"System.Text.Json": {
8498
"type": "CentralTransitive",
8599
"requested": "[10.0.4, )",

‎Google.GenAI.E2E.Tests/Batches/CancelBatchTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public class CancelBatchTest
2828
{
2929
private static TestServerProcess? _server;
30-
private Client vertexClient;
30+
private Client enterpriseClient;
3131
private Client geminiClient;
3232
private string modelName;
3333
public TestContext TestContext { get; set; }
@@ -57,7 +57,7 @@ public void TestInit()
5757
$"{GetType().Name}.{TestContext.TestName}" } },
5858
BaseUrl = "http://localhost:1453"
5959
};
60-
var vertexClientHttpOptions = new HttpOptions {
60+
var enterpriseClientHttpOptions = new HttpOptions {
6161
Headers = new Dictionary<string, string> { { "Test-Name",
6262
$"{GetType().Name}.{TestContext.TestName}" } },
6363
BaseUrl = "http://localhost:1454"
@@ -68,11 +68,11 @@ public void TestInit()
6868
string location =
6969
System.Environment.GetEnvironmentVariable("GOOGLE_CLOUD_LOCATION") ?? "us-central1";
7070
string apiKey = System.Environment.GetEnvironmentVariable("GOOGLE_API_KEY");
71-
vertexClient = new Client(project: project, location: location, vertexAI: true,
71+
enterpriseClient = new Client(project: project, location: location, enterprise: true,
7272
credential: TestServer.GetCredentialForTestMode(),
73-
httpOptions: vertexClientHttpOptions);
73+
httpOptions: enterpriseClientHttpOptions);
7474
geminiClient =
75-
new Client(apiKey: apiKey, vertexAI: false, httpOptions: geminiClientHttpOptions);
75+
new Client(apiKey: apiKey, enterprise: false, httpOptions: geminiClientHttpOptions);
7676

7777
// Specific setup for this test class
7878
modelName = "gemini-2.5-flash";
@@ -95,8 +95,8 @@ public async Task CancelBatchJobVertexTest()
9595
Format = "jsonl"
9696
}
9797
};
98-
var response = await vertexClient.Batches.CreateAsync(modelName, src, config);
99-
await vertexClient.Batches.CancelAsync(response.Name);
98+
var response = await enterpriseClient.Batches.CreateAsync(modelName, src, config);
99+
await enterpriseClient.Batches.CancelAsync(response.Name);
100100
}
101101

102102
[TestMethod]

‎Google.GenAI.E2E.Tests/Batches/EmbeddingBatchTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public class EmbeddingBatchTest
2828
{
2929
private static TestServerProcess? _server;
30-
private Client vertexClient;
30+
private Client enterpriseClient;
3131
private Client geminiClient;
3232
private string modelName;
3333
public TestContext TestContext { get; set; }
@@ -58,7 +58,7 @@ public void TestInit()
5858
$"{GetType().Name}.{TestContext.TestName}" } },
5959
BaseUrl = "http://localhost:1453"
6060
};
61-
var vertexClientHttpOptions = new HttpOptions
61+
var enterpriseClientHttpOptions = new HttpOptions
6262
{
6363
Headers = new Dictionary<string, string> { { "Test-Name",
6464
$"{GetType().Name}.{TestContext.TestName}" } },
@@ -69,11 +69,11 @@ public void TestInit()
6969
string location =
7070
System.Environment.GetEnvironmentVariable("GOOGLE_CLOUD_LOCATION") ?? "us-central1";
7171
string apiKey = System.Environment.GetEnvironmentVariable("GOOGLE_API_KEY");
72-
vertexClient = new Client(project: project, location: location, vertexAI: true,
72+
enterpriseClient = new Client(project: project, location: location, enterprise: true,
7373
credential: TestServer.GetCredentialForTestMode(),
74-
httpOptions: vertexClientHttpOptions);
74+
httpOptions: enterpriseClientHttpOptions);
7575
geminiClient =
76-
new Client(apiKey: apiKey, vertexAI: false, httpOptions: geminiClientHttpOptions);
76+
new Client(apiKey: apiKey, enterprise: false, httpOptions: geminiClientHttpOptions);
7777
// Specific setup for this test class
7878
modelName = "gemini-embedding-001";
7979
}
@@ -120,7 +120,7 @@ public async Task CreateEmbeddingBatchWithInlinedRequestsVertexTest()
120120
};
121121
await Assert.ThrowsExceptionAsync<NotSupportedException>(async () =>
122122
{
123-
await vertexClient.Batches.CreateEmbeddingsAsync(modelName, src, null);
123+
await enterpriseClient.Batches.CreateEmbeddingsAsync(modelName, src, null);
124124
});
125125
}
126126

@@ -149,7 +149,7 @@ public async Task CreateEmbeddingBatchWithFileVertexTest()
149149
};
150150
await Assert.ThrowsExceptionAsync<NotSupportedException>(async () =>
151151
{
152-
await vertexClient.Batches.CreateEmbeddingsAsync(modelName, src, null);
152+
await enterpriseClient.Batches.CreateEmbeddingsAsync(modelName, src, null);
153153
});
154154
}
155155
}

‎Google.GenAI.E2E.Tests/Caches/CreateCacheTest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class CreateCacheTest
3131
{
3232
private static TestServerProcess? _server;
33-
private Client vertexClient;
33+
private Client enterpriseClient;
3434
private Client geminiClient;
3535
private string modelName;
3636
public TestContext TestContext { get; set; }
@@ -60,7 +60,7 @@ public void TestInit()
6060
$"{GetType().Name}.{TestContext.TestName}" } },
6161
BaseUrl = "http://localhost:1453"
6262
};
63-
var vertexClientHttpOptions = new HttpOptions {
63+
var enterpriseClientHttpOptions = new HttpOptions {
6464
Headers = new Dictionary<string, string> { { "Test-Name",
6565
$"{GetType().Name}.{TestContext.TestName}" } },
6666
BaseUrl = "http://localhost:1454"
@@ -71,11 +71,11 @@ public void TestInit()
7171
string location =
7272
System.Environment.GetEnvironmentVariable("GOOGLE_CLOUD_LOCATION") ?? "us-central1";
7373
string apiKey = System.Environment.GetEnvironmentVariable("GOOGLE_API_KEY");
74-
vertexClient = new Client(project: project, location: location, vertexAI: true,
74+
enterpriseClient = new Client(project: project, location: location, enterprise: true,
7575
credential: TestServer.GetCredentialForTestMode(),
76-
httpOptions: vertexClientHttpOptions);
76+
httpOptions: enterpriseClientHttpOptions);
7777
geminiClient =
78-
new Client(apiKey: apiKey, vertexAI: false, httpOptions: geminiClientHttpOptions);
78+
new Client(apiKey: apiKey, enterprise: false, httpOptions: geminiClientHttpOptions);
7979

8080
// Specific setup for this test class
8181
modelName = "gemini-2.5-flash";
@@ -108,7 +108,7 @@ public async Task CreateCacheGcsUriVertexTest()
108108
Ttl = "86400s"
109109
};
110110

111-
var vertexResponse = await vertexClient.Caches.CreateAsync(model: modelName, config: config);
111+
var vertexResponse = await enterpriseClient.Caches.CreateAsync(model: modelName, config: config);
112112

113113
Assert.IsNotNull(vertexResponse);
114114
Assert.IsNotNull(vertexResponse.Name);
@@ -186,7 +186,7 @@ public async Task CreateCacheGoogleAiFileVertexTest()
186186
};
187187

188188
await Assert.ThrowsExceptionAsync<ServerError>(async () => {
189-
await vertexClient.Caches.CreateAsync(model: modelName, config: config);
189+
await enterpriseClient.Caches.CreateAsync(model: modelName, config: config);
190190
});
191191
}
192192
}

0 commit comments

Comments
 (0)