save_entity no longer try to save the entity without a key ,add analyze enum for the IndexDefinition,fix track entity method to be more precise and stable

Author: IdanHaim

pyravendb/data/indexes.py

@@ -25,6 +25,15 @@ def __str__(self):
         return self.value
 
 
+class FieldIndexing(Enum):
+    # Do not index the field value.
+    no = "No"
+    # Index the tokens produced by running the field's value through an Analyzer
+    analyzed = "Analyzed"
+    # Index the field's value without using an Analyzer, so it can be searched.
+    not_analyzed = "NotAnalyzed"
+
+
 class IndexDefinition(object):
     def __init__(self, index_map, name=None, **kwargs):
         """

pyravendb/store/document_session.py

@@ -70,15 +70,16 @@ def save_includes(self, includes=None):
                     self._includes[include["@metadata"]["@id"]] = include
 
     def save_entity(self, key, entity, original_metadata, metadata, document, force_concurrency_check=False):
-        self._known_missing_ids.discard(key)
+        if key is not None:
+            self._known_missing_ids.discard(key)
 
-        if key not in self._entities_by_key:
-            self._entities_by_key[key] = entity
+            if key not in self._entities_by_key:
+                self._entities_by_key[key] = entity
 
-            self._entities_and_metadata[self._entities_by_key[key]] = {
-                "original_value": document.copy(), "metadata": metadata,
-                "original_metadata": original_metadata, "etag": metadata.get("etag", None), "key": key,
-                "force_concurrency_check": force_concurrency_check}
+                self._entities_and_metadata[self._entities_by_key[key]] = {
+                    "original_value": document.copy(), "metadata": metadata,
+                    "original_metadata": original_metadata, "etag": metadata.get("etag", None), "key": key,
+                    "force_concurrency_check": force_concurrency_check}
 
     def _convert_and_save_entity(self, key, document, object_type, nested_object_types):
         if key not in self._entities_by_key:

pyravendb/store/session_query.py

@@ -210,10 +210,10 @@ def where_greater_than(self, field_name, value):
     def where_greater_than_or_equal(self, field_name, value):
         return self.where_between_or_equal(field_name, value, None)
 
-    def where_less_then(self, field_name, value):
+    def where_less_than(self, field_name, value):
         return self.where_between(field_name, None, value)
 
-    def where_less_then_or_equal(self, field_name, value):
+    def where_less_than_or_equal(self, field_name, value):
         return self.where_between_or_equal(field_name, None, value)
 
     def where_not_none(self, field_name):
@@ -279,7 +279,8 @@ def _execute_query(self):
         for result in response_results:
             entity, metadata, original_metadata = Utils.convert_to_entity(result, self.object_type, conventions,
                                                                           self.nested_object_types)
-            self.session.save_entity(key=original_metadata["@id"], entity=entity, original_metadata=original_metadata,
+            self.session.save_entity(key=original_metadata.get("@id", None), entity=entity,
+                                     original_metadata=original_metadata,
                                      metadata=metadata, document=result)
             results.append(entity)
         self.session.save_includes(response_includes)

pyravendb/tools/utils.py

@@ -93,10 +93,11 @@ def convert_to_entity(document, object_type, conventions, nested_object_types=No
         metadata = document.pop("@metadata")
         original_metadata = metadata.copy()
         type_from_metadata = conventions.try_get_type_from_metadata(metadata)
+        entity = _DynamicStructure(**document)
         object_from_metadata = None
         if type_from_metadata is not None:
             object_from_metadata = Utils.import_class(type_from_metadata)
-        entity = _DynamicStructure(**document)
+
         if object_from_metadata is None:
             if object_type is not None:
                 entity.__class__ = object_type
@@ -108,7 +109,9 @@ def convert_to_entity(document, object_type, conventions, nested_object_types=No
             entity.__class__ = object_from_metadata
         # Checking the class for initialize
         entity_initialize_dict = Utils.make_initialize_dict(document, entity.__class__.__init__)
-        entity.__init__(**entity_initialize_dict)
+
+        entity = entity.__class__(**entity_initialize_dict)
+
         if nested_object_types:
             for key in nested_object_types:
                 attr = getattr(entity, key)
@@ -134,8 +137,8 @@ def make_initialize_dict(document, entity_init):
             return document
 
         entity_initialize_dict = {}
-        args, __, __, defaults = inspect.getargspec(entity_init)
-        if (len(args) - 1) != len(document):
+        args, __, keywords, defaults = inspect.getargspec(entity_init)
+        if (len(args) - 1) > len(document):
             remainder = len(args)
             if defaults:
                 remainder -= len(defaults)
@@ -144,7 +147,12 @@ def make_initialize_dict(document, entity_init):
             for i in range(remainder, len(args)):
                 entity_initialize_dict[args[i]] = document.get(args[i], defaults[i - remainder])
         else:
-            entity_initialize_dict = document
+            if keywords == "kwargs":
+                entity_initialize_dict = document
+            else:
+                for key in document:
+                    if key in args:
+                        entity_initialize_dict[key] = document[key]
 
         return entity_initialize_dict
 
@@ -196,7 +204,7 @@ def numeric_to_lucene_syntax(value):
 
         python_version = sys.version_info.major
 
-        if (python_version > 2 and value > sys.maxsize and isinstance(value,int)) \
+        if (python_version > 2 and value > sys.maxsize and isinstance(value, int)) \
                 or python_version <= 2 and isinstance(value, long):
             value = "Lx{0}".format(int(value))