chainlit 2.0rc0__py3-none-any.whl → 2.0.1__py3-none-any.whl

chainlit/data/__init__.py

@@ -1,4 +1,5 @@
 import os
+import warnings
 from typing import Optional
 
 from .base import BaseDataLayer
@@ -7,26 +8,106 @@ from .utils import (
 )
 
 _data_layer: Optional[BaseDataLayer] = None
+_data_layer_initialized = False
 
 
 def get_data_layer():
-    global _data_layer
-    print("Getting data layer", _data_layer)
-
-    if not _data_layer:
-        from chainlit.config import config
-
-        if config.code.data_layer:
-            # When @data_layer is configured, call it to get data layer.
-            _data_layer = config.code.data_layer()
-        elif api_key := os.environ.get("LITERAL_API_KEY"):
-            # When LITERAL_API_KEY is defined, use LiteralAI data layer
-            from .literalai import LiteralDataLayer
-
-            # support legacy LITERAL_SERVER variable as fallback
-            server = os.environ.get("LITERAL_API_URL") or os.environ.get(
-                "LITERAL_SERVER"
+    global _data_layer, _data_layer_initialized
+
+    if not _data_layer_initialized:
+        if _data_layer:
+            # Data layer manually set, warn user that this is deprecated.
+
+            warnings.warn(
+                "Setting data layer manually is deprecated. Use @data_layer instead.",
+                DeprecationWarning,
             )
-            _data_layer = LiteralDataLayer(api_key=api_key, server=server)
+
+        else:
+            from chainlit.config import config
+
+            if config.code.data_layer:
+                # When @data_layer is configured, call it to get data layer.
+                _data_layer = config.code.data_layer()
+            elif database_url := os.environ.get("DATABASE_URL"):
+                # Default to Chainlit data layer if DATABASE_URL specified.
+                from .chainlit_data_layer import ChainlitDataLayer
+
+                if os.environ.get("LITERAL_API_KEY"):
+                    warnings.warn(
+                        "Both LITERAL_API_KEY and DATABASE_URL specified. Ignoring Literal AI data layer and relying on data layer pointing to DATABASE_URL."
+                    )
+                bucket_name = os.environ.get("BUCKET_NAME")
+
+                # AWS S3
+                aws_region = os.getenv("APP_AWS_REGION")
+                aws_access_key = os.getenv("APP_AWS_ACCESS_KEY")
+                aws_secret_key = os.getenv("APP_AWS_SECRET_KEY")
+                dev_aws_endpoint = os.getenv("DEV_AWS_ENDPOINT")
+                is_using_s3 = bool(aws_access_key and aws_secret_key and aws_region)
+
+                # Google Cloud Storage
+                gcs_project_id = os.getenv("APP_GCS_PROJECT_ID")
+                gcs_client_email = os.getenv("APP_GCS_CLIENT_EMAIL")
+                gcs_private_key = os.getenv("APP_GCS_PRIVATE_KEY")
+                is_using_gcs = bool(
+                    gcs_project_id and gcs_client_email and gcs_private_key
+                )
+
+                # Azure Storage
+                azure_storage_account = os.getenv("APP_AZURE_STORAGE_ACCOUNT")
+                azure_storage_key = os.getenv("APP_AZURE_STORAGE_ACCESS_KEY")
+                is_using_azure = bool(azure_storage_account and azure_storage_key)
+
+                storage_client = None
+
+                if sum([is_using_s3, is_using_gcs, is_using_azure]) > 1:
+                    warnings.warn(
+                        "Multiple storage configurations detected. Please use only one."
+                    )
+                elif is_using_s3:
+                    from chainlit.data.storage_clients.s3 import S3StorageClient
+
+                    storage_client = S3StorageClient(
+                        bucket=bucket_name,
+                        region_name=aws_region,
+                        aws_access_key_id=aws_access_key,
+                        aws_secret_access_key=aws_secret_key,
+                        endpoint_url=dev_aws_endpoint,
+                    )
+                elif is_using_gcs:
+                    from chainlit.data.storage_clients.gcs import GCSStorageClient
+
+                    storage_client = GCSStorageClient(
+                        project_id=gcs_project_id,
+                        client_email=gcs_client_email,
+                        private_key=gcs_private_key,
+                        bucket_name=bucket_name,
+                    )
+                elif is_using_azure:
+                    from chainlit.data.storage_clients.azure_blob import (
+                        AzureBlobStorageClient,
+                    )
+
+                    storage_client = AzureBlobStorageClient(
+                        container_name=bucket_name,
+                        storage_account=azure_storage_account,
+                        storage_key=azure_storage_key,
+                    )
+
+                _data_layer = ChainlitDataLayer(
+                    database_url=database_url, storage_client=storage_client
+                )
+            elif api_key := os.environ.get("LITERAL_API_KEY"):
+                # When LITERAL_API_KEY is defined, use Literal AI data layer
+                from .literalai import LiteralDataLayer
+
+                # support legacy LITERAL_SERVER variable as fallback
+                server = os.environ.get("LITERAL_API_URL") or os.environ.get(
+                    "LITERAL_SERVER"
+                )
+                _data_layer = LiteralDataLayer(api_key=api_key, server=server)
+
+        _data_layer_initialized = True
 
     return _data_layer

chainlit/data/acl.py

@@ -1,6 +1,7 @@
-from chainlit.data import get_data_layer
 from fastapi import HTTPException
 
+from chainlit.data import get_data_layer
+
 
 async def is_thread_author(username: str, thread_id: str):
     data_layer = get_data_layer()
@@ -8,7 +9,7 @@ async def is_thread_author(username: str, thread_id: str):
         raise HTTPException(status_code=400, detail="Data layer not initialized")
 
     thread_author = await data_layer.get_thread_author(thread_id)
-    
+
     if not thread_author:
         raise HTTPException(status_code=404, detail="Thread not found")
 

chainlit/data/base.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Dict, List, Optional
 
 from chainlit.types import (
     Feedback,