support legacy FieldValueFactor name for FieldValueFactorScore

Author: miguelgrinberg

elasticsearch_dsl/function.py

@@ -134,10 +134,14 @@ class RandomScore(ScoreFunction):
     name = "random_score"
 
 
-class FieldValueFactor(ScoreFunction):
+class FieldValueFactorScore(ScoreFunction):
     name = "field_value_factor"
 
 
+class FieldValueFactor(FieldValueFactorScore):  # alias of the above
+    pass
+
+
 class Linear(ScoreFunction):
     name = "linear"
 

elasticsearch_dsl/interfaces.py

@@ -173,7 +173,7 @@ class FunctionScoreContainer(AttrDict[Any]):
     exp: Union["f.DecayFunction", "DefaultType"]
     gauss: Union["f.DecayFunction", "DefaultType"]
     linear: Union["f.DecayFunction", "DefaultType"]
-    field_value_factor: Union["f.FieldValueFactor", "DefaultType"]
+    field_value_factor: Union["f.FieldValueFactorScore", "DefaultType"]
     random_score: Union["f.RandomScore", "DefaultType"]
     script_score: Union["f.ScriptScore", "DefaultType"]
     filter: Union[Query, "DefaultType"]
@@ -185,7 +185,7 @@ def __init__(
         exp: Union["f.DecayFunction", "DefaultType"] = DEFAULT,
         gauss: Union["f.DecayFunction", "DefaultType"] = DEFAULT,
         linear: Union["f.DecayFunction", "DefaultType"] = DEFAULT,
-        field_value_factor: Union["f.FieldValueFactor", "DefaultType"] = DEFAULT,
+        field_value_factor: Union["f.FieldValueFactorScore", "DefaultType"] = DEFAULT,
         random_score: Union["f.RandomScore", "DefaultType"] = DEFAULT,
         script_score: Union["f.ScriptScore", "DefaultType"] = DEFAULT,
         filter: Union[Query, "DefaultType"] = DEFAULT,

utils/generator.py

@@ -211,8 +211,6 @@ def get_python_type(self, schema_type):
                     return '"wrappers.Range[Any]"', None
                 elif schema_type["name"]["name"].endswith("ScoreFunction"):
                     name = schema_type["name"]["name"][:-8]
-                    if name == "FieldValueFactorScore":
-                        name = "FieldValueFactor"  # Python DSL uses different name
                     return f'"f.{name}"', None
                 elif schema_type["name"]["name"].endswith("DecayFunction"):
                     return '"f.DecayFunction"', None