fix: allow AskFileMessage even if spontaneous uploads are disabled (#…

…1668) * fix: allow AskFileMessage even if spontaneous uploads are disabled * chore: update ruff * fix: comment test_upload_file_disabled test * fix: test
Chainlit · Jan 10, 2025 · 5d006f4 · 5d006f4
1 parent 9c54f1f
commit 5d006f4
Show file tree

Hide file tree

Showing 8 changed files with 355 additions and 337 deletions.
diff --git a/.github/workflows/lint-backend.yaml b/.github/workflows/lint-backend.yaml
@@ -19,12 +19,13 @@ jobs:
       - name: Lint with ruff
         uses: astral-sh/ruff-action@v1
         with:
-          version: '0.8.0'
+          version: '0.9.0'
           src: ${{ env.BACKEND_DIR }}
           changed-files: "true"
       - name: Check formatting with ruff
         uses: astral-sh/ruff-action@v1
         with:
+          version: '0.9.0'
           src: ${{ env.BACKEND_DIR }}
           changed-files: "true"
           args: "format --check"

diff --git a/backend/chainlit/auth/cookie.py b/backend/chainlit/auth/cookie.py
@@ -13,14 +13,13 @@
     os.environ.get("CHAINLIT_COOKIE_SAMESITE", "lax"),
 )
 
-assert (
-    _cookie_samesite
-    in [
-        "lax",
-        "strict",
-        "none",
-    ]
-), "Invalid value for CHAINLIT_COOKIE_SAMESITE. Must be one of 'lax', 'strict' or 'none'."
+assert _cookie_samesite in [
+    "lax",
+    "strict",
+    "none",
+], (
+    "Invalid value for CHAINLIT_COOKIE_SAMESITE. Must be one of 'lax', 'strict' or 'none'."
+)
 _cookie_secure = _cookie_samesite == "none"
 
 _auth_cookie_lifetime = 60 * 60  # 1 hour

diff --git a/backend/chainlit/data/chainlit_data_layer.py b/backend/chainlit/data/chainlit_data_layer.py
@@ -523,7 +523,7 @@ async def update_thread(
 
         # Build the query dynamically based on available fields
         columns = [f'"{k}"' for k in data.keys()]
-        placeholders = [f"${i+1}" for i in range(len(data))]
+        placeholders = [f"${i + 1}" for i in range(len(data))]
         values = list(data.values())
 
         update_sets = [f'"{k}" = EXCLUDED."{k}"' for k in data.keys() if k != "id"]

diff --git a/backend/chainlit/message.py b/backend/chainlit/message.py
@@ -540,7 +540,7 @@ async def send(self) -> Union[AskActionResponse, None]:
         if res is None:
             self.content = "Timed out: no action was taken"
         else:
-            self.content = f'**Selected:** {res["label"]}'
+            self.content = f"**Selected:** {res['label']}"
 
         self.wait_for_answer = False
 

diff --git a/backend/chainlit/server.py b/backend/chainlit/server.py
@@ -1123,11 +1123,14 @@ def validate_file_upload(file: UploadFile):
     Raises:
         ValueError: If the file is not allowed.
     """
-    if config.features.spontaneous_file_upload is None:
-        """Default for a missing config is to allow the fileupload without any restrictions"""
-        return
-    if config.features.spontaneous_file_upload.enabled is False:
-        raise ValueError("File upload is not enabled")
+    # TODO: This logic/endpoint is shared across spontaneous uploads and the AskFileMessage API.
+    # Commenting this check until we find a better solution
+
+    # if config.features.spontaneous_file_upload is None:
+    #     """Default for a missing config is to allow the fileupload without any restrictions"""
+    #     return
+    # if not config.features.spontaneous_file_upload.enabled:
+    #     raise ValueError("File upload is not enabled")
 
     validate_file_mime_type(file)
     validate_file_size(file)
@@ -1140,14 +1143,19 @@ def validate_file_mime_type(file: UploadFile):
     Raises:
         ValueError: If the file type is not allowed.
     """
-    accept = config.features.spontaneous_file_upload.accept
-    if accept is None:
+
+    if (
+        config.features.spontaneous_file_upload is None
+        or config.features.spontaneous_file_upload.accept is None
+    ):
         "Accept is not configured, allowing all file types"
         return
 
-    assert (
-        isinstance(accept, List) or isinstance(accept, dict)
-    ), "Invalid configuration for spontaneous_file_upload, accept must be a list or a dict"
+    accept = config.features.spontaneous_file_upload.accept
+
+    assert isinstance(accept, List) or isinstance(accept, dict), (
+        "Invalid configuration for spontaneous_file_upload, accept must be a list or a dict"
+    )
 
     if isinstance(accept, List):
         for pattern in accept:
@@ -1171,7 +1179,10 @@ def validate_file_size(file: UploadFile):
     Raises:
         ValueError: If the file size is too large.
     """
-    if config.features.spontaneous_file_upload.max_size_mb is None:
+    if (
+        config.features.spontaneous_file_upload is None
+        or config.features.spontaneous_file_upload.max_size_mb is None
+    ):
         return
 
     if (

diff --git a/backend/poetry.lock b/backend/poetry.lock
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -41,7 +41,7 @@ script = "build.py"
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0.0"
 httpx = ">=0.23.0"
-literalai = "0.0.623"
+literalai = "0.1.103"
 dataclasses_json = "^0.6.7"
 fastapi = ">=0.115.3,<0.116"
 starlette = "^0.41.2"
@@ -86,7 +86,7 @@ pandas = "^2.2.2"
 moto = "^5.0.14"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.8.0"
+ruff = "^0.9.0"
 
 [tool.poetry.group.mypy]
 optional = true

diff --git a/backend/tests/test_server.py b/backend/tests/test_server.py
@@ -500,36 +500,36 @@ def test_upload_file_unauthorized(
     assert response.status_code == 422
 
 
-def test_upload_file_disabled(
-    test_client: TestClient,
-    test_config: ChainlitConfig,
-    mock_session_get_by_id_patched: Mock,
-    monkeypatch: pytest.MonkeyPatch,
-):
-    """Test file upload being disabled by config."""
-
-    # Set accept in config
-    monkeypatch.setattr(
-        test_config.features,
-        "spontaneous_file_upload",
-        SpontaneousFileUploadFeature(enabled=False),
-    )
-
-    # Prepare the files to upload
-    file_content = b"Sample file content"
-    files = {
-        "file": ("test_upload.txt", file_content, "text/plain"),
-    }
-
-    # Make the POST request to upload the file
-    response = test_client.post(
-        "/project/file",
-        files=files,
-        params={"session_id": mock_session_get_by_id_patched.id},
-    )
-
-    # Verify the response
-    assert response.status_code == 400
+# def test_upload_file_disabled(
+#     test_client: TestClient,
+#     test_config: ChainlitConfig,
+#     mock_session_get_by_id_patched: Mock,
+#     monkeypatch: pytest.MonkeyPatch,
+# ):
+#     """Test file upload being disabled by config."""
+
+#     # Set accept in config
+#     monkeypatch.setattr(
+#         test_config.features,
+#         "spontaneous_file_upload",
+#         SpontaneousFileUploadFeature(enabled=False),
+#     )
+
+#     # Prepare the files to upload
+#     file_content = b"Sample file content"
+#     files = {
+#         "file": ("test_upload.txt", file_content, "text/plain"),
+#     }
+
+#     # Make the POST request to upload the file
+#     response = test_client.post(
+#         "/project/file",
+#         files=files,
+#         params={"session_id": mock_session_get_by_id_patched.id},
+#     )
+
+#     # Verify the response
+#     assert response.status_code == 400
 
 
 @pytest.mark.parametrize(