Merge pull request #58 from VianneyMI/47-bugfixes-in-search

47-bugfixes-in-search

changelog.md

@@ -1,5 +1,14 @@
 # Release Notes
 
+## 0.15.0
+
+### Fixes
+
+* Fixed bug in `Search.from_operator()` classmethod due to recent change in operator type in `Search` class
+* Fixed misspelled operators in constructors map in `Search` class
+* Fixed missing aliases and missing kwargs reduction in some `Search` operators
+
+
 ## 0.14.1
 
 ### Fixes
@@ -8,7 +17,7 @@
 
 ### Refactoring
 
-* Import pydantic into base.py and using abse.py to access pydantic features
+* Import pydantic into base.py and using base.py to access pydantic features
 
 
 ## 0.14.0

monggregate/__init__.py

@@ -3,7 +3,7 @@
 from monggregate.pipeline import Pipeline
 from monggregate.expressions.expressions import Expression
 
-__version__ = "0.14.1"
+__version__ = "0.15.0"
 __author__ = "Vianney Mixtur"
 __contact__ = "prenom.nom@outlook.fr"
 __copyright__ = "Copyright © 2022 Vianney Mixtur"

monggregate/base.py

@@ -45,7 +45,7 @@ class Config(pyd.BaseConfig):
         allow_population_by_field_name = True
         underscore_attrs_are_private = True
         smart_union = True
-        alias_generator = camelize
+        #alias_generator = camelize
 
 
 def isbasemodel(instance:Any)->bool:

monggregate/pipeline.py

@@ -964,6 +964,8 @@ def unset(self, field:str=None, fields:list[str]|None=None)->"Pipeline":
 
         return self
 
-if __name__ == "__main__":
+if __name__ =="__main__":
 
-    pipeline = Pipeline()
+    pipeline = Pipeline()
+    pipeline.search(operator_name="text", query="test", path=["details", "id_epd", "id_serial", "name"] )
+

monggregate/search/operators/compound.py

@@ -189,8 +189,6 @@ def equals(
 
         return self
 
-
-
     def exists(self, type:ClauseType, path:str)->"Compound":
         """Adds an exists clause to the current compound instance."""
 

monggregate/search/operators/text.py

@@ -32,6 +32,7 @@
 """
 
 from monggregate.search.operators.operator import SearchOperator
+from monggregate.search.commons.fuzzy import FuzzyOptions
 
 class Text(SearchOperator):
     """
@@ -66,14 +67,14 @@ class Text(SearchOperator):
 
     query : str|list[str]
     path : str | list[str]
-    fuzzy : dict | None = None
+    fuzzy : FuzzyOptions | None = None
     score : dict | None = None
     synonyms : str | None = None
 
     @property
     def statement(self) -> dict:
 
         return self.resolve({
-            "text" : self.dict(exclude_none=True)
+            "text" : self.dict(exclude_none=True, by_alias=True)
         })
 

monggregate/stages/search.py

@@ -223,7 +223,7 @@ def __get_constructors_map__(cls, operator_name:str)->Callable:
         """Returns appropriate constructor from operator name"""
 
         _constructors_map = {
-            "autcomplete":cls.autocomplete,
+            "autocomplete":cls.autocomplete,
             "compound":cls.compound,
             "equals":cls.equals,
             "exists":cls.exists,
@@ -232,7 +232,7 @@ def __get_constructors_map__(cls, operator_name:str)->Callable:
             "range":cls.range,
             "regex":cls.regex,
             "text":cls.text,
-            "wilcard":cls.wildcard
+            "wildcard":cls.wildcard
         }
 
         return _constructors_map[operator_name]
@@ -289,7 +289,7 @@ def autocomplete(
             fuzzy=fuzzy,
             score=score,
             **kwargs
-        ).statement
+        )
 
         return cls(**base_params, operator=autocomplete_statement)
 
@@ -316,7 +316,7 @@ def compound(
             filter=filter,
             minimum_should_clause=minimum_should_clause,
             **kwargs
-        ).statement
+        )
 
         return cls(**base_params, operator=compound_statement)
 
@@ -344,7 +344,7 @@ def equals(
             path=path,
             value=value,
             score=score
-        ).statement
+        )
 
         return cls(**base_params, operator=equals_statement)
 
@@ -362,7 +362,7 @@ def exists(cls, path:str, **kwargs:Any)->Self:
         """
 
         base_params = SearchBase(**kwargs).dict()
-        exists_statement = Exists(path=path).statement
+        exists_statement = Exists(path=path)
 
         return cls(**base_params, operator=exists_statement)
 
@@ -398,7 +398,7 @@ def more_like_this(cls, like:dict|list[dict], **kwargs:Any)->Self:
         """
 
         base_params = SearchBase(**kwargs).dict()
-        more_like_this_stasement = MoreLikeThis(like=like).statement
+        more_like_this_stasement = MoreLikeThis(like=like)
 
         return cls(**base_params, operator=more_like_this_stasement)
 
@@ -433,7 +433,7 @@ def range(
             lt=lt,
             lte=lte,
             score=score
-        ).statement
+        )
 
         return cls(**base_params, operator=range_statement)
 
@@ -461,7 +461,7 @@ def regex(
             path=path,
             allow_analyzed_field=allow_analyzed_field,
             score=score
-        ).statement
+        )
 
         return cls(**base_params, operator=regex_statement)
 
@@ -488,15 +488,17 @@ def text(
         """
 
         base_params = SearchBase(**kwargs).dict()
+        cls.__reduce_kwargs(kwargs)
+
         text_statement = Text(
             query=query,
             path=path,
             score=score,
             fuzzy=fuzzy,
             synonyms=synonyms
-        ).statement
+        )
 
-        return Search(**base_params, operator=text_statement)
+        return cls(**base_params, operator=text_statement)
 
     @classmethod
     def wildcard(
@@ -517,12 +519,14 @@ def wildcard(
         """
 
         base_params = SearchBase(**kwargs).dict()
+        cls.__reduce_kwargs(kwargs)
+
         wilcard_statement = Wilcard(
             query=query,
             path=path,
             allow_analyzed_field=allow_analyzed_field,
             score=score
-        ).statement
+        )
 
         return cls(**base_params, operator=wilcard_statement)
 

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "monggregate"
-version = "0.14.1"
+version = "0.15.0"
 description = "MongoDB aggregation pipelines made easy. Joins, grouping, counting and much more..."
 readme = "README.md"
 authors = [{ name = "Vianney Mixtur", email = "vianney.mixtur@outlook.fr" }]
@@ -35,7 +35,7 @@ dev = ["bumpver", "pytest", "mypy", "pylint"]
 Homepage = "https://github.com/VianneyMI/monggregate"
 
 [tool.bumpver]
-current_version = "0.14.1"
+current_version = "0.15.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

test/test_search_operators.py

@@ -4,6 +4,7 @@
 from monggregate.base import pyd
 from monggregate.search.operators import(
     Autocomplete,
+    Compound,
     Equals,
     Exists,
     MoreLikeThis,
@@ -22,7 +23,7 @@ class TestSearchOperators:
     """This class only aims at reusing the markers"""
 
     def test_autocomplete(self)->None:
-        """Test the autocomplete operator"""
+        """Tests the autocomplete operator"""
 
         # generate test
         # --------------
@@ -57,6 +58,11 @@ def test_autocomplete(self)->None:
             }
         }
 
+    # def test_compound(self)->None:
+    #     """Tests the compound operator"""
+
+    #     autocomplete = Autocomplete()
+
     def test_equals(self)->None:
         """Tests the equals operator"""