chainlit 0.6.3__tar.gz → 0.6.401__tar.gz

{chainlit-0.6.3 → chainlit-0.6.401}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chainlit
-Version: 0.6.3
+Version: 0.6.401
 Summary: A faster way to build chatbot UIs.
 Home-page: https://github.com/Chainlit/chainlit
 License: Apache-2.0 license
@@ -18,20 +18,21 @@ Requires-Dist: asyncer (>=0.0.2,<0.0.3)
 Requires-Dist: auth0-python (>=4.4.0,<5.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: dataclasses_json (>=0.5.7,<0.6.0)
-Requires-Dist: fastapi (>=0.97.0,<0.98.0)
+Requires-Dist: fastapi (>=0.99.0,<0.100.0)
 Requires-Dist: fastapi-socketio (>=0.0.10,<0.0.11)
 Requires-Dist: filetype (>=1.2.0,<2.0.0)
 Requires-Dist: lazify (>=0.4.0,<0.5.0)
 Requires-Dist: nest-asyncio (>=1.5.6,<2.0.0)
-Requires-Dist: prisma (>=0.9.0,<0.10.0)
+Requires-Dist: packaging (>=23.1,<24.0)
+Requires-Dist: prisma (>=0.10.0,<0.11.0)
 Requires-Dist: pydantic (>=1.10.8,<2.0.0)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-graphql-client (>=0.4.3,<0.5.0)
 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: uvicorn (>=0.22.0,<0.23.0)
-Requires-Dist: watchfiles (>=0.19.0,<0.20.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
 Description-Content-Type: text/markdown
 

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/__init__.py

@@ -1,6 +1,6 @@
 import asyncio
 import os
-from typing import TYPE_CHECKING, Any, Callable, Dict, Optional
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union
 
 from dotenv import load_dotenv
 from starlette.datastructures import Headers
@@ -13,6 +13,7 @@ if TYPE_CHECKING:
         AsyncLangchainCallbackHandler,
     )
     from chainlit.llama_index.callbacks import LlamaIndexCallbackHandler
+
 import chainlit.input_widget as input_widget
 from chainlit.action import Action
 from chainlit.cache import cache
@@ -35,6 +36,7 @@ from chainlit.logger import logger
 from chainlit.message import AskFileMessage, AskUserMessage, ErrorMessage, Message
 from chainlit.sync import make_async, run_sync
 from chainlit.telemetry import trace
+from chainlit.types import FileSpec
 from chainlit.user_session import user_session
 from chainlit.utils import make_module_getattr, wrap_user_function
 from chainlit.version import __version__
@@ -176,6 +178,37 @@ def db_client_factory(
     return func
 
 
+def on_file_upload(
+    accept: Union[List[str], Dict[str, List[str]]],
+    max_size_mb: int = 2,
+    max_files: int = 1,
+) -> Callable:
+    """
+    A decorator designed for handling spontaneously uploaded files.
+    This decorator is intended to be used with files that are uploaded on-the-fly.
+
+    Args:
+        accept (Union[List[str], Dict[str, List[str]]]): A list of accepted file extensions or a dictionary of extension lists per field.
+        type (Optional[str]): The type of upload, defaults to "file".
+        max_size_mb (Optional[int]): The maximum file size in megabytes, defaults to 2.
+        max_files (Optional[int]): The maximum number of files allowed to be uploaded, defaults to 1.
+
+    Returns:
+        Callable: The decorated function for handling spontaneous file uploads.
+    """
+
+    def decorator(func: Callable) -> Callable:
+        config.code.on_file_upload_config = FileSpec(
+            accept=accept,
+            max_size_mb=max_size_mb,
+            max_files=max_files,
+        )
+        config.code.on_file_upload = wrap_user_function(func)
+        return func
+
+    return decorator
+
+
 def sleep(duration: int):
     """
     Sleep for a given duration.
@@ -230,3 +263,7 @@ __all__ = [
     "LlamaIndexCallbackHandler",
     "HaystackAgentCallbackHandler",
 ]
+
+
+def __dir__():
+    return __all__

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/cache.py

@@ -5,17 +5,14 @@ from chainlit.config import config
 from chainlit.logger import logger
 
 
-def is_langchain_installed():
-    from chainlit.langchain import LANGCHAIN_INSTALLED
-
-    return LANGCHAIN_INSTALLED
-
-
 def init_lc_cache():
-    use_cache = config.run.no_cache is False and config.run.ci is False
+    use_cache = config.project.cache is True and config.run.no_cache is False
 
-    if use_cache and is_langchain_installed():
-        import langchain
+    if use_cache:
+        try:
+            import langchain
+        except ImportError:
+            return
         from langchain.cache import SQLiteCache
 
         if config.project.lc_cache_path is not None:

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/cli/deploy.py

@@ -57,7 +57,7 @@ def upload_tar_gz_archive(access_token: str, archive_path: str):
     json_res = res.json()
 
     upload_details = json_res["post"]
-    permanent_url = json_res["permanentUrl"]
+    signedUrl = json_res["signedUrl"]
 
     files = {"file": open(archive_path, "rb")}
 
@@ -69,7 +69,7 @@ def upload_tar_gz_archive(access_token: str, archive_path: str):
         raise Exception(f"Failed to upload archive: {res.text}")
 
     url = f'{upload_details["url"]}/{upload_details["fields"]["key"]}'
-    return permanent_url, url
+    return signedUrl, url
 
 
 def deploy(target: str):

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/client/base.py

@@ -53,6 +53,7 @@ class ElementDict(TypedDict):
     conversationId: Optional[str]
     type: ElementType
     url: str
+    objectKey: Optional[str]
     name: str
     display: ElementDisplay
     size: Optional[ElementSize]
@@ -145,7 +146,7 @@ class BaseDBClient(ABC):
         pass
 
     @abstractmethod
-    async def upload_element(self, content: Union[bytes, str], mime: str) -> str:
+    async def upload_element(self, content: Union[bytes, str], mime: str) -> Dict:
         pass
 
     @abstractmethod

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/client/cloud.py

@@ -424,11 +424,12 @@ class CloudDBClient(BaseDBClient, GraphQLClient):
             return None
 
         mutation = """
-        mutation ($conversationId: ID!, $type: String!, $url: String!, $name: String!, $display: String!, $forIds: [String!]!, $size: String, $language: String) {
-            createElement(conversationId: $conversationId, type: $type, url: $url, name: $name, display: $display, size: $size, language: $language, forIds: $forIds) {
+        mutation ($conversationId: ID!, $type: String!, $name: String!, $display: String!, $forIds: [String!]!, $url: String, $objectKey: String, $size: String, $language: String) {
+            createElement(conversationId: $conversationId, type: $type, url: $url, objectKey: $objectKey, name: $name, display: $display, size: $size, language: $language, forIds: $forIds) {
                 id,
                 type,
                 url,
+                objectKey,
                 name,
                 display,
                 size,
@@ -471,7 +472,7 @@ class CloudDBClient(BaseDBClient, GraphQLClient):
 
         return res["data"]["updateElement"]
 
-    async def upload_element(self, content: Union[bytes, str], mime: str) -> str:
+    async def upload_element(self, content: Union[bytes, str], mime: str) -> Dict:
         id = str(uuid.uuid4())
         body = {"projectId": self.project_id, "fileName": id, "contentType": mime}
 
@@ -486,11 +487,12 @@ class CloudDBClient(BaseDBClient, GraphQLClient):
                 if not r.ok:
                     reason = await r.text()
                     logger.error(f"Failed to upload file: {reason}")
-                    return ""
+                    return {"object_key": None, "url": None}
                 json_res = await r.json()
 
         upload_details = json_res["post"]
-        permanent_url = json_res["permanentUrl"]
+        object_key = upload_details["fields"]["key"]
+        signed_url = json_res["signedUrl"]
 
         form_data = aiohttp.FormData()
 
@@ -508,7 +510,7 @@ class CloudDBClient(BaseDBClient, GraphQLClient):
                 if not upload_response.ok:
                     reason = await upload_response.text()
                     logger.error(f"Failed to upload file: {reason}")
-                    return ""
+                    return {"object_key": None, "url": None}
 
-                url = f'{upload_details["url"]}/{upload_details["fields"]["key"]}'
-                return permanent_url
+                url = f'{upload_details["url"]}/{object_key}'
+                return {"object_key": object_key, "url": signed_url}

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/client/local.py

@@ -39,6 +39,9 @@ class LocalDBClient(BaseDBClient):
             # Sqlite doesn't support list of primitives, so we need to serialize it.
             variables["forIds"] = json.dumps(variables["forIds"])
 
+        if "streaming" in variables:
+            del variables["streaming"]
+
     def after_read(self, variables: Dict):
         if "prompt" in variables:
             # Sqlite doesn't support json fields, so we need to parse it.
@@ -288,7 +291,7 @@ class LocalDBClient(BaseDBClient):
             await out.flush()
 
             url = f"/files/{sub_path}"
-            return url
+            return {"object_key": "", "url": url}
 
     async def set_human_feedback(self, message_id, feedback):
         from prisma.models import Message

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/client/utils.py

@@ -1,6 +1,6 @@
 from typing import Dict, Optional
 
-from fastapi import Request
+from fastapi import HTTPException, Request
 from starlette.datastructures import Headers
 
 from chainlit.client.base import BaseAuthClient, BaseDBClient, UserDict
@@ -30,7 +30,9 @@ async def get_auth_client(
         # Check if the user is a member of the project
         is_project_member = await auth_client.is_project_member()
         if not is_project_member:
-            raise ConnectionRefusedError("User is not a member of the project")
+            raise HTTPException(
+                status_code=401, detail="User is not a member of the project"
+            )
 
         return auth_client
 

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/config.py

@@ -48,6 +48,15 @@ user_env = []
 # Duration (in seconds) during which the session is saved when the connection is lost
 session_timeout = 3600
 
+# Enable third parties caching (e.g LangChain cache)
+cache = false
+
+# Follow symlink for asset mount (see https://github.com/Chainlit/chainlit/issues/317)
+# follow_symlink = false
+
+# Chainlit server address
+# chainlit_server = ""
+
 [UI]
 # Name of the app and chatbot.
 name = "Chatbot"
@@ -90,7 +99,7 @@ generated_by = "{__version__}"
 """
 
 chainlit_prod_url = os.environ.get("CHAINLIT_PROD_URL")
-chainlit_server = "https://cloud.chainlit.io"
+default_chainlit_server = "https://cloud.chainlit.io"
 
 
 DEFAULT_HOST = "0.0.0.0"
@@ -150,6 +159,7 @@ class CodeSettings:
     on_stop: Optional[Callable[[], Any]] = None
     on_chat_start: Optional[Callable[[], Any]] = None
     on_message: Optional[Callable[[str], Any]] = None
+    on_file_upload: Optional[Callable[[str], Any]] = None
     auth_client_factory: Optional[
         Callable[[Optional[Dict[str, str]], Optional[Headers]], "BaseAuthClient"]
     ] = None
@@ -194,6 +204,12 @@ class ProjectSettings(DataClassJsonMixin):
     local_fs_path: Optional[str] = None
     # Duration (in seconds) during which the session is saved when the connection is lost
     session_timeout: int = 3600
+    # Enable third parties caching (e.g LangChain cache)
+    cache: bool = False
+    # Follow symlink for asset mount (see https://github.com/Chainlit/chainlit/issues/317)
+    follow_symlink: bool = False
+    # Chainlit server address
+    chainlit_server: Optional[str] = None
 
 
 @dataclass()
@@ -308,6 +324,11 @@ def load_config():
 
     settings = load_settings()
 
+    chainlit_server = default_chainlit_server
+    project_settings = settings.get("project")
+    if project_settings and project_settings.chainlit_server:
+        chainlit_server = project_settings.chainlit_server
+
     config = ChainlitConfig(
         chainlit_server=chainlit_server,
         chainlit_prod_url=chainlit_prod_url,

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/context.py

@@ -47,4 +47,4 @@ def get_context() -> ChainlitContext:
         raise ChainlitContextException()
 
 
-context = LazyProxy(get_context, enable_cache=False)
+context: ChainlitContext = LazyProxy(get_context, enable_cache=False)

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/db/prisma/schema.prisma

@@ -32,7 +32,8 @@ model Element {
   conversationId String
   conversation   Conversation @relation(fields: [conversationId], references: [id], onDelete: Cascade)
   type           String
-  url            String
+  objectKey      String?
+  url            String?
   name           String
   display        String
   size           String?

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/element.py

@@ -30,6 +30,8 @@ class Element:
     name: Optional[str] = None
     # The URL of the element if already hosted somehwere else.
     url: Optional[str] = None
+    # The S3 object key.
+    object_key: Optional[str] = None
     # The local path of the element.
     path: Optional[str] = None
     # The byte content of the element.
@@ -58,6 +60,7 @@ class Element:
                 "url": self.url or "",
                 "name": self.name or "",
                 "display": self.display,
+                "objectKey": getattr(self, "object_key", None),
                 "size": getattr(self, "size", None),
                 "language": getattr(self, "language", None),
                 "forIds": getattr(self, "for_ids", None),
@@ -84,7 +87,9 @@ class Element:
                 if self.type in mime_types
                 else filetype.guess_mime(self.content)
             )
-            self.url = await client.upload_element(content=self.content, mime=mime)
+            upload_res = await client.upload_element(content=self.content, mime=mime)
+            self.url = upload_res["url"]
+            self.object_key = upload_res["object_key"]
 
         if not self.persisted:
             element_dict = await client.create_element(self.to_dict())

{chainlit-0.6.3 → chainlit-0.6.401}/chainlit/emitter.py

@@ -6,7 +6,7 @@ from socketio.exceptions import TimeoutError
 from chainlit.client.base import BaseDBClient, MessageDict
 from chainlit.message import Message
 from chainlit.session import Session
-from chainlit.types import AskSpec
+from chainlit.types import AskSpec, FileSpec
 
 
 class ChainlitEmitter:
@@ -69,6 +69,11 @@ class ChainlitEmitter:
 
         return self.emit("clear_ask", {})
 
+    def enable_file_upload(self, spec: FileSpec):
+        """Enable uploading file in the UI."""
+
+        return self.emit("enable_file_upload", spec.to_dict())
+
     async def process_user_message(self, message_dict: MessageDict) -> Message:
         # Temporary UUID generated by the frontend should use v4
         assert uuid.UUID(message_dict["id"]).version == 4