GAPIC Header Consistency: Vision #3050

lukesneeringer · 2017-02-22T18:21:08Z

@daspecster Would you please take a longer look at this one? I found the "two clients" thing really confusing and am not sure I did this correctly.

In particular, I am pretty sure the existing code threw away the credentials argument when being used with GAX. (Not sure how anyone would successfully set any of the other arguments, either.) I updated this and added a test for it.

daspecster · 2017-02-22T18:24:43Z

Taking a look now.

vision/google/cloud/vision/_gax.py

    :param client: Instance of ``Client`` object.
+
+    :type kwargs: dict
+    :param kwargs: Additional keyword arguments are sent to the GAPIC client.


vision/google/cloud/vision/client.py

            if self._use_gax:
-                self._vision_api_internal = _GAPICVisionAPI(self)
+                self._vision_api_internal = _GAPICVisionAPI(self,
+                    credentials=None)


vision/unit_tests/test__gax.py

+        from google.cloud.gapic.vision.v1.image_annotator_client import (
+            ImageAnnotatorClient)
+
+        from .test_client import _make_credentials


vision/unit_tests/test__gax.py

+
+            # Create the GAX client.
+            credentials = _make_credentials()
+            self._make_one(client=object(), credentials=credentials)


vision/unit_tests/test__gax.py

+            # Assert that the GAPIC constructor was called once, and
+            # that the credentials were sent.
+            iac.assert_called_once()
+            self.assertIs(iac.mock_calls[0][2]['credentials'], credentials)


vision/unit_tests/test__gax.py

+            # that lib_name and lib_version were sent.
+            iac.assert_called_once()
+            self.assertEqual(iac.mock_calls[0][2]['lib_name'], 'gccl')
+            self.assertEqual(iac.mock_calls[0][2]['lib_version'], __version__)


vision/google/cloud/vision/_gax.py

        self._client = client
-        self._annotator_client = image_annotator_client.ImageAnnotatorClient()
+        self._annotator_client = image_annotator_client.ImageAnnotatorClient(
+            credentials=credentials, lib_name='gccl', lib_version=__version__)


lukesneeringer · 2017-02-22T18:57:18Z

@daspecster Please verify now. (Also, obviously, waiting on tests.)

vision/google/cloud/vision/_gax.py

                    instance.

-    :rtype: :class:`~google.cloud.grpc.vision.v1.image_annotator_pb2.Feature`
+    :rtype: :class:`~google.cloudvision.v1.image_annotator_pb2.Feature`


vision/google/cloud/vision/client.py

            if self._use_gax:
-                self._vision_api_internal = _GAPICVisionAPI(self)
+                self._vision_api_internal = _GAPICVisionAPI(
+                    self, credentials=None)


vision/google/cloud/vision/annotations.py

        """Factory: construct an instance of ``Annotations`` from protobuf.

-        :type response: :class:`~google.cloud.grpc.vision.v1.\
+        :type response: :class:`~google.cloudvision.v1.\


daspecster · 2017-02-22T19:27:26Z

Pending travis/circle this LGTM. I would recommend running the system tests as well if you haven't yet.

lukesneeringer · 2017-02-22T19:56:00Z

The Travis errors suggest the credentials are not being passed correctly.

vision/unit_tests/test__gax.py

+
+            # Create the GAX client.
+            credentials = _make_credentials()
+            client = Client(credentials=credentials)


daspecster · 2017-02-22T22:37:19Z

@lukesneeringer cool looks like that worked. Just a lint issue now.

…0 [(#3050)](GoogleCloudPlatform/python-docs-samples#3050) * chore(deps): update dependency google-cloud-bigquery-storage to v0.8.0 * chore(deps): update pandas-gbq * chore(deps): update ipython * chore: update requirements.txt * chore: it is spelled version. * chore(deps): split pandas version * chore(deps): split pandas version Co-authored-by: Christopher Wilcox <crwilcox@google.com> Co-authored-by: Leah Cole <coleleah@google.com>

Annotator lib_name and lib_version

0fddd53

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 22, 2017

lukesneeringer mentioned this pull request Feb 22, 2017

GAX headers #3049

Closed

7 tasks

Add a test for credential passthrough.

1b23078

lukesneeringer assigned lukesneeringer and bjwatson Feb 22, 2017

lukesneeringer requested review from dhermes and daspecster February 22, 2017 18:22

dhermes reviewed Feb 22, 2017

View reviewed changes

daspecster suggested changes Feb 22, 2017

View reviewed changes

Luke Sneeringer added 2 commits February 22, 2017 10:46

Style tweaks and using client._credentials.

dafb0db

Change .grpc. to .proto.

128d1c5

daspecster reviewed Feb 22, 2017

View reviewed changes

vision/google/cloud/vision/_gax.py Outdated

instance.

:rtype: :class:`~google.cloud.grpc.vision.v1.image_annotator_pb2.Feature`

:rtype: :class:`~google.cloudvision.v1.image_annotator_pb2.Feature`

This comment was marked as spam.

Sign in to view

daspecster reviewed Feb 22, 2017

View reviewed changes

vision/google/cloud/vision/client.py Outdated

if self._use_gax:

self._vision_api_internal = _GAPICVisionAPI(self)

self._vision_api_internal = _GAPICVisionAPI(

self, credentials=None)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Additional fixes.

410887e

daspecster reviewed Feb 22, 2017

View reviewed changes

Fix find/replace error.

ee2bd3c

daspecster approved these changes Feb 22, 2017

View reviewed changes

daspecster reviewed Feb 22, 2017

View reviewed changes

vision/unit_tests/test__gax.py Outdated

# Create the GAX client.

credentials = _make_credentials()

client = Client(credentials=credentials)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Explicitly set project.

5290d6b

Luke Sneeringer added 2 commits February 22, 2017 14:51

Fix doc/lint issue.

241f761

Remove errant **kwargs documentation.

73b3b49

lukesneeringer merged commit c525b44 into googleapis:master Feb 23, 2017

lukesneeringer deleted the gccl-vision branch February 23, 2017 01:46

daspecster mentioned this pull request Feb 24, 2017

Upgrading all versions for umbrella release. #3068

Merged

19 tasks

richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017

GAPIC Header Consistency: Vision (googleapis#3050)

a9c29e5

theacodes unassigned bjwatson Sep 28, 2018

parthea pushed a commit that referenced this pull request Oct 21, 2023

GAPIC Header Consistency: Vision (#3050)

bfcd036

GAPIC Header Consistency: Vision #3050

GAPIC Header Consistency: Vision #3050

Uh oh!

Conversation

lukesneeringer commented Feb 22, 2017

Uh oh!

daspecster commented Feb 22, 2017

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

lukesneeringer commented Feb 22, 2017

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

daspecster commented Feb 22, 2017

Uh oh!

lukesneeringer commented Feb 22, 2017

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

daspecster commented Feb 22, 2017

Uh oh!

Uh oh!