valkey-glide 2.0.1__cp310-cp310-macosx_11_0_arm64.whl → 2.1.0rc1__cp310-cp310-macosx_11_0_arm64.whl

glide/async_commands/{server_modules/ft.py → ft.py}

@@ -5,24 +5,24 @@ module for `vector search` commands.
 
 from typing import List, Mapping, Optional, cast
 
-from glide.async_commands.server_modules.ft_options.ft_aggregate_options import (
+from glide_shared.commands.server_modules.ft_options.ft_aggregate_options import (
     FtAggregateOptions,
 )
-from glide.async_commands.server_modules.ft_options.ft_constants import (
+from glide_shared.commands.server_modules.ft_options.ft_constants import (
     CommandNames,
     FtCreateKeywords,
 )
-from glide.async_commands.server_modules.ft_options.ft_create_options import (
+from glide_shared.commands.server_modules.ft_options.ft_create_options import (
     Field,
     FtCreateOptions,
 )
-from glide.async_commands.server_modules.ft_options.ft_profile_options import (
+from glide_shared.commands.server_modules.ft_options.ft_profile_options import (
     FtProfileOptions,
 )
-from glide.async_commands.server_modules.ft_options.ft_search_options import (
+from glide_shared.commands.server_modules.ft_options.ft_search_options import (
     FtSearchOptions,
 )
-from glide.constants import (
+from glide_shared.constants import (
     TOK,
     FtAggregateResponse,
     FtInfoResponse,
@@ -30,7 +30,8 @@ from glide.constants import (
     FtSearchResponse,
     TEncodable,
 )
-from glide.glide_client import TGlideClient
+
+from ..glide_client import TGlideClient
 
 
 async def create(

glide/async_commands/{server_modules/glide_json.py → glide_json.py}

@@ -7,7 +7,7 @@ Examples:
     >>> import json
     >>> value = {'a': 1.0, 'b': 2}
     >>> json_str = json.dumps(value) # Convert Python dictionary to JSON string using json.dumps()
-    >>> await json.set(client, "doc", "$", json_str)
+    >>> await glide_json.set(client, "doc", "$", json_str)
         'OK'  # Indicates successful setting of the value at path '$' in the key stored at `doc`.
     >>> json_get = await glide_json.get(client, "doc", "$") # Returns the value at path '$' in the JSON document stored at
                                                             # `doc` as JSON string.
@@ -19,97 +19,20 @@ Examples:
 """
 from typing import List, Optional, Union, cast
 
-from glide.async_commands.core import ConditionalChange
-from glide.constants import TOK, TEncodable, TJsonResponse, TJsonUniversalResponse
-from glide.glide_client import TGlideClient
-
-
-class JsonGetOptions:
-    """
-    Represents options for formatting JSON data, to be used in  the [JSON.GET](https://valkey.io/commands/json.get/) command.
-
-    Args:
-        indent (Optional[str]): Sets an indentation string for nested levels. Defaults to None.
-        newline (Optional[str]): Sets a string that's printed at the end of each line. Defaults to None.
-        space (Optional[str]): Sets a string that's put between a key and a value. Defaults to None.
-    """
-
-    def __init__(
-        self,
-        indent: Optional[str] = None,
-        newline: Optional[str] = None,
-        space: Optional[str] = None,
-    ):
-        self.indent = indent
-        self.new_line = newline
-        self.space = space
-
-    def get_options(self) -> List[str]:
-        args = []
-        if self.indent:
-            args.extend(["INDENT", self.indent])
-        if self.new_line:
-            args.extend(["NEWLINE", self.new_line])
-        if self.space:
-            args.extend(["SPACE", self.space])
-        return args
-
-
-class JsonArrIndexOptions:
-    """
-    Options for the `JSON.ARRINDEX` command.
-
-    Args:
-        start (int): The inclusive start index from which the search begins. Defaults to None.
-        end (Optional[int]): The exclusive end index where the search stops. Defaults to None.
-
-    Note:
-        - If `start` is greater than `end`, the command returns `-1` to indicate that the value was not found.
-        - Indices that exceed the array bounds are automatically adjusted to the nearest valid position.
-    """
-
-    def __init__(self, start: int, end: Optional[int] = None):
-        self.start = start
-        self.end = end
-
-    def to_args(self) -> List[str]:
-        """
-        Get the options as a list of arguments for the JSON.ARRINDEX command.
-
-        Returns:
-            List[str]: A list containing the start and end indices if specified.
-        """
-        args = [str(self.start)]
-        if self.end is not None:
-            args.append(str(self.end))
-        return args
-
-
-class JsonArrPopOptions:
-    """
-    Options for the JSON.ARRPOP command.
-
-    Args:
-        path (TEncodable): The path within the JSON document.
-        index (Optional[int]): The index of the element to pop. If not specified, will pop the last element.
-            Out of boundary indexes are rounded to their respective array boundaries. Defaults to None.
-    """
-
-    def __init__(self, path: TEncodable, index: Optional[int] = None):
-        self.path = path
-        self.index = index
-
-    def to_args(self) -> List[TEncodable]:
-        """
-        Get the options as a list of arguments for the `JSON.ARRPOP` command.
-
-        Returns:
-            List[TEncodable]: A list containing the path and, if specified, the index.
-        """
-        args = [self.path]
-        if self.index is not None:
-            args.append(str(self.index))
-        return args
+from glide_shared.commands.core_options import ConditionalChange
+from glide_shared.commands.server_modules.json_options import (
+    JsonArrIndexOptions,
+    JsonArrPopOptions,
+    JsonGetOptions,
+)
+from glide_shared.constants import (
+    TOK,
+    TEncodable,
+    TJsonResponse,
+    TJsonUniversalResponse,
+)
+
+from ..glide_client import TGlideClient
 
 
 async def set(

glide/async_commands/standalone_commands.py

@@ -4,25 +4,25 @@ from __future__ import annotations
 
 from typing import Dict, List, Mapping, Optional, Union, cast
 
-from glide.async_commands.batch import Batch
-from glide.async_commands.batch_options import BatchOptions
-from glide.async_commands.command_args import ObjectType
-from glide.async_commands.core import (
-    CoreCommands,
+from glide.glide import Script
+from glide_shared.commands.batch import Batch
+from glide_shared.commands.batch_options import BatchOptions
+from glide_shared.commands.command_args import ObjectType
+from glide_shared.commands.core_options import (
     FlushMode,
     FunctionRestorePolicy,
     InfoSection,
 )
-from glide.constants import (
+from glide_shared.constants import (
     TOK,
     TEncodable,
     TFunctionListResponse,
     TFunctionStatsFullResponse,
     TResult,
 )
-from glide.protobuf.command_request_pb2 import RequestType
+from glide_shared.protobuf.command_request_pb2 import RequestType
 
-from ..glide import Script
+from .core import CoreCommands
 
 
 class StandaloneCommands(CoreCommands):
@@ -871,8 +871,6 @@ class StandaloneCommands(CoreCommands):
             TOK: A simple "OK" response.
 
         Examples:
-            >>> await client.watch("sampleKey")
-                'OK'
             >>> await client.unwatch()
                 'OK'
         """
@@ -1036,7 +1034,7 @@ class StandaloneCommands(CoreCommands):
 
         Examples:
             >>> lua_script = Script("return { KEYS[1], ARGV[1] }")
-            >>> await client.invoke_script(lua_script, keys=["foo"], args=["bar"] );
+            >>> await client.invoke_script(lua_script, keys=["foo"], args=["bar"])
                 [b"foo", b"bar"]
         """
         return await self._execute_script(script.get_hash(), keys, args)

glide/glide.pyi

@@ -2,7 +2,7 @@ from collections.abc import Callable
 from enum import Enum
 from typing import List, Optional, Union
 
-from glide.constants import TResult
+from glide_shared.constants import TResult
 
 DEFAULT_TIMEOUT_IN_MILLISECONDS: int = ...
 MAX_REQUEST_ARGS_LEN: int = ...

glide/glide_client.py

@@ -11,7 +11,6 @@ from typing import (
     Optional,
     Set,
     Tuple,
-    Type,
     Union,
     cast,
 )
@@ -19,31 +18,7 @@ from typing import (
 import anyio
 import sniffio
 from anyio import to_thread
-
-from glide.async_commands.cluster_commands import ClusterCommands
-from glide.async_commands.command_args import ObjectType
-from glide.async_commands.core import CoreCommands
-from glide.async_commands.standalone_commands import StandaloneCommands
-from glide.config import BaseClientConfiguration, ServerCredentials
-from glide.constants import DEFAULT_READ_BYTES_SIZE, OK, TEncodable, TRequest, TResult
-from glide.exceptions import (
-    ClosingError,
-    ConfigurationError,
-    ConnectionError,
-    ExecAbortError,
-    RequestError,
-    TimeoutError,
-)
-from glide.logger import Level as LogLevel
-from glide.logger import Logger as ClientLogger
-from glide.opentelemetry import OpenTelemetry
-from glide.protobuf.command_request_pb2 import Command, CommandRequest, RequestType
-from glide.protobuf.connection_request_pb2 import ConnectionRequest
-from glide.protobuf.response_pb2 import RequestErrorType, Response
-from glide.protobuf_codec import PartialMessageException, ProtobufCodec
-from glide.routes import Route, set_protobuf_route
-
-from .glide import (
+from glide.glide import (
     DEFAULT_TIMEOUT_IN_MILLISECONDS,
     MAX_REQUEST_ARGS_LEN,
     ClusterScanCursor,
@@ -54,6 +29,38 @@ from .glide import (
     start_socket_listener_external,
     value_from_pointer,
 )
+from glide_shared.commands.command_args import ObjectType
+from glide_shared.commands.core_options import PubSubMsg
+from glide_shared.config import BaseClientConfiguration, ServerCredentials
+from glide_shared.constants import (
+    DEFAULT_READ_BYTES_SIZE,
+    OK,
+    TEncodable,
+    TRequest,
+    TResult,
+)
+from glide_shared.exceptions import (
+    ClosingError,
+    ConfigurationError,
+    ConnectionError,
+    get_request_error_class,
+)
+from glide_shared.protobuf.command_request_pb2 import (
+    Command,
+    CommandRequest,
+    RequestType,
+)
+from glide_shared.protobuf.connection_request_pb2 import ConnectionRequest
+from glide_shared.protobuf.response_pb2 import Response
+from glide_shared.protobuf_codec import PartialMessageException, ProtobufCodec
+from glide_shared.routes import Route, set_protobuf_route
+
+from .async_commands.cluster_commands import ClusterCommands
+from .async_commands.core import CoreCommands
+from .async_commands.standalone_commands import StandaloneCommands
+from .logger import Level as LogLevel
+from .logger import Logger as ClientLogger
+from .opentelemetry import OpenTelemetry
 
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -69,20 +76,6 @@ if TYPE_CHECKING:
     TFuture = Union[asyncio.Future[Any], "_CompatFuture"]
 
 
-def get_request_error_class(
-    error_type: Optional[RequestErrorType.ValueType],
-) -> Type[RequestError]:
-    if error_type == RequestErrorType.Disconnect:
-        return ConnectionError
-    if error_type == RequestErrorType.ExecAbort:
-        return ExecAbortError
-    if error_type == RequestErrorType.Timeout:
-        return TimeoutError
-    if error_type == RequestErrorType.Unspecified:
-        return RequestError
-    return RequestError
-
-
 class _CompatFuture:
     """anyio shim for asyncio.Future-like functionality"""
 
@@ -524,7 +517,7 @@ class BaseClient(CoreCommands):
         set_protobuf_route(request, route)
         return await self._write_request_await_response(request)
 
-    async def get_pubsub_message(self) -> CoreCommands.PubSubMsg:
+    async def get_pubsub_message(self) -> PubSubMsg:
         if self._is_closed:
             raise ClosingError(
                 "Unable to execute requests; the client is closed. Please create a new client."
@@ -551,7 +544,7 @@ class BaseClient(CoreCommands):
         await response_future
         return response_future.result()
 
-    def try_get_pubsub_message(self) -> Optional[CoreCommands.PubSubMsg]:
+    def try_get_pubsub_message(self) -> Optional[PubSubMsg]:
         if self._is_closed:
             raise ClosingError(
                 "Unable to execute requests; the client is closed. Please create a new client."
@@ -568,7 +561,7 @@ class BaseClient(CoreCommands):
             )
 
         # locking might not be required
-        msg: Optional[CoreCommands.PubSubMsg] = None
+        msg: Optional[PubSubMsg] = None
         try:
             self._pubsub_lock.acquire()
             self._complete_pubsub_futures_safe()
@@ -586,7 +579,7 @@ class BaseClient(CoreCommands):
 
     def _notification_to_pubsub_message_safe(
         self, response: Response
-    ) -> Optional[CoreCommands.PubSubMsg]:
+    ) -> Optional[PubSubMsg]:
         pubsub_message = None
         push_notification = cast(
             Dict[str, Any], value_from_pointer(response.resp_pointer)
@@ -605,11 +598,11 @@ class BaseClient(CoreCommands):
         ):
             values: List = push_notification["values"]
             if message_kind == "PMessage":
-                pubsub_message = BaseClient.PubSubMsg(
+                pubsub_message = PubSubMsg(
                     message=values[2], channel=values[1], pattern=values[0]
                 )
             else:
-                pubsub_message = BaseClient.PubSubMsg(
+                pubsub_message = PubSubMsg(
                     message=values[1], channel=values[0], pattern=None
                 )
         elif (

glide/logger.py

@@ -6,8 +6,8 @@ import traceback
 from enum import Enum
 from typing import Optional
 
-from .glide import Level as internalLevel
-from .glide import py_init, py_log
+from glide.glide import Level as internalLevel
+from glide.glide import py_init, py_log
 
 
 class Level(Enum):
@@ -40,7 +40,7 @@ class Logger:
     def init(cls, level: Optional[Level] = None, file_name: Optional[str] = None):
         """
         Initialize a logger if it wasn't initialized before - this method is meant to be used when there is no intention to
-        replace an existing logger.
+        replace an existing logger. Otherwise, use `set_logger_config` for overriding the existing logger configs.
         The logger will filter all logs with a level lower than the given level.
         If given a file_name argument, will write the logs to files postfixed with file_name. If file_name isn't provided,
         the logs will be written to the console.

glide/opentelemetry.py

@@ -37,10 +37,14 @@ If you need to change configuration, restart the process with new settings.
 import random
 from typing import Optional
 
-from glide.exceptions import ConfigurationError
-from glide.logger import Level, Logger
-
-from .glide import OpenTelemetryConfig, OpenTelemetryTracesConfig, init_opentelemetry
+from glide.glide import (
+    OpenTelemetryConfig,
+    OpenTelemetryTracesConfig,
+    init_opentelemetry,
+)
+from glide_shared.exceptions import ConfigurationError
+
+from .logger import Level, Logger
 
 
 class OpenTelemetry: