Skip to content

Commit aa6773e

Browse files
dhermesdhermes
authored
Merge pull request #2703 from dhermes/connection-non-public
Making base connection module non-public and making connection attribute non-public
2 parents 72733cc + 0d17a71 commit aa6773e

File tree

3 files changed

+26
-27
lines changed

3 files changed

+26
-27
lines changed

‎packages/google-cloud-vision/google/cloud/vision/client.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ def annotate(self, image, features):
101101
request = VisionRequest(image, features)
102102

103103
data = {'requests': [request.as_dict()]}
104-
response = self.connection.api_request(method='POST',
105-
path='/images:annotate',
106-
data=data)
104+
response = self._connection.api_request(
105+
method='POST', path='/images:annotate', data=data)
107106

108107
return response['responses'][0]
109108

‎packages/google-cloud-vision/google/cloud/vision/connection.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"""Create / interact with Google Cloud Vision connections."""
1717

1818

19-
from google.cloud import connection as base_connection
19+
from google.cloud import _http
2020

2121

22-
class Connection(base_connection.JSONConnection):
22+
class Connection(_http.JSONConnection):
2323
"""A connection to Google Cloud Vision via the JSON REST API.
2424
2525
:type credentials: :class:`oauth2client.client.OAuth2Credentials`

‎packages/google-cloud-vision/unit_tests/test_client.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ def test_face_annotation(self):
6161
}
6262
credentials = _Credentials()
6363
client = self._make_one(project=PROJECT, credentials=credentials)
64-
client.connection = _Connection(RETURNED)
64+
client._connection = _Connection(RETURNED)
6565

6666
features = [Feature(feature_type=FeatureTypes.FACE_DETECTION,
6767
max_results=3)]
6868
image = client.image(content=IMAGE_CONTENT)
6969
response = client.annotate(image, features)
7070

7171
self.assertEqual(REQUEST,
72-
client.connection._requested[0]['data'])
72+
client._connection._requested[0]['data'])
7373
self.assertTrue('faceAnnotations' in response)
7474

7575
def test_image_with_client(self):
@@ -87,13 +87,13 @@ def test_face_detection_from_source(self):
8787
RETURNED = FACE_DETECTION_RESPONSE
8888
credentials = _Credentials()
8989
client = self._make_one(project=PROJECT, credentials=credentials)
90-
client.connection = _Connection(RETURNED)
90+
client._connection = _Connection(RETURNED)
9191

9292
image = client.image(source_uri=IMAGE_SOURCE)
9393
faces = image.detect_faces(limit=3)
9494
self.assertEqual(5, len(faces))
9595
self.assertIsInstance(faces[0], Face)
96-
image_request = client.connection._requested[0]['data']['requests'][0]
96+
image_request = client._connection._requested[0]['data']['requests'][0]
9797
self.assertEqual(IMAGE_SOURCE,
9898
image_request['image']['source']['gcs_image_uri'])
9999
self.assertEqual(3, image_request['features'][0]['maxResults'])
@@ -104,13 +104,13 @@ def test_face_detection_from_content(self):
104104
RETURNED = FACE_DETECTION_RESPONSE
105105
credentials = _Credentials()
106106
client = self._make_one(project=PROJECT, credentials=credentials)
107-
client.connection = _Connection(RETURNED)
107+
client._connection = _Connection(RETURNED)
108108

109109
image = client.image(content=IMAGE_CONTENT)
110110
faces = image.detect_faces(limit=5)
111111
self.assertEqual(5, len(faces))
112112
self.assertIsInstance(faces[0], Face)
113-
image_request = client.connection._requested[0]['data']['requests'][0]
113+
image_request = client._connection._requested[0]['data']['requests'][0]
114114

115115
self.assertEqual(B64_IMAGE_CONTENT,
116116
image_request['image']['content'])
@@ -123,13 +123,13 @@ def test_label_detection_from_source(self):
123123

124124
credentials = _Credentials()
125125
client = self._make_one(project=PROJECT, credentials=credentials)
126-
client.connection = _Connection(RETURNED)
126+
client._connection = _Connection(RETURNED)
127127

128128
image = client.image(source_uri=IMAGE_SOURCE)
129129
labels = image.detect_labels(limit=3)
130130
self.assertEqual(3, len(labels))
131131
self.assertIsInstance(labels[0], EntityAnnotation)
132-
image_request = client.connection._requested[0]['data']['requests'][0]
132+
image_request = client._connection._requested[0]['data']['requests'][0]
133133
self.assertEqual(IMAGE_SOURCE,
134134
image_request['image']['source']['gcs_image_uri'])
135135
self.assertEqual(3, image_request['features'][0]['maxResults'])
@@ -145,13 +145,13 @@ def test_landmark_detection_from_source(self):
145145

146146
credentials = _Credentials()
147147
client = self._make_one(project=PROJECT, credentials=credentials)
148-
client.connection = _Connection(RETURNED)
148+
client._connection = _Connection(RETURNED)
149149

150150
image = client.image(source_uri=IMAGE_SOURCE)
151151
landmarks = image.detect_landmarks(limit=3)
152152
self.assertEqual(2, len(landmarks))
153153
self.assertIsInstance(landmarks[0], EntityAnnotation)
154-
image_request = client.connection._requested[0]['data']['requests'][0]
154+
image_request = client._connection._requested[0]['data']['requests'][0]
155155
self.assertEqual(IMAGE_SOURCE,
156156
image_request['image']['source']['gcs_image_uri'])
157157
self.assertEqual(3, image_request['features'][0]['maxResults'])
@@ -167,13 +167,13 @@ def test_landmark_detection_from_content(self):
167167

168168
credentials = _Credentials()
169169
client = self._make_one(project=PROJECT, credentials=credentials)
170-
client.connection = _Connection(RETURNED)
170+
client._connection = _Connection(RETURNED)
171171

172172
image = client.image(content=IMAGE_CONTENT)
173173
landmarks = image.detect_landmarks(limit=5)
174174
self.assertEqual(2, len(landmarks))
175175
self.assertIsInstance(landmarks[0], EntityAnnotation)
176-
image_request = client.connection._requested[0]['data']['requests'][0]
176+
image_request = client._connection._requested[0]['data']['requests'][0]
177177
self.assertEqual(B64_IMAGE_CONTENT,
178178
image_request['image']['content'])
179179
self.assertEqual(5, image_request['features'][0]['maxResults'])
@@ -184,13 +184,13 @@ def test_logo_detection_from_source(self):
184184
RETURNED = LOGO_DETECTION_RESPONSE
185185
credentials = _Credentials()
186186
client = self._make_one(project=PROJECT, credentials=credentials)
187-
client.connection = _Connection(RETURNED)
187+
client._connection = _Connection(RETURNED)
188188

189189
image = client.image(source_uri=IMAGE_SOURCE)
190190
logos = image.detect_logos(limit=3)
191191
self.assertEqual(2, len(logos))
192192
self.assertIsInstance(logos[0], EntityAnnotation)
193-
image_request = client.connection._requested[0]['data']['requests'][0]
193+
image_request = client._connection._requested[0]['data']['requests'][0]
194194
self.assertEqual(IMAGE_SOURCE,
195195
image_request['image']['source']['gcs_image_uri'])
196196
self.assertEqual(3, image_request['features'][0]['maxResults'])
@@ -201,13 +201,13 @@ def test_logo_detection_from_content(self):
201201
RETURNED = LOGO_DETECTION_RESPONSE
202202
credentials = _Credentials()
203203
client = self._make_one(project=PROJECT, credentials=credentials)
204-
client.connection = _Connection(RETURNED)
204+
client._connection = _Connection(RETURNED)
205205

206206
image = client.image(content=IMAGE_CONTENT)
207207
logos = image.detect_logos(limit=5)
208208
self.assertEqual(2, len(logos))
209209
self.assertIsInstance(logos[0], EntityAnnotation)
210-
image_request = client.connection._requested[0]['data']['requests'][0]
210+
image_request = client._connection._requested[0]['data']['requests'][0]
211211
self.assertEqual(B64_IMAGE_CONTENT,
212212
image_request['image']['content'])
213213
self.assertEqual(5, image_request['features'][0]['maxResults'])
@@ -219,13 +219,13 @@ def test_text_detection_from_source(self):
219219

220220
credentials = _Credentials()
221221
client = self._make_one(project=PROJECT, credentials=credentials)
222-
client.connection = _Connection(RETURNED)
222+
client._connection = _Connection(RETURNED)
223223

224224
image = client.image(source_uri=IMAGE_SOURCE)
225225
text = image.detect_text(limit=3)
226226
self.assertEqual(3, len(text))
227227
self.assertIsInstance(text[0], EntityAnnotation)
228-
image_request = client.connection._requested[0]['data']['requests'][0]
228+
image_request = client._connection._requested[0]['data']['requests'][0]
229229
self.assertEqual(IMAGE_SOURCE,
230230
image_request['image']['source']['gcs_image_uri'])
231231
self.assertEqual(3, image_request['features'][0]['maxResults'])
@@ -241,12 +241,12 @@ def test_safe_search_detection_from_source(self):
241241
RETURNED = SAFE_SEARCH_DETECTION_RESPONSE
242242
credentials = _Credentials()
243243
client = self._make_one(project=PROJECT, credentials=credentials)
244-
client.connection = _Connection(RETURNED)
244+
client._connection = _Connection(RETURNED)
245245

246246
image = client.image(source_uri=IMAGE_SOURCE)
247247
safe_search = image.detect_safe_search()[0]
248248
self.assertIsInstance(safe_search, SafeSearchAnnotation)
249-
image_request = client.connection._requested[0]['data']['requests'][0]
249+
image_request = client._connection._requested[0]['data']['requests'][0]
250250
self.assertEqual(IMAGE_SOURCE,
251251
image_request['image']['source']['gcs_image_uri'])
252252
self.assertEqual('VERY_UNLIKELY', safe_search.adult)
@@ -261,12 +261,12 @@ def test_image_properties_detection_from_source(self):
261261
RETURNED = IMAGE_PROPERTIES_RESPONSE
262262
credentials = _Credentials()
263263
client = self._make_one(project=PROJECT, credentials=credentials)
264-
client.connection = _Connection(RETURNED)
264+
client._connection = _Connection(RETURNED)
265265

266266
image = client.image(source_uri=IMAGE_SOURCE)
267267
image_properties = image.detect_properties()[0]
268268
self.assertIsInstance(image_properties, ImagePropertiesAnnotation)
269-
image_request = client.connection._requested[0]['data']['requests'][0]
269+
image_request = client._connection._requested[0]['data']['requests'][0]
270270
self.assertEqual(IMAGE_SOURCE,
271271
image_request['image']['source']['gcs_image_uri'])
272272
self.assertEqual(0.42258179, image_properties.colors[0].score)

0 commit comments

Comments
 (0)