Merge branch 'dev' into feat/support-tg

deeppavlov · Oct 1, 2024 · 6ed9b5d · 6ed9b5d
2 parents 1ccea2f + 0a2728b
commit 6ed9b5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/backend/chatsky_ui/api/api_v1/endpoints/bot.py b/backend/chatsky_ui/api/api_v1/endpoints/bot.py
@@ -9,6 +9,7 @@
 from chatsky_ui.services.index import Index
 from chatsky_ui.services.process_manager import BuildManager, ProcessManager, RunManager
 from chatsky_ui.services.websocket_manager import WebSocketManager
+from chatsky_ui.schemas.process_status import Status
 
 router = APIRouter()
 
@@ -277,4 +278,5 @@ async def connect(
         return_when=asyncio.FIRST_COMPLETED,
     )
     websocket_manager.disconnect(websocket)
-    await run_manager.stop_all()
+    if await run_manager.get_status(run_id) in [Status.ALIVE, Status.RUNNING]:
+        await run_manager.stop(run_id)
diff --git a/backend/chatsky_ui/cli.py b/backend/chatsky_ui/cli.py
@@ -179,6 +179,7 @@ def init(
             "https://github.com/Ramimashkouk/df_d_template.git",
             no_input=no_input,
             overwrite_if_exists=overwrite_if_exists,
+            checkout="feat/add-slots2"
         )
     finally:
         os.chdir(original_dir)
diff --git a/backend/chatsky_ui/services/json_converter.py b/backend/chatsky_ui/services/json_converter.py
@@ -78,7 +78,8 @@ def _convert_slots(slots: dict) -> dict:
                 group_slot[slot_name] = _convert_slots(slot_values)
         return dict(group_slot)
 
-    script["slots"] = _convert_slots(flow_graph["slots"])
+    if "slots" in flow_graph:
+        script["slots"] = _convert_slots(flow_graph["slots"])
 
     return nodes, script