Merge branch 'main' into feature/postgres-ssl-flag-option

LICENSE.md

@@ -2,22 +2,6 @@
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
-Flowise is governed by the Apache License 2.0, with additional terms and conditions outlined below:
-
-Flowise can be used for commercial purposes for "backend-as-a-service" for your applications or as a development platform for enterprises. However, under specific conditions, you must reach out to the project's administrators to secure a commercial license:
-
-a. Multi-tenant SaaS service: Unless you have explicit written authorization from Flowise, you may not utilize the Flowise source code to operate a multi-tenant SaaS service that closely resembles the Flowise cloud-based services.
-b. Logo and copyright information: While using Flowise in commercial application, you are prohibited from removing or altering the LOGO or copyright information displayed in the Flowise console and UI.
-
-For inquiries regarding licensing matters, please contact [email protected] via email.
-
-Contributors are required to consent to the following terms related to their contributed code:
-
-a. The project maintainers have the authority to modify the open-source agreement to be more stringent or lenient.
-b. Contributed code can be used for commercial purposes, including Flowise's cloud-based services.
-
-All other rights and restrictions are in accordance with the Apache License 2.0.
-
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
 1. Definitions.

packages/components/nodes/vectorstores/Qdrant/Qdrant.ts

@@ -149,9 +149,12 @@ class Qdrant_VectorStores implements INode {
             const credentialData = await getCredentialData(nodeData.credential ?? '', options)
             const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData)
 
+            const port = Qdrant_VectorStores.determinePortByUrl(qdrantServerUrl)
+
             const client = new QdrantClient({
                 url: qdrantServerUrl,
-                apiKey: qdrantApiKey
+                apiKey: qdrantApiKey,
+                port: port
             })
 
             const flattenDocs = docs && docs.length ? flatten(docs) : []
@@ -198,9 +201,12 @@ class Qdrant_VectorStores implements INode {
         const credentialData = await getCredentialData(nodeData.credential ?? '', options)
         const qdrantApiKey = getCredentialParam('qdrantApiKey', credentialData, nodeData)
 
+        const port = Qdrant_VectorStores.determinePortByUrl(qdrantServerUrl)
+
         const client = new QdrantClient({
             url: qdrantServerUrl,
-            apiKey: qdrantApiKey
+            apiKey: qdrantApiKey,
+            port: port
         })
 
         const dbConfig: QdrantLibArgs = {
@@ -242,6 +248,28 @@ class Qdrant_VectorStores implements INode {
         }
         return vectorStore
     }
+
+    /**
+     * Determine the port number from the given URL.
+     *
+     * The problem is when not doing this the qdrant-client.js will fall back on 6663 when you enter a port 443 and 80.
+     * See: https://stackoverflow.com/questions/59104197/nodejs-new-url-urlhttps-myurl-com80-lists-the-port-as-empty
+     * @param qdrantServerUrl the url to get the port from
+     */
+    static determinePortByUrl(qdrantServerUrl: string): number {
+        const parsedUrl = new URL(qdrantServerUrl)
+
+        let port = parsedUrl.port ? parseInt(parsedUrl.port) : 6663
+
+        if (parsedUrl.protocol === 'https:' && parsedUrl.port === '') {
+            port = 443
+        }
+        if (parsedUrl.protocol === 'http:' && parsedUrl.port === '') {
+            port = 80
+        }
+
+        return port
+    }
 }
 
 module.exports = { nodeClass: Qdrant_VectorStores }

packages/components/package.json

@@ -53,9 +53,9 @@
         "husky": "^8.0.3",
         "ioredis": "^5.3.2",
         "langchain": "^0.0.214",
-        "langfuse": "^1.2.0",
-        "langfuse-langchain": "^1.0.31",
-        "langsmith": "^0.0.53",
+        "langfuse": "2.0.2",
+        "langfuse-langchain": "2.0.2",
+        "langsmith": "0.0.53",
         "linkifyjs": "^4.1.1",
         "llmonitor": "^0.5.5",
         "mammoth": "^1.5.1",

packages/components/src/handler.ts

@@ -538,7 +538,7 @@ export class AnalyticHandler {
             if (trace) {
                 const generation = trace.generation({
                     name,
-                    prompt: input
+                    input: input
                 })
                 this.handlers['langFuse'].generation = { [generation.id]: generation }
                 returnIds['langFuse'].generation = generation.id
@@ -583,7 +583,7 @@ export class AnalyticHandler {
             const generation: LangfuseGenerationClient | undefined = this.handlers['langFuse'].generation[returnIds['langFuse'].generation]
             if (generation) {
                 generation.end({
-                    completion: output
+                    output: output
                 })
             }
         }
@@ -618,7 +618,7 @@ export class AnalyticHandler {
             const generation: LangfuseGenerationClient | undefined = this.handlers['langFuse'].generation[returnIds['langFuse'].generation]
             if (generation) {
                 generation.end({
-                    completion: error
+                    output: error
                 })
             }
         }