Merge pull request ravendb#149 from poissoncorp/v5.2beta3

RDBC-610 Python - more like this

Author: ml054

ravendb/documents/conventions/document_conventions.py

@@ -209,6 +209,8 @@ def json_default(o):
             return o.value
         elif isinstance(o, ravendb.json.metadata_as_dictionary.MetadataAsDictionary):
             return o.metadata
+        elif getattr(o, "to_json", None) and getattr(o.to_json, "__call__", None):
+            return o.to_json()
         elif getattr(o, "__dict__", None):
             return o.__dict__
         elif isinstance(o, set):

ravendb/documents/queries/more_like_this.py

@@ -139,7 +139,7 @@ def using_any_document(self) -> MoreLikeThisOperations[_T]:
     def using_document(
         self, document_json_or_builder: Union[str, Callable[[DocumentQuery[_T]], None]]
     ) -> MoreLikeThisOperations[_T]:
-        if isinstance(str, document_json_or_builder):
+        if isinstance(document_json_or_builder, str):
             self.__more_like_this = MoreLikeThisUsingDocument(document_json_or_builder)
             return self
         self.__more_like_this = MoreLikeThisUsingDocumentForDocumentQuery()
@@ -149,3 +149,12 @@ def using_document(
     def with_options(self, options: MoreLikeThisOptions) -> MoreLikeThisOperations[_T]:
         self.__more_like_this.options = options
         return self
+
+
+class MoreLikeThisStopWords:
+    def __init__(self, Id: str = None, stop_words: List[str] = None):
+        self.Id = Id
+        self.stop_words = stop_words
+
+    def to_json(self):
+        return {"Id": self.Id, "StopWords": self.stop_words}

ravendb/documents/queries/utils.py

@@ -30,6 +30,8 @@ def write(self, obj: object):
             self.__buffer.append(str(obj))
         elif isinstance(obj, list):
             self.__buffer.append(str(self.__convert_to_hashable(obj)))
+        elif isinstance(obj, dict):
+            self.__buffer.append(str(self.__convert_to_hashable(obj.items())))
         elif "__str__" in obj.__class__.__dict__:
             self.__buffer.append(str(obj))
         else:

ravendb/documents/session/query.py

@@ -2184,6 +2184,7 @@ def more_like_this(
         more_like_this_or_builder(f)
 
         more_like_this = self._more_like_this()
+        more_like_this.with_options(f.more_like_this.options)
 
         if isinstance(f.more_like_this, MoreLikeThisUsingDocument):
             more_like_this_using_document: MoreLikeThisUsingDocument = f.more_like_this

ravendb/extensions/json_extensions.py

@@ -75,12 +75,14 @@ def _convert_parameter_to_json(param: object, conventions: DocumentConventions)
             updated = set()
             for item in param:
                 updated.add(JsonExtensions._convert_parameter_to_json(item, conventions))
+            return updated
 
         elif isinstance(param, dict):
             param: dict
             updated = {}
             for key, value in param.items():
                 updated.update({key: JsonExtensions._convert_parameter_to_json(value, conventions)})
+            return updated
 
         elif isinstance(param, tuple):
             param: tuple

ravendb/infrastructure/entities.py

@@ -1,3 +1,8 @@
+from __future__ import annotations
+from datetime import datetime
+from typing import List
+
+
 class User:
     def __init__(
         self,
@@ -14,3 +19,21 @@ def __init__(
         self.address_id = address_id
         self.count = count
         self.age = age
+
+
+class Post:
+    def __init__(
+        self,
+        Id: str = None,
+        title: str = None,
+        desc: str = None,
+        comments: List[Post] = None,
+        attachment_ids: str = None,
+        created_at: datetime.date = None,
+    ):
+        self.Id = Id
+        self.title = title
+        self.desc = desc
+        self.comments = comments
+        self.attachment_ids = attachment_ids
+        self.created_at = created_at

ravendb/tests/jvm_migrated_tests/client_tests/indexing_tests/test_indexes_from_client.py

@@ -1,6 +1,7 @@
+from ravendb import MoreLikeThisOptions
 from ravendb.documents.indexes.definitions import FieldIndexing, FieldStorage
 from ravendb.documents.indexes.index_creation import IndexCreation, AbstractIndexCreationTask
-from ravendb.infrastructure.entities import User
+from ravendb.infrastructure.entities import User, Post
 from ravendb.tests.test_base import TestBase
 
 
@@ -15,6 +16,19 @@ def __init__(self):
         self._store("name", FieldStorage.YES)
 
 
+class Posts_ByTitleAndDesc(AbstractIndexCreationTask):
+    def __init__(self):
+        super(Posts_ByTitleAndDesc, self).__init__()
+        self.map = "from p in docs.Posts select new { p.title, p.desc }"
+        self._index("title", FieldIndexing.SEARCH)
+        self._store("title", FieldIndexing.YES)
+        self._analyze("title", "Lucene.Net.Analysis.SimpleAnalyzer")
+
+        self._index("desc", FieldIndexing.SEARCH)
+        self._store("desc", FieldStorage.YES)
+        self._analyze("desc", "Lucene.Net.Analysis.SimpleAnalyzer")
+
+
 class TestIndexesFromClient(TestBase):
     def setUp(self):
         super(TestIndexesFromClient, self).setUp()
@@ -32,3 +46,37 @@ def test_can_create_indexes_using_index_creation(self):
         with self.store.open_session() as session:
             users = list(session.query_index_type(Users_ByName, User))
             self.assertEqual(1, len(users))
+
+    def test_more_like_this(self):
+        with self.store.open_session() as session:
+            post1 = Post("posts/1", "doduck", "prototype")
+            post2 = Post("posts/2", "doduck", "prototype your idea")
+            post3 = Post("posts/3", "doduck", "love programming")
+            post4 = Post("posts/4", "We do", "prototype")
+            post5 = Post("posts/5", "We love", "challange")
+
+            session.store(post1)
+            session.store(post2)
+            session.store(post3)
+            session.store(post4)
+            session.store(post5)
+            session.save_changes()
+
+        Posts_ByTitleAndDesc().execute(self.store)
+        self.wait_for_indexing(self.store)
+
+        with self.store.open_session() as session:
+            options = MoreLikeThisOptions(minimum_document_frequency=1, minimum_term_frequency=0)
+            results = list(
+                session.query_index_type(Posts_ByTitleAndDesc, Post).more_like_this(
+                    lambda f: f.using_document(lambda x: x.where_equals("id()", "posts/1")).with_options(options)
+                )
+            )
+            self.assertEqual(3, len(results))
+
+            self.assertEqual("doduck", results[0].title)
+            self.assertEqual("prototype your idea", results[0].desc)
+            self.assertEqual("doduck", results[1].title)
+            self.assertEqual("love programming", results[1].desc)
+            self.assertEqual("We do", results[2].title)
+            self.assertEqual("prototype", results[2].desc)