Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'FlowiseAI:main' into main

This commit is contained in:
Darien Kindlund 2024-01-22 11:44:05 -05:00 committed by GitHub
parent b76c3b27a9 764efcccb7
commit dd32a31a3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/autoSyncMergedPullRequest.yml vendored
View File

@ -23,4 +23,11 @@ jobs:
token: ${{ secrets.AUTOSYNC_TOKEN }} token: ${{ secrets.AUTOSYNC_TOKEN }}
repository: ${{ secrets.AUTOSYNC_CH_URL }} repository: ${{ secrets.AUTOSYNC_CH_URL }}
event-type: ${{ secrets.AUTOSYNC_PR_EVENT_TYPE }} event-type: ${{ secrets.AUTOSYNC_PR_EVENT_TYPE }}
client-payload: '{"ref": "${{ github.ref }}", "prNumber": "${{ github.event.pull_request.number }}", "sha": "${{ github.sha }}"}' client-payload: >-
{
"ref": "${{ github.ref }}",
"prNumber": "${{ github.event.pull_request.number }}",
"prTitle": "${{ github.event.pull_request.title }}",
"prDescription": "${{ github.event.pull_request.description }}",
"sha": "${{ github.sha }}"
}

7
.github/workflows/autoSyncSingleCommit.yml vendored
View File

@ -28,4 +28,9 @@ jobs:
token: ${{ secrets.AUTOSYNC_TOKEN }} token: ${{ secrets.AUTOSYNC_TOKEN }}
repository: ${{ secrets.AUTOSYNC_CH_URL }} repository: ${{ secrets.AUTOSYNC_CH_URL }}
event-type: ${{ secrets.AUTOSYNC_SC_EVENT_TYPE }} event-type: ${{ secrets.AUTOSYNC_SC_EVENT_TYPE }}
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' client-payload: >-
{
"ref": "${{ github.ref }}",
"sha": "${{ github.sha }}",
"commitMessage": "${{ github.event.commits[0].message }}"
}

6
packages/server/src/index.ts
View File

@ -1825,8 +1825,10 @@ export class App {
flowGraph: getTelemetryFlowObj(nodes, edges) flowGraph: getTelemetryFlowObj(nodes, edges)
}) })
// Only return ChatId when its Internal OR incoming input has ChatId, to avoid confusion when calling API // Prepare response
if (incomingInput.chatId || isInternal) result.chatId = chatId result.chatId = chatId
if (sessionId) result.sessionId = sessionId
if (memoryType) result.memoryType = memoryType
return res.json(result) return res.json(result)
} catch (e: any) { } catch (e: any) {

1
packages/server/src/utils/index.ts
View File

@ -1099,6 +1099,7 @@ export const getTelemetryFlowObj = (nodes: IReactFlowNode[], edges: IReactFlowEd
* TODO: move env variables to settings json file, easier configuration * TODO: move env variables to settings json file, easier configuration
*/ */
export const getUserSettingsFilePath = () => { export const getUserSettingsFilePath = () => {
if (process.env.SECRETKEY_PATH) return path.join(process.env.SECRETKEY_PATH, 'settings.json')
const checkPaths = [path.join(getUserHome(), '.flowise', 'settings.json')] const checkPaths = [path.join(getUserHome(), '.flowise', 'settings.json')]
for (const checkPath of checkPaths) { for (const checkPath of checkPaths) {
if (fs.existsSync(checkPath)) { if (fs.existsSync(checkPath)) {

4
packages/server/src/utils/telemetry.ts
View File

@ -25,7 +25,9 @@ export class Telemetry {
const settings = { const settings = {
instanceId instanceId
} }
const defaultLocation = path.join(getUserHome(), '.flowise', 'settings.json') const defaultLocation = process.env.SECRETKEY_PATH
? path.join(process.env.SECRETKEY_PATH, 'settings.json')
: path.join(getUserHome(), '.flowise', 'settings.json')
await fs.promises.writeFile(defaultLocation, JSON.stringify(settings, null, 2)) await fs.promises.writeFile(defaultLocation, JSON.stringify(settings, null, 2))
return instanceId return instanceId
} }