Skip to content

OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.

Python

S3: env fallback & show bucket errors

Edwin Jose7658d538ee2b
diff --git a/frontend/app/settings/_components/connector-card.tsx b/frontend/app/settings/_components/connector-card.tsx
index 37c08dc77..93711ea06 100644
--- a/frontend/app/settings/_components/connector-card.tsx
+++ b/frontend/app/settings/_components/connector-card.tsx
@@ -80,7 +80,7 @@ export default function ConnectorCard({
</div>
</CardHeader>
<CardContent className="flex-1 flex flex-col justify-end space-y-4">
- {connector?.available ? (
+ {connector?.available || isConnected ? (
<div className="space-y-3">
{isConnected ? (
<div className="flex gap-2 overflow-hidden w-full">
diff --git a/frontend/app/upload/[provider]/page.tsx b/frontend/app/upload/[provider]/page.tsx
index 464e7c283..1b43564df 100644
--- a/frontend/app/upload/[provider]/page.tsx
+++ b/frontend/app/upload/[provider]/page.tsx
@@ -211,7 +211,7 @@ function S3BucketView({
onDone: () => void;
}) {
const queryClient = useQueryClient();
- const { data: buckets, isLoading, refetch } = useS3BucketStatusQuery(
+ const { data: buckets, isLoading, error: bucketsError, refetch } = useS3BucketStatusQuery(
connector.connectionId,
{ enabled: true },
);
@@ -321,6 +321,10 @@ function S3BucketView({
<div className="flex justify-center py-8">
<div className="animate-spin rounded-full h-6 w-6 border-b-2 border-primary" />
</div>
+ ) : bucketsError ? (
+ <div className="rounded-lg border border-destructive/50 p-6 text-center text-destructive text-sm">
+ {(bucketsError as Error).message || "Failed to load buckets. Check your S3 credentials and endpoint."}
+ </div>
) : !buckets?.length ? (
<div className="rounded-lg border p-6 text-center text-muted-foreground text-sm">
No buckets found. Check your S3 credentials and endpoint.
diff --git a/src/connectors/aws_s3/connector.py b/src/connectors/aws_s3/connector.py
index 917e002bd..0b5ec749a 100644
--- a/src/connectors/aws_s3/connector.py
+++ b/src/connectors/aws_s3/connector.py
@@ -51,6 +51,26 @@ class S3Connector(BaseConnector):
CLIENT_ID_ENV_VAR = "AWS_ACCESS_KEY_ID"
CLIENT_SECRET_ENV_VAR = "AWS_SECRET_ACCESS_KEY"
+ def get_client_id(self) -> str:
+ """Return access key from config dict, or AWS_ACCESS_KEY_ID env var as fallback."""
+ val = self.config.get("access_key") or os.getenv("AWS_ACCESS_KEY_ID")
+ if val:
+ return val
+ raise ValueError(
+ "S3 credentials not set. Provide 'access_key' in the connector config "
+ "or set the AWS_ACCESS_KEY_ID environment variable."
+ )
+
+ def get_client_secret(self) -> str:
+ """Return secret key from config dict, or AWS_SECRET_ACCESS_KEY env var as fallback."""
+ val = self.config.get("secret_key") or os.getenv("AWS_SECRET_ACCESS_KEY")
+ if val:
+ return val
+ raise ValueError(
+ "S3 credentials not set. Provide 'secret_key' in the connector config "
+ "or set the AWS_SECRET_ACCESS_KEY environment variable."
+ )
+
def __init__(self, config: Dict[str, Any]):
if config is None:
config = {}