conflict-resolver 06211dd7c4 Merge branch 'main' into fix-pr13295-conflicts ...

# Conflicts:
#	api/apps/canvas_app.py
#	api/apps/restful_apis/mcp_api.py
#	api/db/services/canvas_service.py

2026-06-30 16:13:13 +08:00

..

__init__.py

Feat: tenant llm provider (#14595)

2026-05-29 17:39:41 +08:00

api_service.py

Feat: Agent api (#14157)

2026-04-24 10:02:22 +08:00

canvas_service.py

Merge branch 'main' into fix-pr13295-conflicts

2026-06-30 16:13:13 +08:00

chat_channel_service.py

fix: rename dialog_id to chat_id in chat_channel (backend + frontend) (#16096)

2026-06-16 19:02:20 +08:00

chunk_feedback_service.py

feat: Auto-adjust chunk recall weights based on user feedback (#12689)

2026-04-08 09:52:18 +08:00

common_service.py

Revert "fix: duplicate document ingest guard" (#15707)

2026-06-05 17:45:29 +08:00

connector_service.py

Fix one data source can be synced to multiple dataset (#16023)

2026-06-15 16:54:25 +08:00

conversation_service.py

fix(codeql): close remaining 44 CodeQL alerts post-merge (#16408)

2026-06-29 09:45:16 +08:00

dialog_service.py

fix(api): align use_sql Markdown separator with Source header (#16317)

2026-06-25 19:00:01 +08:00

doc_metadata_service.py

Fix: paginate get_flatted_meta_by_kbs to support datasets with >10k documents (#16034) (#16095)

2026-06-24 13:20:07 +08:00

document_service.py

fix(document_service): prevent NoneType error on progress_msg.strip() (#16289)

2026-06-24 13:07:40 +08:00

evaluation_service.py

feat(evaluation): track token usage in evaluation results (#13487)

2026-05-22 15:19:53 +08:00

file2document_service.py

Feat: add delete all support for delete operations (#13530)

2026-03-12 09:47:42 +08:00

file_commit_service.py

Add git-like file commit API (#15978)

2026-06-15 11:19:56 +08:00

file_service.py

Fix: handle empty folder when link to datasets (#16296)

2026-06-24 13:31:32 +08:00

knowledgebase_service.py

Refact: Added a private helper _visibility_and_status_filter (#13627)

2026-05-11 15:21:41 +08:00

langfuse_service.py

Fix the consistency of ts and datetime (#12288)

2025-12-29 12:37:13 +08:00

llm_service.py

fix(codeql): close remaining 44 CodeQL alerts post-merge (#16408)

2026-06-29 09:45:16 +08:00

mcp_server_service.py

Fix typos: retrievaler -> retriever (#10372)

2025-10-10 09:17:36 +08:00

memory_service.py

Feat: tenant llm provider (#14595)

2026-05-29 17:39:41 +08:00

pipeline_operation_log_service.py

fix: propagate memory tenant id in task collect (#15837)

2026-06-09 17:47:48 +08:00

search_service.py

fix(api): guard missing row in SearchService.get_detail (#15622)

2026-06-08 23:01:28 +08:00

system_settings_service.py

Fix admin CLI system variable commands (#14956)

2026-05-18 19:08:45 +08:00

task_service.py

Fix document progress not set to fail when embedding model error (#16381)

2026-06-26 16:11:54 +08:00

tenant_llm_service.py

fix(security): address 93 CodeQL code-scanning alerts across 61 files (#16407)

2026-06-29 09:45:16 +08:00

tenant_model_group_mapping_service.py

Feat: tenant llm provider (#14595)

2026-05-29 17:39:41 +08:00

tenant_model_group_service.py

Feat: tenant llm provider (#14595)

2026-05-29 17:39:41 +08:00

tenant_model_instance_service.py

Feat: tenant llm provider (#14595)

2026-05-29 17:39:41 +08:00

tenant_model_provider_service.py

feat: unify provider id or name routing (#16336)

2026-06-25 13:04:21 +08:00

tenant_model_service.py

Fix: v0.26.1 model provider (#16073)

2026-06-16 16:21:43 +08:00

user_canvas_version.py

Fix tiny issues (#14006)

2026-04-09 19:01:36 +08:00

user_service.py

Feat: tenant llm provider (#14595)

2026-05-29 17:39:41 +08:00