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

chainlit/__init__.py

@@ -28,7 +28,6 @@ from chainlit.config import config
 from chainlit.context import context
 from chainlit.element import (
     Audio,
-    Component,
     File,
     Image,
     Pdf,
@@ -115,7 +114,7 @@ def oauth_callback(
 
     Example:
         @cl.oauth_callback
-        async def oauth_callback(provider_id: str, token: str, raw_user_data: Dict[str, str], default_app_user: User, id_token: Optional[str]) -> Optional[User]:
+        async def oauth_callback(provider_id: str, token: str, raw_user_data: Dict[str, str], default_app_user: User) -> Optional[User]:
 
     Returns:
         Callable[[str, str, Dict[str, str], User], Optional[User]]: The decorated authentication callback.
@@ -377,7 +376,6 @@ __all__ = [
     "Plotly",
     "Image",
     "Text",
-    "Component",
     "Pyplot",
     "File",
     "Task",

chainlit/cli/__init__.py

@@ -7,12 +7,13 @@ import uvicorn
 
 nest_asyncio.apply()
 
+from chainlit.auth import ensure_jwt_secret
 from chainlit.cache import init_lc_cache
+from chainlit.cli.utils import check_file
 from chainlit.config import (
     BACKEND_ROOT,
     DEFAULT_HOST,
     DEFAULT_PORT,
-    DEFAULT_ROOT_PATH,
     config,
     init_config,
     lint_translations,
@@ -21,8 +22,8 @@ from chainlit.config import (
 from chainlit.logger import logger
 from chainlit.markdown import init_markdown
 from chainlit.secret import random_secret
+from chainlit.server import app, register_wildcard_route_handler
 from chainlit.telemetry import trace_event
-from chainlit.utils import check_file, ensure_jwt_secret
 
 
 # Create the main command group for Chainlit CLI
@@ -34,14 +35,8 @@ def cli():
 
 # Define the function to run Chainlit with provided options
 def run_chainlit(target: str):
-    from chainlit.server import combined_asgi_app as app
-
     host = os.environ.get("CHAINLIT_HOST", DEFAULT_HOST)
     port = int(os.environ.get("CHAINLIT_PORT", DEFAULT_PORT))
-    root_path = os.environ.get("CHAINLIT_ROOT_PATH", DEFAULT_ROOT_PATH)
-
-    ssl_certfile = os.environ.get("CHAINLIT_SSL_CERT", None)
-    ssl_keyfile = os.environ.get("CHAINLIT_SSL_KEY", None)
 
     ws_per_message_deflate_env = os.environ.get(
         "UVICORN_WS_PER_MESSAGE_DEFLATE", "true"
@@ -52,13 +47,8 @@ def run_chainlit(target: str):
         "yes",
     ]  # Convert to boolean
 
-    ws_protocol = os.environ.get(
-        "UVICORN_WS_PROTOCOL", "auto"
-    )
-
     config.run.host = host
     config.run.port = port
-    config.run.root_path = root_path
 
     check_file(target)
     # Load the module provided by the user
@@ -67,6 +57,8 @@ def run_chainlit(target: str):
 
     ensure_jwt_secret()
 
+    register_wildcard_route_handler()
+
     # Create the chainlit.md file if it doesn't exist
     init_markdown(config.root)
 
@@ -81,11 +73,8 @@ def run_chainlit(target: str):
             app,
             host=host,
             port=port,
-            ws=ws_protocol,
             log_level=log_level,
             ws_per_message_deflate=ws_per_message_deflate,
-            ssl_keyfile=ssl_keyfile,
-            ssl_certfile=ssl_certfile,
         )
         server = uvicorn.Server(config)
         await server.serve()
@@ -137,47 +126,13 @@ def run_chainlit(target: str):
     envvar="NO_CACHE",
     help="Useful to disable third parties cache, such as langchain.",
 )
-@click.option(
-    "--ssl-cert",
-    default=None,
-    envvar="CHAINLIT_SSL_CERT",
-    help="Specify the file path for the SSL certificate.",
-)
-@click.option(
-    "--ssl-key",
-    default=None,
-    envvar="CHAINLIT_SSL_KEY",
-    help="Specify the file path for the SSL key",
-)
 @click.option("--host", help="Specify a different host to run the server on")
 @click.option("--port", help="Specify a different port to run the server on")
-@click.option("--root-path", help="Specify a different root path to run the server on")
-def chainlit_run(
-    target,
-    watch,
-    headless,
-    debug,
-    ci,
-    no_cache,
-    ssl_cert,
-    ssl_key,
-    host,
-    port,
-    root_path,
-):
+def chainlit_run(target, watch, headless, debug, ci, no_cache, host, port):
     if host:
         os.environ["CHAINLIT_HOST"] = host
     if port:
         os.environ["CHAINLIT_PORT"] = port
-    if bool(ssl_cert) != bool(ssl_key):
-        raise click.UsageError(
-            "Both --ssl-cert and --ssl-key must be provided together."
-        )
-    if ssl_cert:
-        os.environ["CHAINLIT_SSL_CERT"] = ssl_cert
-        os.environ["CHAINLIT_SSL_KEY"] = ssl_key
-    if root_path:
-        os.environ["CHAINLIT_ROOT_PATH"] = root_path
     if ci:
         logger.info("Running in CI mode")
 
@@ -195,8 +150,6 @@ def chainlit_run(
     config.run.no_cache = no_cache
     config.run.ci = ci
     config.run.watch = watch
-    config.run.ssl_cert = ssl_cert
-    config.run.ssl_key = ssl_key
 
     run_chainlit(target)
 

chainlit/cli/utils.py

@@ -0,0 +1,24 @@
+import os
+
+import click
+
+
+def check_file(target: str):
+    # Define accepted file extensions for Chainlit
+    ACCEPTED_FILE_EXTENSIONS = ("py", "py3")
+
+    _, extension = os.path.splitext(target)
+
+    # Check file extension
+    if extension[1:] not in ACCEPTED_FILE_EXTENSIONS:
+        if extension[1:] == "":
+            raise click.BadArgumentUsage(
+                "Chainlit requires raw Python (.py) files, but the provided file has no extension."
+            )
+        else:
+            raise click.BadArgumentUsage(
+                f"Chainlit requires raw Python (.py) files, not {extension}."
+            )
+
+    if not os.path.exists(target):
+        raise click.BadParameter(f"File does not exist: {target}")

chainlit/config.py

@@ -163,7 +163,6 @@ generated_by = "{__version__}"
 
 DEFAULT_HOST = "0.0.0.0"
 DEFAULT_PORT = 8000
-DEFAULT_ROOT_PATH = ""
 
 
 @dataclass()
@@ -172,9 +171,6 @@ class RunSettings:
     module_name: Optional[str] = None
     host: str = DEFAULT_HOST
     port: int = DEFAULT_PORT
-    ssl_cert: Optional[str] = None
-    ssl_key: Optional[str] = None
-    root_path: str = DEFAULT_ROOT_PATH
     headless: bool = False
     watch: bool = False
     no_cache: bool = False

chainlit/context.py

@@ -69,8 +69,6 @@ def init_http_context(
     user_env: Optional[Dict[str, str]] = None,
     client_type: ClientType = "webapp",
 ) -> ChainlitContext:
-    from chainlit.data import get_data_layer
-
     session_id = str(uuid.uuid4())
     thread_id = thread_id or str(uuid.uuid4())
     session = HTTPSession(
@@ -83,13 +81,6 @@ def init_http_context(
     )
     context = ChainlitContext(session)
     context_var.set(context)
-
-    if data_layer := get_data_layer():
-        if user_id := getattr(user, "id", None):
-            asyncio.create_task(
-                data_layer.update_thread(thread_id=thread_id, user_id=user_id)
-            )
-
     return context