Merge branch 'main' into main

2025-11-29 16:43:16 +00:00 · 2024-12-05 16:33:55 +05:30
parent 0e4bd06795 6d2a2632c5
commit ed2609d3b3
15 changed files with 126 additions and 25 deletions
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -24,7 +24,7 @@ jobs:
          python -m pytest --cov=application --cov-report=xml
      - name: Upload coverage reports to Codecov
        if: github.event_name == 'pull_request' && matrix.python-version == '3.11'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

--- a/application/requirements.txt
+++ b/application/requirements.txt
@@ -85,5 +85,5 @@ tzdata==2024.2
 urllib3==2.2.3
 vine==5.1.0
 wcwidth==0.2.13
-werkzeug==3.0.4
+werkzeug==3.1.3
 yarl==1.11.1
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -17,8 +17,8 @@
        "react-chartjs-2": "^5.2.0",
        "react-copy-to-clipboard": "^5.1.0",
        "react-dom": "^18.3.1",
-        "react-dropzone": "^14.2.3",
        "react-helmet": "^6.1.0",
+        "react-dropzone": "^14.3.5",
        "react-i18next": "^15.0.2",
        "react-markdown": "^9.0.1",
        "react-redux": "^8.0.5",
@@ -2383,9 +2383,9 @@
      }
    },
    "node_modules/attr-accept": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz",
-      "integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.4.tgz",
+      "integrity": "sha512-2pA6xFIbdTUDCAwjN8nQwI+842VwzbDUXO2IYlpPXQIORgKnavorcr4Ce3rwh+zsNg9zK7QPsdvDj3Lum4WX4w==",
      "engines": {
        "node": ">=4"
      }
@@ -4167,20 +4167,20 @@
      }
    },
    "node_modules/file-selector": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.6.0.tgz",
-      "integrity": "sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-2.1.0.tgz",
+      "integrity": "sha512-ZuXAqGePcSPz4JuerOY06Dzzq0hrmQ6VGoXVzGyFI1npeOfBgqGIKKpznfYWRkSLJlXutkqVC5WvGZtkFVhu9Q==",
      "dependencies": {
-        "tslib": "^2.4.0"
+        "tslib": "^2.7.0"
      },
      "engines": {
        "node": ">= 12"
      }
    },
    "node_modules/file-selector/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
    },
    "node_modules/fill-range": {
      "version": "7.1.1",
@@ -7842,12 +7842,12 @@
      }
    },
    "node_modules/react-dropzone": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.3.tgz",
-      "integrity": "sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug==",
+      "version": "14.3.5",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.3.5.tgz",
+      "integrity": "sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==",
      "dependencies": {
-        "attr-accept": "^2.2.2",
-        "file-selector": "^0.6.0",
+        "attr-accept": "^2.2.4",
+        "file-selector": "^2.1.0",
        "prop-types": "^15.8.1"
      },
      "engines": {
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -28,8 +28,8 @@
    "react-chartjs-2": "^5.2.0",
    "react-copy-to-clipboard": "^5.1.0",
    "react-dom": "^18.3.1",
-    "react-dropzone": "^14.2.3",
    "react-helmet": "^6.1.0",
+    "react-dropzone": "^14.3.5",
    "react-i18next": "^15.0.2",
    "react-markdown": "^9.0.1",
    "react-redux": "^8.0.5",
--- a/frontend/src/Navigation.tsx
+++ b/frontend/src/Navigation.tsx
@@ -476,8 +476,10 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
      />
      {uploadModalState === 'ACTIVE' && (
        <Upload
+          receivedFile={[]}
          setModalState={setUploadModalState}
          isOnboarding={false}
+          renderTab={null}
          close={() => setUploadModalState('INACTIVE')}
        ></Upload>
      )}
--- a/frontend/src/api/endpoints.ts
+++ b/frontend/src/api/endpoints.ts
@@ -17,7 +17,7 @@ const endpoints = {
    TOKEN_ANALYTICS: '/api/get_token_analytics',
    FEEDBACK_ANALYTICS: '/api/get_feedback_analytics',
    LOGS: `/api/get_user_logs`,
-    MANAGE_SYNC: '/api/manage_sync'
+    MANAGE_SYNC: '/api/manage_sync',
  },
  CONVERSATION: {
    ANSWER: '/api/answer',
--- a/frontend/src/assets/DragFileUpload.svg
+++ b/frontend/src/assets/DragFileUpload.svg
@@ -0,0 +1,4 @@
+<svg width="72" height="72" viewBox="0 0 72 72" fill="current" xmlns="http://www.w3.org/2000/svg">
+<path d="M33.8788 9.87836C34.4413 9.31595 35.2043 9 35.9998 9C36.7952 9 37.5582 9.31595 38.1208 9.87836L50.1208 21.8784C50.6672 22.4442 50.9696 23.202 50.9628 23.9886C50.9559 24.7752 50.6404 25.5276 50.0842 26.0838C49.528 26.64 48.7755 26.9555 47.989 26.9624C47.2024 26.9692 46.4446 26.6668 45.8788 26.1204L38.9998 19.2414V47.9994C38.9998 48.795 38.6837 49.5581 38.1211 50.1207C37.5585 50.6833 36.7954 50.9994 35.9998 50.9994C35.2041 50.9994 34.441 50.6833 33.8784 50.1207C33.3158 49.5581 32.9998 48.795 32.9998 47.9994V19.2414L26.1208 26.1204C25.555 26.6668 24.7971 26.9692 24.0106 26.9624C23.224 26.9555 22.4715 26.64 21.9153 26.0838C21.3591 25.5276 21.0436 24.7752 21.0367 23.9886C21.0299 23.202 21.3323 22.4442 21.8788 21.8784L33.8788 9.87836Z" fill="#313131"/>
+<path d="M18 51C18 50.2044 17.6839 49.4413 17.1213 48.8787C16.5587 48.3161 15.7956 48 15 48C14.2044 48 13.4413 48.3161 12.8787 48.8787C12.3161 49.4413 12 50.2044 12 51V52.8C12 58.446 16.554 63 22.2 63H49.8C55.446 63 60 58.446 60 52.8V51C60 50.2044 59.6839 49.4413 59.1213 48.8787C58.5587 48.3161 57.7957 48 57 48C56.2043 48 55.4413 48.3161 54.8787 48.8787C54.3161 49.4413 54 50.2044 54 51V52.8C54 55.134 52.134 57 49.8 57H22.2C19.866 57 18 55.134 18 52.8V51Z" fill="#313131"/>
+</svg>
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -1,8 +1,10 @@
-import { Fragment, useEffect, useRef, useState } from 'react';
+import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import Hero from '../Hero';
+import { useDropzone } from 'react-dropzone';
+import DragFileUpload from '../assets/DragFileUpload.svg';
 import ArrowDown from '../assets/arrow-down.svg';
 import newChatIcon from '../assets/openNewChat.svg';
 import Send from '../assets/send.svg';
@@ -28,6 +30,8 @@ import {
  updateConversationId,
  updateQuery,
 } from './conversationSlice';
+import Upload from '../upload/Upload';
+import { ActiveState } from '../models/misc';

 export default function Conversation() {
  const queries = useSelector(selectQueries);
@@ -45,6 +49,47 @@ export default function Conversation() {
  const [isShareModalOpen, setShareModalState] = useState<boolean>(false);
  const { t } = useTranslation();
  const { isMobile } = useMediaQuery();
+  const [uploadModalState, setUploadModalState] =
+    useState<ActiveState>('INACTIVE');
+  const [files, setFiles] = useState<File[]>([]);
+  const [handleDragActive, setHandleDragActive] = useState<boolean>(false);
+
+  const onDrop = useCallback((acceptedFiles: File[]) => {
+    setUploadModalState('ACTIVE');
+    setFiles(acceptedFiles);
+    setHandleDragActive(false);
+  }, []);
+
+  const { getRootProps, getInputProps } = useDropzone({
+    onDrop,
+    noClick: true,
+    multiple: true,
+    onDragEnter: () => {
+      setHandleDragActive(true);
+    },
+    onDragLeave: () => {
+      setHandleDragActive(false);
+    },
+    maxSize: 25000000,
+    accept: {
+      'application/pdf': ['.pdf'],
+      'text/plain': ['.txt'],
+      'text/x-rst': ['.rst'],
+      'text/x-markdown': ['.md'],
+      'application/zip': ['.zip'],
+      'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+        ['.docx'],
+      'application/json': ['.json'],
+      'text/csv': ['.csv'],
+      'text/html': ['.html'],
+      'application/epub+zip': ['.epub'],
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': [
+        '.xlsx',
+      ],
+      'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+        ['.pptx'],
+    },
+  });

  const handleUserInterruption = () => {
    if (!eventInterrupt && status === 'loading') setEventInterrupt(true);
@@ -323,7 +368,11 @@ export default function Conversation() {
      </div>

      <div className="flex w-11/12 flex-col items-end self-center rounded-2xl bg-opacity-0 z-3 sm:w-[62%] h-auto py-1">
-        <div className="flex w-full items-center rounded-[40px] border border-silver bg-white dark:bg-raisin-black">
+        <div
+          {...getRootProps()}
+          className="flex w-full items-center rounded-[40px] border border-silver bg-white dark:bg-raisin-black"
+        >
+          <input {...getInputProps()}></input>
          <textarea
            id="inputbox"
            ref={inputRef}
@@ -358,6 +407,26 @@ export default function Conversation() {
          {t('tagline')}
        </p>
      </div>
+      {handleDragActive && (
+        <div className="pointer-events-none fixed top-0 left-0 z-30 flex flex-col size-full items-center justify-center bg-opacity-50 bg-white dark:bg-gray-alpha">
+          <img className="filter dark:invert" src={DragFileUpload} />
+          <span className="px-2 text-2xl font-bold text-outer-space dark:text-silver">
+            {t('modals.uploadDoc.drag.title')}
+          </span>
+          <span className="p-2 text-s w-48 text-center text-outer-space dark:text-silver">
+            {t('modals.uploadDoc.drag.description')}
+          </span>
+        </div>
+      )}
+      {uploadModalState === 'ACTIVE' && (
+        <Upload
+          receivedFile={files}
+          setModalState={setUploadModalState}
+          isOnboarding={false}
+          renderTab={'file'}
+          close={() => setUploadModalState('INACTIVE')}
+        ></Upload>
+      )}
    </div>
  );
 }
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -99,6 +99,10 @@
        "agent": "User agent",
        "searchQueries": "Search queries",
        "numberOfPosts": "Number of posts"
+      },
+      "drag": {
+        "title": "Upload a source file",
+        "description": "Drop your file here to add it as a source"
      }
    },
    "createAPIKey": {
--- a/frontend/src/locale/es.json
+++ b/frontend/src/locale/es.json
@@ -99,6 +99,10 @@
        "agent": "Agente de Usuario",
        "searchQueries": "Consultas de Búsqueda",
        "numberOfPosts": "Número de publicaciones"
+      },
+      "drag": {
+        "title": "Cargar un archivo fuente",
+        "description": "Suelta tu archivo aquí para agregarlo como fuente."
      }
    },
    "createAPIKey": {
--- a/frontend/src/locale/jp.json
+++ b/frontend/src/locale/jp.json
@@ -99,6 +99,10 @@
        "agent": "ユーザーエージェント",
        "searchQueries": "検索クエリ",
        "numberOfPosts": "投稿数"
+      },
+      "drag": {
+        "title": "ソースファイルをアップロードする",
+        "description": "ファイルをここにドロップしてソースとして追加します"
      }
    },
    "createAPIKey": {
--- a/frontend/src/locale/zh-TW.json
+++ b/frontend/src/locale/zh-TW.json
@@ -92,6 +92,10 @@
        "agent": "使用者代理(User-Agent)",
        "searchQueries": "搜尋查詢",
        "numberOfPosts": "貼文數量"
+      },
+      "drag": {
+        "title": "上傳原始檔",
+        "description": "將您的文件拖放到此處以將其添加為來源"
      }
    },
    "createAPIKey": {
--- a/frontend/src/locale/zh.json
+++ b/frontend/src/locale/zh.json
@@ -99,6 +99,10 @@
        "agent": "用户代理",
        "searchQueries": "搜索查询",
        "numberOfPosts": "帖子数量"
+      },
+      "drag": {
+        "title": "上传源文件",
+        "description": "将您的文件拖放到此处以将其添加为源"
      }
    },
    "createAPIKey": {
--- a/frontend/src/settings/Documents.tsx
+++ b/frontend/src/settings/Documents.tsx
@@ -325,8 +325,10 @@ const Documents: React.FC<DocumentsProps> = ({
            <div className="w-full h-full bg-transparent flex flex-col items-center justify-center p-8">
              {/* Your Upload component */}
              <Upload
+                receivedFile={[]}
                setModalState={setModalState}
                isOnboarding={isOnboarding}
+                renderTab={null}
                close={() => setModalState('INACTIVE')}
              />
            </div>
--- a/frontend/src/upload/Upload.tsx
+++ b/frontend/src/upload/Upload.tsx
@@ -19,15 +19,19 @@ import {
 import WrapperModal from '../modals/WrapperModal';

 function Upload({
+  receivedFile = [],
  setModalState,
  isOnboarding,
+  renderTab = null,
  close,
 }: {
+  receivedFile: File[];
  setModalState: (state: ActiveState) => void;
  isOnboarding: boolean;
+  renderTab: string | null;
  close: () => void;
 }) {
-  const [docName, setDocName] = useState('');
+  const [docName, setDocName] = useState(receivedFile[0]?.name);
  const [urlName, setUrlName] = useState('');
  const [url, setUrl] = useState('');
  const [repoUrl, setRepoUrl] = useState(''); // P3f93
@@ -38,8 +42,8 @@ function Upload({
    search_queries: [''],
    number_posts: 10,
  });
-  const [activeTab, setActiveTab] = useState<string | null>(null);
-  const [files, setfiles] = useState<File[]>([]);
+  const [activeTab, setActiveTab] = useState<string | null>(renderTab);
+  const [files, setfiles] = useState<File[]>(receivedFile);
  const [progress, setProgress] = useState<{
    type: 'UPLOAD' | 'TRAINING';
    percentage: number;