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

Bugfix/Follow up prompts status (#3341) 

bugfixes of follow up prompts status, unauthroized error message and rate limit ui
This commit is contained in:
Henry Heng 2024-10-11 15:43:28 +01:00 committed by GitHub
parent e710de1f5b
commit a5d4b55bbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/components/src/followUpPrompts.ts
View File

@ -20,7 +20,9 @@ export const generateFollowUpPrompts = async (
options: ICommonObject
) => {
if (followUpPromptsConfig) {
if (!followUpPromptsConfig.status) return undefined
const providerConfig = followUpPromptsConfig[followUpPromptsConfig.selectedProvider]
if (!providerConfig) return undefined
const credentialId = providerConfig.credentialId as string
const credentialData = await getCredentialData(credentialId ?? '', options)
const followUpPromptsPrompt = providerConfig.prompt.replace('{history}', apiMessageContent)

8
packages/server/src/controllers/predictions/index.ts
View File

@ -29,11 +29,13 @@ const createPrediction = async (req: Request, res: Response, next: NextFunction)
throw new InternalFlowiseError(StatusCodes.NOT_FOUND, `Chatflow ${req.params.id} not found`)
}
let isDomainAllowed = true
let unauthorizedOriginError = 'This site is not allowed to access this chatbot'
logger.info(`[server]: Request originated from ${req.headers.origin || 'UNKNOWN ORIGIN'}`)
if (chatflow.chatbotConfig) {
const parsedConfig = JSON.parse(chatflow.chatbotConfig)
// check whether the first one is not empty. if it is empty that means the user set a value and then removed it.
const isValidAllowedOrigins = parsedConfig.allowedOrigins?.length && parsedConfig.allowedOrigins[0] !== ''
unauthorizedOriginError = parsedConfig.allowedOriginsError || 'This site is not allowed to access this chatbot'
if (isValidAllowedOrigins && req.headers.origin) {
const originHeader = req.headers.origin
const origin = new URL(originHeader).host
@ -81,7 +83,11 @@ const createPrediction = async (req: Request, res: Response, next: NextFunction)
return res.json(apiResponse)
}
} else {
throw new InternalFlowiseError(StatusCodes.UNAUTHORIZED, `This site is not allowed to access this chatbot`)
const isStreamingRequested = req.body.streaming === 'true' || req.body.streaming === true
if (isStreamingRequested) {
return res.status(StatusCodes.FORBIDDEN).send(unauthorizedOriginError)
}
throw new InternalFlowiseError(StatusCodes.FORBIDDEN, unauthorizedOriginError)
}
} catch (error) {
next(error)

2
packages/ui/src/ui-component/extended/RateLimit.jsx
View File

@ -30,7 +30,7 @@ const RateLimit = () => {
const enqueueSnackbar = (...args) => dispatch(enqueueSnackbarAction(...args))
const closeSnackbar = (...args) => dispatch(closeSnackbarAction(...args))
const [rateLimitStatus, setRateLimitStatus] = useState(false)
const [rateLimitStatus, setRateLimitStatus] = useState(apiConfig?.rateLimit?.status !== undefined ? apiConfig.rateLimit.status : false)
const [limitMax, setLimitMax] = useState(apiConfig?.rateLimit?.limitMax ?? '')
const [limitDuration, setLimitDuration] = useState(apiConfig?.rateLimit?.limitDuration ?? '')
const [limitMsg, setLimitMsg] = useState(apiConfig?.rateLimit?.limitMsg ?? '')