(dsl): Support Function Score Query #224

markaya · 2023-05-18T13:03:59Z

No description provided.

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

modules/library/src/test/scala/zio/elasticsearch/FunctionScoreFunctionsSpec.scala

modules/library/src/it/scala/zio/elasticsearch/HttpExecutorSpec.scala

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

modules/library/src/test/scala/zio/elasticsearch/FunctionScoreFunctionsSpec.scala

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

drmarjanovic · 2023-05-26T15:47:56Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+        Chunk(
+          Some("functions" -> Arr(functionScoreFunctions.map(_.toJson))),
+          boost.map("boost" -> Num(_)),
+          boostMode.map(bm => "boost_mode" -> Str(s"${bm.toString.toLowerCase}")),


Suggested change

boostMode.map(bm => "boost_mode" -> Str(s"${bm.toString.toLowerCase}")),

boostMode.map(bm => "boost_mode" -> Str(bm.toString.toLowerCase)),

Can you also change Str(bm.toString.toLowerCase)) to bm.toString.toLowerCase.toJson?
Also change this in other places, if any.

drmarjanovic · 2023-05-30T08:57:47Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   *   the [[zio.elasticsearch.query.ElasticQuery]] used for filtering
+   * @return
+   *   an instance of [[zio.elasticsearch.query.FunctionScoreFunction]] that can be used in
+   *   [[zio.elasticsearch.query.FunctionScoreQuery] ] to be performed enriched with the `filter` parameter.


Suggested change

* [[zio.elasticsearch.query.FunctionScoreQuery] ] to be performed enriched with the `filter` parameter.

* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed enriched with the `filter` parameter.

drmarjanovic · 2023-05-30T08:58:00Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   *   the type of query used in filter, requires implicit [[zio.schema.Schema]] in scope
+   * @return
+   *   an instance of [[zio.elasticsearch.query.FunctionScoreFunction]] that can be used in
+   *   [[zio.elasticsearch.query.FunctionScoreQuery] to be performed enriched with the `filter` parameter.


Suggested change

* [[zio.elasticsearch.query.FunctionScoreQuery] to be performed enriched with the `filter` parameter.

* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed enriched with the `filter` parameter.

drmarjanovic · 2023-05-30T08:59:20Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   *   defines the distance from origin + offset at which the computed score will equal `decay` parameter
+   * @return
+   *   an instance of [[zio.elasticsearch.query.DecayFunction]] that can be used in
+   *   [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.


Suggested change

* [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.

* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed.

drmarjanovic · 2023-05-30T08:59:30Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   *   defines the distance from origin + offset at which the computed score will equal `decay`
+   * @return
+   *   an instance of [[zio.elasticsearch.query.DecayFunction]] that can be used in
+   *   [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.


Suggested change

* [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.

* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed.

drmarjanovic · 2023-05-30T09:00:01Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+  /**
+   * Constructs a type-safe instance of [[zio.elasticsearch.query.FieldValueFactor]] using the specified parameters.
+   * [[zio.elasticsearch.query.FieldValueFactor]] function allows you to use a field from a document to influence the
+   * score. It is similar to using the script_score function, however, it avoids the overhead of scripting. If used on a


Should we better reference the script_score function?

drmarjanovic · 2023-05-30T09:03:48Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   *   the final score will be computed based on this value and default value for `field` which is "_seq_no"
+   * @return
+   *   an instance of [[zio.elasticsearch.query.RandomScoreFunction]] that can be used in
+   *   [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.


Suggested change

* [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.

* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed.

drmarjanovic · 2023-05-30T09:03:58Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   *   the field value that will be used to compute final score
+   * @return
+   *   an instance of [[zio.elasticsearch.query.RandomScoreFunction]] that can be used in
+   *   [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.


Suggested change

* [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.

* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed.

drmarjanovic · 2023-05-30T09:04:09Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+  /**
+   * Constructs an instance of [[zio.elasticsearch.query.RandomScoreFunction]] using the specified parameters.
+   * [[zio.elasticsearch.query.RandomScoreFunction]] generates scores that are uniformly distributed from 0 up to but
+   * not including 1. By default, it uses the internal Lucene doc ids as a source of randomness, which is very efficient


document IDs

drmarjanovic · 2023-05-30T09:04:31Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   *   the type-safe field for which [[zio.elasticsearch.query.RandomScoreFunction]] is specified for
+   * @return
+   *   an instance of [[zio.elasticsearch.query.RandomScoreFunction]] that can be used in
+   *   [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.


Suggested change

* [[zio.elasticsearch.query.FunctionScoreQuery] to be performed.

* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed.

drmarjanovic · 2023-05-30T09:07:04Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

+
+  /**
+   * Sets the `scoreMode` parameter for the [[zio.elasticsearch.query.FunctionScoreQuery]]. The `scoreMode` parameter
+   * specifies how the computed scores are combined


Suggested change

* specifies how the computed scores are combined

* specifies how the computed scores are combined.

dbulaja98 · 2023-05-30T10:01:03Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+   * Constructs a type-safe instance of [[zio.elasticsearch.query.FunctionScore]] query with one or multiple
+   * [[zio.elasticsearch.query.FunctionScoreFunction]]


Suggested change

* Constructs a type-safe instance of [[zio.elasticsearch.query.FunctionScore]] query with one or multiple

* [[zio.elasticsearch.query.FunctionScoreFunction]]

* Constructs a type-safe instance of [[zio.elasticsearch.query.FunctionScore]] query with one or multiple

* [[zio.elasticsearch.query.FunctionScoreFunction]].

dbulaja98 · 2023-05-30T10:01:22Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+   *   [[zio.elasticsearch.query.FunctionScore]] query
+   * @return
+   *   an instance of [[zio.elasticsearch.query.FunctionScore]] that represents the Function Score Query with functions
+   *   that are used to calculate score for result


Suggested change

* that are used to calculate score for result

* that are used to calculate score for result.

dbulaja98 · 2023-05-30T10:01:42Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+
+  /**
+   * Constructs an instance of [[zio.elasticsearch.query.FunctionScore]] query with one or multiple
+   * [[zio.elasticsearch.query.FunctionScoreFunction]]


Suggested change

* [[zio.elasticsearch.query.FunctionScoreFunction]]

* [[zio.elasticsearch.query.FunctionScoreFunction]].

dbulaja98 · 2023-05-30T10:01:55Z

modules/library/src/main/scala/zio/elasticsearch/ElasticQuery.scala

+   *   [[zio.elasticsearch.query.FunctionScore]] query
+   * @return
+   *   an instance of [[zio.elasticsearch.query.FunctionScore]] that represents the Function Score Query with functions
+   *   that are used to calculate score for result


Suggested change

* that are used to calculate score for result

* that are used to calculate score for result.

dbulaja98 · 2023-05-30T10:09:26Z

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala

+   * [[zio.elasticsearch.query.WeightFunction]] score allows you to multiply the score by the provided `weight`.
+   *
+   * @param weight
+   *   the number you wish to multiply the score with


Suggested change

* the number you wish to multiply the score with

* the non-negative real number you wish to multiply the score with

dbulaja98 · 2023-05-30T10:14:46Z

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala

@@ -310,9 +444,9 @@ sealed trait HasChildQuery[S]
   * limit, it is excluded from the search results.
   *
   * @param value
-   *   the [[scala.Int]] value for `score` parameter
+   *   the [[scala.Int]] value for `minChildren` parameter


Maybe:

Suggested change

* the [[scala.Int]] value for `minChildren` parameter

* the whole number value for `minChildren` parameter

drmarjanovic requested changes May 19, 2023

View reviewed changes

dbulaja98 requested changes May 19, 2023

View reviewed changes

drmarjanovic reviewed May 22, 2023

View reviewed changes

modules/library/src/main/scala/zio/elasticsearch/query/FunctionScoreFunction.scala Outdated Show resolved Hide resolved

modules/library/src/test/scala/zio/elasticsearch/FunctionScoreFunctionsSpec.scala Show resolved Hide resolved

markaya force-pushed the task-support-function-score-query branch 2 times, most recently from 15b37f6 to c730d63 Compare May 23, 2023 13:34

dbulaja98 requested changes May 23, 2023

View reviewed changes

markaya force-pushed the task-support-function-score-query branch from c730d63 to 4a38eb1 Compare May 25, 2023 08:31

dbulaja98 requested changes May 25, 2023

View reviewed changes

drmarjanovic requested changes May 25, 2023

View reviewed changes

modules/library/src/main/scala/zio/elasticsearch/query/Queries.scala Outdated Show resolved Hide resolved

drmarjanovic requested changes May 26, 2023

View reviewed changes

markaya added 15 commits May 29, 2023 11:58

Create function score query

6f6fa57

Execute sbt prepare

dded4a7

Function score new init

cf84636

Add unit tests for functions and functionScore

47eb85f

Fix errors for rebase

3dfa5f8

Fix conflicts

a49c7df

Fix coder remarks

9f2ef88

fix code remarks

ab3e1bf

Add integration tests

1d894d2

Add type-safety, scaladoc and tests

17a6911

Perform rebase

2afa38d

Fix code remarks, type safety and add website

4e576e3

Add missing scaladoc

53e537c

Fix code remarks

0c243ba

Fix code remarks, add tests and rebase

a268162

markaya force-pushed the task-support-function-score-query branch from faf44e7 to a268162 Compare May 29, 2023 14:23

fix name collision

4c3e9c4

drmarjanovic requested changes May 30, 2023

View reviewed changes

Fix scala doc

f09ba33

drmarjanovic previously approved these changes May 30, 2023

View reviewed changes

dbulaja98 reviewed May 30, 2023

View reviewed changes

Fix code remarks

c9b9590

markaya dismissed drmarjanovic’s stale review via c9b9590 May 30, 2023 10:31

dbulaja98 merged commit 1e5f9b1 into main May 30, 2023

dbulaja98 deleted the task-support-function-score-query branch May 30, 2023 10:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(dsl): Support Function Score Query #224

(dsl): Support Function Score Query #224

markaya commented May 18, 2023

drmarjanovic May 26, 2023

dbulaja98 May 28, 2023 •

edited

Loading

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

drmarjanovic May 30, 2023

dbulaja98 May 30, 2023

dbulaja98 May 30, 2023

dbulaja98 May 30, 2023

dbulaja98 May 30, 2023

dbulaja98 May 30, 2023

dbulaja98 May 30, 2023

	boostMode.map(bm => "boost_mode" -> Str(s"${bm.toString.toLowerCase}")),
	boostMode.map(bm => "boost_mode" -> Str(bm.toString.toLowerCase)),

	* [[zio.elasticsearch.query.FunctionScoreQuery] ] to be performed enriched with the `filter` parameter.
	* [[zio.elasticsearch.query.FunctionScoreQuery]] to be performed enriched with the `filter` parameter.

	* specifies how the computed scores are combined
	* specifies how the computed scores are combined.

		* Constructs a type-safe instance of [[zio.elasticsearch.query.FunctionScore]] query with one or multiple
		* [[zio.elasticsearch.query.FunctionScoreFunction]]

	* that are used to calculate score for result
	* that are used to calculate score for result.

	* the number you wish to multiply the score with
	* the non-negative real number you wish to multiply the score with

	* the [[scala.Int]] value for `minChildren` parameter
	* the whole number value for `minChildren` parameter

(dsl): Support Function Score Query #224

(dsl): Support Function Score Query #224

Conversation

markaya commented May 18, 2023

Choose a reason for hiding this comment

dbulaja98 May 28, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dbulaja98 May 28, 2023 •

edited

Loading