diff --git a/docs/docs/agents/modules/memory/hybrid_memory.md b/docs/docs/agents/modules/memory/hybrid_memory.md index da95e0ae5..707ac0ed8 100644 --- a/docs/docs/agents/modules/memory/hybrid_memory.md +++ b/docs/docs/agents/modules/memory/hybrid_memory.md @@ -51,7 +51,7 @@ You need to prepare a vector store, here we use the `ChromaStore` as an example: ```python import shutil -from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore +from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore # Delete old vector store directory(/tmp/tmp_ltm_vector_stor) shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True) diff --git a/docs/docs/agents/modules/memory/long_term_memory.md b/docs/docs/agents/modules/memory/long_term_memory.md index ac435275d..44c73b055 100644 --- a/docs/docs/agents/modules/memory/long_term_memory.md +++ b/docs/docs/agents/modules/memory/long_term_memory.md @@ -42,7 +42,7 @@ pip install chromadb ```python import shutil -from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore +from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore # Delete old vector store directory(/tmp/tmp_ltm_vector_stor) shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True) diff --git a/docs/docs/awel/cookbook/first_rag_with_awel.md b/docs/docs/awel/cookbook/first_rag_with_awel.md index 8c3fb57b2..d29056d05 100644 --- a/docs/docs/awel/cookbook/first_rag_with_awel.md +++ b/docs/docs/awel/cookbook/first_rag_with_awel.md @@ -75,8 +75,9 @@ import shutil from dbgpt.core.awel import DAG from dbgpt_ext.rag import ChunkParameters from dbgpt.rag.knowledge import KnowledgeType -from dbgpt.rag.operators import EmbeddingAssemblerOperator, KnowledgeOperator -from dbgpt.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig +from dbgpt_ext.rag.operators import EmbeddingAssemblerOperator +from dbgpt_ext.rag.operators.knowledge import KnowledgeOperator +from dbgpt_ext.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig # Delete old vector store directory(/tmp/awel_rag_test_vector_store) shutil.rmtree("/tmp/awel_rag_test_vector_store", ignore_errors=True) @@ -254,10 +255,10 @@ from dbgpt.core.awel import DAG, MapOperator, InputOperator, JoinOperator, Input from dbgpt.core.operators import PromptBuilderOperator, RequestBuilderOperator from dbgpt_ext.rag import ChunkParameters from dbgpt.rag.knowledge import KnowledgeType -from dbgpt.rag.operators import EmbeddingAssemblerOperator, KnowledgeOperator, - EmbeddingRetrieverOperator +from dbgpt_ext.rag.operators.embedding import EmbeddingAssemblerOperator, EmbeddingRetrieverOperator +from dbgpt_ext.rag.operators import KnowledgeOperator from dbgpt.rag.embedding import DefaultEmbeddingFactory -from dbgpt.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig +from dbgpt_ext.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig from dbgpt.model.operators import LLMOperator from dbgpt.model.proxy import OpenAILLMClient diff --git a/docs/docs/awel/cookbook/write_your_chat_database.md b/docs/docs/awel/cookbook/write_your_chat_database.md index 7987058e7..db7f7fb67 100644 --- a/docs/docs/awel/cookbook/write_your_chat_database.md +++ b/docs/docs/awel/cookbook/write_your_chat_database.md @@ -29,7 +29,7 @@ In this guide, we mainly focus on step 1, 2, and 3. First, you need to install the `dbgpt` library. ```bash -pip install "dbgpt[rag]>=0.5.3rc0" -U +pip install "dbgpt[rag]>=0.7.0" -U ```` ## Build Knowledge Base @@ -52,7 +52,7 @@ embeddings = DefaultEmbeddingFactory.openai() Here we create a simple SQLite database. ```python -from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector +from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector db_conn = SQLiteTempConnector.create_temporary_db() db_conn.create_temp_tables( @@ -83,8 +83,8 @@ import asyncio import shutil from dbgpt.core.awel import DAG, InputOperator from dbgpt_ext.rag import ChunkParameters -from dbgpt.rag.operators import DBSchemaAssemblerOperator -from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore +from dbgpt_ext.rag.operators.db_schema import DBSchemaAssemblerOperator +from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore # Delete old vector store directory(/tmp/awel_with_data_vector_store) shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True) @@ -115,7 +115,7 @@ print(chunks) ```python from dbgpt.core.awel import InputSource -from dbgpt.rag.operators import DBSchemaRetrieverOperator +from dbgpt_ext.rag.operators.db_schema import DBSchemaRetrieverOperator with DAG("retrieve_schema_dag") as retrieve_schema_dag: input_task = InputOperator(input_source=InputSource.from_callable()) @@ -194,7 +194,7 @@ from dbgpt.core import ( ) from dbgpt.core.awel import DAG, InputOperator, InputSource, MapOperator, JoinOperator from dbgpt.core.operators import PromptBuilderOperator, RequestBuilderOperator -from dbgpt.rag.operators import DBSchemaRetrieverOperator +from dbgpt_ext.rag.operators.db_schema import DBSchemaRetrieverOperator from dbgpt.model.operators import LLMOperator system_prompt = """You are a database expert. Please answer the user's question based on the database selected by the user and some of the available table structure definitions of the database. @@ -448,13 +448,13 @@ from dbgpt.core.awel import ( ) from dbgpt.core.operators import PromptBuilderOperator, RequestBuilderOperator from dbgpt.datasource.operators import DatasourceOperator -from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector +from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector from dbgpt.model.operators import LLMOperator from dbgpt.model.proxy import OpenAILLMClient from dbgpt_ext.rag import ChunkParameters from dbgpt.rag.embedding import DefaultEmbeddingFactory -from dbgpt.rag.operators import DBSchemaAssemblerOperator, DBSchemaRetrieverOperator -from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore +from dbgpt_ext.rag.operators.db_schema import DBSchemaAssemblerOperator, DBSchemaRetrieverOperator +from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore # Delete old vector store directory(/tmp/awel_with_data_vector_store) shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True) diff --git a/packages/dbgpt-core/src/dbgpt/agent/resource/database.py b/packages/dbgpt-core/src/dbgpt/agent/resource/database.py index ed307325e..919cf0c32 100644 --- a/packages/dbgpt-core/src/dbgpt/agent/resource/database.py +++ b/packages/dbgpt-core/src/dbgpt/agent/resource/database.py @@ -201,7 +201,7 @@ class SQLiteDBResource(RDBMSConnectorResource): self, name: str, db_name: str, executor: Optional[Executor] = None, **kwargs ): """Initialize the SQLite database resource.""" - from dbgpt.datasource.rdbms.conn_sqlite import SQLiteConnector + from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteConnector conn = SQLiteConnector.from_file_path(db_name) super().__init__(name, conn, executor=executor, **kwargs) diff --git a/packages/dbgpt-core/src/dbgpt/rag/evaluation/retriever.py b/packages/dbgpt-core/src/dbgpt/rag/evaluation/retriever.py index 0c984107b..ad00a3375 100644 --- a/packages/dbgpt-core/src/dbgpt/rag/evaluation/retriever.py +++ b/packages/dbgpt-core/src/dbgpt/rag/evaluation/retriever.py @@ -164,8 +164,8 @@ class RetrieverEvaluator(Evaluator): RetrieverSimilarityMetric, ) from dbgpt.rag.embedding import DefaultEmbeddingFactory - from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig - from dbgpt.storage.vector_store.connector import VectorStoreConnector + from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig + from dbgpt_serve.rag.connector import VectorStoreConnector from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH embeddings = DefaultEmbeddingFactory( diff --git a/packages/dbgpt-core/src/dbgpt/rag/retriever/embedding.py b/packages/dbgpt-core/src/dbgpt/rag/retriever/embedding.py index 71cade66b..3a60c1732 100644 --- a/packages/dbgpt-core/src/dbgpt/rag/retriever/embedding.py +++ b/packages/dbgpt-core/src/dbgpt/rag/retriever/embedding.py @@ -36,7 +36,9 @@ class EmbeddingRetriever(BaseRetriever): .. code-block:: python from dbgpt.storage.vector_store.connector import VectorStoreConnector - from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig + from dbgpt_ext.storage.vector_store.chroma_store import ( + ChromaVectorConfig, + ) from dbgpt.rag.retriever.embedding import EmbeddingRetriever from dbgpt.rag.embedding.embedding_factory import ( DefaultEmbeddingFactory, diff --git a/packages/dbgpt-ext/src/dbgpt_ext/rag/assembler/db_schema.py b/packages/dbgpt-ext/src/dbgpt_ext/rag/assembler/db_schema.py index 276960e01..a9df3382b 100644 --- a/packages/dbgpt-ext/src/dbgpt_ext/rag/assembler/db_schema.py +++ b/packages/dbgpt-ext/src/dbgpt_ext/rag/assembler/db_schema.py @@ -19,10 +19,10 @@ class DBSchemaAssembler(BaseAssembler): Example: .. code-block:: python - from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector - from dbgpt_serve.rag.assembler.db_struct import DBSchemaAssembler - from dbgpt.storage.vector_store.connector import VectorStoreBase - from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig + from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector + from dbgpt_ext.rag.assembler.db_schema import DBSchemaAssembler + from dbgpt.storage.vector_store.base import VectorStoreBase + from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig connection = SQLiteTempConnector.create_temporary_db() assembler = DBSchemaAssembler.load_from_connection( diff --git a/packages/dbgpt-ext/src/dbgpt_ext/rag/retriever/db_schema.py b/packages/dbgpt-ext/src/dbgpt_ext/rag/retriever/db_schema.py index 10faf0c1c..4c041fa57 100644 --- a/packages/dbgpt-ext/src/dbgpt_ext/rag/retriever/db_schema.py +++ b/packages/dbgpt-ext/src/dbgpt_ext/rag/retriever/db_schema.py @@ -55,10 +55,12 @@ class DBSchemaRetriever(BaseRetriever): Examples: .. code-block:: python - from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector - from dbgpt_serve.rag.assembler.db_schema import DBSchemaAssembler - from dbgpt.storage.vector_store.connector import VectorStoreConnector - from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig + from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector + from dbgpt_ext.rag.assembler.db_schema import DBSchemaAssembler + from dbgpt_serve.rag.connector import VectorStoreConnector + from dbgpt_ext.storage.vector_store.chroma_store import ( + ChromaVectorConfig, + ) from dbgpt.rag.retriever.embedding import EmbeddingRetriever diff --git a/packages/dbgpt-serve/src/dbgpt_serve/agent/evaluation/evaluation.py b/packages/dbgpt-serve/src/dbgpt_serve/agent/evaluation/evaluation.py index b74be6068..abfacecdb 100644 --- a/packages/dbgpt-serve/src/dbgpt_serve/agent/evaluation/evaluation.py +++ b/packages/dbgpt-serve/src/dbgpt_serve/agent/evaluation/evaluation.py @@ -141,7 +141,7 @@ class AgentEvaluator(Evaluator): RetrieverSimilarityMetric, ) from dbgpt.rag.embedding import DefaultEmbeddingFactory - from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig + from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig from dbgpt.storage.vector_store.connector import VectorStoreConnector from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH diff --git a/tests/intetration_tests/datasource/test_conn_starrocks.py b/tests/intetration_tests/datasource/test_conn_starrocks.py index 9c4ee3dc4..afc1b5dae 100644 --- a/tests/intetration_tests/datasource/test_conn_starrocks.py +++ b/tests/intetration_tests/datasource/test_conn_starrocks.py @@ -21,7 +21,7 @@ import pytest -from dbgpt.datasource.rdbms.conn_starrocks import StarRocksConnector +from dbgpt_ext.datasource.rdbms.conn_starrocks import StarRocksConnector @pytest.fixture