Dependencies: upgrade Elasticsearch to 9.3.0 (#845)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: alexklibisz

build.sbt

@@ -7,10 +7,10 @@ Global / scalaVersion := "3.3.6"
 Global / scalacOptions += "-explain"
 
 lazy val CirceVersion = "0.14.14"
-lazy val ElasticsearchVersion = "9.2.0"
-lazy val Elastic4sVersion = "9.1.1"
+lazy val ElasticsearchVersion = "9.3.0"
+lazy val Elastic4sVersion = "9.3.0"
 lazy val ElastiknnVersion = IO.read(file("version")).strip()
-lazy val LuceneVersion = "10.3.1"
+lazy val LuceneVersion = "10.3.2"
 
 // Setting this to simplify local development.
 // https://github.com/typelevel/sbt-tpolecat/tree/v0.5.1?tab=readme-ov-file#modes

client-python/requirements.txt

@@ -1,3 +1,3 @@
-elasticsearch==9.2.1
+elasticsearch==9.3.0
 tqdm==4.61.1
 scipy==1.10.1

docker/Dockerfile

@@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:9.2.0
+FROM docker.elastic.co/elasticsearch/elasticsearch:9.3.0
 COPY elastiknn-plugin/target/elastiknn*.zip .
-RUN elasticsearch-plugin install -b file:$(ls elastiknn*zip | sort | tail -n1)
+RUN PLUGIN=$(ls elastiknn*.zip | sort | tail -n1) && elasticsearch-plugin install -b "file://$PWD/$PLUGIN"

docs/pages/installation.md

@@ -42,8 +42,8 @@ Make a Dockerfile like below.
 The image version (`elasticsearch:A.B.C`) must match the plugin's version (e.g. `A.B.C.x/elastiknn-A.B.C.x`).
 
 ```docker
-FROM docker.elastic.co/elasticsearch/elasticsearch:9.2.0
-RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/9.2.0.0/elastiknn-9.2.0.0.zip
+FROM docker.elastic.co/elasticsearch/elasticsearch:9.3.0
+RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/9.3.0.0/elastiknn-9.3.0.0.zip
 ```
 
 Build and run the Dockerfile. If you have any issues please refer to the [official docs.](https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html)

elastiknn-client-elastic4s/src/main/scala/com/klibisz/elastiknn/client/ElastiknnClient.scala

@@ -1,6 +1,5 @@
 package com.klibisz.elastiknn.client
 
-import com.fasterxml.jackson.module.scala.JavaTypeable
 import com.klibisz.elastiknn.api._
 import com.sksamuel.elastic4s.ElasticDsl._
 import com.sksamuel.elastic4s._
@@ -25,11 +24,11 @@ trait ElastiknnClient[F[_]] extends AutoCloseable {
 
   /** Abstract method for executing a request.
     */
-  def execute[T, U](request: T)(using handler: Handler[T, U], javaTypeable: JavaTypeable[U]): F[Response[U]]
+  def execute[T, U](request: T)(using handler: Handler[T, U]): F[Response[U]]
 
   /** Execute the given request.
     */
-  final def apply[T, U](request: T)(using handler: Handler[T, U], javaTypeable: JavaTypeable[U]): F[Response[U]] = execute(request)
+  final def apply[T, U](request: T)(using handler: Handler[T, U]): F[Response[U]] = execute(request)
 
   /** See ElastiknnRequests.putMapping().
     */
@@ -118,8 +117,8 @@ object ElastiknnClient {
     new ElastiknnFutureClient {
       given cats.Functor[Future] = catsStdInstancesForFuture
       val elasticClient: ElasticClient[Future] = ElasticClient(jc)
-      override def execute[T, U](req: T)(using handler: Handler[T, U], javaTypeable: JavaTypeable[U]): Future[Response[U]] = {
-        val future: Future[Response[U]] = elasticClient.execute(req)
+      override def execute[T, U](req: T)(using handler: Handler[T, U]): Future[Response[U]] = {
+        val future: Future[Response[U]] = elasticClient.execute(req)(using handler, CommonRequestOptions.defaults)
         if (strictFailure) future.flatMap { res =>
           checkResponse(req, res) match {
             case Left(ex) => Future.failed(ex)

elastiknn-plugin/src/main/scala/com/klibisz/elastiknn/mapper/VectorMapper.scala

@@ -68,7 +68,7 @@ object VectorMapper {
 
   // TODO: 7.9.x. Unsure if the constructor params passed to the superclass are correct.
   class FieldType(contentTypeName: String, fieldName: String, val mapping: Mapping)
-      extends MappedFieldType(fieldName, true, true, true, Collections.emptyMap()) {
+      extends MappedFieldType(fieldName, IndexType.terms(true, true), false, Collections.emptyMap()) {
     override def typeName(): String = contentTypeName
     override def clone(): FieldType = new FieldType(contentTypeName, fieldName, mapping)
     override def termQuery(value: Any, context: SearchExecutionContext): Query = {

version

@@ -1 +1 @@
-9.2.0.0
+9.3.0.0