Merge pull request #191 from poissoncorp/RDBC-740

Multiple minor tickets RDBC (739-749)

Author: ml054

ravendb/data/query.py

@@ -1,5 +1,6 @@
 from typing import Union, TYPE_CHECKING
 
+from ravendb.documents.queries.facets.misc import FacetTermSortMode
 from ravendb.tools.utils import Utils
 from abc import ABCMeta
 from enum import Enum
@@ -197,16 +198,6 @@ def __str__(self):
         return self.value
 
 
-class FacetTermSortMode(Enum):
-    value_asc = "ValueAsc"
-    value_desc = "ValueDesc"
-    hits_asc = "HitsAsc"
-    hits_desc = "HitsDesc"
-
-    def __str__(self):
-        return self.value
-
-
 class OldFacet(object):
     def __init__(
         self,
@@ -218,7 +209,7 @@ def __init__(
         aggregation_field=None,
         aggregation_type=None,
         max_result=None,
-        term_sort_mode=FacetTermSortMode.value_asc,
+        term_sort_mode=FacetTermSortMode.VALUE_ASC,
         include_remaining_terms=False,
     ):
         """

ravendb/documents/indexes/spatial/configuration.py

@@ -165,7 +165,7 @@ def geohash_prefix_tree_index(
             opts.units = circle_radius_units
             return opts
 
-        def quad_prefix_tree_level(
+        def quad_prefix_tree_index(
             self, max_tree_level: int, circle_radius_units: SpatialUnits = SpatialUnits.KILOMETERS
         ) -> SpatialOptions:
             if max_tree_level == 0:

ravendb/documents/queries/facets/definitions.py

@@ -44,14 +44,16 @@ def to_facet_token(self, add_query_parameter: Callable[[object], str]) -> FacetT
         pass
 
     def to_json(self) -> Dict:
-        return {
+        json_dict = {
             "DisplayFieldName": self.display_field_name,
-            "Options": self.options.to_json(),
             "Aggregations": {
                 aggregation.to_json(): {aggregation_field.to_json() for aggregation_field in aggregation_fields_set}
                 for aggregation, aggregation_fields_set in self.aggregations.items()
             },
         }
+        if self.options:
+            json_dict["Options"] = self.options.to_json()
+        return json_dict
 
     @classmethod
     def from_json(cls, json_dict: Dict) -> FacetBase:
@@ -133,6 +135,15 @@ class FacetSetup:
     def __init__(self, facets: List[Facet] = None, range_facets: List[RangeFacet] = None):
         self.facets = facets or []
         self.range_facets = range_facets or []
+        self.Id: Optional[str] = None
+
+    @property
+    def id_(self):
+        return self.Id
+
+    @id_.setter
+    def id_(self, value: str):
+        self.Id = value
 
     @classmethod
     def from_json(cls, json_dict: Dict) -> FacetSetup:

ravendb/documents/session/document_session.py

@@ -20,6 +20,7 @@
 from ravendb.documents.operations.attachments import (
     GetAttachmentOperation,
     AttachmentName,
+    CloseableAttachmentResult,
 )
 from ravendb.documents.operations.batch import BatchOperation
 from ravendb.documents.operations.executor import OperationExecutor, SessionOperationExecutor
@@ -1027,7 +1028,14 @@ def exists(self, document_id: str, name: str) -> bool:
                 self.__session._request_executor.execute_command(command, self.__session.session_info)
                 return command.result is not None
 
-            def store(self, entity_or_document_id, name, stream, content_type=None, change_vector=None):
+            def store(
+                self,
+                entity_or_document_id: Union[object, str],
+                name: str,
+                stream: bytes,
+                content_type: str = None,
+                change_vector: str = None,
+            ):
                 if not isinstance(entity_or_document_id, str):
                     entity = self.__session._documents_by_entity.get(entity_or_document_id, None)
                     if not entity:
@@ -1120,7 +1128,7 @@ def get(
                 name: str = None,
                 # att_requests: Optional[List[AttachmentRequest]] = None,
                 # todo: fetching multiple attachments with single command
-            ):
+            ) -> CloseableAttachmentResult:
                 # if att_requests is not None:
                 #     if entity_or_document_id or name:
                 #         raise ValueError("Specify either <att_requests> or <entity/document_id, name>")

ravendb/documents/session/loaders/loaders.py

@@ -16,7 +16,7 @@ def include(self, path: str) -> LoaderWithInclude:
         pass
 
     @abstractmethod
-    def load(self, object_type: type, *ids: str) -> Dict[str, object]:
+    def load(self, object_type: _T, *ids: str) -> _T:
         pass
 
 
@@ -29,7 +29,7 @@ def include(self, path: str) -> LoaderWithInclude:
         self.__includes.append(path)
         return self
 
-    def load(self, object_type: Type[_T], *ids: str) -> Dict[str, object]:
+    def load(self, object_type: Type[_T], *ids: str) -> Dict[str, _T]:
         return self.__session._load_internal(object_type, list(ids), self.__includes)
 
 
@@ -42,5 +42,5 @@ def include(self, path: str) -> LazyMultiLoaderWithInclude:
         self.__includes.append(path)
         return self
 
-    def load(self, object_type: Type[_T], *ids: str) -> Lazy[Dict[str, object]]:
+    def load(self, object_type: Type[_T], *ids: str) -> Lazy[Dict[str, _T]]:
         return self.__session.lazy_load_internal(object_type, list(ids), self.__includes, None)

ravendb/documents/session/query.py

@@ -2097,7 +2097,7 @@ def aggregate_by(
 
         return AggregationDocumentQuery(self)
 
-    def aggregate_by_facets(self, *facets: FacetBase) -> AggregationDocumentQuery[_T]:
+    def aggregate_by_facets(self, facets: List[FacetBase]) -> AggregationDocumentQuery[_T]:
         for facet in facets:
             self.aggregate_by(facet)