Support Confluence cookies

llama-index-integrations/readers/llama-index-readers-confluence/README.md

@@ -18,9 +18,10 @@ The following order is used for checking authentication credentials:
 
 1. `oauth2`
 2. `api_token`
-3. `user_name` and `password`
-4. Environment variable `CONFLUENCE_API_TOKEN`
-5. Environment variable `CONFLUENCE_USERNAME` and `CONFLUENCE_PASSWORD`
+3. `cookies`
+4. `user_name` and `password`
+5. Environment variable `CONFLUENCE_API_TOKEN`
+6. Environment variable `CONFLUENCE_USERNAME` and `CONFLUENCE_PASSWORD`
 
 For more on authenticating using OAuth 2.0, checkout:
 

llama-index-integrations/readers/llama-index-readers-confluence/llama_index/readers/confluence/base.py

@@ -31,6 +31,7 @@ class ConfluenceReader(BaseReader):
         base_url (str): 'base_url' for confluence cloud instance, this is suffixed with '/wiki', eg 'https://yoursite.atlassian.com/wiki'
         cloud (bool): connecting to Confluence Cloud or self-hosted instance
         api_token (str): Confluence API token, see https://confluence.atlassian.com/cloud/api-tokens-938839638.html
+        cookies (dict): Confluence cookies, see https://atlassian-python-api.readthedocs.io/index.html
         user_name (str): Confluence username, used for basic auth. Must be used with `password`.
         password (str): Confluence password, used for basic auth. Must be used with `user_name`.
         client_args (dict): Additional keyword arguments to pass directly to the Atlassian Confluence client constructor, for example `{'backoff_and_retry': True}`.
@@ -43,6 +44,7 @@ def __init__(
         oauth2: Optional[Dict] = None,
         cloud: bool = True,
         api_token: Optional[str] = None,
+        cookies: Optional[dict] = None,
         user_name: Optional[str] = None,
         password: Optional[str] = None,
         client_args: Optional[dict] = None,
@@ -71,6 +73,10 @@ def __init__(
                 self.confluence = Confluence(
                     url=base_url, token=api_token, cloud=cloud, **client_args
                 )
+            elif cookies is not None:
+                self.confluence = Confluence(
+                    url=base_url, cookies=cookies, cloud=cloud, **client_args
+                )
             elif user_name is not None and password is not None:
                 self.confluence = Confluence(
                     url=base_url,

llama-index-integrations/readers/llama-index-readers-confluence/pyproject.toml

@@ -28,7 +28,7 @@ license = "MIT"
 maintainers = ["zywilliamli"]
 name = "llama-index-readers-confluence"
 readme = "README.md"
-version = "0.3.0"
+version = "0.3.1"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"

llama-index-integrations/readers/llama-index-readers-confluence/tests/test_readers_confluence.py

@@ -33,6 +33,14 @@ def test_confluence_reader_with_api_token():
     assert reader.confluence is not None
 
 
+def test_confluence_reader_with_cookies():
+    reader = ConfluenceReader(
+        base_url="https://example.atlassian.net/wiki",
+        cookies={"key": "value"},
+    )
+    assert reader.confluence is not None
+
+
 def test_confluence_reader_with_client_args():
     with patch("atlassian.Confluence") as MockConstructor:
         reader = ConfluenceReader(