chainlit 1.1.201__py3-none-any.whl → 1.1.300__py3-none-any.whl

chainlit/socket.py

@@ -3,6 +3,7 @@ import json
 import time
 import uuid
 from typing import Any, Dict, Literal
+from urllib.parse import unquote
 
 from chainlit.action import Action
 from chainlit.auth import get_current_user, require_login
@@ -12,14 +13,15 @@ from chainlit.data import get_data_layer
 from chainlit.element import Element
 from chainlit.logger import logger
 from chainlit.message import ErrorMessage, Message
-from chainlit.server import socket
+from chainlit.server import sio
 from chainlit.session import WebsocketSession
 from chainlit.telemetry import trace_event
 from chainlit.types import (
     AudioChunk,
     AudioChunkPayload,
     AudioEndPayload,
-    UIMessagePayload,
+    MessagePayload,
+    SystemMessagePayload,
 )
 from chainlit.user_session import user_sessions
 
@@ -52,7 +54,7 @@ async def resume_thread(session: WebsocketSession):
     user_is_author = author == session.user.identifier
 
     if user_is_author:
-        metadata = thread.get("metadata", {})
+        metadata = thread.get("metadata") or {}
         user_sessions[session.id] = metadata.copy()
         if chat_profile := metadata.get("chat_profile"):
             session.chat_profile = chat_profile
@@ -97,8 +99,8 @@ def build_anon_user_identifier(environ):
         return str(uuid.uuid5(uuid.NAMESPACE_DNS, ip))
 
 
-@socket.on("connect")
-async def connect(sid, environ, auth):
+@sio.on("connect")
+async def connect(sid, environ):
     if (
         not config.code.on_chat_start
         and not config.code.on_message
@@ -123,11 +125,11 @@ async def connect(sid, environ, auth):
 
     # Session scoped function to emit to the client
     def emit_fn(event, data):
-        return socket.emit(event, data, to=sid)
+        return sio.emit(event, data, to=sid)
 
     # Session scoped function to emit to the client and wait for a response
     def emit_call_fn(event: Literal["ask", "call_fn"], data, timeout):
-        return socket.call(event, data, timeout=timeout, to=sid)
+        return sio.call(event, data, timeout=timeout, to=sid)
 
     session_id = environ.get("HTTP_X_CHAINLIT_SESSION_ID")
     if restore_existing_session(sid, session_id, emit_fn, emit_call_fn):
@@ -138,6 +140,10 @@ async def connect(sid, environ, auth):
 
     client_type = environ.get("HTTP_X_CHAINLIT_CLIENT_TYPE")
     http_referer = environ.get("HTTP_REFERER")
+    url_encoded_chat_profile = environ.get("HTTP_X_CHAINLIT_CHAT_PROFILE")
+    chat_profile = (
+        unquote(url_encoded_chat_profile) if url_encoded_chat_profile else None
+    )
 
     ws_session = WebsocketSession(
         id=session_id,
@@ -148,7 +154,7 @@ async def connect(sid, environ, auth):
         user_env=user_env,
         user=user,
         token=token,
-        chat_profile=environ.get("HTTP_X_CHAINLIT_CHAT_PROFILE"),
+        chat_profile=chat_profile,
         thread_id=environ.get("HTTP_X_CHAINLIT_THREAD_ID"),
         languages=environ.get("HTTP_ACCEPT_LANGUAGE"),
         http_referer=http_referer,
@@ -158,7 +164,7 @@ async def connect(sid, environ, auth):
     return True
 
 
-@socket.on("connection_successful")
+@sio.on("connection_successful")
 async def connection_successful(sid):
     context = init_ws_context(sid)
 
@@ -186,14 +192,14 @@ async def connection_successful(sid):
         context.session.current_task = task
 
 
-@socket.on("clear_session")
+@sio.on("clear_session")
 async def clean_session(sid):
     session = WebsocketSession.get(sid)
     if session:
         session.to_clear = True
 
 
-@socket.on("disconnect")
+@sio.on("disconnect")
 async def disconnect(sid):
     session = WebsocketSession.get(sid)
 
@@ -227,15 +233,13 @@ async def disconnect(sid):
         asyncio.ensure_future(clear_on_timeout(sid))
 
 
-@socket.on("stop")
+@sio.on("stop")
 async def stop(sid):
     if session := WebsocketSession.get(sid):
         trace_event("stop_task")
 
         init_ws_context(session)
-        await Message(
-            author="System", content="Task manually stopped.", disable_feedback=True
-        ).send()
+        await Message(content="Task manually stopped.", disable_feedback=True).send()
 
         if session.current_task:
             session.current_task.cancel()
@@ -244,12 +248,12 @@ async def stop(sid):
             await config.code.on_stop()
 
 
-async def process_message(session: WebsocketSession, payload: UIMessagePayload):
+async def process_message(session: WebsocketSession, payload: MessagePayload):
     """Process a message from the user."""
     try:
         context = init_ws_context(session)
         await context.emitter.task_start()
-        message = await context.emitter.process_user_message(payload)
+        message = await context.emitter.process_message(payload)
 
         if config.code.on_message:
             # Sleep 1ms to make sure any children step starts after the message step start
@@ -266,8 +270,8 @@ async def process_message(session: WebsocketSession, payload: UIMessagePayload):
         await context.emitter.task_end()
 
 
-@socket.on("ui_message")
-async def message(sid, payload: UIMessagePayload):
+@sio.on("client_message")
+async def message(sid, payload: MessagePayload):
     """Handle a message sent by the User."""
     session = WebsocketSession.require(sid)
 
@@ -275,7 +279,7 @@ async def message(sid, payload: UIMessagePayload):
     session.current_task = task
 
 
-@socket.on("audio_chunk")
+@sio.on("audio_chunk")
 async def audio_chunk(sid, payload: AudioChunkPayload):
     """Handle an audio chunk sent by the user."""
     session = WebsocketSession.require(sid)
@@ -286,7 +290,7 @@ async def audio_chunk(sid, payload: AudioChunkPayload):
         asyncio.create_task(config.code.on_audio_chunk(AudioChunk(**payload)))
 
 
-@socket.on("audio_end")
+@sio.on("audio_end")
 async def audio_end(sid, payload: AudioEndPayload):
     """Handle the end of the audio stream."""
     session = WebsocketSession.require(sid)
@@ -330,7 +334,7 @@ async def process_action(action: Action):
         logger.warning("No callback found for action %s", action.name)
 
 
-@socket.on("action_call")
+@sio.on("action_call")
 async def call_action(sid, action):
     """Handle an action call from the UI."""
     context = init_ws_context(sid)
@@ -357,7 +361,7 @@ async def call_action(sid, action):
         )
 
 
-@socket.on("chat_settings_change")
+@sio.on("chat_settings_change")
 async def change_settings(sid, settings: Dict[str, Any]):
     """Handle change settings submit from the UI."""
     context = init_ws_context(sid)

chainlit/step.py

@@ -50,9 +50,8 @@ def step(
     id: Optional[str] = None,
     tags: Optional[List[str]] = None,
     disable_feedback: bool = True,
-    root: bool = False,
     language: Optional[str] = None,
-    show_input: Union[bool, str] = False,
+    show_input: Union[bool, str] = "json",
 ):
     """Step decorator for async and sync functions."""
 
@@ -72,7 +71,6 @@ def step(
                     name=name,
                     id=id,
                     disable_feedback=disable_feedback,
-                    root=root,
                     tags=tags,
                     language=language,
                     show_input=show_input,
@@ -85,8 +83,9 @@ def step(
                     try:
                         if result and not step.output:
                             step.output = result
-                    except:
-                        pass
+                    except Exception as e:
+                        step.is_error = True
+                        step.output = str(e)
                     return result
 
             return async_wrapper
@@ -99,7 +98,6 @@ def step(
                     name=name,
                     id=id,
                     disable_feedback=disable_feedback,
-                    root=root,
                     tags=tags,
                     language=language,
                     show_input=show_input,
@@ -113,7 +111,8 @@ def step(
                         if result and not step.output:
                             step.output = result
                     except:
-                        pass
+                        step.is_error = True
+                        step.output = str(e)
                     return result
 
             return sync_wrapper
@@ -136,7 +135,6 @@ class Step:
     streaming: bool
     persisted: bool
 
-    root: bool
     show_input: Union[bool, str]
 
     is_error: Optional[bool]
@@ -161,9 +159,8 @@ class Step:
         metadata: Optional[Dict] = None,
         tags: Optional[List[str]] = None,
         disable_feedback: bool = True,
-        root: bool = False,
         language: Optional[str] = None,
-        show_input: Union[bool, str] = False,
+        show_input: Union[bool, str] = "json",
     ):
         trace_event(f"init {self.__class__.__name__} {type}")
         time.sleep(0.001)
@@ -179,7 +176,6 @@ class Step:
         self.is_error = False
         self.show_input = show_input
         self.parent_id = parent_id
-        self.root = root
 
         self.language = language
         self.generation = None
@@ -299,11 +295,11 @@ class Step:
         tasks = [el.send(for_id=self.id) for el in self.elements]
         await asyncio.gather(*tasks)
 
-        if config.ui.hide_cot and (self.parent_id or not self.root):
-            return
-
-        if not config.features.prompt_playground and "generation" in step_dict:
-            step_dict.pop("generation", None)
+        if config.ui.hide_cot and self.type not in [
+            "user_message",
+            "assistant_message",
+        ]:
+            return True
 
         await context.emitter.update_step(step_dict)
 
@@ -356,39 +352,48 @@ class Step:
         tasks = [el.send(for_id=self.id) for el in self.elements]
         await asyncio.gather(*tasks)
 
-        if config.ui.hide_cot and (self.parent_id or not self.root):
+        if config.ui.hide_cot and self.type not in [
+            "user_message",
+            "assistant_message",
+        ]:
             return self
 
-        if not config.features.prompt_playground and "generation" in step_dict:
-            step_dict.pop("generation", None)
-
         await context.emitter.send_step(step_dict)
 
         return self
 
-    async def stream_token(self, token: str, is_sequence=False):
+    async def stream_token(self, token: str, is_sequence=False, is_input=False):
         """
         Sends a token to the UI.
         Once all tokens have been streamed, call .send() to end the stream and persist the step if persistence is enabled.
         """
         if is_sequence:
-            self.output = token
+            if is_input:
+                self.input = token
+            else:
+                self.output = token
         else:
-            self.output += token
+            if is_input:
+                self.input += token
+            else:
+                self.output += token
 
         assert self.id
 
-        if config.ui.hide_cot and (self.parent_id or not self.root):
+        if config.ui.hide_cot and self.type not in [
+            "user_message",
+            "assistant_message",
+        ]:
             return
 
         if not self.streaming:
             self.streaming = True
             step_dict = self.to_dict()
             await context.emitter.stream_start(step_dict)
-
-        await context.emitter.send_token(
-            id=self.id, token=token, is_sequence=is_sequence
-        )
+        else:
+            await context.emitter.send_token(
+                id=self.id, token=token, is_sequence=is_sequence, is_input=is_input
+            )
 
     # Handle parameter less decorator
     def __call__(self, func):
@@ -408,7 +413,7 @@ class Step:
         previous_steps = local_steps.get() or []
         parent_step = previous_steps[-1] if previous_steps else None
 
-        if not self.parent_id and not self.root:
+        if not self.parent_id:
             if parent_step:
                 self.parent_id = parent_step.id
             elif context.session.root_message:
@@ -421,6 +426,10 @@ class Step:
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         self.end = utc_now()
 
+        if exc_type:
+            self.output = str(exc_val)
+            self.is_error = True
+
         if self in context.active_steps:
             context.active_steps.remove(self)
 
@@ -437,7 +446,7 @@ class Step:
         previous_steps = local_steps.get() or []
         parent_step = previous_steps[-1] if previous_steps else None
 
-        if not self.parent_id and not self.root:
+        if not self.parent_id:
             if parent_step:
                 self.parent_id = parent_step.id
             elif context.session.root_message:
@@ -450,6 +459,11 @@ class Step:
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.end = utc_now()
+
+        if exc_type:
+            self.output = str(exc_val)
+            self.is_error = True
+
         if self in context.active_steps:
             context.active_steps.remove(self)
 

chainlit/teams/__init__.py

@@ -0,0 +1,6 @@
+try:
+    import botbuilder
+except ModuleNotFoundError:
+    raise ValueError(
+        "The botbuilder-core package is required to integrate Chainlit with a Slack app. Run `pip install botbuilder-core --upgrade`"
+    )