You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2017/07/09 15:18:18 UTC
[tika] branch master updated (6aa4bc6 -> 65ef6d8)
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 6aa4bc6 [maven-release-plugin] prepare for next development iteration
add 9068584 Tika 2262: Create dummy classes for the client
add f73a117 Merge remote-tracking branch 'upstream/master'
add c7719fb Tika 2262: Implement image captioning server
add 806bdc9 Tika 2262: Relocating image captioning server
add 25fde02 Tika 2262 #create initial version of im2txtRESTDockerfile #minor fixes for model_info.xml & im2txtapi.py
add f68d33a Tika 2262: minor fix for model_info.xml
add 76815ea Tika 2262: fix minor error in the "/" route
add d51227f Tika 2262: Change directories of models & .py files
add 477ce4c Tika 2262: # Reformat dockerfile # Update directories in model_info.xml
add cba1cb2 Tika 2262: # Remove unneeded lines # Add symbolic link to im2txtapi.py
add d8d2374 Tika 2262: Change route "/getcaptions" into "/captions"
add 614d951 Tika 2262: Change method name "get_captions()" to "gen_captions()"
add de87206 Tika 2262: Remove optional metadata to speedup beam search
add 5e19c01 Tika 2262: Add informative log messages (for advanced users to troubleshoot errors when modifying model_info.xml)
add cead1d0 TIKA 2262 : Implement initial version of java client
add c35e257 TIKA 2262 : Update return type to List<? extends RecognisedObject>
add 4f06e2c TIKA 2262 : Remove unneeded return type change to List<? extends RecognisedObject>
add 8979094 TIKA 2262 : Minor fixes # Fix minor error in apiUri # add toString() to CaptionObject class
add 6be752c TIKA 2262 : Minor fixes
add 6e9f796 TIKA 2262 : Change routes to "/inception/v3/.."
add d53fa48 TIKA 2262 : Allowing to set post params through config.xml
add dab7788 TIKA 2262 : Modify ObjectRecognitionParser to support im2txt
add 92fb768 TIKA 2262 : Add tests & test images
add 9a4f576 TIKA 2262 : Remove wildcard import
add 8ffd67c TIKA 2262 : Remove unneeded initialization of TensorflowRESTRecognizer
add f534fce TIKA 2262 : Minor fixes & code reformatting
add 8410067 TIKA 2262 : Add apiBaseURI + reformat ObjectRecognitionParser
add c53af43 TIKA 2262 : Swap json imports to json simple
add 2bdf783 Add all image format support to the captioning server
add 5478311 Tika 2262 : Add all image format support to the captioning client + clean imports
add 7b47239 TIKA 2262 : Minor fixes in TensorflowRESTCaptioner & Tests
add 2369149 TIKA 2262 : # cleanup imports in ObjectRecognitionParser # reformat im2txtapi.py # add pillow python package install to Im2txtRestDockerfile # add gif image & gif image test
add 6a60a79 TIKA 2262 : Minor reformatting + Change log level into info to see captioning time
add 8ef1eb9 TIKA 2262 : Remove unused imports + spaces
add b618984 Merge remote-tracking branch 'upstream/master'
add 44082d3 TIKA 2262 : Adopt changes in TIKA-2389
add 36d742e Merge pull request #189 from ThejanW/master
add 2e7a4f5 Merge https://github.com/apache/tika into gsoc17
add b36a5b7 - explicitly set Locale in String.format
add e9793d3 - ignore pydevproject
add 2eabced Make sure tests get run if Tensorflow is available via Docker or script
add 56ab7b2 - handle exceptions
add 65ef6d8 record change for TIKA-2262
No new revisions were added by this update.
Summary of changes:
CHANGES.txt | 7 +
tika-parsers/.gitignore | 1 +
.../CaptionObject.java} | 31 +-
.../tf/TensorflowRESTCaptioner.java} | 89 +++---
.../tika/parser/recognition/ObjectRecogniser.java | 2 +-
.../recognition/ObjectRecognitionParser.java | 93 +++---
.../tika/parser/recognition/RecognisedObject.java | 8 +-
.../tika/parser/captioning/tf/Im2txtRestDockerfile | 62 ++++
.../tika/parser/captioning/tf/caption_generator.py | 179 +++++++++++
.../apache/tika/parser/captioning/tf/im2txtapi.py | 266 ++++++++++++++++
.../tika/parser/captioning/tf/model_info.xml | 17 +-
.../tika/parser/captioning/tf/model_wrapper.py | 340 +++++++++++++++++++++
.../apache/tika/parser/captioning/tf/vocabulary.py | 67 ++++
.../recognition/ObjectRecognitionParserTest.java | 119 ++++++--
.../recognition/tika-config-tflow-im2txt-rest.xml | 11 +-
.../src/test/resources/test-documents/baseball.gif | Bin 0 -> 582196 bytes
.../src/test/resources/test-documents/baseball.jpg | Bin 0 -> 38474 bytes
.../src/test/resources/test-documents/baseball.png | Bin 0 -> 263301 bytes
18 files changed, 1156 insertions(+), 136 deletions(-)
create mode 100644 tika-parsers/.gitignore
copy tika-parsers/src/main/java/org/apache/tika/parser/{microsoft/TextCell.java => captioning/CaptionObject.java} (53%)
copy tika-parsers/src/main/java/org/apache/tika/parser/{recognition/tf/TensorflowRESTRecogniser.java => captioning/tf/TensorflowRESTCaptioner.java} (65%)
create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/Im2txtRestDockerfile
create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py
create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py
copy tika-core/src/test/resources/org/apache/tika/config/TIKA-1986-bad-types.xml => tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml (72%)
create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py
create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py
copy tika-dl/src/test/resources/org/apache/tika/dl/imagerec/dl4j-vgg16-config.xml => tika-parsers/src/test/resources/org/apache/tika/parser/recognition/tika-config-tflow-im2txt-rest.xml (76%)
create mode 100644 tika-parsers/src/test/resources/test-documents/baseball.gif
create mode 100644 tika-parsers/src/test/resources/test-documents/baseball.jpg
create mode 100644 tika-parsers/src/test/resources/test-documents/baseball.png
--
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].