Skip to content

Separate HTTP client.#2845

Merged
daspecster merged 1 commit intogoogleapis:masterfrom
daspecster:vision-separate-rest-client
Dec 15, 2016
Merged

Separate HTTP client.#2845
daspecster merged 1 commit intogoogleapis:masterfrom
daspecster:vision-separate-rest-client

Conversation

@daspecster
Copy link
Contributor

@daspecster daspecster commented Dec 8, 2016

Towards #2753 for adding GAPIC support.

Separates out the REST client in preparation to add the GAPIC client alongside.

@daspecster daspecster added the api: vision Issues related to the Cloud Vision API. label Dec 8, 2016
@daspecster daspecster requested review from dhermes and tseaver December 8, 2016 21:08
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Dec 8, 2016
dhermes
dhermes reviewed Dec 8, 2016
View reviewed changes
vision/google/cloud/vision/_rest.py Outdated
@@ -0,0 +1,91 @@
# Copyright 2016 Google Inc.

This comment was marked as spam.

Sign in to view

vision/google/cloud/vision/_rest.py Outdated
from google.cloud.vision.feature import Feature


class _RESTVisionAPI(object):

This comment was marked as spam.

Sign in to view

vision/google/cloud/vision/_rest.py Outdated
# See the License for the specific language governing permissions and
# limitations under the License.

"""REST Client for interacting with the Google Cloud Vision API."""

This comment was marked as spam.

Sign in to view

vision/google/cloud/vision/_rest.py Outdated
if isinstance(features, list):
self._features.extend(features)
elif isinstance(features, Feature):
self._features.append(features)

This comment was marked as spam.

Sign in to view

vision/google/cloud/vision/_rest.py Outdated
return response['responses'][0]


class VisionRequest(object):

This comment was marked as spam.

Sign in to view

vision/google/cloud/vision/_rest.py Outdated
response = self._connection.api_request(
method='POST', path='/images:annotate', data=data)

return response['responses'][0]

This comment was marked as spam.

Sign in to view

vision/google/cloud/vision/client.py Outdated
source_uri=source_uri)

@property
def vision_api(self):

This comment was marked as spam.

Sign in to view

@tseaver tseaver changed the title Separate REST client. Separate HTTP client. Dec 9, 2016
dhermes
dhermes reviewed Dec 9, 2016
View reviewed changes
vision/google/cloud/vision/_http.py Outdated
features = [features]

feature_check = (isinstance(feature, Feature) for feature in features)
if not isinstance(features, list) or not any(feature_check):

This comment was marked as spam.

Sign in to view

vision/google/cloud/vision/_http.py Outdated

return {
'image': image.as_dict(),
'features': [feature.as_dict() for feature in features]

This comment was marked as spam.

Sign in to view

vision/unit_tests/test__http.py Outdated
from google.cloud.vision.image import Image

credentials = _make_credentials()
client = Client(project=PROJECT, credentials=credentials)

This comment was marked as spam.

Sign in to view

vision/unit_tests/test_client.py Outdated

class MockVisionAPI(object):
def annotate(self):
return True

This comment was marked as spam.

Sign in to view

@daspecster
Copy link
Contributor Author

daspecster commented Dec 15, 2016

@dhermes is this all set?

@dhermes
Copy link
Contributor

dhermes commented Dec 15, 2016

Yes, though it seems the rebase of #2870 into this would be easier than the other way around. WDYT?

@daspecster
Copy link
Contributor Author

daspecster commented Dec 15, 2016

Sure, I can wait for #2870. I'll squash this for now and merge once #2870 and probably #2874 are merged to master.

@daspecster daspecster force-pushed the vision-separate-rest-client branch from 23fd960 to fb6f7f8 Compare December 15, 2016 20:02
@dhermes
Copy link
Contributor

dhermes commented Dec 15, 2016

Luckily #2874 won't conflict here

@daspecster
Copy link
Contributor Author

daspecster commented Dec 15, 2016

@dhermes yeah I just looked through #2874. SGTM! Will merge after #2870.

@daspecster daspecster force-pushed the vision-separate-rest-client branch from fb6f7f8 to 74e537b Compare December 15, 2016 20:33
@daspecster
Copy link
Contributor Author

daspecster commented Dec 15, 2016

Rebased and squashed. Will merge once build passes.

@dhermes
Copy link
Contributor

dhermes commented Dec 15, 2016

SGTM

@daspecster daspecster merged commit f4c3025 into googleapis:master Dec 15, 2016
@daspecster daspecster deleted the vision-separate-rest-client branch December 15, 2016 20:56
richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017
@daspecster
Merge pull request googleapis#2845 from daspecster/vision-separate-re…
7c0a6fe 
…st-client

Separate HTTP client.
parthea pushed a commit that referenced this pull request Oct 21, 2023
@daspecster
Merge pull request #2845 from daspecster/vision-separate-rest-client
7e66b21 
Separate HTTP client.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@dhermes dhermes dhermes left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@tseaver tseaver

Labels

api: vision Issues related to the Cloud Vision API. cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@daspecster @dhermes @tseaver @googlebot