Python: Moved PubSubMsg class to a shared module

benchmarks/python/python_benchmark.py

@@ -17,6 +17,7 @@
 import redis.asyncio as redispy  # type: ignore
 from glide import (
     GlideClient,
+    TGlideClient,
     GlideClientConfiguration,
     GlideClusterClient,
     GlideClusterClientConfiguration,

docs/markdown/python/base_batch.md

@@ -1 +1 @@
-::: glide.async_commands.batch.BaseBatch
+::: glide.commands.batch.BaseBatch

docs/markdown/python/cluster_batch.md

@@ -1 +1 @@
-::: glide.async_commands.batch.ClusterBatch
+::: glide.commands.batch.ClusterBatch

docs/markdown/python/cluster_transaction.md

@@ -1 +1 @@
-::: glide.async_commands.batch.ClusterTransaction
+::: glide.commands.batch.ClusterTransaction

docs/markdown/python/standalone_batch.md

@@ -1 +1 @@
-::: glide.async_commands.batch.Batch
+::: glide.commands.batch.Batch

docs/markdown/python/standalone_transaction.md

@@ -1 +1 @@
-::: glide.async_commands.batch.Transaction
+::: glide.commands.batch.Transaction

examples/python/ft_example.py

@@ -15,17 +15,17 @@
     RequestError,
 )
 from glide import TimeoutError as GlideTimeoutError
-from glide.async_commands.server_modules import ft, glide_json
-from glide.async_commands.server_modules.ft_options.ft_create_options import (
+from glide.shared.commands.server_modules import ft, glide_json
+from glide.shared.commands.server_modules.ft_options.ft_create_options import (
     DataType,
     FtCreateOptions,
     NumericField,
 )
-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,
     ReturnField,
 )
-from glide.constants import OK, FtSearchResponse, TEncodable
+from glide.shared.constants import OK, FtSearchResponse, TEncodable
 
 
 async def create_client(

examples/python/json_example.py

@@ -14,7 +14,7 @@
     RequestError,
 )
 from glide import TimeoutError as GlideTimeoutError
-from glide.async_commands.server_modules import glide_json
+from glide.shared.commands.server_modules import glide_json
 
 
 async def create_client(

ffi/.cargo/config.toml

@@ -1,5 +1,5 @@
 [env]
-GLIDE_NAME = { value = "GlideFFI", force = true }
+GLIDE_NAME = { value = "GlideGo", force = true }
 GLIDE_VERSION = "0.1.0"
 # Suppress error
 # > ... was built for newer 'macOS' version (14.5) than being linked (14.0)

ffi/Cargo.toml

@@ -6,7 +6,7 @@ license = "Apache-2.0"
 authors = ["Valkey GLIDE Maintainers"]
 
 [lib]
-crate-type = ["staticlib", "rlib"]
+crate-type = ["staticlib", "rlib", "cdylib"]
 
 [dependencies]
 protobuf = { version = "3", features = [] }

ffi/src/lib.rs

@@ -936,7 +936,7 @@ pub unsafe extern "C" fn command(
     };
 
     // Create the command outside of the task to ensure that the command arguments passed
-    // from "go" are still valid
+    // from the caller are still valid
     let mut cmd = command_type
         .get_command()
         .expect("Couldn't fetch command type");
@@ -950,7 +950,7 @@ pub unsafe extern "C" fn command(
     } else {
         Routes::default()
     };
-
+    
     let mut client = client_adapter.core.client.clone();
     client_adapter.execute_command(channel, async move {
         client

python/dev.py

@@ -18,13 +18,16 @@ def find_project_root() -> Path:
 
 # Constants
 PROTO_REL_PATH = "glide-core/src/protobuf"
-PYTHON_CLIENT_PATH = "python/python/glide"
 VENV_NAME = ".env"
 GLIDE_ROOT = find_project_root()
 PYTHON_DIR = GLIDE_ROOT / "python"
-VENV_DIR = PYTHON_DIR / VENV_NAME
+PYTHON_CLIENT_PATH = PYTHON_DIR / "glide"
+ASYNC_CLIENT_DIR = PYTHON_CLIENT_PATH / "glide_async"
+SYNC_CLIENT_DIR = PYTHON_CLIENT_PATH / "glide_sync"
+VENV_DIR = ASYNC_CLIENT_DIR / VENV_NAME
 VENV_BIN_DIR = VENV_DIR / "bin"
 PYTHON_EXE = VENV_BIN_DIR / "python"
+FFI_DIR = GLIDE_ROOT / "ffi"
 
 
 def check_dependencies() -> None:
@@ -95,7 +98,7 @@ def get_venv_env() -> Dict[str, str]:
 
 def generate_protobuf_files() -> None:
     proto_src = GLIDE_ROOT / PROTO_REL_PATH
-    proto_dst = GLIDE_ROOT / PYTHON_CLIENT_PATH
+    proto_dst = PYTHON_CLIENT_PATH
     proto_files = list(proto_src.glob("*.proto"))
 
     if not proto_files:
@@ -139,10 +142,19 @@ def build_async_client(release: bool, no_cache: bool = False) -> None:
     if release:
         cmd += ["--release", "--strip"]
 
-    run_command(cmd, cwd=PYTHON_DIR, env=env, label="maturin develop")
+    run_command(cmd, cwd=ASYNC_CLIENT_DIR, env=env, label="maturin develop")
     print("[OK] Async client build completed")
 
 
+def build_sync_client() -> None:
+    print("[INFO] Building sync client...")
+    generate_protobuf_files()
+
+    run_command(["cargo", "build"], cwd=FFI_DIR, label="cargo build ffi")
+
+    print("[OK] Sync client build completed")
+
+
 def run_command(
     cmd: List[str],
     cwd: Optional[Path] = None,
@@ -220,6 +232,7 @@ def main() -> None:
 Examples:
     python dev.py build                                   # Build the async client in debug mode
     python dev.py build --client async --mode release     # Build the async client in release mode
+    python dev.py build --client sync                     # Build the sync client
     python dev.py protobuf                                # Generate Python protobuf files (.py and .pyi)
     python dev.py lint                                    # Run Python linters
     python dev.py test                                    # Run all tests
@@ -231,7 +244,10 @@ def main() -> None:
 
     build_parser = subparsers.add_parser("build", help="Build the Python clients")
     build_parser.add_argument(
-        "--client", default="async", choices=["async"], help="Which client to build"
+        "--client",
+        default="all",
+        choices=["async", "sync", "all"],
+        help="Which client to build: 'async', 'sync', or 'all' to build both.",
     )
     build_parser.add_argument(
         "--mode", choices=["debug", "release"], default="debug", help="Build mode"
@@ -279,9 +295,12 @@ def main() -> None:
     elif args.command == "build":
         release = args.mode == "release"
         no_cache = args.no_cache
-        if args.client in ("async"):
+        if args.client in ["async", "all"]:
             print(f"🛠 Building async client ({args.mode} mode)...")
             build_async_client(release, no_cache)
+        if args.client in ["sync", "all"]:
+            print("🛠 Building sync client...")
+            build_sync_client()
 
     print("[✅ DONE] Task completed successfully.")
 

python/dev_requirements.txt

@@ -13,3 +13,7 @@ sphinx >= 7.4.7
 sphinx-rtd-theme
 deprecated
 types-Deprecated
+
+# Sync
+cffi
+types-cffi

python/docs/conf.py

@@ -31,6 +31,7 @@
     "glide.protobuf",
     "pytest",
     "google",
+    "cffi",
 ]  # Prevents confusion in sphinx with imports
 
 autodoc_typehints = "description"

python/docs/index.rst

@@ -13,5 +13,5 @@ Welcome to the documentation page for Valkey GLIDE!
    :caption: Contents:
 
    glide
-   glide.async_commands
+   glide.commands.async_commands
    modules

python/Cargo.toml → python/glide/glide_async/Cargo.toml

@@ -13,14 +13,14 @@ crate-type = ["cdylib"]
 [dependencies]
 pyo3 = { version = "^0.24", features = ["extension-module", "num-bigint"] }
 bytes = { version = "^1.8" }
-redis = { path = "../glide-core/redis-rs/redis", features = [
+redis = { path = "../../../glide-core/redis-rs/redis", features = [
     "aio",
     "tokio-comp",
     "connection-manager",
     "tokio-rustls-comp",
 ] }
-glide-core = { path = "../glide-core", features = ["socket-layer"] }
-logger_core = { path = "../logger_core" }
+glide-core = { path = "../../../glide-core", features = ["socket-layer"] }
+logger_core = { path = "../../../logger_core" }
 
 [package.metadata.maturin]
 python-source = "python"

python/glide/glide_async/pyproject.toml

@@ -0,0 +1,39 @@
+[build-system]
+requires = ["maturin==0.14.17"]
+build-backend = "maturin"
+
+[project]
+name = "test-glide-async"
+description = "An open source Valkey client library that supports Valkey and Redis open source 6.2, 7.0, 7.2 and 8.0."
+requires-python = ">=3.9"
+dependencies = [
+    # Note: If you add a dependency here, make sure to also add it to requirements.txt
+    # Once issue https://github.com/aboutcode-org/python-inspector/issues/197 is resolved, the requirements.txt file can be removed.
+    "async-timeout>=4.0.2; python_version < '3.11'",
+    "typing-extensions>=4.8.0; python_version < '3.11'",
+    "protobuf>=3.20",
+]
+
+classifiers = [
+    "Topic :: Database",
+    "Topic :: Utilities",
+    "License :: OSI Approved :: Apache Software License",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development",
+    "Programming Language :: Rust",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+
+[tool.isort]
+profile = "black"
+skip = [
+    ".env",
+    "python/glide/protobuf"
+]
+
+[tool.black]
+target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
+
+[tool.mypy]
+exclude = "^(.*\\/)?(\\.env|python/python/glide/protobuf|utils/release-candidate-testing|target|ort)(\\/|$)"

python/glide/glide_async/python/glide/__init__.py

@@ -0,0 +1,5 @@
+# Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
+
+from .glide_client import BaseClient, GlideClient, GlideClusterClient, TGlideClient
+
+__all__ = ["BaseClient", "GlideClient", "GlideClusterClient", "TGlideClient"]

python/python/glide/async_commands/cluster_commands.py → python/glide/glide_async/python/glide/async_commands/cluster_commands.py

@@ -4,15 +4,11 @@
 
 from typing import Dict, List, Mapping, Optional, Union, cast
 
-from glide.async_commands.batch import ClusterBatch
-from glide.async_commands.command_args import ObjectType
-from glide.async_commands.core import (
-    CoreCommands,
-    FlushMode,
-    FunctionRestorePolicy,
-    InfoSection,
-)
-from glide.constants import (
+from ..async_commands.core import CoreCommands
+from glide.shared.commands.batch import ClusterBatch
+from glide.shared.commands.command_args import ObjectType
+from glide.shared.commands.core_options import FlushMode, FunctionRestorePolicy, InfoSection
+from glide.shared.constants import (
     TOK,
     TClusterResponse,
     TEncodable,
@@ -21,10 +17,10 @@
     TResult,
     TSingleNodeRoute,
 )
-from glide.protobuf.command_request_pb2 import RequestType
-from glide.routes import Route
+from glide.shared.protobuf.command_request_pb2 import RequestType
+from glide.shared.routes import Route
 
-from ..glide import ClusterScanCursor, Script
+from glide.glide_async.python.glide.glide import ClusterScanCursor, Script
 
 
 class ClusterCommands(CoreCommands):