lyzno1 67762cf1d8 chore: resolve merge conflict in pnpm-lock.yaml ...

Merged origin/main into feat/collaboration and resolved dependency lock file conflicts by regenerating pnpm-lock.yaml through clean install.

Changes:
- Resolved eslint version differences (9.36.0 vs 9.35.0)
- Updated lock file reflects current dependency resolution
- All other changes from main branch successfully merged

2025-10-13 11:53:43 +08:00

..

auth

Issue 23579 (#26777)

2025-10-13 10:16:12 +08:00

enterprise

change all to httpx (#26119)

2025-10-10 23:41:16 +08:00

entities

fix RetrievalMethod StrEnum (#26768)

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

errors

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

plugin

remove .value (#26633)

2025-10-11 09:08:29 +08:00

rag_pipeline

fix RetrievalMethod StrEnum (#26768)

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

recommend_app

change all to httpx (#26119)

2025-10-10 23:41:16 +08:00

tools

Issue 23579 (#26777)

2025-10-13 10:16:12 +08:00

workflow

remove .value (#26633)

2025-10-11 09:08:29 +08:00

__init__.py

chore(api/services): apply ruff reformatting (#7599)

2024-08-26 13:43:57 +08:00

account_service.py

remove .value (#26633)

2025-10-11 09:08:29 +08:00

advanced_prompt_template_service.py

chore: adopt StrEnum and auto() for some string-typed enums (#25129)

2025-09-12 21:14:26 +08:00

agent_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

annotation_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

api_based_extension_service.py

remove bare list, dict, Sequence, None, Any (#25058)

2025-09-06 03:32:23 +08:00

app_dsl_service.py

feat: add tracking for updated_by and updated_at fields in app models (#26736)

2025-10-11 13:48:57 +08:00

app_generate_service.py

chore: Avoid directly using OpenAI dependencies (#26590)

2025-10-06 10:40:38 +08:00

app_model_config_service.py

remove bare list, dict, Sequence, None, Any (#25058)

2025-09-06 03:32:23 +08:00

app_service.py

one example of Session (#24135)

2025-09-24 03:32:48 +08:00

audio_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

billing_service.py

fix: remove billing cache when add or delete app or member (#25885)

2025-09-18 12:18:07 +08:00

clear_free_plan_tenant_expired_logs.py

update sql in batch (#24801)

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

code_based_extension_service.py

remove bare list, dict, Sequence, None, Any (#25058)

2025-09-06 03:32:23 +08:00

conversation_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

dataset_service.py

fix RetrievalMethod StrEnum (#26768)

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

datasource_provider_service.py

remove .value (#26633)

2025-10-11 09:08:29 +08:00

external_knowledge_service.py

fix: external knowledge url check ssrf (#26789)

2025-10-13 11:19:00 +08:00

feature_service.py

feat: knowledge pipeline (#25360)

2025-09-18 12:49:10 +08:00

file_service.py

feat: knowledge pipeline (#25360)

2025-09-18 12:49:10 +08:00

hit_testing_service.py

fix RetrievalMethod StrEnum (#26768)

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

knowledge_service.py

feat: mypy for all type check (#10921)

2024-12-24 18:38:51 +08:00

message_service.py

fix: Message => str (#25876)

2025-09-18 17:57:57 +08:00

metadata_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

model_load_balancing_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

model_provider_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

oauth_server.py

feat: oauth provider (#24206)

2025-08-29 14:10:51 +08:00

operation_service.py

more httpx (#25651)

2025-09-22 23:07:09 +08:00

ops_service.py

use model_validate (#26182)

2025-10-10 17:30:13 +09:00

recommended_app_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

saved_message_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

tag_service.py

one example of Session (#24135)

2025-09-24 03:32:48 +08:00

variable_truncator.py

fix(api): Fix variable truncation for list[File] value in output mapping (#26133)

2025-09-23 21:30:46 +08:00

vector_service.py

remove .value (#26633)

2025-10-11 09:08:29 +08:00

web_conversation_service.py

chore: add ast-grep rule to convert Optional[T] to T | None (#25560)

2025-09-15 13:06:33 +08:00

webapp_auth_service.py

remove .value (#26633)

2025-10-11 09:08:29 +08:00

website_service.py

more httpx (#25651)

2025-09-22 23:07:09 +08:00

workflow_app_service.py

feat: knowledge pipeline (#25360)

2025-09-18 12:49:10 +08:00

workflow_comment_service.py

ruff format

2025-09-10 14:25:37 +08:00

workflow_draft_variable_service.py

remove .value (#26633)

2025-10-11 09:08:29 +08:00

workflow_run_service.py

remove .value (#26633)

2025-10-11 09:08:29 +08:00

workflow_service.py

Merge remote-tracking branch 'origin/main' into feat/collaboration

2025-10-11 14:43:20 +08:00

workspace_service.py

Fix basedpyright type errors (#25435)

2025-09-10 01:54:26 +08:00