Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,20 @@
"rollup": "4.45.0",
"semver": "7.7.1",
"set-value": "4.1.0",
"solid-js": "1.9.7",
"tar-fs": "3.1.0",
"solid-js": "1.9.11",
"protobufjs": ">=7.5.5",
"tar-fs": "3.1.1",
"unset-value": "2.0.1",
"webpack-dev-middleware": "7.4.2",
"ws": "8.18.3",
"xlsx": "0.18.5",
"uuid": "^10.0.0",
"request>uuid": "^3.4.0"
"request>uuid": "^3.4.0",
"@tootallnate/once": ">=3.0.1",
"tmp": ">=0.2.4",
"@elastic/transport": ">=8.9.3",
"@modelcontextprotocol/sdk": ">=1.25.2",
Comment thread
0xi4o marked this conversation as resolved.
"multer": ">=2.1.1"
}
},
"engines": {
Expand All @@ -107,7 +113,7 @@
"@langchain/core": "1.1.20",
"@qdrant/openapi-typescript-fetch": "1.2.6",
"openai": "6.19.0",
"protobufjs": "7.4.0",
"protobufjs": "7.5.5",
"uuid": "^10.0.0"
},
"eslintIgnore": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeOutputsValue, INodeParams } from '../../../src/Interface'
import { handleDocumentLoaderDocuments, handleDocumentLoaderMetadata, handleDocumentLoaderOutput } from '../../../src/utils'
import { getAWSCredentialConfig } from '../../../src/awsToolsUtils'
import { getAWSCredentialConfig, AWSCredentials } from '../../../src/awsToolsUtils'
import { getSafeFilePath } from '../../../src/validator'
import { S3Client, GetObjectCommand, S3ClientConfig, ListObjectsV2Command, ListObjectsV2Output } from '@aws-sdk/client-s3'
import { getRegions, MODEL_TYPE } from '../../../src/modelLoader'
Expand Down Expand Up @@ -153,7 +153,7 @@ class S3_DocumentLoaders implements INode {
const _omitMetadataKeys = nodeData.inputs?.omitMetadataKeys as string
const output = nodeData.outputs?.output as string

let credentials: S3ClientConfig['credentials'] | undefined
let credentials: AWSCredentials | undefined
if (nodeData.credential) {
const credentialConfig = await getAWSCredentialConfig(nodeData, options, region)
credentials = credentialConfig.credentials
Expand Down
4 changes: 2 additions & 2 deletions packages/components/nodes/documentloaders/S3File/S3File.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
HiResModelName
} from '@langchain/community/document_loaders/fs/unstructured'
import { handleDocumentLoaderDocuments, handleDocumentLoaderMetadata, handleDocumentLoaderOutput } from '../../../src/utils'
import { getAWSCredentialConfig } from '../../../src/awsToolsUtils'
import { getAWSCredentialConfig, AWSCredentials } from '../../../src/awsToolsUtils'
import { getSafeFilePath } from '../../../src/validator'
import { S3Client, GetObjectCommand, HeadObjectCommand, S3ClientConfig } from '@aws-sdk/client-s3'
import { getRegions, MODEL_TYPE } from '../../../src/modelLoader'
Expand Down Expand Up @@ -576,7 +576,7 @@ class S3_DocumentLoaders implements INode {
omitMetadataKeys = _omitMetadataKeys.split(',').map((key) => key.trim())
}

let credentials: S3ClientConfig['credentials'] | undefined
let credentials: AWSCredentials | undefined
if (nodeData.credential) {
const credentialConfig = await getAWSCredentialConfig(nodeData, options, region)
credentials = credentialConfig.credentials
Expand Down
22 changes: 11 additions & 11 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@
"@anthropic-ai/sdk": "^0.73.0",
"@apidevtools/json-schema-ref-parser": "^11.7.0",
"@arizeai/openinference-instrumentation-langchain": "^2.0.0",
"@aws-sdk/client-bedrock": "3.966.0",
"@aws-sdk/client-bedrock-runtime": "3.966.0",
"@aws-sdk/client-dynamodb": "^3.360.0",
"@aws-sdk/client-kendra": "^3.750.0",
"@aws-sdk/client-s3": "^3.844.0",
"@aws-sdk/client-secrets-manager": "^3.699.0",
"@aws-sdk/client-sns": "^3.699.0",
"@aws-sdk/client-sts": "^3.699.0",
"@aws-sdk/client-bedrock": "^3.1014.0",
"@aws-sdk/client-bedrock-runtime": "^3.1014.0",
"@aws-sdk/client-dynamodb": "^3.1014.0",
"@aws-sdk/client-kendra": "^3.1014.0",
"@aws-sdk/client-s3": "^3.1014.0",
"@aws-sdk/client-secrets-manager": "^3.1014.0",
"@aws-sdk/client-sns": "^3.1014.0",
"@aws-sdk/client-sts": "^3.1014.0",
"@azure/storage-blob": "^12.29.0",
"@brave/brave-search-mcp-server": "2.0.80",
"@datastax/astra-db-ts": "1.5.0",
"@dqbd/tiktoken": "^1.0.21",
"@e2b/code-interpreter": "^1.5.1",
"@elastic/elasticsearch": "^8.9.0",
"@elastic/elasticsearch": "^8.16.0",
"@elevenlabs/elevenlabs-js": "^2.8.0",
"@getzep/zep-cloud": "~1.0.7",
"@getzep/zep-js": "^0.9.0",
Expand Down Expand Up @@ -108,7 +108,7 @@
"@opentelemetry/sdk-trace-base": "1.27.0",
"@opentelemetry/semantic-conventions": "1.27.0",
"@pinecone-database/pinecone": "4.0.0",
"@qdrant/js-client-rest": "^1.17.0",
"@qdrant/js-client-rest": "^1.18.0",
"@stripe/agent-toolkit": "^0.1.20",
"@supabase/supabase-js": "^2.29.0",
"@types/js-yaml": "^4.0.5",
Expand Down Expand Up @@ -178,7 +178,7 @@
"sanitize-filename": "^1.6.3",
"srt-parser-2": "^1.2.3",
"supergateway": "3.0.1",
"typeorm": "^0.3.6",
"typeorm": "^0.3.28",
"uuid": "^10.0.0",
"vm2": "3.11.2",
"weaviate-client": "3.12.0",
Expand Down
20 changes: 6 additions & 14 deletions packages/components/src/storage/S3StorageProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,12 @@ export class S3StorageProvider extends BaseStorageProvider {
}

const s3Config: S3ClientConfig = {
region: region,
forcePathStyle: forcePathStyle
}

// Only include endpoint if customURL is not empty
if (customURL && customURL.trim() !== '') {
s3Config.endpoint = customURL
}

if (accessKeyId && accessKeyId.trim() !== '' && secretAccessKey && secretAccessKey.trim() !== '') {
s3Config.credentials = {
accessKeyId: accessKeyId,
secretAccessKey: secretAccessKey
}
region,
forcePathStyle,
...(customURL && customURL.trim() !== '' ? { endpoint: customURL } : {}),
...(accessKeyId && accessKeyId.trim() !== '' && secretAccessKey && secretAccessKey.trim() !== ''
? { credentials: { accessKeyId, secretAccessKey } }
: {})
}

const s3Client = new S3Client(s3Config)
Expand Down
8 changes: 4 additions & 4 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
},
"license": "SEE LICENSE IN LICENSE.md",
"dependencies": {
"@aws-sdk/client-secrets-manager": "^3.699.0",
"@aws-sdk/client-secrets-manager": "^3.1014.0",
"@bull-board/api": "^6.11.0",
"@bull-board/express": "^6.11.0",
"@modelcontextprotocol/sdk": "^1.10.1",
"@modelcontextprotocol/sdk": "1.29.0",
"@google-cloud/logging-winston": "^6.0.0",
"@keyv/redis": "^4.2.0",
"@oclif/core": "4.0.7",
Expand Down Expand Up @@ -121,7 +121,7 @@
"lodash": "^4.17.21",
"moment": "^2.29.3",
"moment-timezone": "^0.5.34",
"multer": "^2.0.2",
"multer": "^2.1.1",
"multer-azure-blob-storage": "^1.2.0",
"multer-cloud-storage": "^4.0.0",
"multer-s3": "^3.0.1",
Expand All @@ -148,7 +148,7 @@
"sqlite3": "^5.1.6",
"stripe": "^15.6.0",
"turndown": "^7.2.0",
"typeorm": "^0.3.6",
"typeorm": "^0.3.28",
"uuid": "^10.0.0",
"winston": "^3.9.0",
"winston-azure-blob": "^1.5.0",
Expand Down
Loading
Loading