Merge pull request #197 from poissoncorp/RDBC-767

RDBC-767 Python Client - time series 4

Author: ml054

ravendb/__init__.py

@@ -63,15 +63,15 @@
     GetCompareExchangeValuesOperation,
     DeleteCompareExchangeValueOperation,
 )
-from ravendb.documents.operations.configuration import (
+from ravendb.documents.operations.configuration.operations import (
     GetServerWideClientConfigurationOperation,
     PutServerWideClientConfigurationOperation,
     ClientConfiguration,
     GetClientConfigurationOperation,
     PutClientConfigurationOperation,
-    StudioConfiguration,
-    StudioEnvironment,
 )
+from ravendb.documents.operations.configuration.definitions import StudioConfiguration, StudioEnvironment
+
 from ravendb.documents.operations.connection_strings import ConnectionString
 from ravendb.documents.operations.etl.configuration import EtlConfiguration, RavenEtlConfiguration
 from ravendb.documents.operations.etl.olap import OlapEtlConfiguration

ravendb/documents/commands/batches.py

@@ -15,7 +15,6 @@
 )
 from ravendb.documents.operations.time_series import TimeSeriesOperation
 from ravendb.documents.session.misc import TransactionMode, ForceRevisionStrategy
-from ravendb.documents.time_series import TimeSeriesOperations
 from ravendb.http.raven_command import RavenCommand
 from ravendb.http.server_node import ServerNode
 from ravendb.json.result import BatchCommandResult

ravendb/documents/conventions.py

@@ -12,7 +12,11 @@
 from typing import TypeVar
 from ravendb.json.metadata_as_dictionary import MetadataAsDictionary
 from ravendb.primitives import constants
-from ravendb.documents.operations.configuration import ClientConfiguration, LoadBalanceBehavior, ReadBalanceBehavior
+from ravendb.documents.operations.configuration.definitions import (
+    ClientConfiguration,
+    LoadBalanceBehavior,
+    ReadBalanceBehavior,
+)
 from ravendb.documents.indexes.definitions import SortOptions
 from ravendb.tools.utils import Utils
 

ravendb/documents/indexes/definitions.py

@@ -625,7 +625,7 @@ def detect_static_index_source_type(map_str: str) -> IndexSourceType:
 
             tokens = [token for token in map_lower.split(" ", 4) if token]
 
-            if len(tokens) > 4 and tokens[2].lower() == "in":
+            if len(tokens) >= 4 and tokens[2].lower() == "in":
                 if tokens[3].startswith("timeseries"):
                     return IndexSourceType.TIME_SERIES
                 if tokens[3].startswith("counters"):

ravendb/documents/operations/configuration/__init__.py

@@ -0,0 +1,69 @@
+from __future__ import annotations
+from enum import Enum
+from typing import Optional, Union
+
+from ravendb.http.misc import ReadBalanceBehavior, LoadBalanceBehavior
+
+
+class StudioEnvironment(Enum):
+    NONE = "NONE"
+    DEVELOPMENT = "DEVELOPMENT"
+    TESTING = "TESTING"
+    PRODUCTION = "PRODUCTION"
+
+
+class StudioConfiguration:
+    def __init__(self, disabled: Optional[bool] = None, environment: Optional[StudioEnvironment] = None):
+        self.disabled = disabled
+        self.environment = environment
+
+
+class ClientConfiguration:
+    def __init__(self):
+        self.__identity_parts_separator: Union[None, str] = None
+        self.etag: int = 0
+        self.disabled: bool = False
+        self.max_number_of_requests_per_session: Optional[int] = None
+        self.read_balance_behavior: Optional[ReadBalanceBehavior] = None
+        self.load_balance_behavior: Optional[LoadBalanceBehavior] = None
+        self.load_balancer_context_seed: Optional[int] = None
+
+    @property
+    def identity_parts_separator(self) -> str:
+        return self.__identity_parts_separator
+
+    @identity_parts_separator.setter
+    def identity_parts_separator(self, value: str):
+        if value is not None and "|" == value:
+            raise ValueError("Cannot set identity parts separator to '|'")
+        self.__identity_parts_separator = value
+
+    def to_json(self) -> dict:
+        return {
+            "IdentityPartsSeparator": self.__identity_parts_separator,
+            "Etag": self.etag,
+            "Disabled": self.disabled,
+            "MaxNumberOfRequestsPerSession": self.max_number_of_requests_per_session,
+            "ReadBalanceBehavior": self.read_balance_behavior.value
+            if self.read_balance_behavior
+            else ReadBalanceBehavior.NONE,
+            "LoadBalanceBehavior": self.load_balance_behavior.value
+            if self.load_balance_behavior
+            else LoadBalanceBehavior.NONE,
+            "LoadBalancerContextSeed": self.load_balancer_context_seed,
+        }
+
+    @classmethod
+    def from_json(cls, json_dict: dict) -> Optional[ClientConfiguration]:
+        if json_dict is None:
+            return None
+        config = cls()
+        config.__identity_parts_separator = json_dict["IdentityPartsSeparator"]
+        config.etag = json_dict["Etag"]
+        config.disabled = json_dict["Disabled"]
+        config.max_number_of_requests_per_session = json_dict["MaxNumberOfRequestsPerSession"]
+        config.read_balance_behavior = ReadBalanceBehavior(json_dict["ReadBalanceBehavior"])
+        config.load_balance_behavior = LoadBalanceBehavior(json_dict["LoadBalanceBehavior"])
+        config.load_balancer_context_seed = json_dict["LoadBalancerContextSeed"]
+
+        return config

ravendb/documents/operations/configuration/definitions.py

@@ -1,85 +1,21 @@
 from __future__ import annotations
 
 import json
-from enum import Enum
-from typing import Union, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 import requests
 
+from ravendb.documents.operations.configuration.definitions import ClientConfiguration
 from ravendb.documents.operations.definitions import VoidMaintenanceOperation, MaintenanceOperation
 from ravendb.http.raven_command import RavenCommand, VoidRavenCommand
 from ravendb.http.server_node import ServerNode
 from ravendb.http.topology import RaftCommand
-from ravendb.serverwide.operations.common import ServerOperation, VoidServerOperation
 from ravendb.util.util import RaftIdGenerator
-from ravendb.http.misc import ReadBalanceBehavior, LoadBalanceBehavior
 
 if TYPE_CHECKING:
     from ravendb.documents.conventions import DocumentConventions
 
-
-class StudioEnvironment(Enum):
-    NONE = "NONE"
-    DEVELOPMENT = "DEVELOPMENT"
-    TESTING = "TESTING"
-    PRODUCTION = "PRODUCTION"
-
-
-class StudioConfiguration:
-    def __init__(self, disabled: Optional[bool] = None, environment: Optional[StudioEnvironment] = None):
-        self.disabled = disabled
-        self.environment = environment
-
-
-class ClientConfiguration:
-    def __init__(self):
-        self.__identity_parts_separator: Union[None, str] = None
-        self.etag: int = 0
-        self.disabled: bool = False
-        self.max_number_of_requests_per_session: Union[None, int] = None
-        self.read_balance_behavior: Union[None, "ReadBalanceBehavior"] = None
-        self.load_balance_behavior: Union[None, "LoadBalanceBehavior"] = None
-        self.load_balancer_context_seed: Union[None, int] = None
-
-    @property
-    def identity_parts_separator(self) -> str:
-        return self.__identity_parts_separator
-
-    @identity_parts_separator.setter
-    def identity_parts_separator(self, value: str):
-        if value is not None and "|" == value:
-            raise ValueError("Cannot set identity parts separator to '|'")
-        self.__identity_parts_separator = value
-
-    def to_json(self) -> dict:
-        return {
-            "IdentityPartsSeparator": self.__identity_parts_separator,
-            "Etag": self.etag,
-            "Disabled": self.disabled,
-            "MaxNumberOfRequestsPerSession": self.max_number_of_requests_per_session,
-            "ReadBalanceBehavior": self.read_balance_behavior.value
-            if self.read_balance_behavior
-            else ReadBalanceBehavior.NONE,
-            "LoadBalanceBehavior": self.load_balance_behavior.value
-            if self.load_balance_behavior
-            else LoadBalanceBehavior.NONE,
-            "LoadBalancerContextSeed": self.load_balancer_context_seed,
-        }
-
-    @classmethod
-    def from_json(cls, json_dict: dict) -> Optional[ClientConfiguration]:
-        if json_dict is None:
-            return None
-        config = cls()
-        config.__identity_parts_separator = json_dict["IdentityPartsSeparator"]
-        config.etag = json_dict["Etag"]
-        config.disabled = json_dict["Disabled"]
-        config.max_number_of_requests_per_session = json_dict["MaxNumberOfRequestsPerSession"]
-        config.read_balance_behavior = ReadBalanceBehavior(json_dict["ReadBalanceBehavior"])
-        config.load_balance_behavior = LoadBalanceBehavior(json_dict["LoadBalanceBehavior"])
-        config.load_balancer_context_seed = json_dict["LoadBalancerContextSeed"]
-
-        return config
+from ravendb.serverwide.operations.common import ServerOperation, VoidServerOperation
 
 
 class GetClientConfigurationOperation(MaintenanceOperation):