rasa-pro 3.10.13__py3-none-any.whl → 3.10.13a1__py3-none-any.whl

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/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/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/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/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/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/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"

{rasa_pro-3.10.13.dist-info → rasa_pro-3.10.13a1.dist-info}/METADATA

@@ -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.dist-info → rasa_pro-3.10.13a1.dist-info}/RECORD

@@ -80,7 +80,7 @@ rasa/cli/scaffold.py,sha256=Eqv44T7b5cOd2FKLU1tSrAVPKwMfoiUIjc43PtaxJGg,7988
 rasa/cli/shell.py,sha256=wymYOj6jdUON0y7pe-rpRqarWDGaDquU7PRp8knxqHk,4264
 rasa/cli/studio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/cli/studio/download.py,sha256=r3UCbpD6-8GGKK47FqXTPI1hvYElADjgcdegG6B9XYg,1832
-rasa/cli/studio/studio.py,sha256=HJpxm2GmzD5nqbKenWUgE-luEOtJ5p2xv_bjzDzRS1c,9004
+rasa/cli/studio/studio.py,sha256=fADCRFRyarZ4eU_frmNfgCoutdH7lLPRQBq4612Q_pA,8871
 rasa/cli/studio/train.py,sha256=ruXA5UkaRbO3femk8w3I2cXKs06-34FYtB_9MKdP6hw,1572
 rasa/cli/studio/upload.py,sha256=kdHqrVGsEbbqH5fz_HusWwJEycB31SHaPlXer8lXAE0,2069
 rasa/cli/telemetry.py,sha256=ZywhlOpp0l2Yz9oEcOGA2ej3SEkSTisKPpBhn_fS7tc,3538
@@ -667,14 +667,14 @@ rasa/shared/utils/schemas/model_config.yml,sha256=GU1lL_apXjJ3Xbd9Fj5jKm2h1HeB6V
 rasa/shared/utils/schemas/stories.yml,sha256=DV3wAFnv1leD7kV-FH-GQihF1QX5oKHc8Eb24mxjizc,4737
 rasa/shared/utils/yaml.py,sha256=poDOFJ4jU-hQG7XS7ozeFA8ec5L4NSUBiFvH-N5BuQc,31089
 rasa/studio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/studio/auth.py,sha256=Lw0zkNhQx3pW8yANWAg9x1M4hXT4Jjpxcnjfw8LYFsA,9672
-rasa/studio/config.py,sha256=IGxMCpdE31PFms0hqYbT6GlAOS1w2L1wutnc8wQSO4s,4541
-rasa/studio/constants.py,sha256=SIpfW70P3OwoLU359BSXQ9fNEVLF6YTCnX6CVvsG0uo,810
-rasa/studio/data_handler.py,sha256=o6jDLE15SBtkBDv4n9RCG9spF0f9BCm0PmXU8jSOfik,12416
+rasa/studio/auth.py,sha256=6Hk6aHpNNrFXpGygWVIF2V5FFyVpqEOyMX5fVU8bqxU,9673
+rasa/studio/config.py,sha256=wqjvg_hARKG-6cV3JrhnP_ptZIq0VSFbdv-aWrH0u_Q,4091
+rasa/studio/constants.py,sha256=7ixKE1kPw2OM0dWhnEHGSVtSwZ5h9cNL1TB6eExg0EA,732
+rasa/studio/data_handler.py,sha256=oG2pLb7sJa2QO3h63PUIZU8DbiJO9B7FGx3pYrAsMjA,12212
 rasa/studio/download.py,sha256=9uE4KKaHnID_3-Tt_E5_D00XTwhLlj4oxORY8CZRrZc,17188
 rasa/studio/results_logger.py,sha256=0gCkEaZ1CeFmxRHArK5my_DsLYjApZrxfiRMT5asE6A,4963
 rasa/studio/train.py,sha256=gfPtirITzBDo9gV4hqDNSwPYtVp_22cq8OWI6YIBgyk,4243
-rasa/studio/upload.py,sha256=5hvj_DUzxq5JkZswro-KaLE4QAKwbMLGb8TakzS1etk,14290
+rasa/studio/upload.py,sha256=3XqYyIZE1L3ohJtRcpf039IRc73A_rZ4KVWC32_dBo4,14027
 rasa/telemetry.py,sha256=Q6MQnDhOY6cKRVs3PayiM6WYWb8QJ_Hb3_eOm12n0tI,61093
 rasa/tracing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/tracing/config.py,sha256=O4iHkE4kF6r4uVAt3JUb--TniK7pWD4j3d08Vf_GuYY,12736
@@ -720,9 +720,9 @@ rasa/utils/train_utils.py,sha256=f1NWpp5y6al0dzoQyyio4hc4Nf73DRoRSHDzEK6-C4E,212
 rasa/utils/url_tools.py,sha256=JQcHL2aLqLHu82k7_d9imUoETCm2bmlHaDpOJ-dKqBc,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=ToRaa4dS859CJO3H2VGqS943O5qWOg45ypbDfFMKECU,62699
-rasa/version.py,sha256=aji2ixgfN5o0Qbky9Ay-XdGG4bS_vwvrv5hZY9MWQR0,118
-rasa_pro-3.10.13.dist-info/METADATA,sha256=jRz-VIUgsUpiuvknI7kTqZZoRTQfJNlaMwIquWXNyzw,10919
-rasa_pro-3.10.13.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.10.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rasa_pro-3.10.13.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.10.13.dist-info/RECORD,,
+rasa/version.py,sha256=XeYU5gF7m3YQ6D79cZdCdDxwmL4reMJlBtTt5PKs8BI,120
+rasa_pro-3.10.13a1.dist-info/METADATA,sha256=X0kN_6S3XcNSWg1RyxSSf3WrT1YDi6Nf9Qj9JY8ZvAU,10921
+rasa_pro-3.10.13a1.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.10.13a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rasa_pro-3.10.13a1.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.10.13a1.dist-info/RECORD,,