This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4676-refactor-inference
in repository https://gitbox.apache.org/repos/asf/tika.git
from 86418fdfce tweaks
add 3b53d0d1dd TIKA-4674 - progress timeout (#2650)
add fdeb82f179 simplify serialization, take 2 (#2651)
add 323be43de7 Merge origin/main — keep TikaHttpClient, adopt
TimeoutLimits and TikaProgressTracker
No new revisions were added by this update.
Summary of changes:
docs/modules/ROOT/nav.adoc | 1 +
docs/modules/ROOT/pages/pipes/index.adoc | 1 +
.../ROOT/pages/pipes/shared-server-mode.adoc | 10 +-
docs/modules/ROOT/pages/pipes/timeouts.adoc | 170 +++++++++++++++
.../src/main/java/org/apache/tika/cli/TikaCLI.java | 4 +-
.../test/resources/configs/config-template.json | 6 +-
.../apache/tika/config/TikaProgressTracker.java | 82 +++++++
.../org/apache/tika/config/TikaTaskTimeout.java | 76 -------
.../java/org/apache/tika/config/TimeoutLimits.java | 112 +++++++---
.../tika/parser/external2/ExternalParser.java | 6 +-
.../tika/config/TikaProgressTrackerTest.java | 103 +++++++++
.../customocr/tika-config-inline.json | 1 -
.../customocr/tika-config-rendered.json | 1 -
.../sample-configs/grobid/tika-config.json | 1 -
.../tika-grpc/sample-configs/ner/tika-config.json | 16 +-
.../tika/example/PipesForkParserExample.java | 10 +-
.../src/test/resources/tika-pipes-test-config.json | 6 +-
.../src/test/resources/kafka/plugins-template.json | 1 -
.../resources/opensearch/plugins-template.json | 3 +-
.../opensearch/tika-config-opensearch.json | 3 +-
.../src/test/resources/s3/plugins-template.json | 1 -
.../src/test/resources/solr/plugins-template.json | 3 +-
.../src/test/resources/tika-config-solr-urls.json | 1 -
.../org/apache/tika/parser/gdal/GDALParser.java | 6 +-
.../tika/inference/OpenAIImageEmbeddingParser.java | 6 +-
.../apache/tika/parser/ner/NamedEntityParser.java | 2 +
.../src/test/resources/configs/tika-config.json | 2 +-
.../tika/parser/ocr/tess4j/Tess4JParser.java | 6 +-
.../apache/tika/parser/vlm/AbstractVLMParser.java | 6 +-
.../apache/tika/parser/ocr/TesseractOCRParser.java | 6 +-
.../tika/parser/ocr/TesseractOCRParserTest.java | 4 +-
.../apache/tika/parser/strings/StringsParser.java | 11 +-
.../org/apache/tika/parser/pdf/PDFParserTest.java | 32 +--
.../org/apache/tika/async/cli/PluginsWriter.java | 15 +-
.../test/resources/configs/config-template.json | 6 +-
tika-pipes/tika-pipes-api/pom.xml | 19 ++
.../java/org/apache/tika/pipes/api/ParseMode.java | 3 +
.../org/apache/tika/pipes/core/PipesClient.java | 41 ++--
.../org/apache/tika/pipes/core/PipesConfig.java | 15 --
.../tika/pipes/core/config/ConfigMerger.java | 22 +-
.../tika/pipes/core/config/ConfigOverrides.java | 39 ++--
.../tika/pipes/core/protocol/PipesMessage.java | 16 +-
.../tika/pipes/core/server/ConnectionHandler.java | 62 ++++--
.../apache/tika/pipes/core/server/PipesServer.java | 43 +++-
.../tika/pipes/core/config/ConfigMergerTest.java | 11 +-
.../tika/pipes/core/protocol/PipesMessageTest.java | 2 +-
.../apache/tika/pipes/fork/PipesForkParser.java | 6 +-
.../tika/pipes/fork/PipesForkParserConfig.java | 22 +-
.../tika/pipes/fork/PipesForkParserTest.java | 52 ++---
.../apache/tika/pipes/core/CrashingDetector.java | 2 +
.../apache/tika/pipes/core/PipesClientTest.java | 30 +--
.../resources/configs/tika-config-bad-class.json | 6 +-
.../configs/tika-config-bad-java-path.json | 6 +-
.../configs/tika-config-bad-jvm-args.json | 6 +-
.../test/resources/configs/tika-config-basic.json | 8 +-
.../configs/tika-config-crashing-detector.json | 8 +-
.../resources/configs/tika-config-emit-all.json | 6 +-
.../resources/configs/tika-config-passback.json | 8 +-
.../configs/tika-config-shared-server.json | 8 +-
.../configs/tika-config-timeout-lt-heartbeat.json | 6 +-
.../resources/configs/tika-config-truncate.json | 4 +-
.../resources/configs/tika-config-uppercasing.json | 8 +-
.../configs/tika-config-write-limiter.json | 4 +-
.../tika/config/loader/ComponentInstantiator.java | 157 +++++++++++++-
.../config/loader/TikaObjectMapperFactory.java | 29 +++
.../tika/serialization/ComponentNameResolver.java | 104 ++++++++-
.../tika/serialization/ParseContextUtils.java | 36 +---
.../org/apache/tika/serialization/TikaModule.java | 238 ++-------------------
.../serdes/ParseContextDeserializer.java | 47 +---
.../serdes/ParseContextSerializer.java | 42 +---
.../java/org/apache/tika/config/AllLimitsTest.java | 11 +-
.../org/apache/tika/config/TimeoutLimitsTest.java | 55 +++--
.../tika/config/loader/ConfigLoaderTest.java | 24 +--
.../serialization/RoundTripSerializationTest.java | 38 ++--
.../TestParseContextSerialization.java | 49 ++---
.../test/resources/configs/all-limits-test.json | 3 +-
.../test/resources/configs/test-config-loader.json | 2 +-
.../resources/configs/test-partial-config.json | 2 +-
.../resources/configs/timeout-limits-test.json | 3 +-
.../apache/tika/server/core/TikaServerProcess.java | 4 +-
.../org/apache/tika/server/core/CXFTestBase.java | 8 +-
.../core/TikaServerPipesIntegrationTest.java | 2 +-
.../resources/configs/cxf-test-base-template.json | 8 +-
.../configs/cxf-unpack-test-template.json | 4 +-
.../configs/tika-config-server-basic.json | 6 +-
.../configs/tika-config-server-emitter.json | 6 +-
.../tika-config-server-fetcher-template.json | 6 +-
.../tika-config-server-fetchers-emitters.json | 6 +-
.../configs/tika-config-server-pipes-basic.json | 6 +-
.../tika-config-server-tls-one-way-template.json | 6 +-
.../tika-config-server-tls-two-way-template.json | 6 +-
.../resources/configs/tika-config-server-tls.json | 6 +-
.../test/resources/configs/tika-config-server.json | 6 +-
.../configs/tika-config-timeout-100ms.json | 4 +-
.../configs/tika-config-with-timeout.json | 4 +-
.../resources/configs/cxf-test-base-template.json | 8 +-
.../configs/tika-config-for-server-tests.json | 6 +-
.../test/resources/configs/tika-config-json.json | 6 +-
.../tika-config-langdetect-opennlp-filter.json | 6 +-
.../tika-config-langdetect-optimaize-filter.json | 6 +-
100 files changed, 1353 insertions(+), 790 deletions(-)
create mode 100644 docs/modules/ROOT/pages/pipes/timeouts.adoc
create mode 100644
tika-core/src/main/java/org/apache/tika/config/TikaProgressTracker.java
delete mode 100644
tika-core/src/main/java/org/apache/tika/config/TikaTaskTimeout.java
create mode 100644
tika-core/src/test/java/org/apache/tika/config/TikaProgressTrackerTest.java
