Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
pbernet committed Jan 18, 2025
1 parent 7721d9d commit b1ef479
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ libraryDependencies ++= Seq(
"ca.uhn.hapi" % "hapi-structures-v25" % "2.3",
"ca.uhn.hapi" % "hapi-structures-v281" % "2.3",

"org.apache.opennlp" % "opennlp-tools" % "2.5.0",
"org.apache.opennlp" % "opennlp-tools" % "2.5.3",

"org.apache.httpcomponents.client5" % "httpclient5" % "5.4",
"org.apache.httpcomponents.core5" % "httpcore5" % "5.3",
Expand Down Expand Up @@ -127,7 +127,7 @@ libraryDependencies ++= Seq(
"com.clickhouse" % "clickhouse-jdbc" % "0.7.2",
"com.crobox.clickhouse" %% "client" % "1.2.6",

"org.opensearch" % "opensearch-testcontainers" % "2.0.1",
"org.opensearch" % "opensearch-testcontainers" % "2.1.2",
"com.github.dasniko" % "testcontainers-keycloak" % "3.5.1",
"eu.rekawek.toxiproxy" % "toxiproxy-java" % "2.1.7",
"org.testcontainers" % "junit-jupiter" % testContainersVersion % Test,
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import scala.util.control.NonFatal
* do NER processing for persons in EN
* and write the results to either:
* - Elasticsearch version 7.x server
* - Opensearch version 1.x server
* - Opensearch version 2.x server
*
* Remarks:
* - We still need spray.json because of the elasticsearch pekko connectors
Expand All @@ -63,7 +63,7 @@ object SSEtoElasticsearch extends App {
}

// 2.x model from https://opennlp.apache.org/models.html
private val tokenModel = new TokenizerModel(new FileInputStream(Paths.get("src/main/resources/opennlp-en-ud-ewt-tokens-1.0-1.9.3.bin").toFile))
private val tokenModel = new TokenizerModel(new FileInputStream(Paths.get("src/main/resources/opennlp-en-ud-ewt-tokens-1.2-2.5.0.bin").toFile))
// 1.5 model from https://opennlp.sourceforge.net/models-1.5
private val personModel = new TokenNameFinderModel(new FileInputStream(Paths.get("src/main/resources/en-ner-person.bin").toFile))

Expand Down Expand Up @@ -93,7 +93,7 @@ object SSEtoElasticsearch extends App {
// elasticsearchContainer.start()
private val dockerImageNameOS = DockerImageName
.parse("opensearchproject/opensearch")
.withTag("1.3.19")
.withTag("2.18.0")
private val searchContainer = new OpensearchContainer(dockerImageNameOS)
searchContainer.start()

Expand All @@ -110,7 +110,7 @@ object SSEtoElasticsearch extends App {

private val sourceSettings = ElasticsearchSourceSettings(connectionSettings).withApiVersion(ApiVersion.V7)

// Note that ElasticsearchSource reads are scroll requests, where you are able to fetch even the entire collection of documents
// ElasticsearchSource reads are "scroll requests". Allows to fetch the entire collection of documents
private val elasticsearchSourceTyped = ElasticsearchSource
.typed[Ctx](
searchParams,
Expand Down Expand Up @@ -243,7 +243,7 @@ object SSEtoElasticsearch extends App {
//.mapAsync(3)(ctx => findPersonsRemoteGpt3NER(ctx))
.filter(ctx => ctx.personsFound.nonEmpty)

logger.info(s"Elasticsearch container listening on: ${searchContainer.getHttpHostAddress}")
logger.info(s"Elasticsearch/Opensearch container listening on: ${searchContainer.getHttpHostAddress}")
logger.info("About to start processing flow...")

restartSource
Expand Down

0 comments on commit b1ef479

Please sign in to comment.