Skip to content

Commit 4afa2b8

Browse files
chore: Update dependency reference path (#2745)
1 parent 0188d23 commit 4afa2b8

File tree

11 files changed

+35
-30
lines changed

11 files changed

+35
-30
lines changed

docs/docs/agents/modules/memory/hybrid_memory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You need to prepare a vector store, here we use the `ChromaStore` as an example:
5151
```python
5252

5353
import shutil
54-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
54+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
5555

5656
# Delete old vector store directory(/tmp/tmp_ltm_vector_stor)
5757
shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True)

docs/docs/agents/modules/memory/long_term_memory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pip install chromadb
4242
```python
4343

4444
import shutil
45-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
45+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
4646

4747
# Delete old vector store directory(/tmp/tmp_ltm_vector_stor)
4848
shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True)

docs/docs/awel/cookbook/first_rag_with_awel.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ import shutil
7575
from dbgpt.core.awel import DAG
7676
from dbgpt_ext.rag import ChunkParameters
7777
from dbgpt.rag.knowledge import KnowledgeType
78-
from dbgpt.rag.operators import EmbeddingAssemblerOperator, KnowledgeOperator
79-
from dbgpt.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig
78+
from dbgpt_ext.rag.operators import EmbeddingAssemblerOperator
79+
from dbgpt_ext.rag.operators.knowledge import KnowledgeOperator
80+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig
8081
8182
# Delete old vector store directory(/tmp/awel_rag_test_vector_store)
8283
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
254255
from dbgpt.core.operators import PromptBuilderOperator, RequestBuilderOperator
255256
from dbgpt_ext.rag import ChunkParameters
256257
from dbgpt.rag.knowledge import KnowledgeType
257-
from dbgpt.rag.operators import EmbeddingAssemblerOperator, KnowledgeOperator,
258-
EmbeddingRetrieverOperator
258+
from dbgpt_ext.rag.operators.embedding import EmbeddingAssemblerOperator, EmbeddingRetrieverOperator
259+
from dbgpt_ext.rag.operators import KnowledgeOperator
259260
from dbgpt.rag.embedding import DefaultEmbeddingFactory
260-
from dbgpt.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig
261+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaStore, ChromaVectorConfig
261262
from dbgpt.model.operators import LLMOperator
262263
from dbgpt.model.proxy import OpenAILLMClient
263264

docs/docs/awel/cookbook/write_your_chat_database.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In this guide, we mainly focus on step 1, 2, and 3.
2929
First, you need to install the `dbgpt` library.
3030

3131
```bash
32-
pip install "dbgpt[rag]>=0.5.3rc0" -U
32+
pip install "dbgpt[rag]>=0.7.0" -U
3333
````
3434

3535
## Build Knowledge Base
@@ -52,7 +52,7 @@ embeddings = DefaultEmbeddingFactory.openai()
5252
Here we create a simple SQLite database.
5353
5454
```python
55-
from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector
55+
from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector
5656
5757
db_conn = SQLiteTempConnector.create_temporary_db()
5858
db_conn.create_temp_tables(
@@ -83,8 +83,8 @@ import asyncio
8383
import shutil
8484
from dbgpt.core.awel import DAG, InputOperator
8585
from dbgpt_ext.rag import ChunkParameters
86-
from dbgpt.rag.operators import DBSchemaAssemblerOperator
87-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
86+
from dbgpt_ext.rag.operators.db_schema import DBSchemaAssemblerOperator
87+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
8888
8989
# Delete old vector store directory(/tmp/awel_with_data_vector_store)
9090
shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True)
@@ -115,7 +115,7 @@ print(chunks)
115115
116116
```python
117117
from dbgpt.core.awel import InputSource
118-
from dbgpt.rag.operators import DBSchemaRetrieverOperator
118+
from dbgpt_ext.rag.operators.db_schema import DBSchemaRetrieverOperator
119119
120120
with DAG("retrieve_schema_dag") as retrieve_schema_dag:
121121
input_task = InputOperator(input_source=InputSource.from_callable())
@@ -194,7 +194,7 @@ from dbgpt.core import (
194194
)
195195
from dbgpt.core.awel import DAG, InputOperator, InputSource, MapOperator, JoinOperator
196196
from dbgpt.core.operators import PromptBuilderOperator, RequestBuilderOperator
197-
from dbgpt.rag.operators import DBSchemaRetrieverOperator
197+
from dbgpt_ext.rag.operators.db_schema import DBSchemaRetrieverOperator
198198
from dbgpt.model.operators import LLMOperator
199199
200200
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 (
448448
)
449449
from dbgpt.core.operators import PromptBuilderOperator, RequestBuilderOperator
450450
from dbgpt.datasource.operators import DatasourceOperator
451-
from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector
451+
from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector
452452
from dbgpt.model.operators import LLMOperator
453453
from dbgpt.model.proxy import OpenAILLMClient
454454
from dbgpt_ext.rag import ChunkParameters
455455
from dbgpt.rag.embedding import DefaultEmbeddingFactory
456-
from dbgpt.rag.operators import DBSchemaAssemblerOperator, DBSchemaRetrieverOperator
457-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
456+
from dbgpt_ext.rag.operators.db_schema import DBSchemaAssemblerOperator, DBSchemaRetrieverOperator
457+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, ChromaStore
458458
459459
# Delete old vector store directory(/tmp/awel_with_data_vector_store)
460460
shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True)

packages/dbgpt-core/src/dbgpt/agent/resource/database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def __init__(
201201
self, name: str, db_name: str, executor: Optional[Executor] = None, **kwargs
202202
):
203203
"""Initialize the SQLite database resource."""
204-
from dbgpt.datasource.rdbms.conn_sqlite import SQLiteConnector
204+
from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteConnector
205205

206206
conn = SQLiteConnector.from_file_path(db_name)
207207
super().__init__(name, conn, executor=executor, **kwargs)

packages/dbgpt-core/src/dbgpt/rag/evaluation/retriever.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ class RetrieverEvaluator(Evaluator):
164164
RetrieverSimilarityMetric,
165165
)
166166
from dbgpt.rag.embedding import DefaultEmbeddingFactory
167-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig
168-
from dbgpt.storage.vector_store.connector import VectorStoreConnector
167+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig
168+
from dbgpt_serve.rag.connector import VectorStoreConnector
169169
from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH
170170
171171
embeddings = DefaultEmbeddingFactory(

packages/dbgpt-core/src/dbgpt/rag/retriever/embedding.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ def __init__(
3636
.. code-block:: python
3737
3838
from dbgpt.storage.vector_store.connector import VectorStoreConnector
39-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig
39+
from dbgpt_ext.storage.vector_store.chroma_store import (
40+
ChromaVectorConfig,
41+
)
4042
from dbgpt.rag.retriever.embedding import EmbeddingRetriever
4143
from dbgpt.rag.embedding.embedding_factory import (
4244
DefaultEmbeddingFactory,

packages/dbgpt-ext/src/dbgpt_ext/rag/assembler/db_schema.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ class DBSchemaAssembler(BaseAssembler):
1919
Example:
2020
.. code-block:: python
2121
22-
from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector
23-
from dbgpt_serve.rag.assembler.db_struct import DBSchemaAssembler
24-
from dbgpt.storage.vector_store.connector import VectorStoreBase
25-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig
22+
from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector
23+
from dbgpt_ext.rag.assembler.db_schema import DBSchemaAssembler
24+
from dbgpt.storage.vector_store.base import VectorStoreBase
25+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig
2626
2727
connection = SQLiteTempConnector.create_temporary_db()
2828
assembler = DBSchemaAssembler.load_from_connection(

packages/dbgpt-ext/src/dbgpt_ext/rag/retriever/db_schema.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ def __init__(
5555
Examples:
5656
.. code-block:: python
5757
58-
from dbgpt.datasource.rdbms.conn_sqlite import SQLiteTempConnector
59-
from dbgpt_serve.rag.assembler.db_schema import DBSchemaAssembler
60-
from dbgpt.storage.vector_store.connector import VectorStoreConnector
61-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig
58+
from dbgpt_ext.datasource.rdbms.conn_sqlite import SQLiteTempConnector
59+
from dbgpt_ext.rag.assembler.db_schema import DBSchemaAssembler
60+
from dbgpt_serve.rag.connector import VectorStoreConnector
61+
from dbgpt_ext.storage.vector_store.chroma_store import (
62+
ChromaVectorConfig,
63+
)
6264
from dbgpt.rag.retriever.embedding import EmbeddingRetriever
6365
6466

packages/dbgpt-serve/src/dbgpt_serve/agent/evaluation/evaluation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class AgentEvaluator(Evaluator):
141141
RetrieverSimilarityMetric,
142142
)
143143
from dbgpt.rag.embedding import DefaultEmbeddingFactory
144-
from dbgpt.storage.vector_store.chroma_store import ChromaVectorConfig
144+
from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig
145145
from dbgpt.storage.vector_store.connector import VectorStoreConnector
146146
from dbgpt.configs.model_config import MODEL_PATH, PILOT_PATH
147147

0 commit comments

Comments
 (0)