chainlit 1.0.0rc2__py3-none-any.whl → 1.0.100__py3-none-any.whl

chainlit/socket.py

@@ -1,5 +1,7 @@
 import asyncio
 import json
+import uuid
+from datetime import datetime
 from typing import Any, Dict
 
 from chainlit.action import Action
@@ -73,22 +75,41 @@ def load_user_env(user_env):
     return user_env
 
 
+def build_anon_user_identifier(environ):
+    scope = environ.get("asgi.scope", {})
+    client_ip, _ = scope.get("client")
+    ip = environ.get("HTTP_X_FORWARDED_FOR", client_ip)
+
+    try:
+        headers = scope.get("headers", {})
+        user_agent = next(
+            (v.decode("utf-8") for k, v in headers if k.decode("utf-8") == "user-agent")
+        )
+        return str(uuid.uuid5(uuid.NAMESPACE_DNS, user_agent + ip))
+
+    except StopIteration:
+        return str(uuid.uuid5(uuid.NAMESPACE_DNS, ip))
+
+
 @socket.on("connect")
 async def connect(sid, environ, auth):
     if not config.code.on_chat_start and not config.code.on_message:
-        raise ConnectionRefusedError(
+        logger.warning(
             "You need to configure at least an on_chat_start or an on_message callback"
         )
-
+        return False
     user = None
+    anon_user_identifier = build_anon_user_identifier(environ)
     token = None
+    login_required = require_login()
     try:
         # Check if the authentication is required
-        if require_login():
+        if login_required:
             authorization_header = environ.get("HTTP_AUTHORIZATION")
             token = authorization_header.split(" ")[1] if authorization_header else None
             user = await get_current_user(token=token)
     except Exception as e:
+        logger.info("Authentication failed")
         return False
 
     # Function to send a message to this particular session
@@ -113,7 +134,7 @@ async def connect(sid, environ, auth):
 
     user_env_string = environ.get("HTTP_USER_ENV")
     user_env = load_user_env(user_env_string)
-    WebsocketSession(
+    ws_session = WebsocketSession(
         id=session_id,
         socket_id=sid,
         emit=emit_fn,
@@ -124,6 +145,17 @@ async def connect(sid, environ, auth):
         chat_profile=environ.get("HTTP_X_CHAINLIT_CHAT_PROFILE"),
         thread_id=environ.get("HTTP_X_CHAINLIT_THREAD_ID"),
     )
+
+    if data_layer := get_data_layer():
+        asyncio.create_task(
+            data_layer.create_user_session(
+                id=session_id,
+                started_at=datetime.utcnow().isoformat(),
+                anon_user_id=anon_user_identifier if not user else None,
+                user_id=user.identifier if user else None,
+            )
+        )
+
     trace_event("connection_successful")
     return True
 
@@ -138,8 +170,9 @@ async def connection_successful(sid):
     if context.session.thread_id_to_resume and config.code.on_chat_resume:
         thread = await resume_thread(context.session)
         if thread:
-            context.session.has_user_message = True
+            context.session.has_first_interaction = True
             await context.emitter.clear_ask()
+            await context.emitter.emit("first_interaction", "resume")
             await context.emitter.resume_thread(thread)
             await config.code.on_chat_resume(thread)
             return
@@ -152,32 +185,31 @@ async def connection_successful(sid):
 
 @socket.on("clear_session")
 async def clean_session(sid):
-    if session := WebsocketSession.get(sid):
-        if config.code.on_chat_end:
-            init_ws_context(session)
-            await config.code.on_chat_end()
-        # Clean up the user session
-        if session.id in user_sessions:
-            user_sessions.pop(session.id)
-
-        # Clean up the session
-        session.delete()
+    await disconnect(sid, force_clear=True)
 
 
 @socket.on("disconnect")
-async def disconnect(sid):
+async def disconnect(sid, force_clear=False):
     session = WebsocketSession.get(sid)
     if session:
+        if data_layer := get_data_layer():
+            asyncio.create_task(
+                data_layer.update_user_session(
+                    id=session.id,
+                    is_interactive=session.has_first_interaction,
+                    ended_at=datetime.utcnow().isoformat(),
+                )
+            )
+
         init_ws_context(session)
 
     if config.code.on_chat_end and session:
         await config.code.on_chat_end()
 
-    if session and session.thread_id and session.has_user_message:
+    if session and session.thread_id and session.has_first_interaction:
         await persist_user_session(session.thread_id, session.to_persistable())
 
-    async def disconnect_on_timeout(sid):
-        await asyncio.sleep(config.project.session_timeout)
+    def clear():
         if session := WebsocketSession.get(sid):
             # Clean up the user session
             if session.id in user_sessions:
@@ -185,7 +217,14 @@ async def disconnect(sid):
             # Clean up the session
             session.delete()
 
-    asyncio.ensure_future(disconnect_on_timeout(sid))
+    async def clear_on_timeout(sid):
+        await asyncio.sleep(config.project.session_timeout)
+        clear()
+
+    if force_clear:
+        clear()
+    else:
+        asyncio.ensure_future(clear_on_timeout(sid))
 
 
 @socket.on("stop")

chainlit/step.py

@@ -14,8 +14,8 @@ from chainlit.element import Element
 from chainlit.logger import logger
 from chainlit.telemetry import trace_event
 from chainlit.types import FeedbackDict
-from chainlit_client import BaseGeneration
-from chainlit_client.step import StepType, TrueStepType
+from literalai import BaseGeneration
+from literalai.step import StepType, TrueStepType
 
 
 class StepDict(TypedDict, total=False):
@@ -257,7 +257,7 @@ class Step:
 
         if data_layer:
             try:
-                asyncio.create_task(data_layer.update_step(step_dict))
+                asyncio.create_task(data_layer.update_step(step_dict.copy()))
             except Exception as e:
                 if self.fail_on_persist_error:
                     raise e
@@ -313,7 +313,7 @@ class Step:
 
         if data_layer:
             try:
-                asyncio.create_task(data_layer.create_step(step_dict))
+                asyncio.create_task(data_layer.create_step(step_dict.copy()))
                 self.persisted = True
             except Exception as e:
                 if self.fail_on_persist_error:

chainlit/telemetry.py

@@ -31,9 +31,6 @@ class ChainlitTelemetry:
         if resource:
             return resource
 
-        # If we are in production, use the URL as hostname
-        if config.chainlit_prod_url:
-            host_name = config.chainlit_prod_url
         # Hash the local hostname to avoid leaking it.
         else:
             host_name = gethostname()
@@ -42,7 +39,7 @@ class ChainlitTelemetry:
         attrs = {"host.name": host_name}
 
         if resource_attributes:
-            attrs.update(resource_attributes)
+            attrs.update(resource_attributes)  # type: ignore
         if service_name:
             attrs["service.name"] = service_name
         if service_version:
@@ -50,7 +47,7 @@ class ChainlitTelemetry:
         if deployment_environment:
             attrs["deployment.environment"] = deployment_environment
 
-        return Resource.create(attrs)
+        return Resource.create(attrs)  # type: ignore
 
     def configure_tracer(self):
         import uptrace
@@ -67,7 +64,6 @@ class ChainlitTelemetry:
         uptrace.configure_opentelemetry(
             dsn="https://YPa4AbDF853uCW6UWN2oYg@api.uptrace.dev/1778",
             service_name="chainlit",
-            service_version="1.1.0",
             deployment_environment="production",
             logging_level=logging.CRITICAL,
         )

chainlit/types.py

@@ -6,8 +6,8 @@ if TYPE_CHECKING:
     from chainlit.user import UserDict
     from chainlit.step import StepDict
 
-from chainlit_client import ChatGeneration, CompletionGeneration
 from dataclasses_json import DataClassJsonMixin
+from literalai import ChatGeneration, CompletionGeneration
 from pydantic import BaseModel
 from pydantic.dataclasses import dataclass
 

{chainlit-1.0.0rc2.dist-info → chainlit-1.0.100.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chainlit
-Version: 1.0.0rc2
+Version: 1.0.100
 Summary: A faster way to build chatbot UIs.
 Home-page: https://github.com/Chainlit/chainlit
 License: Apache-2.0 license
@@ -15,7 +15,6 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiofiles (>=23.1.0,<24.0.0)
 Requires-Dist: asyncer (>=0.0.2,<0.0.3)
-Requires-Dist: chainlit_client (==0.1.0rc7)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: dataclasses_json (>=0.5.7,<0.6.0)
 Requires-Dist: fastapi (>=0.100,<0.101)
@@ -23,6 +22,7 @@ Requires-Dist: fastapi-socketio (>=0.0.10,<0.0.11)
 Requires-Dist: filetype (>=1.2.0,<2.0.0)
 Requires-Dist: httpx (>=0.23.0,<0.25.0)
 Requires-Dist: lazify (>=0.4.0,<0.5.0)
+Requires-Dist: literalai (==0.0.102)
 Requires-Dist: nest-asyncio (>=1.5.6,<2.0.0)
 Requires-Dist: packaging (>=23.1,<24.0)
 Requires-Dist: pydantic (>=1,<3)
@@ -32,7 +32,7 @@ Requires-Dist: python-graphql-client (>=0.4.3,<0.5.0)
 Requires-Dist: python-multipart (>=0.0.6,<0.0.7)
 Requires-Dist: syncer (>=2.0.3,<3.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0)
-Requires-Dist: uptrace (>=1.18.0,<2.0.0)
+Requires-Dist: uptrace (>=1.22.0,<2.0.0)
 Requires-Dist: uvicorn (>=0.23.2,<0.24.0)
 Requires-Dist: watchfiles (>=0.20.0,<0.21.0)
 Project-URL: Repository, https://github.com/Chainlit/chainlit

chainlit-1.0.100.dist-info/RECORD

@@ -0,0 +1,60 @@
+chainlit/__init__.py,sha256=SPlsN7CA9RbelAfrBovwwW7h4cKTSB0xLhDfdZWjH-s,9313
+chainlit/__main__.py,sha256=7Vg3w3T3qDuz4KDu5lQhLH6lQ3cYdume7gHH7Z1V97U,87
+chainlit/action.py,sha256=k-GsblVHI4DnDWFyF-RZgq3KfdfAFICFh2OBeU4w8N8,1410
+chainlit/auth.py,sha256=dIu37bsPVBSIf0hTGevWuHVfjNPpFWXnPNrUcICPFrg,2688
+chainlit/cache.py,sha256=Bv3dT4eHhE6Fq3c6Do0ZTpiyoXgXYewdxTgpYghEd9g,1361
+chainlit/chat_settings.py,sha256=2ByenmwS8O6jQjDVJjhhbLrBPGA5aY2F7R3VvQQxXPk,877
+chainlit/cli/__init__.py,sha256=aMynTbqbJEvxkoIzDjsdKL6wJ0HFgLfVrbxFkwqp1FU,4733
+chainlit/cli/utils.py,sha256=mE2d9oOk-B2b9ZvDV1zENoDWxjfMriGP7bVwEFduZP4,717
+chainlit/config.py,sha256=RtXHJROx7r-moxu_2bsjXjsGnqKNePlUWDVemoi8wXk,10477
+chainlit/context.py,sha256=Su3eabnD2sgLNx5IwlxEpG4pev64GLi-GlvbE5Mw7sM,2264
+chainlit/data/__init__.py,sha256=uOrpWPwxfAGogGRKVkBGzvvaxi4-5yZnyF2y6HzxdUk,15512
+chainlit/data/acl.py,sha256=hx7Othkx12EitonyZD4iFIRVHwxBmBY2TKdwjPuZMSo,461
+chainlit/element.py,sha256=cjQDuCSv4OSI2Z0q9JNJf4jn08dAcym6jX8iiHaZrKA,10123
+chainlit/emitter.py,sha256=H-MbWGf2KWrCRpqEfBxsjI_G0wQErb8aIo1yutb2ouQ,11272
+chainlit/frontend/dist/assets/index-c4f40824.js,sha256=WwrBcZL_7OKyO6BqYlpwtcegkEEPF8tm2WMAOJJ1gOI,3177303
+chainlit/frontend/dist/assets/index-d088547c.css,sha256=0IhUfCm_IY1kjvlTR2edW1qKXAFDya3LZ6mnZnP6ovk,6605
+chainlit/frontend/dist/assets/logo_dark-bc7401f6.svg,sha256=vHQB9g-n5OqOmuH3Fduuc7ZMg0EmMsGyO9cEnYwLbHg,8889
+chainlit/frontend/dist/assets/logo_light-f19fc2ea.svg,sha256=8Z_C6t-0V9QL9ldmLjaLfp2REcGDuaTeNynj6-6muNI,8891
+chainlit/frontend/dist/assets/react-plotly-259d6961.js,sha256=djnx-4HnrUzyis8Z9IKHZ3nlEQgBLKQ83a9SiqfaTws,3739251
+chainlit/frontend/dist/favicon.svg,sha256=0Cy8x28obT5eWW3nxZRhsEvu6_zMqrqbg0y6hT3D0Q0,6455
+chainlit/frontend/dist/index.html,sha256=smQKmixVXuV17iimIpLLTDVddvpOTUv9B2mMf0XViuc,959
+chainlit/haystack/__init__.py,sha256=uZ77YiPy-qleSTi3dQCDO9HE6S6F6GpJWmh7jO4cxXA,217
+chainlit/haystack/callbacks.py,sha256=OAGPW25i5IpYGF-wd9fIsFhERnmB61vxcKZ2PKmGp9w,5168
+chainlit/hello.py,sha256=LwENQWo5s5r8nNDn4iKSV77vX60Ky5r_qGjQhyi7qlY,416
+chainlit/input_widget.py,sha256=1Z1qn3YwaZ7upqqxZXtbfDxBlVobDjbZ3HtlNOj-U3E,4880
+chainlit/langchain/__init__.py,sha256=zErMw0_3ufSGeF9ye7X0ZX3wDat4mTOx97T40ePDO2g,217
+chainlit/langchain/callbacks.py,sha256=UZrRlUDl089_cljNfBcYKoKN69pqOgoxiHPJrlhDkoE,24141
+chainlit/langflow/__init__.py,sha256=wxhxdsl1yxdsRyNTgZticxFF_8VFtJJ4OdIy3tnEIyM,817
+chainlit/llama_index/__init__.py,sha256=c7wIUZmKTtZPU9zpdGpKTHctQaBWTuRGqTN0kkIkBcg,218
+chainlit/llama_index/callbacks.py,sha256=OZXkQjDz2gEd1fCwN3UJLKwT_j7St7uoy5VaZzHgen4,5868
+chainlit/logger.py,sha256=wTwRSZsLfXwWy6U4351IgWAm4KCMThgxm9EZpjGUEr4,373
+chainlit/markdown.py,sha256=L2IPPWxIlrhJZcKPfO1akomHdN3sgC2EvC2ilxR8MQs,1624
+chainlit/message.py,sha256=nKBvf5RHPHE9YyoQPBWl7IMfg69irvwEJ6TqE6bkV7k,17500
+chainlit/oauth_providers.py,sha256=WiKUFpNp0RRN5Vq6LHCR9V-9td_1YEn2yD8iGu8atvY,17459
+chainlit/playground/__init__.py,sha256=igNRcBgqLKPTjOQtTNhhGNJFmZn-Dl1fHRQzQSjDGTQ,80
+chainlit/playground/config.py,sha256=_T0ELFRfBVUIOlaNvp3Af3X7wfMEQjxZPh26X_6mXYY,1033
+chainlit/playground/provider.py,sha256=Fs_gnwbz_xCKa2fNE5G7Q2xnAAGJXyTmjpTCRkYHcFU,5167
+chainlit/playground/providers/__init__.py,sha256=DxVp9BbQUdAPstpDTg2koNUTMS3tJa84iPTt_gQoHGM,236
+chainlit/playground/providers/anthropic.py,sha256=VZVTCMUmiQPNFyqt57vwXwU7EbANf1hMfkWsdnkvZoQ,3441
+chainlit/playground/providers/huggingface.py,sha256=AmBmIzvfqBjswEI40jifb0OrMQkTk5rXCkGX7nMJ-bk,2130
+chainlit/playground/providers/langchain.py,sha256=vc6p9WmcY9kxGvK5irefbIfhUtNmBQgUuSx55T-Wiis,2978
+chainlit/playground/providers/openai.py,sha256=ch2Eyoz696YJ6H2P1dT6n9RAw-PsiBLVK2_MhgEEcFo,12421
+chainlit/playground/providers/vertexai.py,sha256=zKy501f-MHnLrvuRzN50FqgB3xoHzfQFTVbw83Nsj20,5084
+chainlit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+chainlit/secret.py,sha256=0MXq8YxTeL93K8IyAew5UgZmIIw9_yJ_Kg4iML6cdVM,296
+chainlit/server.py,sha256=ykFDvPs-oG-kHThf_jkNRfZizDUjrhbprjI8x4cvhg0,21059
+chainlit/session.py,sha256=AmPZWf7tfF4K9TkslmjztZzT51u5QoNw6YTwwdhMU7M,8517
+chainlit/socket.py,sha256=RPoxOMV1twB1_O4u2brKLDJO-FiGA0Jmdesy47qWiCE,10337
+chainlit/step.py,sha256=pfTkRAffl86svFSrz_W41HM0WM8766gFFLgc-9SEzJM,12186
+chainlit/sync.py,sha256=G1n-7-3WgXsN8y1bJkEyws_YwmHZIyDZoZUwhprigag,1235
+chainlit/telemetry.py,sha256=Rk4dnZv0OnGOgV4kD-VHdhgl4i7i3ypqhSE_R-LZceM,3060
+chainlit/types.py,sha256=mEVTk_z_wJABJf92_uWkqGF4WmOqLf9HIiuTVSREImo,3355
+chainlit/user.py,sha256=Cw4uGz0ffivWFszv8W__EHwkvTHQ3Lj9hqpRCPxFujo,619
+chainlit/user_session.py,sha256=nyPx8vSICP8BhpPcW5h9vbHVf9ixj39SrkvJBUI_6zs,1368
+chainlit/utils.py,sha256=3HzhfZ4XJhBIe9sJ_3Lxv3lMH4mFXsi6nLBGqm8Gtdw,2571
+chainlit/version.py,sha256=iosXhlXclBwBqlADFKEilxAC2wWKbtuBKi87AmPi7s8,196
+chainlit-1.0.100.dist-info/METADATA,sha256=YreNSwLh2etgpLlX6f56ZBwrHGUAoJM9gRH4ByE0MD8,5552
+chainlit-1.0.100.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+chainlit-1.0.100.dist-info/entry_points.txt,sha256=FrkqdjrFl8juSnvBndniyX7XuKojmUwO4ghRh-CFMQc,45
+chainlit-1.0.100.dist-info/RECORD,,