rasa-pro 3.10.13__tar.gz → 3.10.13a1__tar.gz

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.10.13
+Version: 3.10.13a1
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.10.13"
+version = "3.10.13a1"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -160,7 +160,7 @@ wheel = ">=0.40.0"
 certifi = ">=2024.07.04"
 cryptography = ">=42.0.5"
 jsonpatch = "^1.33"
-importlib-resources = "6.1.3" # pinned to avoid breaking changes in versions >= 6.2.0 with Python 3.9
+importlib-resources = "6.1.3"
 importlib-metadata = "~8.5.0"
 opentelemetry-sdk = "~1.16.0"
 opentelemetry-exporter-jaeger = "~1.16.0"
@@ -178,10 +178,10 @@ python-keycloak = "^3.12.0"
 tiktoken = "~0.7.0"
 faiss-cpu = "^1.7.4"
 pycountry = "^22.3.5"
-pymilvus = "<2.4.2" # pinned because 2.4.2 introduces milvus-lite dependency that fails on windows
+pymilvus = "<2.4.2"
 qdrant-client = "^1.9.0"
 psutil = "^5.9.5"
-tenacity = "~8.4.1" # pinned down because of langchain
+tenacity = "~8.4.1"
 types-protobuf = "4.25.0.20240417"
 litellm = "~1.52.6"
 openpyxl = "^3.1.5"
@@ -189,7 +189,7 @@ diskcache = "~5.6.3"
 skops = "~0.10.0"
 safetensors = "~0.4.5"
 [[tool.poetry.dependencies.tensorflow-io-gcs-filesystem]]
-version = "==0.31" # newer versions doesn't provide wheels for Windows
+version = "==0.31"
 markers = "sys_platform == 'win32'"
 
 [[tool.poetry.dependencies.tensorflow-io-gcs-filesystem]]
@@ -245,20 +245,6 @@ mlflow = [ "mlflow",]
 rasa = "rasa.__main__:main"
 
 [tool.ruff.lint]
-# The following checks are disabled because they are not relevant for Rasa
-# - RUF001: Checks for ambiguous Unicode characters in strings. https://docs.astral.sh/ruff/rules/ambiguous-unicode-character-string/
-# - RUF002: Checks for ambiguous Unicode characters in docstrings. https://docs.astral.sh/ruff/rules/ambiguous-unicode-character-docstring/
-# - RUF003: Checks for ambiguous Unicode characters in comments. https://docs.astral.sh/ruff/rules/ambiguous-unicode-character-comment/
-# - RUF005: Use of + operator for string concatenation https://docs.astral.sh/ruff/rules/collection-literal-concatenation/
-# Following checks are currently disabled but will be enabled in the future
-# as part of the ticket https://rasahq.atlassian.net/browse/ATO-866
-# - D100: Missing docstring in public module
-# - D101: Missing docstring in public class
-# - D102: Missing docstring in public method
-# - D103: Missing docstring in public function
-# - D104: Missing docstring in public package
-# - D105: Missing docstring in magic method
-# - D107: Missing docstring in __init__
 ignore = [ "D100", "D101", "D102", "D103", "D104", "D105", "D107", "RUF001", "RUF002", "RUF003", "RUF005",]
 select = [ "D", "E", "F", "W", "RUF",]
 

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/rasa/cli/studio/studio.py

@@ -1,5 +1,5 @@
 import argparse
-from typing import List, Optional, Tuple
+from typing import List, Optional
 from urllib.parse import ParseResult, urlparse
 
 import questionary
@@ -149,7 +149,7 @@ def _configure_studio_url() -> Optional[str]:
     return studio_url
 
 
-def _get_advanced_config(studio_url: str) -> Tuple:
+def _get_advanced_config(studio_url: str) -> tuple:
     """Get the advanced configuration values for Rasa Studio."""
     keycloak_url = questionary.text(
         "Please provide your Rasa Studio Keycloak URL",
@@ -167,7 +167,7 @@ def _get_advanced_config(studio_url: str) -> Tuple:
     return keycloak_url, realm_name, client_id
 
 
-def _get_default_config(studio_url: str) -> Tuple:
+def _get_default_config(studio_url: str) -> tuple:
     """Get the default configuration values for Rasa Studio."""
     keycloak_url = studio_url + "auth/"
     realm_name = DEFAULT_REALM_NAME
@@ -178,7 +178,6 @@ def _get_default_config(studio_url: str) -> Tuple:
         f"Keycloak URL: {keycloak_url}, "
         f"Realm Name: '{realm_name}', "
         f"Client ID: '{client_id}'. "
-        f"SSL verification is enabled."
         f"You can use '--advanced' to configure these settings."
     )
 
@@ -186,11 +185,7 @@ def _get_default_config(studio_url: str) -> Tuple:
 
 
 def _create_studio_config(
-    studio_url: str,
-    keycloak_url: str,
-    realm_name: str,
-    client_id: str,
-    disable_verify: bool = False,
+    studio_url: str, keycloak_url: str, realm_name: str, client_id: str
 ) -> StudioConfig:
     """Create a StudioConfig object with the provided parameters."""
     return StudioConfig(
@@ -198,7 +193,6 @@ def _create_studio_config(
         studio_url=studio_url + "api/graphql/",
         client_id=client_id,
         realm_name=realm_name,
-        disable_verify=disable_verify,
     )
 
 
@@ -233,23 +227,19 @@ def _configure_studio_config(args: argparse.Namespace) -> StudioConfig:
 
     # create a configuration and auth object to try to reach the studio
     studio_config = _create_studio_config(
-        studio_url,
-        keycloak_url,
-        realm_name,
-        client_id,
-        disable_verify=args.disable_verify,
+        studio_url, keycloak_url, realm_name, client_id
     )
 
-    if studio_config.disable_verify:
+    if args.disable_verify:
         rasa.shared.utils.cli.print_info(
             "Disabling SSL verification for the Rasa Studio authentication server."
         )
+        studio_auth = StudioAuth(studio_config, verify=False)
     else:
         rasa.shared.utils.cli.print_info(
             "Enabling SSL verification for the Rasa Studio authentication server."
         )
-
-    studio_auth = StudioAuth(studio_config)
+        studio_auth = StudioAuth(studio_config, verify=True)
 
     if _check_studio_auth(studio_auth):
         return studio_config

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/rasa/studio/auth.py

@@ -23,10 +23,12 @@ from rasa.studio.results_logger import with_studio_error_handler, StudioResult
 class StudioAuth:
     """Handles the authentication with the Rasa Studio authentication server."""
 
-    def __init__(self, studio_config: StudioConfig) -> None:
+    def __init__(
+        self,
+        studio_config: StudioConfig,
+        verify: bool = True,
+    ) -> None:
         self.config = studio_config
-        verify = not studio_config.disable_verify
-
         self.keycloak_openid = KeycloakOpenID(
             server_url=studio_config.authentication_server_url,
             client_id=studio_config.client_id,

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/rasa/studio/config.py

@@ -2,14 +2,13 @@ from __future__ import annotations
 
 import os
 from dataclasses import dataclass
-from typing import Any, Dict, Optional, Text
+from typing import Dict, Optional, Text
 
 from rasa.utils.common import read_global_config_value, write_global_config_value
 
 from rasa.studio.constants import (
     RASA_STUDIO_AUTH_SERVER_URL_ENV,
     RASA_STUDIO_CLI_CLIENT_ID_KEY_ENV,
-    RASA_STUDIO_CLI_DISABLE_VERIFY_KEY_ENV,
     RASA_STUDIO_CLI_REALM_NAME_KEY_ENV,
     RASA_STUDIO_CLI_STUDIO_URL_ENV,
     STUDIO_CONFIG_KEY,
@@ -20,7 +19,6 @@ STUDIO_URL_KEY = "studio_url"
 CLIENT_ID_KEY = "client_id"
 REALM_NAME_KEY = "realm_name"
 CLIENT_SECRET_KEY = "client_secret"
-DISABLE_VERIFY = "disable_verify"
 
 
 @dataclass
@@ -29,15 +27,13 @@ class StudioConfig:
     studio_url: Optional[Text]
     client_id: Optional[Text]
     realm_name: Optional[Text]
-    disable_verify: bool = False
 
-    def to_dict(self) -> Dict[Text, Optional[Any]]:
+    def to_dict(self) -> Dict[Text, Optional[Text]]:
         return {
             AUTH_SERVER_URL_KEY: self.authentication_server_url,
             STUDIO_URL_KEY: self.studio_url,
             CLIENT_ID_KEY: self.client_id,
             REALM_NAME_KEY: self.realm_name,
-            DISABLE_VERIFY: self.disable_verify,
         }
 
     @classmethod
@@ -47,7 +43,6 @@ class StudioConfig:
             studio_url=data[STUDIO_URL_KEY],
             client_id=data[CLIENT_ID_KEY],
             realm_name=data[REALM_NAME_KEY],
-            disable_verify=data.get(DISABLE_VERIFY, False),
         )
 
     def write_config(self) -> None:
@@ -78,7 +73,7 @@ class StudioConfig:
         config = read_global_config_value(STUDIO_CONFIG_KEY, unavailable_ok=True)
 
         if config is None:
-            return StudioConfig(None, None, None, None, False)
+            return StudioConfig(None, None, None, None)
 
         if not isinstance(config, dict):
             raise ValueError(
@@ -88,7 +83,7 @@ class StudioConfig:
             )
 
         for key in config:
-            if not isinstance(config[key], str) and key != DISABLE_VERIFY:
+            if not isinstance(config[key], str):
                 raise ValueError(
                     "Invalid config file format. "
                     f"Key '{key}' is not a text value."
@@ -107,9 +102,6 @@ class StudioConfig:
             studio_url=StudioConfig._read_env_value(RASA_STUDIO_CLI_STUDIO_URL_ENV),
             client_id=StudioConfig._read_env_value(RASA_STUDIO_CLI_CLIENT_ID_KEY_ENV),
             realm_name=StudioConfig._read_env_value(RASA_STUDIO_CLI_REALM_NAME_KEY_ENV),
-            disable_verify=bool(
-                os.getenv(RASA_STUDIO_CLI_DISABLE_VERIFY_KEY_ENV, False)
-            ),
         )
 
     @staticmethod
@@ -132,5 +124,4 @@ class StudioConfig:
             studio_url=self.studio_url or other.studio_url,
             client_id=self.client_id or other.client_id,
             realm_name=self.realm_name or other.realm_name,
-            disable_verify=self.disable_verify or other.disable_verify,
         )

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/rasa/studio/constants.py

@@ -10,7 +10,6 @@ RASA_STUDIO_AUTH_SERVER_URL_ENV = "RASA_STUDIO_AUTH_SERVER_URL"
 RASA_STUDIO_CLI_STUDIO_URL_ENV = "RASA_STUDIO_CLI_STUDIO_URL"
 RASA_STUDIO_CLI_REALM_NAME_KEY_ENV = "RASA_STUDIO_CLI_REALM_NAME_KEY"
 RASA_STUDIO_CLI_CLIENT_ID_KEY_ENV = "RASA_STUDIO_CLI_CLIENT_ID_KEY"
-RASA_STUDIO_CLI_DISABLE_VERIFY_KEY_ENV = "RASA_STUDIO_CLI_DISABLE_VERIFY_KEY"
 
 STUDIO_NLU_FILENAME = "studio_nlu.yml"
 STUDIO_DOMAIN_FILENAME = "studio_domain.yml"

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/rasa/studio/data_handler.py

@@ -76,9 +76,7 @@ class StudioDataHandler:
 
         return request
 
-    def _make_request(
-        self, GQL_req: Dict[Any, Any], verify: bool = True
-    ) -> Dict[Any, Any]:
+    def _make_request(self, GQL_req: Dict[Any, Any]) -> Dict[Any, Any]:
         token = KeycloakTokenReader().get_token()
         if token.is_expired():
             token = self.refresh_token(token)
@@ -95,7 +93,6 @@ class StudioDataHandler:
                 "Authorization": f"{token.token_type} {token.access_token}",
                 "Content-Type": "application/json",
             },
-            verify=verify,
         )
 
         if res.status_code != 200:
@@ -131,9 +128,7 @@ class StudioDataHandler:
             The data from Rasa Studio.
         """
         GQL_req = self._build_request()
-        verify = not self.studio_config.disable_verify
-
-        response = self._make_request(GQL_req, verify=verify)
+        response = self._make_request(GQL_req)
         self._extract_data(response)
 
     def request_data(
@@ -150,9 +145,7 @@ class StudioDataHandler:
             The data from Rasa Studio.
         """
         GQL_req = self._build_request(intent_names, entity_names)
-        verify = not self.studio_config.disable_verify
-
-        response = self._make_request(GQL_req, verify=verify)
+        response = self._make_request(GQL_req)
         self._extract_data(response)
 
     def get_config(self) -> Optional[str]:

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/rasa/studio/upload.py

@@ -56,10 +56,7 @@ def _get_selected_entities_and_intents(
 
 def handle_upload(args: argparse.Namespace) -> None:
     """Uploads primitives to rasa studio."""
-    studio_config = StudioConfig.read_config()
-    endpoint = studio_config.studio_url
-    verify = not studio_config.disable_verify
-
+    endpoint = StudioConfig.read_config().studio_url
     if not endpoint:
         rasa.shared.utils.cli.print_error_and_exit(
             "No GraphQL endpoint found in config. Please run `rasa studio config`."
@@ -79,9 +76,9 @@ def handle_upload(args: argparse.Namespace) -> None:
 
         # check safely if args.calm is set and not fail if not
         if hasattr(args, "calm") and args.calm:
-            upload_calm_assistant(args, endpoint, verify=verify)
+            upload_calm_assistant(args, endpoint)
         else:
-            upload_nlu_assistant(args, endpoint, verify=verify)
+            upload_nlu_assistant(args, endpoint)
 
 
 config_keys = [
@@ -129,9 +126,7 @@ def _get_assistant_name(config: Dict[Text, Any]) -> str:
 
 
 @with_studio_error_handler
-def upload_calm_assistant(
-    args: argparse.Namespace, endpoint: str, verify: bool = True
-) -> StudioResult:
+def upload_calm_assistant(args: argparse.Namespace, endpoint: str) -> StudioResult:
     """Uploads the CALM assistant data to Rasa Studio.
 
     Args:
@@ -221,13 +216,11 @@ def upload_calm_assistant(
     )
 
     structlogger.info("Uploading to Rasa Studio...")
-    return make_request(endpoint, graphql_req, verify)
+    return make_request(endpoint, graphql_req)
 
 
 @with_studio_error_handler
-def upload_nlu_assistant(
-    args: argparse.Namespace, endpoint: str, verify: bool = True
-) -> StudioResult:
+def upload_nlu_assistant(args: argparse.Namespace, endpoint: str) -> StudioResult:
     """Uploads the classic (dm1) assistant data to Rasa Studio.
 
     Args:
@@ -275,16 +268,15 @@ def upload_nlu_assistant(
     graphql_req = build_request(assistant_name, nlu_examples_yaml, domain_yaml)
 
     structlogger.info("Uploading to Rasa Studio...")
-    return make_request(endpoint, graphql_req, verify)
+    return make_request(endpoint, graphql_req)
 
 
-def make_request(endpoint: str, graphql_req: Dict, verify: bool = True) -> StudioResult:
+def make_request(endpoint: str, graphql_req: Dict) -> StudioResult:
     """Makes a request to the studio endpoint to upload data.
 
     Args:
         endpoint: The studio endpoint
         graphql_req: The graphql request
-        verify: Whether to verify SSL
     """
     token = KeycloakTokenReader().get_token()
     res = requests.post(
@@ -294,7 +286,6 @@ def make_request(endpoint: str, graphql_req: Dict, verify: bool = True) -> Studi
             "Authorization": f"{token.token_type} {token.access_token}",
             "Content-Type": "application/json",
         },
-        verify=verify,
     )
 
     if results_logger.response_has_errors(res.json()):

{rasa_pro-3.10.13 → rasa_pro-3.10.13a1}/rasa/version.py

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