# Conflicts:
# api/controllers/console/apikey.py
# api/controllers/console/auth/oauth.py
# api/controllers/web/completion.py
# api/core/app/apps/advanced_chat/generate_task_pipeline.py
# api/core/app/apps/agent_chat/app_generator.py
# api/core/app/apps/workflow/generate_task_pipeline.py
# api/core/app/task_pipeline/workflow_cycle_manage.py
# api/extensions/ext_celery.py
# api/libs/oauth.py
# api/models/model.py
# api/poetry.lock
# api/services/workspace_service.py
# web/.env.example
# web/package.json
# web/yarn.lock