Skip to content

Commit 7a23322

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: [Many APIs] update typescript gapic generator to 4.8.1 (#6143)
- [ ] Regenerate this pull request now. feat: add request/response debug logging to gapics, update templates to gax 5 and node 18 (#1671) fix: add json files to tsconfig templates (#1692) (ba6be1d) PiperOrigin-RevId: 735896588 Source-Link: https://togithub.com/googleapis/googleapis/commit/3419af786b385118d2dacfd8d99b141a00e9944d Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/f35ba1142f4e168222327d892b5f6ee908e5d461 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXZpc2lvbi8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXZtbWlncmF0aW9uLy5Pd2xCb3QueWFtbCIsImgiOiJmMzViYTExNDJmNGUxNjgyMjIzMjdkODkyYjVmNmVlOTA4ZTVkNDYxIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXZtd2FyZWVuZ2luZS8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXZwY2FjY2Vzcy8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXdlYnJpc2svLk93bEJvdC55YW1sIiwiaCI6ImYzNWJhMTE0MmY0ZTE2ODIyMjMyN2Q4OTJiNWY2ZWU5MDhlNWQ0NjEifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXdlYnNlY3VyaXR5c2Nhbm5lci8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXdvcmtmbG93cy1leGVjdXRpb25zLy5Pd2xCb3QueWFtbCIsImgiOiJmMzViYTExNDJmNGUxNjgyMjIzMjdkODkyYjVmNmVlOTA4ZTVkNDYxIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXdvcmtzdGF0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWRhdGFmbG93Ly5Pd2xCb3QueWFtbCIsImgiOiJmMzViYTExNDJmNGUxNjgyMjIzMjdkODkyYjVmNmVlOTA4ZTVkNDYxIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWRldnRvb2xzLWFydGlmYWN0cmVnaXN0cnkvLk93bEJvdC55YW1sIiwiaCI6ImYzNWJhMTE0MmY0ZTE2ODIyMjMyN2Q4OTJiNWY2ZWU5MDhlNWQ0NjEifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWRldnRvb2xzLWNsb3VkYnVpbGQvLk93bEJvdC55YW1sIiwiaCI6ImYzNWJhMTE0MmY0ZTE2ODIyMjMyN2Q4OTJiNWY2ZWU5MDhlNWQ0NjEifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWRldnRvb2xzLWNsb3VkcHJvZmlsZXIvLk93bEJvdC55YW1sIiwiaCI6ImYzNWJhMTE0MmY0ZTE2ODIyMjMyN2Q4OTJiNWY2ZWU5MDhlNWQ0NjEifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWRldnRvb2xzLWNvbnRhaW5lcmFuYWx5c2lzLy5Pd2xCb3QueWFtbCIsImgiOiJmMzViYTExNDJmNGUxNjgyMjIzMjdkODkyYjVmNmVlOTA4ZTVkNDYxIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWlhbS1jcmVkZW50aWFscy8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWlhbS8uT3dsQm90LnlhbWwiLCJoIjoiZjM1YmExMTQyZjRlMTY4MjIyMzI3ZDg5MmI1ZjZlZTkwOGU1ZDQ2MSJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWlkZW50aXR5LWFjY2Vzc2NvbnRleHRtYW5hZ2VyLy5Pd2xCb3QueWFtbCIsImgiOiJmMzViYTExNDJmNGUxNjgyMjIzMjdkODkyYjVmNmVlOTA4ZTVkNDYxIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLW1hcHMtYWRkcmVzc3ZhbGlkYXRpb24vLk93bEJvdC55YW1sIiwiaCI6ImYzNWJhMTE0MmY0ZTE2ODIyMjMyN2Q4OTJiNWY2ZWU5MDhlNWQ0NjEifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLW1hcHMtYXJlYWluc2lnaHRzLy5Pd2xCb3QueWFtbCIsImgiOiJmMzViYTExNDJmNGUxNjgyMjIzMjdkODkyYjVmNmVlOTA4ZTVkNDYxIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLW1hcHMtZmxlZXRlbmdpbmUtZGVsaXZlcnkvLk93bEJvdC55YW1sIiwiaCI6ImYzNWJhMTE0MmY0ZTE2ODIyMjMyN2Q4OTJiNWY2ZWU5MDhlNWQ0NjEifQ==
1 parent 7d0481e commit 7a23322

108 files changed

Lines changed: 17521 additions & 1192 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.

‎packages/google-cloud-vision/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained].
4444
1. [Select or create a Cloud Platform project][projects].
4545
1. [Enable billing for your project][billing].
4646
1. [Enable the Google Cloud Vision API API][enable_api].
47-
1. [Set up authentication][auth] so you can access the
47+
1. [Set up authentication with a service account][auth] so you can access the
4848
API from your local workstation.
4949

5050
### Installing the client library
@@ -201,4 +201,4 @@ See [LICENSE](https://github.com/googleapis/google-cloud-node/blob/main/LICENSE)
201201
[projects]: https://console.cloud.google.com/project
202202
[billing]: https://support.google.com/cloud/answer/6293499#enable-billing
203203
[enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=vision.googleapis.com
204-
[auth]: https://cloud.google.com/docs/authentication/external/set-up-adc-local
204+
[auth]: https://cloud.google.com/docs/authentication/getting-started

‎packages/google-cloud-vision/protos/protos.json‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/google-cloud-vision/src/v1/image_annotator_client.ts‎

Lines changed: 123 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import type {
2929

3030
import * as protos from '../../protos/protos';
3131
import jsonProtos = require('../../protos/protos.json');
32+
import {loggingUtils as logging} from 'google-gax';
3233

3334
/**
3435
* Client JSON configuration object, loaded from
@@ -55,6 +56,8 @@ export class ImageAnnotatorClient {
5556
private _defaults: {[method: string]: gax.CallSettings};
5657
private _universeDomain: string;
5758
private _servicePath: string;
59+
private _log = logging.log('vision');
60+
5861
auth: gax.GoogleAuth;
5962
descriptors: Descriptors = {
6063
page: {},
@@ -90,7 +93,7 @@ export class ImageAnnotatorClient {
9093
* Developer's Console, e.g. 'grape-spaceship-123'. We will also check
9194
* the environment variable GCLOUD_PROJECT for your project ID. If your
9295
* app is running in an environment which supports
93-
* {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials},
96+
* {@link https://cloud.google.com/docs/authentication/application-default-credentials Application Default Credentials},
9497
* your project ID will be detected automatically.
9598
* @param {string} [options.apiEndpoint] - The domain name of the
9699
* API remote host.
@@ -551,7 +554,33 @@ export class ImageAnnotatorClient {
551554
parent: request.parent ?? '',
552555
});
553556
this.initialize();
554-
return this.innerApiCalls.batchAnnotateImages(request, options, callback);
557+
this._log.info('batchAnnotateImages request %j', request);
558+
const wrappedCallback:
559+
| Callback<
560+
protos.google.cloud.vision.v1.IBatchAnnotateImagesResponse,
561+
| protos.google.cloud.vision.v1.IBatchAnnotateImagesRequest
562+
| null
563+
| undefined,
564+
{} | null | undefined
565+
>
566+
| undefined = callback
567+
? (error, response, options, rawResponse) => {
568+
this._log.info('batchAnnotateImages response %j', response);
569+
callback!(error, response, options, rawResponse); // We verified callback above.
570+
}
571+
: undefined;
572+
return this.innerApiCalls
573+
.batchAnnotateImages(request, options, wrappedCallback)
574+
?.then(
575+
([response, options, rawResponse]: [
576+
protos.google.cloud.vision.v1.IBatchAnnotateImagesResponse,
577+
protos.google.cloud.vision.v1.IBatchAnnotateImagesRequest | undefined,
578+
{} | undefined,
579+
]) => {
580+
this._log.info('batchAnnotateImages response %j', response);
581+
return [response, options, rawResponse];
582+
}
583+
);
555584
}
556585
/**
557586
* Service that performs image detection and annotation for a batch of files.
@@ -668,7 +697,33 @@ export class ImageAnnotatorClient {
668697
parent: request.parent ?? '',
669698
});
670699
this.initialize();
671-
return this.innerApiCalls.batchAnnotateFiles(request, options, callback);
700+
this._log.info('batchAnnotateFiles request %j', request);
701+
const wrappedCallback:
702+
| Callback<
703+
protos.google.cloud.vision.v1.IBatchAnnotateFilesResponse,
704+
| protos.google.cloud.vision.v1.IBatchAnnotateFilesRequest
705+
| null
706+
| undefined,
707+
{} | null | undefined
708+
>
709+
| undefined = callback
710+
? (error, response, options, rawResponse) => {
711+
this._log.info('batchAnnotateFiles response %j', response);
712+
callback!(error, response, options, rawResponse); // We verified callback above.
713+
}
714+
: undefined;
715+
return this.innerApiCalls
716+
.batchAnnotateFiles(request, options, wrappedCallback)
717+
?.then(
718+
([response, options, rawResponse]: [
719+
protos.google.cloud.vision.v1.IBatchAnnotateFilesResponse,
720+
protos.google.cloud.vision.v1.IBatchAnnotateFilesRequest | undefined,
721+
{} | undefined,
722+
]) => {
723+
this._log.info('batchAnnotateFiles response %j', response);
724+
return [response, options, rawResponse];
725+
}
726+
);
672727
}
673728

674729
/**
@@ -801,11 +856,37 @@ export class ImageAnnotatorClient {
801856
parent: request.parent ?? '',
802857
});
803858
this.initialize();
804-
return this.innerApiCalls.asyncBatchAnnotateImages(
805-
request,
806-
options,
807-
callback
808-
);
859+
const wrappedCallback:
860+
| Callback<
861+
LROperation<
862+
protos.google.cloud.vision.v1.IAsyncBatchAnnotateImagesResponse,
863+
protos.google.cloud.vision.v1.IOperationMetadata
864+
>,
865+
protos.google.longrunning.IOperation | null | undefined,
866+
{} | null | undefined
867+
>
868+
| undefined = callback
869+
? (error, response, rawResponse, _) => {
870+
this._log.info('asyncBatchAnnotateImages response %j', rawResponse);
871+
callback!(error, response, rawResponse, _); // We verified callback above.
872+
}
873+
: undefined;
874+
this._log.info('asyncBatchAnnotateImages request %j', request);
875+
return this.innerApiCalls
876+
.asyncBatchAnnotateImages(request, options, wrappedCallback)
877+
?.then(
878+
([response, rawResponse, _]: [
879+
LROperation<
880+
protos.google.cloud.vision.v1.IAsyncBatchAnnotateImagesResponse,
881+
protos.google.cloud.vision.v1.IOperationMetadata
882+
>,
883+
protos.google.longrunning.IOperation | undefined,
884+
{} | undefined,
885+
]) => {
886+
this._log.info('asyncBatchAnnotateImages response %j', rawResponse);
887+
return [response, rawResponse, _];
888+
}
889+
);
809890
}
810891
/**
811892
* Check the status of the long running operation returned by `asyncBatchAnnotateImages()`.
@@ -826,6 +907,7 @@ export class ImageAnnotatorClient {
826907
protos.google.cloud.vision.v1.OperationMetadata
827908
>
828909
> {
910+
this._log.info('asyncBatchAnnotateImages long-running');
829911
const request =
830912
new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest(
831913
{name}
@@ -966,11 +1048,37 @@ export class ImageAnnotatorClient {
9661048
parent: request.parent ?? '',
9671049
});
9681050
this.initialize();
969-
return this.innerApiCalls.asyncBatchAnnotateFiles(
970-
request,
971-
options,
972-
callback
973-
);
1051+
const wrappedCallback:
1052+
| Callback<
1053+
LROperation<
1054+
protos.google.cloud.vision.v1.IAsyncBatchAnnotateFilesResponse,
1055+
protos.google.cloud.vision.v1.IOperationMetadata
1056+
>,
1057+
protos.google.longrunning.IOperation | null | undefined,
1058+
{} | null | undefined
1059+
>
1060+
| undefined = callback
1061+
? (error, response, rawResponse, _) => {
1062+
this._log.info('asyncBatchAnnotateFiles response %j', rawResponse);
1063+
callback!(error, response, rawResponse, _); // We verified callback above.
1064+
}
1065+
: undefined;
1066+
this._log.info('asyncBatchAnnotateFiles request %j', request);
1067+
return this.innerApiCalls
1068+
.asyncBatchAnnotateFiles(request, options, wrappedCallback)
1069+
?.then(
1070+
([response, rawResponse, _]: [
1071+
LROperation<
1072+
protos.google.cloud.vision.v1.IAsyncBatchAnnotateFilesResponse,
1073+
protos.google.cloud.vision.v1.IOperationMetadata
1074+
>,
1075+
protos.google.longrunning.IOperation | undefined,
1076+
{} | undefined,
1077+
]) => {
1078+
this._log.info('asyncBatchAnnotateFiles response %j', rawResponse);
1079+
return [response, rawResponse, _];
1080+
}
1081+
);
9741082
}
9751083
/**
9761084
* Check the status of the long running operation returned by `asyncBatchAnnotateFiles()`.
@@ -991,6 +1099,7 @@ export class ImageAnnotatorClient {
9911099
protos.google.cloud.vision.v1.OperationMetadata
9921100
>
9931101
> {
1102+
this._log.info('asyncBatchAnnotateFiles long-running');
9941103
const request =
9951104
new this._gaxModule.operationsProtos.google.longrunning.GetOperationRequest(
9961105
{name}
@@ -1419,6 +1528,7 @@ export class ImageAnnotatorClient {
14191528
close(): Promise<void> {
14201529
if (this.imageAnnotatorStub && !this._terminated) {
14211530
return this.imageAnnotatorStub.then(stub => {
1531+
this._log.info('ending gRPC channel');
14221532
this._terminated = true;
14231533
stub.close();
14241534
this.operationsClient.close();

0 commit comments

Comments
 (0)