rasa-pro 3.14.0a16__py3-none-any.whl → 3.14.0a18__py3-none-any.whl

rasa/core/lock_store.py

@@ -4,7 +4,7 @@ import asyncio
 import json
 import os
 from contextlib import asynccontextmanager
-from typing import Any, AsyncGenerator, Dict, Literal, Optional, Text, Union
+from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Text, Union
 
 import structlog
 from pydantic import (
@@ -12,12 +12,18 @@ from pydantic import (
     BaseModel,
     Field,
     NonNegativeInt,
+    ValidationError,
     model_validator,
 )
 
 import rasa.shared.utils.common
 from rasa.core.constants import DEFAULT_LOCK_LIFETIME
 from rasa.core.lock import TicketLock
+from rasa.core.redis_connection_factory import (
+    DeploymentMode,
+    RedisConfig,
+    RedisConnectionFactory,
+)
 from rasa.shared.exceptions import ConnectionException, RasaException
 from rasa.shared.utils.io import raise_deprecation_warning
 from rasa.utils.endpoints import EndpointConfig
@@ -269,6 +275,18 @@ class RedisLockStoreConfig(BaseModel):
         "will be raised in case Redis doesn't respond "
         "within `socket_timeout` seconds.",
     )
+    deployment_mode: DeploymentMode = Field(
+        default=DeploymentMode.STANDARD,
+        description="Redis deployment mode: 'standard', 'cluster', or 'sentinel'",
+    )
+    endpoints: Optional[List[str]] = Field(
+        default=None,
+        description="List of endpoints for cluster/sentinel mode in 'host:port' format",
+    )
+    sentinel_service: Optional[str] = Field(
+        default=None,
+        description="Sentinel service name",
+    )
 
     @model_validator(mode="before")
     @classmethod
@@ -298,9 +316,6 @@ class RedisLockStoreConfig(BaseModel):
             )
         return self
 
-    def to_strict_redis(self) -> Dict[str, Any]:
-        return self.model_dump(by_alias=True, exclude={"key_prefix"})
-
 
 class RedisLockStore(LockStore):
     """Redis store for ticket locks."""
@@ -314,10 +329,26 @@ class RedisLockStore(LockStore):
         Args:
             config: Redis lock store configuration.
         """
-        import redis
-
         self.config = config
-        self.red = redis.StrictRedis(**self.config.to_strict_redis())
+        try:
+            redis_config = RedisConfig(
+                host=str(self.config.host),
+                port=self.config.port,
+                db=self.config.db,
+                username=self.config.username,
+                password=self.config.password,
+                use_ssl=self.config.use_ssl,
+                ssl_keyfile=self.config.ssl_keyfile,
+                ssl_certfile=self.config.ssl_certfile,
+                ssl_ca_certs=self.config.ssl_ca_certs,
+                deployment_mode=self.config.deployment_mode,
+                endpoints=self.config.endpoints,
+                sentinel_service=self.config.sentinel_service,
+                socket_timeout=self.config.socket_timeout,
+            )
+            self.red = RedisConnectionFactory.create_connection(redis_config)
+        except ValidationError as e:
+            raise RasaException(f"Invalid Redis configuration: {e}")
 
         self.key_prefix = DEFAULT_REDIS_LOCK_STORE_KEY_PREFIX
         if self.config.key_prefix:
@@ -349,6 +380,9 @@ class RedisLockStore(LockStore):
         """Retrieves lock (see parent docstring for more information)."""
         serialised_lock = self.red.get(self.key_prefix + conversation_id)
         if serialised_lock:
+            # Handle bytes to string conversion for JSON parsing
+            if isinstance(serialised_lock, bytes):
+                serialised_lock = serialised_lock.decode("utf-8")
             return TicketLock.from_dict(json.loads(serialised_lock))
 
         return None

rasa/model_manager/warm_rasa_process.py

@@ -1,6 +1,7 @@
 import os
 import shlex
 import subprocess
+import time
 import uuid
 from dataclasses import dataclass
 from typing import List
@@ -149,6 +150,7 @@ def warmup() -> None:
     We import them now, so that the training / deployment can later
     directly start.
     """
+    start_time = time.time()
     try:
         import langchain  # noqa: F401
         import litellm  # noqa: F401
@@ -160,8 +162,18 @@ def warmup() -> None:
         import tensorflow  # noqa: F401
 
         import rasa.validator  # noqa: F401
-    except ImportError:
+    except ImportError as e:
+        structlogger.debug(
+            "model_trainer.warmup_error",
+            error=str(e),
+        )
         pass
+    finally:
+        end_time = time.time()
+        structlogger.debug(
+            "model_trainer.warmup_time",
+            time_in_seconds=end_time - start_time,
+        )
 
 
 def warm_rasa_main() -> None:

rasa/shared/nlu/training_data/schemas/responses.yml

@@ -72,6 +72,9 @@ schema;responses:
               allowempty: True
           channel:
             type: "str"
+          allow_interruptions:
+            type: "bool"
+            required: False
           metadata:
             type: "any"
           condition:

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.14.0a16"
+__version__ = "3.14.0a18"

{rasa_pro-3.14.0a16.dist-info → rasa_pro-3.14.0a18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.14.0a16
+Version: 3.14.0a18
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH
@@ -28,8 +28,10 @@ Requires-Dist: absl-py (>=2.0,<2.1)
 Requires-Dist: aio-pika (>=8.2.3,<9.4.4)
 Requires-Dist: aiogram (>=3.22.0,<3.23.0)
 Requires-Dist: aiohttp (>=3.10,<3.11)
+Requires-Dist: aioshutil (>=1.5,<2.0)
 Requires-Dist: apscheduler (>=3.10,<3.11)
 Requires-Dist: attrs (>=23.1,<23.2)
+Requires-Dist: aws-msk-iam-sasl-signer-python (>=1.0.2,<1.1.0)
 Requires-Dist: azure-identity (>=1.24.0,<1.25.0)
 Requires-Dist: azure-storage-blob (>=12.26.0,<12.27.0)
 Requires-Dist: boto3 (>=1.40.21,<1.41.0)
@@ -61,8 +63,8 @@ Requires-Dist: jsonpatch (>=1.33,<2.0)
 Requires-Dist: jsonpickle (>=3.3.0,<3.4)
 Requires-Dist: jsonschema (>=4.22)
 Requires-Dist: keras (==2.14.0)
-Requires-Dist: langchain (>=0.2.17,<0.3.0)
-Requires-Dist: langchain-community (>=0.2.19,<0.3.0)
+Requires-Dist: langchain (>=0.3.27,<0.4.0)
+Requires-Dist: langchain-community (>=0.3.29,<0.4.0)
 Requires-Dist: langcodes (>=3.5.0,<4.0.0)
 Requires-Dist: litellm (>=1.69.0,<1.70.0)
 Requires-Dist: matplotlib (>=3.9.4,<3.10.0)