Skip to content

The agent engineering platform.

Allow ConfluenceLoader authorization via Personal Access Tokens (#25096)

Dominik Fladungffa0c838d835
diff --git a/libs/community/langchain_community/document_loaders/confluence.py b/libs/community/langchain_community/document_loaders/confluence.py
index f69d67f2e2..37256d81ce 100644
--- a/libs/community/langchain_community/document_loaders/confluence.py
+++ b/libs/community/langchain_community/document_loaders/confluence.py
@@ -256,22 +256,53 @@ class ConfluenceLoader(BaseLoader):
x is not None for x in ((api_key or username), session, oauth2, token)
)
if sum(non_null_creds) > 1:
- all_names = ("(api_key, username)", "session", "oath2", "token")
+ all_names = ("(api_key, username)", "session", "oauth2", "token")
provided = tuple(n for x, n in zip(non_null_creds, all_names) if x)
errors.append(
f"Cannot provide a value for more than one of: {all_names}. Received "
f"values for: {provided}"
)
- if oauth2 and set(oauth2.keys()) != {
- "access_token",
- "access_token_secret",
- "consumer_key",
- "key_cert",
- }:
+
+ if (
+ oauth2
+ and set(oauth2.keys())
+ == {
+ "token",
+ "client_id",
+ }
+ and set(oauth2["token"].keys())
+ != {
+ "access_token",
+ "token_type",
+ }
+ ):
+ # OAuth2 token authentication
errors.append(
"You have either omitted require keys or added extra "
"keys to the oauth2 dictionary. key values should be "
- "`['access_token', 'access_token_secret', 'consumer_key', 'key_cert']`"
+ "`['client_id', 'token': ['access_token', 'token_type']]`"
+ )
+
+ if (
+ oauth2
+ and set(oauth2.keys())
+ != {
+ "access_token",
+ "access_token_secret",
+ "consumer_key",
+ "key_cert",
+ }
+ and set(oauth2.keys())
+ != {
+ "token",
+ "client_id",
+ }
+ ):
+ errors.append(
+ "You have either omitted required keys or added extra "
+ "keys to the oauth2 dictionary. key values should be "
+ "`['access_token', 'access_token_secret', 'consumer_key', 'key_cert']` "
+ "or `['client_id', 'token': ['access_token', 'token_type']]`"
)
return errors or None