Skip to content
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.

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

Anbang #1405

Closed
wants to merge 51 commits into from
Closed

Anbang #1405

wants to merge 51 commits into from

Conversation

aaadrain
Copy link

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Snapshots:

Include snapshots for easier review.

Checklist:

  • My code follows the style guidelines of this project
  • I have already rebased the commits and make the commit message conform to the project standard.
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • Any dependent changes have been merged and published in downstream modules

liab added 30 commits March 13, 2024 16:10
优化BM25算法,已经增加new_department的知识库

See merge request ai/dbgpt!1
优化BM25算法,已经增加new_department的知识库

See merge request ai/dbgpt!2
chat.py中优化BM25算法

See merge request ai/dbgpt!3
chat.py中优化BM25算法

See merge request ai/dbgpt!4
Hr test

See merge request ai/dbgpt!5
# Conflicts:
#   dbgpt/app/scene/chat_db/auto_execute/chat.py
#   dbgpt/rag/retriever/bm25.py
#   start_up.sh
Dev muplus

See merge request ai/dbgpt!6
# Conflicts:
#   .gitignore
#   str_prompt.txt
hr_dev

See merge request ai/dbgpt!7
# Conflicts:
#   db/mupluse_chinese/CreateaPlusAttxCCDData.py
#   dbgpt/app/scene/chat_db/auto_execute/chat.py
#   start_up.sh
muplus

See merge request ai/dbgpt!8
liab added 21 commits March 23, 2024 12:56
# Conflicts:
#	.flake8
#	.gitignore
#	.mypy.ini
#	CONTRIBUTING.md
#	Makefile
#	README.md
#	assets/schema/dbgpt.sql
#	assets/wechat.jpg
#	dbgpt/_private/config.py
#	dbgpt/_version.py
#	dbgpt/agent/actions/dashboard_action.py
#	dbgpt/agent/actions/plugin_action.py
#	dbgpt/agent/agents/agent_new.py
#	dbgpt/agent/agents/base_agent_new.py
#	dbgpt/agent/agents/expand/plugin_assistant_agent.py
#	dbgpt/agent/memory/gpts_memory.py
#	dbgpt/agent/resource/resource_api.py
#	dbgpt/app/base.py
#	dbgpt/app/component_configs.py
#	dbgpt/app/dbgpt_server.py
#	dbgpt/app/initialization/db_model_initialization.py
#	dbgpt/app/initialization/embedding_component.py
#	dbgpt/app/initialization/serve_initialization.py
#	dbgpt/app/knowledge/api.py
#	dbgpt/app/knowledge/document_db.py
#	dbgpt/app/knowledge/request/request.py
#	dbgpt/app/knowledge/service.py
#	dbgpt/app/openapi/api_v1/api_v1.py
#	dbgpt/app/openapi/api_v1/editor/api_editor_v1.py
#	dbgpt/app/openapi/api_v1/editor/service.py
#	dbgpt/app/openapi/api_view_model.py
#	dbgpt/app/scene/base_chat.py
#	dbgpt/app/scene/chat_dashboard/chat.py
#	dbgpt/app/scene/chat_dashboard/data_loader.py
#	dbgpt/app/scene/chat_db/auto_execute/chat.py
#	dbgpt/app/scene/chat_db/auto_execute/out_parser.py
#	dbgpt/app/scene/chat_db/auto_execute/prompt.py
#	dbgpt/app/scene/chat_db/professional_qa/chat.py
#	dbgpt/app/scene/chat_knowledge/v1/chat.py
#	dbgpt/app/scene/chat_knowledge/v1/prompt.py
#	dbgpt/app/scene/operators/app_operator.py
#	dbgpt/app/static/404.html
#	dbgpt/app/static/404/index.html
#	dbgpt/app/static/agent/index.html
#	dbgpt/app/static/app/index.html
#	dbgpt/app/static/chat/index.html
#	dbgpt/app/static/database/index.html
#	dbgpt/app/static/flow/canvas/index.html
#	dbgpt/app/static/flow/index.html
#	dbgpt/app/static/index.html
#	dbgpt/app/static/knowledge/chunk/index.html
#	dbgpt/app/static/knowledge/index.html
#	dbgpt/app/static/models/index.html
#	dbgpt/app/static/prompt/index.html
#	dbgpt/component.py
#	dbgpt/configs/model_config.py
#	dbgpt/core/__init__.py
#	dbgpt/core/_private/prompt_registry.py
#	dbgpt/core/awel/__init__.py
#	dbgpt/core/awel/dag/base.py
#	dbgpt/core/awel/flow/base.py
#	dbgpt/core/awel/operators/base.py
#	dbgpt/core/awel/operators/common_operator.py
#	dbgpt/core/awel/runner/local_runner.py
#	dbgpt/core/awel/task/base.py
#	dbgpt/core/awel/task/task_impl.py
#	dbgpt/core/awel/trigger/base.py
#	dbgpt/core/awel/trigger/http_trigger.py
#	dbgpt/core/interface/message.py
#	dbgpt/core/interface/operators/message_operator.py
#	dbgpt/core/interface/output_parser.py
#	dbgpt/core/interface/storage.py
#	dbgpt/datasource/__init__.py
#	dbgpt/datasource/base.py
#	dbgpt/datasource/conn_spark.py
#	dbgpt/datasource/db_conn_info.py
#	dbgpt/datasource/manages/connect_config_db.py
#	dbgpt/datasource/operators/datasource_operator.py
#	dbgpt/datasource/rdbms/base.py
#	dbgpt/datasource/rdbms/conn_clickhouse.py
#	dbgpt/datasource/rdbms/conn_doris.py
#	dbgpt/datasource/rdbms/conn_duckdb.py
#	dbgpt/datasource/rdbms/conn_hive.py
#	dbgpt/datasource/rdbms/conn_mssql.py
#	dbgpt/datasource/rdbms/conn_mysql.py
#	dbgpt/datasource/rdbms/conn_postgresql.py
#	dbgpt/datasource/rdbms/conn_sqlite.py
#	dbgpt/datasource/rdbms/conn_starrocks.py
#	dbgpt/datasource/rdbms/dialect/starrocks/__init__.py
#	dbgpt/datasource/rdbms/dialect/starrocks/sqlalchemy/__init__.py
#	dbgpt/datasource/rdbms/dialect/starrocks/sqlalchemy/datatype.py
#	dbgpt/datasource/rdbms/dialect/starrocks/sqlalchemy/dialect.py
#	dbgpt/datasource/rdbms/tests/test_conn_duckdb.py
#	dbgpt/datasource/rdbms/tests/test_conn_sqlite.py
#	dbgpt/datasource/redis.py
#	dbgpt/model/adapter/proxy_adapter.py
#	dbgpt/model/cluster/apiserver/api.py
#	dbgpt/model/cluster/embedding/remote_embedding.py
#	dbgpt/model/cluster/worker/default_worker.py
#	dbgpt/model/cluster/worker/embedding_worker.py
#	dbgpt/model/cluster/worker/manager.py
#	dbgpt/model/parameter.py
#	dbgpt/model/proxy/__init__.py
#	dbgpt/model/proxy/llms/chatgpt.py
#	dbgpt/model/utils/chatgpt_utils.py
#	dbgpt/rag/chunk_manager.py
#	dbgpt/rag/embedding/embedding_factory.py
#	dbgpt/rag/embedding/embeddings.py
#	dbgpt/rag/extractor/base.py
#	dbgpt/rag/extractor/summary.py
#	dbgpt/rag/extractor/tests/test_summary_extractor.py
#	dbgpt/rag/knowledge/base.py
#	dbgpt/rag/knowledge/csv.py
#	dbgpt/rag/knowledge/docx.py
#	dbgpt/rag/knowledge/factory.py
#	dbgpt/rag/knowledge/html.py
#	dbgpt/rag/knowledge/markdown.py
#	dbgpt/rag/knowledge/pdf.py
#	dbgpt/rag/knowledge/pptx.py
#	dbgpt/rag/knowledge/string.py
#	dbgpt/rag/knowledge/txt.py
#	dbgpt/rag/knowledge/url.py
#	dbgpt/rag/operators/datasource.py
#	dbgpt/rag/operators/db_schema.py
#	dbgpt/rag/operators/embedding.py
#	dbgpt/rag/operators/knowledge.py
#	dbgpt/rag/operators/rerank.py
#	dbgpt/rag/operators/rewrite.py
#	dbgpt/rag/operators/schema_linking.py
#	dbgpt/rag/operators/summary.py
#	dbgpt/rag/retriever/base.py
#	dbgpt/rag/retriever/db_schema.py
#	dbgpt/rag/retriever/embedding.py
#	dbgpt/rag/retriever/rerank.py
#	dbgpt/rag/retriever/rewrite.py
#	dbgpt/rag/retriever/tests/test_db_struct.py
#	dbgpt/rag/retriever/tests/test_embedding.py
#	dbgpt/rag/schemalinker/base_linker.py
#	dbgpt/rag/schemalinker/schema_linking.py
#	dbgpt/rag/summary/db_summary.py
#	dbgpt/rag/summary/db_summary_client.py
#	dbgpt/rag/summary/rdbms_db_summary.py
#	dbgpt/rag/summary/tests/test_rdbms_summary.py
#	dbgpt/rag/text_splitter/pre_text_splitter.py
#	dbgpt/rag/text_splitter/tests/test_splitters.py
#	dbgpt/rag/text_splitter/text_splitter.py
#	dbgpt/rag/text_splitter/token_splitter.py
#	dbgpt/serve/agent/agents/controller.py
#	dbgpt/serve/agent/app/controller.py
#	dbgpt/serve/agent/resource_loader/datasource_load_client.py
#	dbgpt/serve/agent/resource_loader/knowledge_space_load_client.py
#	dbgpt/serve/agent/resource_loader/plugin_hub_load_client.py
#	dbgpt/serve/agent/team/layout/agent_operator.py
#	dbgpt/serve/agent/team/layout/team_awel_layout_new.py
#	dbgpt/serve/agent/team/plan/team_auto_plan.py
#	dbgpt/serve/conversation/api/endpoints.py
#	dbgpt/serve/conversation/api/schemas.py
#	dbgpt/serve/conversation/models/models.py
#	dbgpt/serve/conversation/service/service.py
#	dbgpt/serve/core/config.py
#	dbgpt/serve/core/schemas.py
#	dbgpt/serve/core/serve.py
#	dbgpt/serve/flow/api/endpoints.py
#	dbgpt/serve/flow/serve.py
#	dbgpt/serve/flow/service/service.py
#	dbgpt/serve/prompt/api/endpoints.py
#	dbgpt/serve/rag/retriever/knowledge_space.py
#	dbgpt/storage/cache/__init__.py
#	dbgpt/storage/cache/llm_cache.py
#	dbgpt/storage/cache/manager.py
#	dbgpt/storage/cache/storage/base.py
#	dbgpt/storage/cache/storage/disk/disk_storage.py
#	dbgpt/storage/cache/storage/tests/test_storage.py
#	dbgpt/storage/chat_history/__init__.py
#	dbgpt/storage/chat_history/chat_history_db.py
#	dbgpt/storage/chat_history/storage_adapter.py
#	dbgpt/storage/metadata/__init__.py
#	dbgpt/storage/metadata/_base_dao.py
#	dbgpt/storage/metadata/db_factory.py
#	dbgpt/storage/metadata/db_manager.py
#	dbgpt/storage/metadata/db_storage.py
#	dbgpt/storage/schema.py
#	dbgpt/storage/vector_store/__init__.py
#	dbgpt/storage/vector_store/base.py
#	dbgpt/storage/vector_store/chroma_store.py
#	dbgpt/storage/vector_store/connector.py
#	dbgpt/storage/vector_store/milvus_store.py
#	dbgpt/storage/vector_store/pgvector_store.py
#	dbgpt/storage/vector_store/weaviate_store.py
#	dbgpt/util/chat_util.py
#	dbgpt/util/parameter_utils.py
#	dbgpt/util/speech/say.py
#	docs/docs/awel/awel.md
#	docs/docs/awel/awel_tutorial/getting_started/1.1_hello_world.md
#	docs/docs/installation/advanced_usage/OpenAI_SDK_call.md
#	docs/docs/installation/sourcecode.md
#	docs/docs/overview.md
#	docs/sidebars.js
#	docs/static/img/artificial-intelligence.svg
#	examples/awel/simple_nl_schema_sql_chart_example.py
#	examples/awel/simple_rag_rewrite_example.py
#	examples/awel/simple_rag_summary_example.py
#	examples/rag/db_schema_rag_example.py
#	examples/rag/embedding_rag_example.py
#	examples/rag/rewrite_rag_example.py
#	examples/rag/simple_dbschema_retriever_example.py
#	examples/rag/simple_rag_embedding_example.py
#	examples/rag/simple_rag_retriever_example.py
#	examples/rag/summary_extractor_example.py
#	examples/sdk/simple_sdk_llm_sql_example.py
#	requirements/lint-requirements.txt
#	scripts/build_web_static.sh
#	scripts/setup_autodl_env.sh
#	setup.py
#	tests/intetration_tests/datasource/test_conn_clickhouse.py
#	tests/intetration_tests/datasource/test_conn_doris.py
#	tests/intetration_tests/datasource/test_conn_mysql.py
#	tests/intetration_tests/datasource/test_conn_starrocks.py
#	web/app/chat-context.tsx
#	web/client/api/request.ts
#	web/components/chat/chat-container.tsx
#	web/components/chat/chat-content/chart-view.tsx
#	web/components/chat/chat-content/config.tsx
#	web/components/chat/chat-content/index.tsx
#	web/components/chat/chat-content/vis-convert-error.tsx
#	web/components/chat/header/db-selector.tsx
#	web/components/chat/monaco-editor.tsx
#	web/components/common/completion-input.tsx
#	web/components/database/form-dialog.tsx
#	web/components/knowledge/space-card.tsx
#	web/components/layout/side-bar.tsx
#	web/hooks/use-chat.ts
#	web/hooks/use-summary.ts
#	web/package.json
#	web/pages/chat/index.tsx
#	web/pages/database/index.tsx
#	web/pages/index.tsx
#	web/types/chat.ts
#	web/types/db.ts
#	web/utils/constants.ts
#	web/utils/index.ts
Conflicts:
	dbgpt/app/scene/base_chat.py
@aaadrain
Copy link
Author

11

@aaadrain aaadrain closed this Apr 10, 2024
@csunny
Copy link
Collaborator

csunny commented Apr 10, 2024

Thanks for your PR, maybe you need to sync the latest code of the main branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants