Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e6ad76c

Browse filesBrowse files
gguussJon Wayne Parrott
gguuss
authored and
Jon Wayne Parrott
committed
Improvess consistency in docs and fixes links in restructured text (GoogleCloudPlatform#839)
1 parent 776cef0 commit e6ad76c
Copy full SHA for e6ad76c

File tree

Expand file treeCollapse file tree

3 files changed

+121
-88
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+121
-88
lines changed

‎vision/cloud-client/README.rst

Copy file name to clipboardExpand all lines: vision/cloud-client/README.rst
+18-18Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This directory contains samples for Google Cloud Vision API. `Google Cloud Visio
88

99

1010

11-
.. _Google Cloud Vision API: https://cloud.google.com/vision/docs
11+
.. _Google Cloud Vision API: https://cloud.google.com/vision/docs
1212

1313
Setup
1414
-------------------------------------------------------------------------------
@@ -94,24 +94,24 @@ To run this sample:
9494
$ python detect.py
9595
9696
usage: detect.py [-h]
97-
{faces,faces-uri,labels,labels-uri,landmarks,landmarks-uri,text,text-uri,logos,logos-uri,safe-search,safe-search-uri,properties,properties-uri,web,web-uri,crophints,crophints-uri,fulltext,fulltext-uri}
97+
{faces,faces-uri,labels,labels-uri,landmarks,landmarks-uri,text,text-uri,logos,logos-uri,safe-search,safe-search-uri,properties,properties-uri,web,web-uri,crophints,crophints-uri,document,document-uri}
9898
...
99-
99+
100100
This application demonstrates how to perform basic operations with the
101101
Google Cloud Vision API.
102-
102+
103103
Example Usage:
104104
python detect.py text ./resources/wakeupcat.jpg
105105
python detect.py labels ./resources/landmark.jpg
106106
python detect.py web ./resources/landmark.jpg
107107
python detect.py web-uri http://wheresgus.com/dog.JPG
108108
python detect.py faces-uri gs://your-bucket/file.jpg
109-
109+
110110
For more information, the documentation at
111111
https://cloud.google.com/vision/docs.
112-
112+
113113
positional arguments:
114-
{faces,faces-uri,labels,labels-uri,landmarks,landmarks-uri,text,text-uri,logos,logos-uri,safe-search,safe-search-uri,properties,properties-uri,web,web-uri,crophints,crophints-uri,fulltext,fulltext-uri}
114+
{faces,faces-uri,labels,labels-uri,landmarks,landmarks-uri,text,text-uri,logos,logos-uri,safe-search,safe-search-uri,properties,properties-uri,web,web-uri,crophints,crophints-uri,document,document-uri}
115115
faces Detects faces in an image.
116116
faces-uri Detects faces in the file located in Google Cloud
117117
Storage or the web.
@@ -133,16 +133,16 @@ To run this sample:
133133
properties Detects image properties in the file.
134134
properties-uri Detects image properties in the file located in Google
135135
Cloud Storage or on the Web.
136-
web detects web annotations given an image.
137-
web-uri detects web annotations in the file located in google
138-
cloud storage.
139-
crophints detects crop hints in an image.
140-
crophints-uri detects crop hints in the file located in google cloud
141-
storage.
142-
fulltext extracts full text from an image.
143-
fulltext-uri extracts full text in the file located in google cloud
144-
storage.
145-
136+
web Detects web annotations given an image.
137+
web-uri Detects web annotations in the file located in Google
138+
Cloud Storage.
139+
crophints Detects crop hints in an image.
140+
crophints-uri Detects crop hints in the file located in Google Cloud
141+
Storage.
142+
document Detects document features in an image.
143+
document-uri Detects document features in the file located in
144+
Google Cloud Storage.
145+
146146
optional arguments:
147147
-h, --help show this help message and exit
148148
@@ -164,4 +164,4 @@ to `browse the source`_ and `report issues`_.
164164
https://github.com/GoogleCloudPlatform/google-cloud-python/issues
165165
166166
167-
.. _Google Cloud SDK: https://cloud.google.com/sdk/
167+
.. _Google Cloud SDK: https://cloud.google.com/sdk/

‎vision/cloud-client/detect.py

Copy file name to clipboardExpand all lines: vision/cloud-client/detect.py
+61-38Lines changed: 61 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def detect_properties_uri(uri):
270270

271271

272272
def detect_web(path):
273-
"""detects web annotations given an image."""
273+
"""Detects web annotations given an image."""
274274
vision_client = vision.Client()
275275

276276
with io.open(path, 'rb') as image_file:
@@ -312,7 +312,7 @@ def detect_web(path):
312312

313313

314314
def detect_web_uri(uri):
315-
"""detects web annotations in the file located in google cloud storage."""
315+
"""Detects web annotations in the file located in Google Cloud Storage."""
316316
vision_client = vision.Client()
317317
image = vision_client.image(source_uri=uri)
318318

@@ -350,7 +350,7 @@ def detect_web_uri(uri):
350350

351351

352352
def detect_crop_hints(path):
353-
"""detects crop hints in an image."""
353+
"""Detects crop hints in an image."""
354354
vision_client = vision.Client()
355355
with io.open(path, 'rb') as image_file:
356356
content = image_file.read()
@@ -368,7 +368,7 @@ def detect_crop_hints(path):
368368

369369

370370
def detect_crop_hints_uri(uri):
371-
"""detects crop hints in the file located in google cloud storage."""
371+
"""Detects crop hints in the file located in Google Cloud Storage."""
372372
vision_client = vision.Client()
373373
image = vision_client.image(source_uri=uri)
374374

@@ -382,54 +382,77 @@ def detect_crop_hints_uri(uri):
382382
print('bounds: {}'.format(','.join(vertices)))
383383

384384

385-
def detect_fulltext(path):
386-
"""extracts full text from an image."""
385+
def detect_document(path):
386+
"""Detects document features in an image."""
387387
vision_client = vision.Client()
388388

389389
with io.open(path, 'rb') as image_file:
390390
content = image_file.read()
391391

392392
image = vision_client.image(content=content)
393393

394-
fulltext = image.detect_full_text()
394+
document = image.detect_full_text()
395+
396+
for b, page in enumerate(document.pages):
397+
page_text = ''
395398

396-
for b, page in enumerate(fulltext.pages):
397-
print(page.width)
398399
for bb, block in enumerate(page.blocks):
399-
print('Block: {}'.format(block.bounding_box))
400-
print('Type: {}'.format(dir(block)))
401-
print('Type: {}'.format(block.block_type))
400+
block_text = ''
401+
402402
for p, paragraph in enumerate(block.paragraphs):
403-
print('\tParagraph: ({})'.format(paragraph.bounding_box))
404-
print('\twords: ({})'.format((paragraph.words)))
403+
para_text = ''
404+
405405
for w, word in enumerate(paragraph.words):
406+
word_text = ''
407+
406408
for s, symbol in enumerate(word.symbols):
407-
print('\t\t\t$:{}'.format(symbol.text))
409+
word_text = word_text + symbol.text
410+
411+
para_text = para_text + word_text
412+
413+
block_text = block_text + para_text
414+
print('\n--\nContent Block: {}'.format(block_text))
415+
print('Block Bounding Box:\n{}'.format(block.bounding_box))
416+
417+
page_text = page_text + block_text
408418

409-
print(fulltext.text)
419+
print('Page Content:\n{}'.format(page_text))
420+
print('Page Dimensions: w: {} h: {}'.format(page.width, page.height))
410421

411422

412-
def detect_fulltext_uri(uri):
413-
"""extracts full text in the file located in google cloud storage."""
423+
def detect_document_uri(uri):
424+
"""Detects document features in the file located in Google Cloud
425+
Storage."""
414426
vision_client = vision.Client()
415427
image = vision_client.image(source_uri=uri)
416428

417-
fulltext = image.detect_full_text()
429+
document = image.detect_full_text()
430+
431+
for b, page in enumerate(document.pages):
432+
page_text = ''
418433

419-
for b, page in enumerate(fulltext.pages):
420-
print(page.width)
421434
for bb, block in enumerate(page.blocks):
422-
print('Block: {}'.format(block.bounding_box))
423-
print('Type: {}'.format(dir(block)))
424-
print('Type: {}'.format(block.block_type))
435+
block_text = ''
436+
425437
for p, paragraph in enumerate(block.paragraphs):
426-
print('\tParagraph: ({})'.format(paragraph.bounding_box))
427-
print('\twords: ({})'.format((paragraph.words)))
438+
para_text = ''
439+
428440
for w, word in enumerate(paragraph.words):
441+
word_text = ''
442+
429443
for s, symbol in enumerate(word.symbols):
430-
print('\t\t\t$:{}'.format(symbol.text))
444+
word_text = word_text + symbol.text
445+
446+
para_text = para_text + word_text
447+
448+
block_text = block_text + para_text
449+
print('\n--\nContent Block: {}'.format(block_text))
450+
print('Block Bounding Box:\n{}'.format(block.bounding_box))
451+
452+
page_text = page_text + block_text
431453

432-
print(fulltext.text)
454+
print('Page Content:\n{}'.format(page_text))
455+
print('Page Dimensions: w: {} h: {}'.format(page.width, page.height))
433456

434457

435458
def run_local(args):
@@ -451,8 +474,8 @@ def run_local(args):
451474
detect_web(args.path)
452475
elif args.command == 'crophints':
453476
detect_crop_hints(args.path)
454-
elif args.command == 'fulltext':
455-
detect_fulltext(args.path)
477+
elif args.command == 'document':
478+
detect_document(args.path)
456479

457480

458481
def run_uri(args):
@@ -474,8 +497,8 @@ def run_uri(args):
474497
detect_web_uri(args.uri)
475498
elif args.command == 'crophints-uri':
476499
detect_crop_hints_uri(args.uri)
477-
elif args.command == 'fulltext-uri':
478-
detect_fulltext_uri(args.uri)
500+
elif args.command == 'document-uri':
501+
detect_document_uri(args.uri)
479502

480503

481504
if __name__ == '__main__':
@@ -560,13 +583,13 @@ def run_uri(args):
560583
'crophints-uri', help=detect_crop_hints_uri.__doc__)
561584
crop_hints_uri_parser.add_argument('uri')
562585

563-
fulltext_parser = subparsers.add_parser(
564-
'fulltext', help=detect_fulltext.__doc__)
565-
fulltext_parser.add_argument('path')
586+
document_parser = subparsers.add_parser(
587+
'document', help=detect_document.__doc__)
588+
document_parser.add_argument('path')
566589

567-
fulltext_uri_parser = subparsers.add_parser(
568-
'fulltext-uri', help=detect_fulltext_uri.__doc__)
569-
fulltext_uri_parser.add_argument('uri')
590+
document_uri_parser = subparsers.add_parser(
591+
'document-uri', help=detect_document_uri.__doc__)
592+
document_uri_parser.add_argument('uri')
570593

571594
args = parser.parse_args()
572595

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.