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

Fix merge conflicts and build issues

This commit is contained in:
Ilango 2024-03-12 13:19:16 +05:30
parent 4a7da99996
commit dc59b0468f
10 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ import logger from './utils/logger'
import { expressRequestLogger } from './utils/logger' import { expressRequestLogger } from './utils/logger'
import { v4 as uuidv4 } from 'uuid' import { v4 as uuidv4 } from 'uuid'
import OpenAI from 'openai' import OpenAI from 'openai'
import { DataSource, FindOptionsWhere, MoreThanOrEqual, LessThanOrEqual } from 'typeorm' import { DataSource, FindOptionsWhere, MoreThanOrEqual, LessThanOrEqual, Between } from 'typeorm'
import { import {
IChatFlow, IChatFlow,
IncomingInput, IncomingInput,

0
packages/ui/src/ui-component/cards/StatsCard.js → packages/ui/src/ui-component/cards/StatsCard.jsx
View File

8
packages/ui/src/ui-component/dialog/AllowedDomains.jsx
View File

@ -1,20 +1,20 @@
import { useDispatch } from 'react-redux' import { useDispatch } from 'react-redux'
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions'
// material-ui // material-ui
import { Button, IconButton, OutlinedInput, Box, List, InputAdornment } from '@mui/material' import { Button, IconButton, OutlinedInput, Box, List, InputAdornment } from '@mui/material'
import { IconX, IconTrash, IconPlus } from '@tabler/icons' import { IconX, IconTrash, IconPlus } from '@tabler/icons'
// Project import // Project import
import { StyledButton } from 'ui-component/button/StyledButton' import { StyledButton } from '@/ui-component/button/StyledButton'
// store // store
import useNotifier from 'utils/useNotifier' import useNotifier from '@/utils/useNotifier'
// API // API
import chatflowsApi from 'api/chatflows' import chatflowsApi from '@/api/chatflows'
const AllowedDomains = ({ dialogProps }) => { const AllowedDomains = ({ dialogProps }) => {
const dispatch = useDispatch() const dispatch = useDispatch()

22
packages/ui/src/ui-component/dialog/AnalyseFlow.jsx
View File

@ -1,7 +1,7 @@
import { useDispatch } from 'react-redux' import { useDispatch } from 'react-redux'
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions'
// material-ui // material-ui
import { import {
@ -19,20 +19,20 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
import { IconX } from '@tabler/icons' import { IconX } from '@tabler/icons'
// Project import // Project import
import CredentialInputHandler from 'views/canvas/CredentialInputHandler' import CredentialInputHandler from '@/views/canvas/CredentialInputHandler'
import { TooltipWithParser } from 'ui-component/tooltip/TooltipWithParser' import { TooltipWithParser } from '@/ui-component/tooltip/TooltipWithParser'
import { SwitchInput } from 'ui-component/switch/Switch' import { SwitchInput } from '@/ui-component/switch/Switch'
import { Input } from 'ui-component/input/Input' import { Input } from '@/ui-component/input/Input'
import { StyledButton } from 'ui-component/button/StyledButton' import { StyledButton } from '@/ui-component/button/StyledButton'
import langsmithPNG from 'assets/images/langchain.png' import langsmithPNG from '@/assets/images/langchain.png'
import langfuseSVG from 'assets/images/langfuse.svg' import langfuseSVG from '@/assets/images/langfuse.svg'
import lunarySVG from 'assets/images/lunary.svg' import lunarySVG from '@/assets/images/lunary.svg'
// store // store
import useNotifier from 'utils/useNotifier' import useNotifier from '@/utils/useNotifier'
// API // API
import chatflowsApi from 'api/chatflows' import chatflowsApi from '@/api/chatflows'
const analyticProviders = [ const analyticProviders = [
{ {

10
packages/ui/src/ui-component/dialog/ChatFeedback.jsx
View File

@ -1,21 +1,21 @@
import { useDispatch } from 'react-redux' import { useDispatch } from 'react-redux'
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions'
// material-ui // material-ui
import { Button, Box } from '@mui/material' import { Button, Box } from '@mui/material'
import { IconX } from '@tabler/icons' import { IconX } from '@tabler/icons'
// Project import // Project import
import { StyledButton } from 'ui-component/button/StyledButton' import { StyledButton } from '@/ui-component/button/StyledButton'
import { SwitchInput } from 'ui-component/switch/Switch' import { SwitchInput } from '@/ui-component/switch/Switch'
// store // store
import useNotifier from 'utils/useNotifier' import useNotifier from '@/utils/useNotifier'
// API // API
import chatflowsApi from 'api/chatflows' import chatflowsApi from '@/api/chatflows'
const ChatFeedback = ({ dialogProps }) => { const ChatFeedback = ({ dialogProps }) => {
const dispatch = useDispatch() const dispatch = useDispatch()

2
packages/ui/src/ui-component/dialog/ChatflowConfigurationDialog.jsx
View File

@ -4,7 +4,7 @@ import { useSelector } from 'react-redux'
import { createPortal } from 'react-dom' import { createPortal } from 'react-dom'
import { Box, Dialog, DialogContent, DialogTitle, Tabs, Tab } from '@mui/material' import { Box, Dialog, DialogContent, DialogTitle, Tabs, Tab } from '@mui/material'
import SpeechToText from './SpeechToText' import SpeechToText from './SpeechToText'
import Configuration from 'views/chatflows/Configuration' import Configuration from '@/views/chatflows/Configuration'
import AllowedDomains from './AllowedDomains' import AllowedDomains from './AllowedDomains'
import ChatFeedback from './ChatFeedback' import ChatFeedback from './ChatFeedback'
import AnalyseFlow from './AnalyseFlow' import AnalyseFlow from './AnalyseFlow'

22
packages/ui/src/ui-component/dialog/SpeechToText.jsx
View File

@ -1,27 +1,27 @@
import { useDispatch } from 'react-redux' import { useDispatch } from 'react-redux'
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions'
// material-ui // material-ui
import { Typography, Box, Button, FormControl, ListItem, ListItemAvatar, ListItemText, MenuItem, Select } from '@mui/material' import { Typography, Box, Button, FormControl, ListItem, ListItemAvatar, ListItemText, MenuItem, Select } from '@mui/material'
import { IconX } from '@tabler/icons' import { IconX } from '@tabler/icons'
// Project import // Project import
import CredentialInputHandler from 'views/canvas/CredentialInputHandler' import CredentialInputHandler from '@/views/canvas/CredentialInputHandler'
import { TooltipWithParser } from 'ui-component/tooltip/TooltipWithParser' import { TooltipWithParser } from '@/ui-component/tooltip/TooltipWithParser'
import { SwitchInput } from 'ui-component/switch/Switch' import { SwitchInput } from '@/ui-component/switch/Switch'
import { Input } from 'ui-component/input/Input' import { Input } from '@/ui-component/input/Input'
import { StyledButton } from 'ui-component/button/StyledButton' import { StyledButton } from '@/ui-component/button/StyledButton'
import { Dropdown } from 'ui-component/dropdown/Dropdown' import { Dropdown } from '@/ui-component/dropdown/Dropdown'
import openAISVG from 'assets/images/openai.svg' import openAISVG from '@/assets/images/openai.svg'
import assemblyAIPng from 'assets/images/assemblyai.png' import assemblyAIPng from '@/assets/images/assemblyai.png'
// store // store
import useNotifier from 'utils/useNotifier' import useNotifier from '@/utils/useNotifier'
// API // API
import chatflowsApi from 'api/chatflows' import chatflowsApi from '@/api/chatflows'
const speechToTextProviders = { const speechToTextProviders = {
openAIWhisper: { openAIWhisper: {

8
packages/ui/src/ui-component/dialog/StarterPrompts.jsx
View File

@ -1,20 +1,20 @@
import { useDispatch } from 'react-redux' import { useDispatch } from 'react-redux'
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from 'store/actions' import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction, SET_CHATFLOW } from '@/store/actions'
// material-ui // material-ui
import { Button, IconButton, OutlinedInput, Box, List, InputAdornment } from '@mui/material' import { Button, IconButton, OutlinedInput, Box, List, InputAdornment } from '@mui/material'
import { IconX, IconTrash, IconPlus, IconBulb } from '@tabler/icons' import { IconX, IconTrash, IconPlus, IconBulb } from '@tabler/icons'
// Project import // Project import
import { StyledButton } from 'ui-component/button/StyledButton' import { StyledButton } from '@/ui-component/button/StyledButton'
// store // store
import useNotifier from 'utils/useNotifier' import useNotifier from '@/utils/useNotifier'
// API // API
import chatflowsApi from 'api/chatflows' import chatflowsApi from '@/api/chatflows'
const StarterPrompts = ({ dialogProps }) => { const StarterPrompts = ({ dialogProps }) => {
const dispatch = useDispatch() const dispatch = useDispatch()

0
packages/ui/src/ui-component/extended/Feedback.js → packages/ui/src/ui-component/extended/Feedback.jsx
View File

20
pnpm-lock.yaml
View File

@ -4227,7 +4227,7 @@ packages:
dependencies: dependencies:
lodash.camelcase: 4.3.0 lodash.camelcase: 4.3.0
long: 5.2.3 long: 5.2.3
protobufjs: 7.2.4 protobufjs: 7.2.6
yargs: 17.7.2 yargs: 17.7.2
dev: false dev: false
@ -23845,6 +23845,24 @@ packages:
long: 5.2.3 long: 5.2.3
dev: false dev: false
/protobufjs@7.2.6:
resolution: {integrity: sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==}
engines: {node: '>=12.0.0'}
dependencies:
'@protobufjs/aspromise': 1.1.2
'@protobufjs/base64': 1.1.2
'@protobufjs/codegen': 2.0.4
'@protobufjs/eventemitter': 1.1.0
'@protobufjs/fetch': 1.1.0
'@protobufjs/float': 1.0.2
'@protobufjs/inquire': 1.1.0
'@protobufjs/path': 1.1.2
'@protobufjs/pool': 1.1.0
'@protobufjs/utf8': 1.1.0
'@types/node': 20.11.26
long: 5.2.3
dev: false
/protoc-gen-ts@0.8.7: /protoc-gen-ts@0.8.7:
resolution: {integrity: sha512-jr4VJey2J9LVYCV7EVyVe53g1VMw28cCmYJhBe5e3YX5wiyiDwgxWxeDf9oTqAe4P1bN/YGAkW2jhlH8LohwiQ==} resolution: {integrity: sha512-jr4VJey2J9LVYCV7EVyVe53g1VMw28cCmYJhBe5e3YX5wiyiDwgxWxeDf9oTqAe4P1bN/YGAkW2jhlH8LohwiQ==}
hasBin: true hasBin: true