Skip to content

Add ocr support, sync main branch #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2025
Merged

Add ocr support, sync main branch #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend
Open in desktop
Submodule backend updated 69 files
+2 −1 package.json
+12 −0 pnpm-lock.yaml
+3 −11 src/api-key/api-key.entity.ts
+12 −1 src/app/app.module.ts
+2 −2 src/auth/auth.controller.ts
+28 −47 src/auth/auth.service.ts
+6 −5 src/auth/dto/invitation.dto.ts
+3 −3 src/auth/dto/invite-payload.dto.ts
+3 −3 src/auth/dto/signup-payload.dto.ts
+4 −15 src/common/base.entity.ts
+14 −15 src/conversations/conversations.service.ts
+8 −23 src/conversations/entities/conversation.entity.ts
+6 −26 src/groups/entities/group-user.entity.ts
+5 −16 src/groups/entities/group.entity.ts
+1 −1 src/groups/groups.controller.ts
+2 −0 src/groups/groups.module.ts
+53 −32 src/groups/groups.service.ts
+2 −2 src/invitations/dto/create-invitation-req.dto.ts
+2 −2 src/invitations/dto/invitation.dto.ts
+10 −27 src/invitations/entities/invitation.entity.ts
+2 −1 src/invitations/invitations.module.ts
+48 −42 src/invitations/invitations.service.ts
+16 −27 src/messages/entities/message.entity.ts
+9 −11 src/messages/messages.service.ts
+772 −0 src/migrations/1751900000000-init.ts
+52 −0 src/migrations/1751904560034-user-options.ts
+40 −0 src/migrations/1751905414493-tags.ts
+23 −0 src/migrations/base-columns.ts
+3 −4 src/namespaces/dto/namespace-member.dto.ts
+9 −23 src/namespaces/entities/namespace-member.entity.ts
+4 −25 src/namespaces/entities/namespace.entity.ts
+3 −13 src/namespaces/namespaces.controller.ts
+2 −0 src/namespaces/namespaces.module.ts
+115 −94 src/namespaces/namespaces.service.ts
+39 −63 src/permissions/dto/list-resp.dto.ts
+3 −3 src/permissions/dto/permission.dto.ts
+10 −27 src/permissions/entities/group-permission.entity.ts
+9 −29 src/permissions/entities/user-permission.entity.ts
+0 −45 src/permissions/permission-level.enum.ts
+2 −49 src/permissions/permissions.controller.ts
+2 −0 src/permissions/permissions.module.ts
+234 −424 src/permissions/permissions.service.ts
+45 −0 src/permissions/resource-permission.enum.ts
+1 −1 src/resources/dto/create-resource.dto.ts
+2 −2 src/resources/internal.resource.controller.ts
+79 −96 src/resources/resources.controller.ts
+20 −41 src/resources/resources.entity.ts
+110 −61 src/resources/resources.service.ts
+21 −0 src/resources/utils.ts
+7 −7 src/resources/wizard-task/index.service.ts
+3 −3 src/resources/wizard-task/reader.service.ts
+2 −0 src/search/search.module.ts
+15 −11 src/search/search.service.ts
+7 −14 src/tag/tag.controller.ts
+7 −21 src/tag/tag.entity.ts
+5 −5 src/tag/tag.service.ts
+0 −54 src/tasks/dto/tasks.dto.ts
+18 −36 src/tasks/tasks.entity.ts
+1 −10 src/tasks/tasks.service.ts
+10 −12 src/user/entities/user-option.entity.ts
+6 −31 src/user/entities/user.entity.ts
+1 −13 src/user/user.controller.ts
+9 −12 src/user/user.service.ts
+4 −4 src/wizard/internal.wizard.controller.ts
+23 −13 src/wizard/processors/collect.processor.ts
+1 −1 src/wizard/stream.service.ts
+2 −0 src/wizard/wizard.module.ts
+18 −11 src/wizard/wizard.service.ts
+1 −5 test/resources.e2e-spec.ts
2 changes: 1 addition & 1 deletion client/browser-extension
Open in desktop
Submodule browser-extension updated 85 files
+1 −1 chrome-extension/package.json
+8 −3 chrome-extension/src/background/index.ts
+1 −1 package.json
+1 −55 packages/i18n/locales/en/messages.json
+1 −55 packages/i18n/locales/zh_CN/messages.json
+27 −14 packages/shared/lib/hooks/useOption.tsx
+37 −8 packages/shared/lib/utils/axios.ts
+25 −0 packages/shared/lib/utils/each.ts
+56 −0 packages/shared/lib/utils/shared-types.ts
+0 −4 packages/shared/package.json
+11 −0 packages/ui/index.ts
+34 −0 packages/ui/lib/components/lazyInput/index.tsx
+89 −0 packages/ui/lib/components/namespace/Choose.tsx
+64 −0 packages/ui/lib/components/namespace/index.tsx
+168 −0 packages/ui/lib/components/resource/Choose.tsx
+40 −0 packages/ui/lib/components/resource/FormResource.tsx
+90 −0 packages/ui/lib/components/resource/index.tsx
+28 −0 packages/ui/lib/components/ui/badge.tsx
+130 −0 packages/ui/lib/components/ui/command.tsx
+96 −0 packages/ui/lib/components/ui/dialog.tsx
+177 −0 packages/ui/lib/components/ui/dropdown-menu.tsx
+20 −0 packages/ui/lib/components/ui/separator.tsx
+5 −0 packages/ui/package.json
+13 −1 pages/content/package.json
+48 −0 pages/content/src/actions/choose.ts
+22 −0 pages/content/src/actions/collect.ts
+2 −0 pages/content/src/actions/index.ts
+12 −82 pages/content/src/index.ts
+4 −0 pages/content/src/page/App.tsx
+33 −0 pages/content/src/page/Choose.tsx
+107 −0 pages/content/src/page/Draggable.tsx
+28 −0 pages/content/src/page/Page.tsx
+3 −0 pages/content/src/page/hooks/app-context.ts
+7 −0 pages/content/src/page/hooks/app.class.ts
+125 −0 pages/content/src/page/hooks/hook.class.ts
+12 −0 pages/content/src/page/hooks/useApp.ts
+19 −0 pages/content/src/page/i18n/index.ts
+4 −0 pages/content/src/page/i18n/locales/en.json
+11 −0 pages/content/src/page/i18n/locales/index.ts
+4 −0 pages/content/src/page/i18n/locales/zh.json
+13 −0 pages/content/src/page/index.css
+26 −0 pages/content/src/page/index.tsx
+18 −9 pages/content/src/utils/choose.ts
+36 −0 pages/content/src/utils/is.ts
+18 −0 pages/content/src/utils/limit.ts
+34 −0 pages/content/src/utils/login.ts
+13 −0 pages/content/src/utils/position.ts
+6 −0 pages/content/src/utils/shadow.ts
+9 −0 pages/content/src/utils/transform.ts
+28 −0 pages/content/src/utils/zindex.ts
+7 −0 pages/content/tailwind.config.ts
+2 −0 pages/options/package.json
+31 −142 pages/options/src/Page.tsx
+19 −0 pages/options/src/common-form/index.tsx
+86 −0 pages/options/src/common-form/language.tsx
+82 −0 pages/options/src/common-form/theme.tsx
+0 −28 pages/options/src/form/APiBaseUrl.tsx
+0 −31 pages/options/src/form/ApiKey.tsx
+0 −62 pages/options/src/form/Namespace.tsx
+0 −38 pages/options/src/form/SpaceType.tsx
+18 −0 pages/options/src/i18n/index.ts
+25 −0 pages/options/src/i18n/locales/en.json
+11 −0 pages/options/src/i18n/locales/index.ts
+25 −0 pages/options/src/i18n/locales/zh.json
+1 −8 pages/options/src/index.css
+1 −0 pages/options/src/index.tsx
+50 −0 pages/options/src/setting-form/Access.tsx
+50 −0 pages/options/src/setting-form/Namespace.tsx
+65 −0 pages/options/src/setting-form/Resource.tsx
+27 −0 pages/options/src/setting-form/index.tsx
+2 −0 pages/popup/package.json
+15 −0 pages/popup/src/BuiltIn.tsx
+28 −0 pages/popup/src/Choose.tsx
+28 −0 pages/popup/src/Collect.tsx
+18 −0 pages/popup/src/Config.tsx
+27 −0 pages/popup/src/Done.tsx
+106 −96 pages/popup/src/Page.tsx
+23 −0 pages/popup/src/Setting.tsx
+2 −1 pages/popup/src/Wrapper.tsx
+19 −0 pages/popup/src/i18n/index.ts
+19 −0 pages/popup/src/i18n/locales/en.json
+11 −0 pages/popup/src/i18n/locales/index.ts
+19 −0 pages/popup/src/i18n/locales/zh.json
+1 −0 pages/popup/src/index.tsx
+488 −19 pnpm-lock.yaml
2 changes: 2 additions & 0 deletions compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ services:
OBW_TASK_ASR_API_KEY: ${OBW_TASK_ASR_API_KEY}
OBW_TASK_ASR_BASE_URL: ${OBW_TASK_ASR_BASE_URL}
OBW_TASK_ASR_MODEL: ${OBW_TASK_ASR_MODEL}

OBW_BACKEND_BASE_URL: ${OBW_BACKEND_BASE_URL}
volumes:
- "/etc/localtime:/etc/localtime:ro"
entrypoint: ["python", "main.py"]
Expand Down
2 changes: 2 additions & 0 deletions example.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ OBW_TASK_ASR_API_KEY="***"
OBW_TASK_ASR_BASE_URL="https://api.openai.com/v1"
OBW_TASK_ASR_MODEL="whisper-1"

OBW_BACKEND_BASE_URL="http://127.0.0.1:8000"

OBW_TOOLS_SEARXNG_BASE_URL="https://searxng.example.com"
OBW_TOOLS_RERANKER_OPENAI_API_KEY="***"
OBW_TOOLS_RERANKER_OPENAI_MODEL="reranker"
Expand Down
2 changes: 1 addition & 1 deletion web
Open in desktop
Submodule web updated 62 files
+5 −0 package.json
+1,244 −4 pnpm-lock.yaml
+165 −0 src/components/attributes/index.tsx
+34 −0 src/components/input/lazy.tsx
+4 −0 src/components/markdown/index.css
+2 −1 src/components/markdown/index.tsx
+16 −6 src/components/multiple-selector/index.tsx
+5 −3 src/components/pagination/index.tsx
+7 −2 src/components/space/index.tsx
+44 −0 src/components/tags/index.tsx
+110 −0 src/components/tags/tags.tsx
+15 −6 src/hooks/app.class.ts
+3 −2 src/hooks/use-theme.ts
+1 −1 src/hooks/user-resource.ts
+1 −5 src/i18n/index.ts
+24 −14 src/i18n/locales/en.json
+24 −14 src/i18n/locales/zh.json
+5 −10 src/interface.ts
+63 −45 src/lib/upload-files.ts
+20 −23 src/page/chat/chat-input/chat-tool.tsx
+4 −2 src/page/chat/chat-input/context.tsx
+20 −14 src/page/chat/chat-input/index.tsx
+91 −0 src/page/chat/chat-input/think-tool.tsx
+0 −1 src/page/chat/chat-input/types.tsx
+7 −3 src/page/chat/conversation/index.tsx
+1 −1 src/page/chat/conversation/scrollbar.tsx
+2 −6 src/page/chat/conversation/types.tsx
+36 −32 src/page/chat/conversation/useContext.tsx
+14 −10 src/page/chat/conversation/utils.tsx
+1 −1 src/page/chat/header/actions.tsx
+16 −12 src/page/chat/home.tsx
+5 −17 src/page/chat/messages/citations/citation-markdown.tsx
+1 −1 src/page/chat/messages/index.tsx
+31 −54 src/page/resource/actions/index.tsx
+113 −50 src/page/resource/actions/move/form.tsx
+66 −0 src/page/resource/actions/move/resource.tsx
+2 −2 src/page/resource/actions/share/index.tsx
+16 −21 src/page/resource/editor.tsx
+14 −16 src/page/resource/header/breadcrumb.tsx
+2 −2 src/page/resource/header/index.tsx
+0 −18 src/page/resource/header/utils.ts
+16 −12 src/page/resource/language-toggle.tsx
+12 −3 src/page/resource/page.tsx
+26 −4 src/page/resource/theme-toggle.tsx
+2 −2 src/page/resource/utils.ts
+8 −2 src/page/resource/wrapper.tsx
+8 −6 src/page/sidebar/content/action.tsx
+60 −0 src/page/sidebar/content/icon.tsx
+36 −15 src/page/sidebar/content/index.tsx
+3 −4 src/page/sidebar/content/space.tsx
+73 −20 src/page/sidebar/content/tree.tsx
+3 −0 src/page/sidebar/index.tsx
+7 −6 src/page/sidebar/interface.ts
+11 −0 src/page/sidebar/switcher/basic/index.tsx
+49 −0 src/page/sidebar/switcher/basic/language.tsx
+55 −0 src/page/sidebar/switcher/basic/theme.tsx
+2 −2 src/page/sidebar/switcher/index.tsx
+2 −5 src/page/sidebar/switcher/manage/member/index.tsx
+11 −0 src/page/sidebar/switcher/swtting-wrapper.tsx
+200 −119 src/page/sidebar/useContext.ts
+1,265 −0 src/styles/github-markdown.css
+3 −0 tailwind.config.js
2 changes: 1 addition & 1 deletion wizard
Open in desktop
Submodule wizard updated 95 files
+1 −3 .gitignore
+1 −1 Dockerfile
+5 −5 main.py
+0 −0 omnibox_wizard/__init__.py
+0 −0 omnibox_wizard/common/__init__.py
+0 −0 omnibox_wizard/common/_env.py
+0 −0 omnibox_wizard/common/_project_root.py
+1 −1 omnibox_wizard/common/config_loader.py
+0 −0 omnibox_wizard/common/exception.py
+0 −0 omnibox_wizard/common/json_parser.py
+1 −1 omnibox_wizard/common/logger.py
+0 −0 omnibox_wizard/common/model_dump.py
+2 −2 omnibox_wizard/common/template_parser.py
+0 −0 omnibox_wizard/common/template_render.py
+1 −1 omnibox_wizard/common/trace_info.py
+0 −0 omnibox_wizard/common/utils.py
+0 −0 omnibox_wizard/resources/prompt_templates/ask.j2
+0 −0 omnibox_wizard/resources/prompt_templates/citation_format.j2
+0 −0 omnibox_wizard/resources/prompt_templates/meta_info.j2
+0 −0 omnibox_wizard/resources/prompt_templates/tools.j2
+0 −0 omnibox_wizard/resources/prompt_templates/user_input_description.j2
+0 −0 omnibox_wizard/resources/prompt_templates/write.j2
+0 −0 omnibox_wizard/resources/prompts/ask.md
+0 −0 omnibox_wizard/resources/prompts/html_extractor.md
+0 −0 omnibox_wizard/resources/prompts/tag.md
+0 −0 omnibox_wizard/resources/prompts/title.md
+0 −0 omnibox_wizard/resources/prompts/write.md
+0 −0 omnibox_wizard/wizard/__init__.py
+0 −0 omnibox_wizard/wizard/api/__init__.py
+1 −1 omnibox_wizard/wizard/api/depends.py
+1 −1 omnibox_wizard/wizard/api/entity.py
+7 −7 omnibox_wizard/wizard/api/internal.py
+61 −0 omnibox_wizard/wizard/api/server.py
+1 −1 omnibox_wizard/wizard/api/v1.py
+21 −10 omnibox_wizard/wizard/api/wizard.py
+0 −0 omnibox_wizard/wizard/config.py
+0 −0 omnibox_wizard/wizard/entity.py
+0 −0 omnibox_wizard/wizard/grimoire/__init__.py
+0 −0 omnibox_wizard/wizard/grimoire/agent/__init__.py
+72 −65 omnibox_wizard/wizard/grimoire/agent/agent.py
+7 −0 omnibox_wizard/wizard/grimoire/agent/ask.py
+58 −0 omnibox_wizard/wizard/grimoire/agent/stream_parser.py
+9 −22 omnibox_wizard/wizard/grimoire/agent/tool_executor.py
+2 −2 omnibox_wizard/wizard/grimoire/agent/write.py
+2 −2 omnibox_wizard/wizard/grimoire/base_streamable.py
+7 −7 omnibox_wizard/wizard/grimoire/common_ai.py
+0 −0 omnibox_wizard/wizard/grimoire/entity/__init__.py
+2 −2 omnibox_wizard/wizard/grimoire/entity/api.py
+18 −18 omnibox_wizard/wizard/grimoire/entity/chunk.py
+2 −2 omnibox_wizard/wizard/grimoire/entity/index_record.py
+0 −0 omnibox_wizard/wizard/grimoire/entity/message.py
+66 −0 omnibox_wizard/wizard/grimoire/entity/retrieval.py
+0 −0 omnibox_wizard/wizard/grimoire/entity/tools.py
+0 −0 omnibox_wizard/wizard/grimoire/retriever/__init__.py
+2 −2 omnibox_wizard/wizard/grimoire/retriever/base.py
+8 −8 omnibox_wizard/wizard/grimoire/retriever/meili_vector_db.py
+5 −5 omnibox_wizard/wizard/grimoire/retriever/reranker.py
+10 −27 omnibox_wizard/wizard/grimoire/retriever/searxng.py
+0 −0 omnibox_wizard/wizard/wand/__init__.py
+0 −0 omnibox_wizard/wizard/wand/functions/__init__.py
+2 −2 omnibox_wizard/wizard/wand/functions/base_function.py
+4 −4 omnibox_wizard/wizard/wand/functions/file_reader.py
+3 −3 omnibox_wizard/wizard/wand/functions/html_reader.py
+7 −7 omnibox_wizard/wizard/wand/functions/index.py
+10 −14 omnibox_wizard/wizard/wand/worker.py
+2 −2 pyproject.toml
+0 −51 src/wizard/api/server.py
+0 −7 src/wizard/grimoire/agent/ask.py
+0 −30 src/wizard/grimoire/entity/retrieval.py
+0 −0 tests/omnibox_wizard/__init__.py
+0 −0 tests/omnibox_wizard/agent/__init__.py
+40 −0 tests/omnibox_wizard/agent/test_stream_output_parser.py
+0 −0 tests/omnibox_wizard/common/__init__.py
+3 −3 tests/omnibox_wizard/common/test_template_parser.py
+1 −1 tests/omnibox_wizard/conftest.py
+0 −0 tests/omnibox_wizard/function/__init__.py
+7 −7 tests/omnibox_wizard/function/test_file_reader.py
+5 −5 tests/omnibox_wizard/function/test_html_reader.py
+4 −4 tests/omnibox_wizard/function/test_single_task.py
+0 −0 tests/omnibox_wizard/helper/__init__.py
+8 −2 tests/omnibox_wizard/helper/backend_client.py
+0 −0 tests/omnibox_wizard/helper/chroma_container.py
+10 −10 tests/omnibox_wizard/helper/fixture.py
+1 −1 tests/omnibox_wizard/helper/meilisearch_container.py
+0 −0 tests/omnibox_wizard/pytest.ini
+6 −6 tests/omnibox_wizard/test_ask.py
+3 −3 tests/omnibox_wizard/test_by_log.py
+4 −4 tests/omnibox_wizard/test_common_ai.py
+1 −1 tests/omnibox_wizard/test_config_loader.py
+1 −1 tests/omnibox_wizard/test_searxng.py
+4 −4 tests/omnibox_wizard/test_server.py
+6 −6 tests/omnibox_wizard/test_tasks.py
+6 −6 tests/omnibox_wizard/test_vector.py
+14 −13 tests/omnibox_wizard/test_worker.py
+2 −2 tests/omnibox_wizard/test_write.py