Merge branch 'master' of https://gitlab.huashiai.xyz/bqw/dify_origin_resource

dify_1.9.0/web/app/components/share/text-generation/index.tsx

@@ -41,6 +41,7 @@ import { AccessMode } from '@/models/access-control'
 import { useGlobalPublicStore } from '@/context/global-public-context'
 import useDocumentTitle from '@/hooks/use-document-title'
 import { useWebAppStore } from '@/context/web-app-context'
+import { getUserIdFromUrlParams } from '@/app/components/base/chat/utils'
 
 const GROUP_SIZE = 5 // to avoid RPM(Request per minute) limit. The group task finished then the next group.
 enum TaskStatus {
@@ -125,6 +126,13 @@ const TextGeneration: FC<IMainProps> = ({
     transfer_methods: [TransferMethod.local_file],
   })
   const [completionFiles, setCompletionFiles] = useState<VisionFile[]>([])
+  const [userIdFromQuery, setUserIdFromQuery] = useState<string>('')
+  
+  useEffect(() => {
+    // Get userid from URL query parameter
+    const queryUserId = getUserIdFromUrlParams()
+    setUserIdFromQuery(queryUserId)
+  }, [])
 
   const handleSend = () => {
     setIsCallBatchAPI(false)
@@ -433,6 +441,7 @@ const TextGeneration: FC<IMainProps> = ({
     isShowTextToSpeech={!!textToSpeechConfig?.enabled}
     siteInfo={siteInfo}
     onRunStart={() => setResultExisted(true)}
+    userIdFromQuery={userIdFromQuery}
   />)
 
   const renderBatchRes = () => {

dify_1.9.0/web/app/components/share/text-generation/result/index.tsx

@@ -46,6 +46,7 @@ export type IResultProps = {
   completionFiles: VisionFile[]
   siteInfo: SiteInfo | null
   onRunStart: () => void
+  userIdFromQuery?: string
 }
 
 const Result: FC<IResultProps> = ({
@@ -71,6 +72,7 @@ const Result: FC<IResultProps> = ({
   completionFiles,
   siteInfo,
   onRunStart,
+  userIdFromQuery,
 }) => {
   const [isResponding, { setTrue: setRespondingTrue, setFalse: setRespondingFalse }] = useBoolean(false)
   useEffect(() => {
@@ -162,6 +164,7 @@ const Result: FC<IResultProps> = ({
 
     const data: Record<string, any> = {
       inputs: formatBooleanInputs(promptConfig?.prompt_variables, inputs),
+      user: userIdFromQuery || '',
     }
     if (visionConfig.enabled && completionFiles && completionFiles?.length > 0) {
       data.files = completionFiles.map((item) => {