rasa-pro 3.10.7.dev1__py3-none-any.whl → 3.10.7.dev2__py3-none-any.whl

rasa/model_manager/config.py

@@ -1,6 +1,11 @@
 import sys
+import os
 
-SERVER_BASE_WORKING_DIRECTORY = "working-data"
+SERVER_BASE_WORKING_DIRECTORY = os.environ.get(
+    "RASA_MODEL_SERVER_BASE_DIRECTORY", "working-data"
+)
+
+SERVER_BASE_URL = os.environ.get("RASA_MODEL_SERVER_BASE_URL", None)
 
 # The path to the python executable that is running this script
 # we will use the same python to run training / bots

rasa/model_manager/model_api.py

@@ -9,6 +9,7 @@ from sanic.request import Request
 import structlog
 from socketio import AsyncServer
 
+from rasa.model_manager.config import SERVER_BASE_URL
 from rasa.model_manager.runner_service import (
     BotSession,
     run_bot,
@@ -81,6 +82,14 @@ async def update_status_of_all_bots() -> None:
         await update_bot_status(bot)
 
 
+def base_server_url(request: Request) -> str:
+    """Return the base URL of the server."""
+    if SERVER_BASE_URL:
+        return SERVER_BASE_URL
+    else:
+        return f"{request.scheme}://{request.host}"
+
+
 def get_log_url(request: Request, action_id: str) -> response.HTTPResponse:
     """Return a URL for downloading the log file for training / deployment."""
     if not os.path.exists(logs_path(action_id)):
@@ -88,7 +97,7 @@ def get_log_url(request: Request, action_id: str) -> response.HTTPResponse:
 
     return json(
         {
-            "url": f"{request.scheme}://{request.host}/logs/{action_id}.txt",
+            "url": f"{base_server_url(request)}/logs/{action_id}.txt",
             "expires_in_seconds": 60 * 60 * 24,
         }
     )
@@ -113,14 +122,13 @@ def get_training_model_url(request: Request, training_id: str) -> response.HTTPR
 
     return json(
         {
-            "url": f"{request.scheme}://{request.host}/models/{model}",
+            "url": f"{base_server_url(request)}/models/{model}",
             "expires_in_seconds": 60 * 60 * 24,
         }
     )
 
 
-@app.after_server_start
-async def continuously_update_process_status(running_app: Sanic) -> None:
+async def continuously_update_process_status() -> None:
     """Regularly Update the status of all training and bot processes."""
     structlogger.debug("model_api.update_process_status.started")
 
@@ -285,7 +293,7 @@ async def start_bot(request: Request) -> response.HTTPResponse:
             status=404,
         )
 
-    base_url_path = f"{request.scheme}://{request.host}"
+    base_url_path = base_server_url(request)
     try:
         bot_session = run_bot(deployment_id, training_base_path, base_url_path)
         running_bots[deployment_id] = bot_session

rasa/model_service.py

@@ -36,6 +36,7 @@ def main() -> None:
     structlogger.debug("model_training.starting_server", port=MODEL_SERVICE_PORT)
     structlogger.debug("model_running.starting_server", port=MODEL_SERVICE_PORT)
 
+    model_api.app.add_task(model_api.continuously_update_process_status)
     model_api.app.run(host="0.0.0.0", port=MODEL_SERVICE_PORT, legacy=True)
 
 

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.7.dev1"
+__version__ = "3.10.7.dev2"

{rasa_pro-3.10.7.dev1.dist-info → rasa_pro-3.10.7.dev2.dist-info}/METADATA

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

@@ -483,13 +483,13 @@ 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=CgloLGxk5FtPYxFK9TZPfD9nYdMEJwI53WrBwD4RMtE,211
-rasa/model_manager/model_api.py,sha256=vAyysrHf6zt3OeayAS7d_URZt97XAxRrIzRVKWEcTzU,13730
+rasa/model_manager/config.py,sha256=LCzRoV78bLX_FREW7hfQLsQepupoTs1m-CnK3u_D01s,349
+rasa/model_manager/model_api.py,sha256=Eoq6TBjYaqB-9arLIH1Uz_pb7ZagQ8qYDkUAx6DDARE,13926
 rasa/model_manager/runner_service.py,sha256=aMupR7t0EEy2yOGT5cR_6kluApnwOiiGkjyIVYxdsMk,5553
 rasa/model_manager/socket_bridge.py,sha256=f-dhsV8xYaENXVZT5OOzkMdpSPPPxFEzsQqNJAuktxQ,1390
 rasa/model_manager/trainer_service.py,sha256=7LP_EsLQt-P2oqO1AgqbgIcTC515eCW58BamDkDjJjw,7856
 rasa/model_manager/utils.py,sha256=-DJUcgRiyQZsszlOYlww-OGaAof8CIopbsOxZmeZ9NY,819
-rasa/model_service.py,sha256=FD7cvLpn-DKysdPZ_TyGYaX9hOfkQXbUG7eiIGyhdwo,1139
+rasa/model_service.py,sha256=ZULb8jJHPQYIWtMVv5cCYExJdBnAFs4Wv89p1bVGzqo,1212
 rasa/model_testing.py,sha256=h0QUpJu6p_TDse3aHjCfYwI6OGH47b3Iuo5Ot0HQADM,14959
 rasa/model_training.py,sha256=sFdrizWu8JZZDGrMjI6_0OaY9dK-msOShWpgOOCGZzg,20601
 rasa/nlu/__init__.py,sha256=D0IYuTK_ZQ_F_9xsy0bXxVCAtU62Fzvp8S7J9tmfI_c,123
@@ -727,9 +727,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=HM0ZIWjo3JRt2FMIfgNI_s932OABOSXkflm-rFTNkvY,62608
-rasa/version.py,sha256=mWwXjlqLz4H68SGfZTsjjqVjCUyp6IRXez6QPLV9UeQ,122
-rasa_pro-3.10.7.dev1.dist-info/METADATA,sha256=kunqQOTbfLTTvXrxMPaydYCd0iZ2bNYG5YmnDxZuO6A,28217
-rasa_pro-3.10.7.dev1.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.10.7.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rasa_pro-3.10.7.dev1.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.10.7.dev1.dist-info/RECORD,,
+rasa/version.py,sha256=_xRWomNdCH1OVLVcaYC_a-LVDeKGrYo4iDznhzakf3k,122
+rasa_pro-3.10.7.dev2.dist-info/METADATA,sha256=exaKQ2A81Kk0kydkgvN3ipZyApPtmatZ96AU2LhlpIo,28217
+rasa_pro-3.10.7.dev2.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.10.7.dev2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rasa_pro-3.10.7.dev2.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.10.7.dev2.dist-info/RECORD,,