v0.9 (#4)

services/bot/bot/custom/conditions.py

@@ -1,5 +1,6 @@
-from chatsky.script import Context
+from chatsky import Context, BaseCondition
 
 
-def is_upper_case(ctx: Context, pipeline):
-    return ctx.last_request.text.isupper()
+class IsUpperCase(BaseCondition):
+    async def call(self, ctx: Context) -> bool:
+        return ctx.last_request.text.isupper()

services/bot/bot/pipeline.py

@@ -1,6 +1,6 @@
 import os
 
-from chatsky.pipeline import Pipeline
+from chatsky import Pipeline
 from chatsky.context_storages import context_storage_factory
 from chatsky.messengers.telegram import LongpollingInterface
 
@@ -27,12 +27,12 @@ def get_variable(var_name: str):
     messenger_interface = LongpollingInterface(token=TG_BOT_TOKEN)
 
 
-pipeline = Pipeline.from_script(
-    getattr(script, "SCRIPT"),
-    start_label=getattr(script, "START_NODE"),
-    fallback_label=getattr(script, "FALLBACK_NODE", None),
-    pre_services=getattr(script, "PRE_SERVICES", []),
-    post_services=getattr(script, "POST_SERVICES", []),
+pipeline = Pipeline(
+    script=script.SCRIPT,
+    start_label=script.START_NODE,
+    fallback_label=script.FALLBACK_NODE,
+    pre_services=script.PRE_SERVICES,
+    post_services=script.POST_SERVICES,
     context_storage=context_storage_factory(DB_URI) if DB_URI else None,
     messenger_interface=messenger_interface,
 )

services/bot/bot/script.py

@@ -1,38 +1,45 @@
-from chatsky.script import Message
-from chatsky.script import RESPONSE, TRANSITIONS, LOCAL
-from chatsky.script.conditions import exact_match, true
+from chatsky import Message, RESPONSE, TRANSITIONS, LOCAL, Transition as Tr
+import chatsky.conditions as cnd
 
-from .custom.conditions import is_upper_case
+from .custom.conditions import IsUpperCase
 from .custom.services import pre_service, post_service
 
 
 # todo: change this script to yours
 SCRIPT = {
     "technical_flow": {
         "start_node": {
-            TRANSITIONS: {
-                ("main_flow", "greeting_node"): exact_match("/start"),
-            },
+            TRANSITIONS: [
+                Tr(
+                    dst=("main_flow", "greeting_node"),
+                    cnd=cnd.ExactMatch("/start")
+                )
+            ],
         },
         "fallback": {
-            RESPONSE: Message("Error."),
+            RESPONSE: "Error.",
         },
     },
     "main_flow": {
         LOCAL: {
-            TRANSITIONS: {
-                "upper": is_upper_case,
-                "response": true(),
-            },
+            TRANSITIONS: [
+                Tr(
+                    dst="upper",
+                    cnd=IsUpperCase()
+                ),
+                Tr(
+                    dst="response",
+                )
+            ]
         },
         "greeting_node": {
-            RESPONSE: Message("Hi, please say something."),
+            RESPONSE: "Hi, please say something.",
         },
         "upper": {
-            RESPONSE: Message("Don't scream, please."),
+            RESPONSE: "Don't scream, please.",
         },
         "response": {
-            RESPONSE: Message("Thank you."),
+            RESPONSE: "Thank you.",
         },
     }
 }

services/bot/requirements.txt

@@ -1,2 +1,2 @@
-chatsky[telegram,sqlite]~=0.8
+chatsky[telegram,sqlite]~=0.9
 pytest