Skip to content

Commit 6c03873

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [Many APIs] update Nodejs generator to send API versions in headers for GAPICs (#5350)
* feat: update Nodejs generator to send API versions in headers for GAPICs PiperOrigin-RevId: 634109303 Source-Link: googleapis/googleapis@998ade8 Source-Link: googleapis/googleapis-gen@000ca6f Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFpLWdlbmVyYXRpdmVsYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1hZG1pbi8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1kYXRhLy5Pd2xCb3QueWFtbCIsImgiOiIwMDBjYTZmMDA4MDFmNjViODQ3ZTYwMjljYjA1MTExNDA0ZGYyMWVjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1hcGlrZXlzLy5Pd2xCb3QueWFtbCIsImgiOiIwMDBjYTZmMDA4MDFmNjViODQ3ZTYwMjljYjA1MTExNDA0ZGYyMWVjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1jbG91ZHF1b3Rhcy8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNlY29udHJvbC8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNlbWFuYWdlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwaS1zZXJ2aWNldXNhZ2UvLk93bEJvdC55YW1sIiwiaCI6IjAwMGNhNmYwMDgwMWY2NWI4NDdlNjAyOWNiMDUxMTE0MDRkZjIxZWMifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcGVuZ2luZS8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcHMtbWVldC8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFyZWExMjAtdGFibGVzLy5Pd2xCb3QueWFtbCIsImgiOiIwMDBjYTZmMDA4MDFmNjViODQ3ZTYwMjljYjA1MTExNDA0ZGYyMWVjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFjY2Vzc2FwcHJvdmFsLy5Pd2xCb3QueWFtbCIsImgiOiIwMDBjYTZmMDA4MDFmNjViODQ3ZTYwMjljYjA1MTExNDA0ZGYyMWVjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFkdmlzb3J5bm90aWZpY2F0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFsbG95ZGIvLk93bEJvdC55YW1sIiwiaCI6IjAwMGNhNmYwMDgwMWY2NWI4NDdlNjAyOWNiMDUxMTE0MDRkZjIxZWMifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdhdGV3YXkvLk93bEJvdC55YW1sIiwiaCI6IjAwMGNhNmYwMDgwMWY2NWI4NDdlNjAyOWNiMDUxMTE0MDRkZjIxZWMifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZWNvbm5lY3QvLk93bEJvdC55YW1sIiwiaCI6IjAwMGNhNmYwMDgwMWY2NWI4NDdlNjAyOWNiMDUxMTE0MDRkZjIxZWMifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZXJlZ2lzdHJ5Ly5Pd2xCb3QueWFtbCIsImgiOiIwMDBjYTZmMDA4MDFmNjViODQ3ZTYwMjljYjA1MTExNDA0ZGYyMWVjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwcGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFzc2V0Ly5Pd2xCb3QueWFtbCIsImgiOiIwMDBjYTZmMDA4MDFmNjViODQ3ZTYwMjljYjA1MTExNDA0ZGYyMWVjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFzc3VyZWR3b3JrbG9hZHMvLk93bEJvdC55YW1sIiwiaCI6IjAwMGNhNmYwMDgwMWY2NWI4NDdlNjAyOWNiMDUxMTE0MDRkZjIxZWMifQ== * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 181871c commit 6c03873

5 files changed

Lines changed: 107 additions & 3 deletions

File tree

‎packages/google-ai-generativelanguage/src/v1/generative_service_client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export class GenerativeServiceClient {
207207
streamGenerateContent: new this._gaxModule.StreamDescriptor(
208208
this._gaxModule.StreamType.SERVER_STREAMING,
209209
!!opts.fallback,
210-
/* gaxStreamingRetries: */ false
210+
!!opts.gaxServerStreamingRetries
211211
),
212212
};
213213

‎packages/google-ai-generativelanguage/src/v1beta/generative_service_client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export class GenerativeServiceClient {
224224
streamGenerateContent: new this._gaxModule.StreamDescriptor(
225225
this._gaxModule.StreamType.SERVER_STREAMING,
226226
!!opts.fallback,
227-
/* gaxStreamingRetries: */ false
227+
!!opts.gaxServerStreamingRetries
228228
),
229229
};
230230

‎packages/google-ai-generativelanguage/test/gapic_generative_service_v1.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,51 @@ describe('v1.GenerativeServiceClient', () => {
837837
assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams));
838838
});
839839

840+
it('invokes streamGenerateContent without error and gaxServerStreamingRetries enabled', async () => {
841+
const client = new generativeserviceModule.v1.GenerativeServiceClient({
842+
gaxServerStreamingRetries: true,
843+
});
844+
client.initialize();
845+
const request = generateSampleMessage(
846+
new protos.google.ai.generativelanguage.v1.GenerateContentRequest()
847+
);
848+
const defaultValue1 = getTypeDefaultValue(
849+
'.google.ai.generativelanguage.v1.GenerateContentRequest',
850+
['model']
851+
);
852+
request.model = defaultValue1;
853+
const expectedHeaderRequestParams = `model=${defaultValue1}`;
854+
const expectedResponse = generateSampleMessage(
855+
new protos.google.ai.generativelanguage.v1.GenerateContentResponse()
856+
);
857+
client.innerApiCalls.streamGenerateContent =
858+
stubServerStreamingCall(expectedResponse);
859+
const stream = client.streamGenerateContent(request);
860+
const promise = new Promise((resolve, reject) => {
861+
stream.on(
862+
'data',
863+
(
864+
response: protos.google.ai.generativelanguage.v1.GenerateContentResponse
865+
) => {
866+
resolve(response);
867+
}
868+
);
869+
stream.on('error', (err: Error) => {
870+
reject(err);
871+
});
872+
});
873+
const response = await promise;
874+
assert.deepStrictEqual(response, expectedResponse);
875+
const actualRequest = (
876+
client.innerApiCalls.streamGenerateContent as SinonStub
877+
).getCall(0).args[0];
878+
assert.deepStrictEqual(actualRequest, request);
879+
const actualHeaderRequestParams = (
880+
client.innerApiCalls.streamGenerateContent as SinonStub
881+
).getCall(0).args[1].otherArgs.headers['x-goog-request-params'];
882+
assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams));
883+
});
884+
840885
it('invokes streamGenerateContent with error', async () => {
841886
const client = new generativeserviceModule.v1.GenerativeServiceClient({
842887
credentials: {client_email: 'bogus', private_key: 'bogus'},
@@ -916,6 +961,12 @@ describe('v1.GenerativeServiceClient', () => {
916961
});
917962
await assert.rejects(promise, expectedError);
918963
});
964+
it('should create a client with gaxServerStreamingRetries enabled', () => {
965+
const client = new generativeserviceModule.v1.GenerativeServiceClient({
966+
gaxServerStreamingRetries: true,
967+
});
968+
assert(client);
969+
});
919970
});
920971

921972
describe('Path templates', () => {

‎packages/google-ai-generativelanguage/test/gapic_generative_service_v1beta.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,51 @@ describe('v1beta.GenerativeServiceClient', () => {
10251025
assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams));
10261026
});
10271027

1028+
it('invokes streamGenerateContent without error and gaxServerStreamingRetries enabled', async () => {
1029+
const client = new generativeserviceModule.v1beta.GenerativeServiceClient(
1030+
{gaxServerStreamingRetries: true}
1031+
);
1032+
client.initialize();
1033+
const request = generateSampleMessage(
1034+
new protos.google.ai.generativelanguage.v1beta.GenerateContentRequest()
1035+
);
1036+
const defaultValue1 = getTypeDefaultValue(
1037+
'.google.ai.generativelanguage.v1beta.GenerateContentRequest',
1038+
['model']
1039+
);
1040+
request.model = defaultValue1;
1041+
const expectedHeaderRequestParams = `model=${defaultValue1}`;
1042+
const expectedResponse = generateSampleMessage(
1043+
new protos.google.ai.generativelanguage.v1beta.GenerateContentResponse()
1044+
);
1045+
client.innerApiCalls.streamGenerateContent =
1046+
stubServerStreamingCall(expectedResponse);
1047+
const stream = client.streamGenerateContent(request);
1048+
const promise = new Promise((resolve, reject) => {
1049+
stream.on(
1050+
'data',
1051+
(
1052+
response: protos.google.ai.generativelanguage.v1beta.GenerateContentResponse
1053+
) => {
1054+
resolve(response);
1055+
}
1056+
);
1057+
stream.on('error', (err: Error) => {
1058+
reject(err);
1059+
});
1060+
});
1061+
const response = await promise;
1062+
assert.deepStrictEqual(response, expectedResponse);
1063+
const actualRequest = (
1064+
client.innerApiCalls.streamGenerateContent as SinonStub
1065+
).getCall(0).args[0];
1066+
assert.deepStrictEqual(actualRequest, request);
1067+
const actualHeaderRequestParams = (
1068+
client.innerApiCalls.streamGenerateContent as SinonStub
1069+
).getCall(0).args[1].otherArgs.headers['x-goog-request-params'];
1070+
assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams));
1071+
});
1072+
10281073
it('invokes streamGenerateContent with error', async () => {
10291074
const client = new generativeserviceModule.v1beta.GenerativeServiceClient(
10301075
{
@@ -1108,6 +1153,14 @@ describe('v1beta.GenerativeServiceClient', () => {
11081153
});
11091154
await assert.rejects(promise, expectedError);
11101155
});
1156+
it('should create a client with gaxServerStreamingRetries enabled', () => {
1157+
const client = new generativeserviceModule.v1beta.GenerativeServiceClient(
1158+
{
1159+
gaxServerStreamingRetries: true,
1160+
}
1161+
);
1162+
assert(client);
1163+
});
11111164
});
11121165

11131166
describe('Path templates', () => {

‎packages/google-cloud-apigeeconnect/src/v1/tether_client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ export class TetherClient {
200200
egress: new this._gaxModule.StreamDescriptor(
201201
this._gaxModule.StreamType.BIDI_STREAMING,
202202
!!opts.fallback,
203-
/* gaxStreamingRetries: */ false
203+
!!opts.gaxServerStreamingRetries
204204
),
205205
};
206206

0 commit comments

Comments
 (0)