chore: Update dependency reference path (#2745)

This commit is contained in:
alanchen 2025-06-03 11:31:19 +08:00 committed by GitHub
parent 0188d2367b
commit 4afa2b84b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 35 additions and 30 deletions

View File

@ -51,7 +51,7 @@ You need to prepare a vector store, here we use the `ChromaStore` as an example:
```python ```python
import shutil 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) # Delete old vector store directory(/tmp/tmp_ltm_vector_stor)
shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True) shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True)

View File

@ -42,7 +42,7 @@ pip install chromadb
```python ```python
import shutil 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) # Delete old vector store directory(/tmp/tmp_ltm_vector_stor)
shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True) shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True)

View File

@ -75,8 +75,9 @@ import shutil
from dbgpt.core.awel import DAG from dbgpt.core.awel import DAG
from dbgpt_ext.rag import ChunkParameters from dbgpt_ext.rag import ChunkParameters
from dbgpt.rag.knowledge import KnowledgeType from dbgpt.rag.knowledge import KnowledgeType
from dbgpt.rag.operators import EmbeddingAssemblerOperator, KnowledgeOperator from dbgpt_ext.rag.operators import EmbeddingAssemblerOperator
from dbgpt.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig 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) # Delete old vector store directory(/tmp/awel_rag_test_vector_store)
shutil.rmtree("/tmp/awel_rag_test_vector_store", ignore_errors=True) 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.core.operators import PromptBuilderOperator, RequestBuilderOperator
from dbgpt_ext.rag import ChunkParameters from dbgpt_ext.rag import ChunkParameters
from dbgpt.rag.knowledge import KnowledgeType from dbgpt.rag.knowledge import KnowledgeType
from dbgpt.rag.operators import EmbeddingAssemblerOperator, KnowledgeOperator, from dbgpt_ext.rag.operators.embedding import EmbeddingAssemblerOperator, EmbeddingRetrieverOperator
EmbeddingRetrieverOperator from dbgpt_ext.rag.operators import KnowledgeOperator
from dbgpt.rag.embedding import DefaultEmbeddingFactory 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.operators import LLMOperator
from dbgpt.model.proxy import OpenAILLMClient from dbgpt.model.proxy import OpenAILLMClient

View File

@ -29,7 +29,7 @@ In this guide, we mainly focus on step 1, 2, and 3.
First, you need to install the `dbgpt` library. First, you need to install the `dbgpt` library.
```bash ```bash
pip install "dbgpt[rag]>=0.5.3rc0" -U pip install "dbgpt[rag]>=0.7.0" -U
```` ````
## Build Knowledge Base ## Build Knowledge Base
@ -52,7 +52,7 @@ embeddings = DefaultEmbeddingFactory.openai()
Here we create a simple SQLite database. Here we create a simple SQLite database.
```python ```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 = SQLiteTempConnector.create_temporary_db()
db_conn.create_temp_tables( db_conn.create_temp_tables(
@ -83,8 +83,8 @@ import asyncio
import shutil import shutil
from dbgpt.core.awel import DAG, InputOperator from dbgpt.core.awel import DAG, InputOperator
from dbgpt_ext.rag import ChunkParameters from dbgpt_ext.rag import ChunkParameters
from dbgpt.rag.operators import DBSchemaAssemblerOperator from dbgpt_ext.rag.operators.db_schema import DBSchemaAssemblerOperator
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/awel_with_data_vector_store) # Delete old vector store directory(/tmp/awel_with_data_vector_store)
shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True) shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True)
@ -115,7 +115,7 @@ print(chunks)
```python ```python
from dbgpt.core.awel import InputSource 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: with DAG("retrieve_schema_dag") as retrieve_schema_dag:
input_task = InputOperator(input_source=InputSource.from_callable()) 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.awel import DAG, InputOperator, InputSource, MapOperator, JoinOperator
from dbgpt.core.operators import PromptBuilderOperator, RequestBuilderOperator 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 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. 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.core.operators import PromptBuilderOperator, RequestBuilderOperator
from dbgpt.datasource.operators import DatasourceOperator 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.operators import LLMOperator
from dbgpt.model.proxy import OpenAILLMClient from dbgpt.model.proxy import OpenAILLMClient
from dbgpt_ext.rag import ChunkParameters from dbgpt_ext.rag import ChunkParameters
from dbgpt.rag.embedding import DefaultEmbeddingFactory from dbgpt.rag.embedding import DefaultEmbeddingFactory
from dbgpt.rag.operators import DBSchemaAssemblerOperator, DBSchemaRetrieverOperator from dbgpt_ext.rag.operators.db_schema import DBSchemaAssemblerOperator, DBSchemaRetrieverOperator
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/awel_with_data_vector_store) # Delete old vector store directory(/tmp/awel_with_data_vector_store)
shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True) shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True)

View File

@ -201,7 +201,7 @@ class SQLiteDBResource(RDBMSConnectorResource):
self, name: str, db_name: str, executor: Optional[Executor] = None, **kwargs self, name: str, db_name: str, executor: Optional[Executor] = None, **kwargs
): ):
"""Initialize the SQLite database resource.""" """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) conn = SQLiteConnector.from_file_path(db_name)
super().__init__(name, conn, executor=executor, **kwargs) super().__init__(name, conn, executor=executor, **kwargs)

View File

@ -164,8 +164,8 @@ class RetrieverEvaluator(Evaluator):
RetrieverSimilarityMetric, RetrieverSimilarityMetric,
) )
from dbgpt.rag.embedding import DefaultEmbeddingFactory 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_serve.rag.connector import VectorStoreConnector
from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH
embeddings = DefaultEmbeddingFactory( embeddings = DefaultEmbeddingFactory(

View File

@ -36,7 +36,9 @@ class EmbeddingRetriever(BaseRetriever):
.. code-block:: python .. code-block:: python
from dbgpt.storage.vector_store.connector import VectorStoreConnector 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.retriever.embedding import EmbeddingRetriever
from dbgpt.rag.embedding.embedding_factory import ( from dbgpt.rag.embedding.embedding_factory import (
DefaultEmbeddingFactory, DefaultEmbeddingFactory,

View File

@ -19,10 +19,10 @@ class DBSchemaAssembler(BaseAssembler):
Example: Example:
.. code-block:: python .. code-block:: python
from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector
from dbgpt_serve.rag.assembler.db_struct import DBSchemaAssembler from dbgpt_ext.rag.assembler.db_schema import DBSchemaAssembler
from dbgpt.storage.vector_store.connector import VectorStoreBase from dbgpt.storage.vector_store.base import VectorStoreBase
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig
connection = SQLiteTempConnector.create_temporary_db() connection = SQLiteTempConnector.create_temporary_db()
assembler = DBSchemaAssembler.load_from_connection( assembler = DBSchemaAssembler.load_from_connection(

View File

@ -55,10 +55,12 @@ class DBSchemaRetriever(BaseRetriever):
Examples: Examples:
.. code-block:: python .. code-block:: python
from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector
from dbgpt_serve.rag.assembler.db_schema import DBSchemaAssembler from dbgpt_ext.rag.assembler.db_schema import DBSchemaAssembler
from dbgpt.storage.vector_store.connector import VectorStoreConnector from dbgpt_serve.rag.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.retriever.embedding import EmbeddingRetriever

View File

@ -141,7 +141,7 @@ class AgentEvaluator(Evaluator):
RetrieverSimilarityMetric, RetrieverSimilarityMetric,
) )
from dbgpt.rag.embedding import DefaultEmbeddingFactory 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.storage.vector_store.connector import VectorStoreConnector
from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH

View File

@ -21,7 +21,7 @@
import pytest import pytest
from dbgpt.datasource.rdbms.conn_starrocks import StarRocksConnector from dbgpt_ext.datasource.rdbms.conn_starrocks import StarRocksConnector
@pytest.fixture @pytest.fixture