rasa-pro 3.11.0a4.dev1__py3-none-any.whl → 3.11.0a4.dev3__py3-none-any.whl

rasa/model_manager/config.py

@@ -16,3 +16,5 @@ RASA_PYTHON_PATH = sys.executable
 
 # the max limit for parallel training and bot run requests
 MAX_PARALLEL_TRAININGS = os.getenv("MAX_PARALLEL_TRAININGS", 10)
+
+DEFAULT_SERVER_PATH_PREFIX = "talk"

rasa/model_manager/model_api.py

@@ -1,8 +1,7 @@
 import asyncio
-from functools import wraps
 import os
 from http import HTTPStatus
-from typing import Any, Dict, Optional, Callable
+from typing import Any, Dict, Optional
 import dotenv
 from sanic import Blueprint, Sanic, response
 from sanic.response import json
@@ -12,7 +11,7 @@ import structlog
 from socketio import AsyncServer
 
 from rasa.exceptions import ModelNotFound
-from rasa.model_manager import config, studio_jwt_auth
+from rasa.model_manager import config
 from rasa.model_manager.config import SERVER_BASE_URL
 from rasa.constants import MODEL_ARCHIVE_EXTENSION
 from rasa.model_manager.runner_service import (
@@ -92,7 +91,7 @@ def base_server_url(request: Request) -> str:
     if SERVER_BASE_URL:
         return SERVER_BASE_URL.rstrip("/")
     else:
-        return f"{request.scheme}://{request.host}"
+        return f"{request.scheme}://{request.host}/{config.DEFAULT_SERVER_PATH_PREFIX}"
 
 
 async def continuously_update_process_status() -> None:
@@ -112,27 +111,6 @@ async def continuously_update_process_status() -> None:
             await asyncio.sleep(1)
 
 
-def requires_studio_auth() -> Callable:
-    """Wraps a request handler with token authentication."""
-
-    def decorator(f: Callable) -> Callable:
-        @wraps(f)
-        async def decorated(
-            request: Request, *args: Any, **kwargs: Any
-        ) -> response.HTTPResponse:
-            # get token from bearer in auth header
-            provided = request.headers.get("Authorization", "").split("Bearer ")[-1]
-            try:
-                studio_jwt_auth.authenticate_user_to_service(provided)
-                return await f(request, *args, **kwargs)
-            except studio_jwt_auth.UserToServiceAuthenticationError:
-                return response.json({"message": "User not authenticated."}, status=401)
-
-        return decorated
-
-    return decorator
-
-
 def internal_blueprint() -> Blueprint:
     """Create a blueprint for the model manager API."""
     bp = Blueprint("model_api_internal")
@@ -390,6 +368,20 @@ def internal_blueprint() -> Blueprint:
         ]
         return json({"deployment_sessions": bots, "total_number": len(bots)})
 
+    @bp.route("/models/<model_name>")
+    async def send_model(request: Request, model_name: str) -> response.HTTPResponse:
+        try:
+            model_path = path_to_model(model_name)
+
+            if not model_path:
+                return json({"message": "Model not found"}, status=404)
+
+            return await response.file(model_path)
+        except NotFound:
+            return json({"message": "Model not found"}, status=404)
+        except ModelNotFound:
+            return json({"message": "Model not found"}, status=404)
+
     return bp
 
 
@@ -429,21 +421,6 @@ def external_blueprint() -> Blueprint:
             }
         )
 
-    @bp.route("/models/<model_name>")
-    @requires_studio_auth()
-    async def send_model(request: Request, model_name: str) -> response.HTTPResponse:
-        try:
-            model_path = path_to_model(model_name)
-
-            if not model_path:
-                return json({"message": "Model not found"}, status=404)
-
-            return await response.file(model_path)
-        except NotFound:
-            return json({"message": "Model not found"}, status=404)
-        except ModelNotFound:
-            return json({"message": "Model not found"}, status=404)
-
     return bp
 
 

rasa/model_service.py

@@ -17,8 +17,6 @@ structlogger = structlog.get_logger()
 
 MODEL_SERVICE_PORT = 8000
 
-DEFAULT_SERVER_PATH_PREFIX = "bot"
-
 
 def url_prefix_from_base_url() -> str:
     """Return the path prefix from the base URL."""
@@ -26,7 +24,7 @@ def url_prefix_from_base_url() -> str:
     prefix = urlparse(SERVER_BASE_URL).path.rstrip("/") if SERVER_BASE_URL else ""
 
     # can't be empty
-    return prefix or DEFAULT_SERVER_PATH_PREFIX
+    return prefix or config.DEFAULT_SERVER_PATH_PREFIX
 
 
 def validate_model_storage_type() -> None:

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.11.0a4.dev1"
+__version__ = "3.11.0a4.dev3"

{rasa_pro-3.11.0a4.dev1.dist-info → rasa_pro-3.11.0a4.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.11.0a4.dev1
+Version: 3.11.0a4.dev3
 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.11.0a4.dev1.dist-info → rasa_pro-3.11.0a4.dev3.dist-info}/RECORD

@@ -504,14 +504,14 @@ rasa/markers/upload.py,sha256=Ot1s_O-CEIB9c4CKUlfOldiJo92pdqxFUHOPCU7E_NU,2518
 rasa/markers/validate.py,sha256=YypXKRS87xxrMMEz9HpAQzYJUwg0OPbczMXBRNjlJq4,709
 rasa/model.py,sha256=GH1-N6Po3gL3nwfa9eGoN2bMRNMrn4f3mi17-osW3T0,3491
 rasa/model_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/model_manager/config.py,sha256=7UQgLHlbOSq8NpOlhoVGaL4zS96g5GPOe-DvPDeTmVc,595
-rasa/model_manager/model_api.py,sha256=xu49REVw9ZbsHIq7uH_d_mDUJy2EawcoNZq1uMsocGQ,16474
+rasa/model_manager/config.py,sha256=GaBNdmUEX5pYj1qiqnqnkdXQ0oHF4SScEGtbwOREI10,632
+rasa/model_manager/model_api.py,sha256=kvPCs_Lr5zOX1JNVixTczbE7xv5l6VxmzzWhDekzM48,15653
 rasa/model_manager/runner_service.py,sha256=9rfgfxYYTb032x-KquYauPtWz4ndQbIMI_toZI2X2ow,8231
 rasa/model_manager/socket_bridge.py,sha256=2Rm3dYJma7Axf_ns8C87iY2GgJKnJRLt8v2g-Q9ppm4,4685
 rasa/model_manager/studio_jwt_auth.py,sha256=eZ_srnbL2sKIKgx0OZIp29NbIrH2J8PlI8Or0lLg_Xo,2644
 rasa/model_manager/trainer_service.py,sha256=1wzXif1zwVSkVF-iv_0Tza2eEEWz1asKQwAAZnZn384,10404
 rasa/model_manager/utils.py,sha256=OgxhKm4T9Iv_Qd8G9E74c-oNsBy4CD5cD0wPHFuKE3w,1918
-rasa/model_service.py,sha256=tMujeptSFbWdxarRg6gd_Y8RXDgloEZ96Q6Bh5mc1fQ,3539
+rasa/model_service.py,sha256=lu49WhOyg-sMFJ2i8wkjCtJEEUssWK64vbHAu9Ko83w,3510
 rasa/model_testing.py,sha256=h0QUpJu6p_TDse3aHjCfYwI6OGH47b3Iuo5Ot0HQADM,14959
 rasa/model_training.py,sha256=TCGQgmYym3AM4NDGpzaSVQabvBeS74nPt3DhCIC5mqg,21444
 rasa/nlu/__init__.py,sha256=D0IYuTK_ZQ_F_9xsy0bXxVCAtU62Fzvp8S7J9tmfI_c,123
@@ -749,9 +749,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=PNcN1YT7_I7sa5gEJy4BWEPw3AGIvrdb4eVD9-j-GhM,124
-rasa_pro-3.11.0a4.dev1.dist-info/METADATA,sha256=rmoaiD4WCKfqfp6yIShe-1u7rbADGeojmyeBvhGRMHc,10920
-rasa_pro-3.11.0a4.dev1.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.11.0a4.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rasa_pro-3.11.0a4.dev1.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.11.0a4.dev1.dist-info/RECORD,,
+rasa/version.py,sha256=drfncXxqHx0zWcS5E4KSsfGiZie9yNLdPZ_dDB0ftQw,124
+rasa_pro-3.11.0a4.dev3.dist-info/METADATA,sha256=Y_XGoHMgnTSSNGyKqF_uKu9qFSrxgs31pOSTv_Be0Ds,10920
+rasa_pro-3.11.0a4.dev3.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.11.0a4.dev3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rasa_pro-3.11.0a4.dev3.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.11.0a4.dev3.dist-info/RECORD,,