Skip to content

Commit f423b1f

Browse files
chore: update create chroma store param (#2798)
1 parent bf6f389 commit f423b1f

File tree

7 files changed

+38
-42
lines changed

7 files changed

+38
-42
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,10 @@ from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, Chro
5757
shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True)
5858
vector_store = ChromaStore(
5959
ChromaVectorConfig(
60-
embedding_fn=embeddings,
61-
vector_store_config=ChromaVectorConfig(
62-
name="ltm_vector_store",
63-
persist_path="/tmp/tmp_ltm_vector_store",
64-
),
65-
)
60+
persist_path="/tmp/tmp_ltm_vector_store",
61+
),
62+
name="ltm_vector_store",
63+
embedding_fn=embeddings
6664
)
6765
```
6866

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ from dbgpt_ext.storage.vector_store.chroma_store import ChromaVectorConfig, Chro
4747
# Delete old vector store directory(/tmp/tmp_ltm_vector_stor)
4848
shutil.rmtree("/tmp/tmp_ltm_vector_store", ignore_errors=True)
4949
vector_store = ChromaStore(
50-
ChromaVectorConfig(
51-
embedding_fn=embeddings,
52-
vector_store_config=ChromaVectorConfig(
53-
name="ltm_vector_store",
54-
persist_path="/tmp/tmp_ltm_vector_store",
55-
),
56-
)
50+
vector_store_config=ChromaVectorConfig(
51+
persist_path="/tmp/tmp_ltm_vector_store",
52+
),
53+
name="ltm_vector_store",
54+
embedding_fn=embeddings,
5755
)
5856
```
5957

docs/docs/awel/cookbook/first_rag_with_awel.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ In this example, we will load your knowledge from a URL and store it in a vector
1111
First, you need to install the `dbgpt` library.
1212

1313
```bash
14-
pip install "dbgpt[rag]>=0.5.2"
14+
pip install "dbgpt[agent,simple_framework, client]>=0.7.1" "dbgpt_ext>=0.7.1" -U
1515
````
1616

1717
### Prepare Embedding Model
@@ -84,10 +84,10 @@ shutil.rmtree("/tmp/awel_rag_test_vector_store", ignore_errors=True)
8484
8585
vector_store = ChromaStore(
8686
vector_store_config=ChromaVectorConfig(
87-
name="test_vstore",
88-
persist_path="/tmp/awel_rag_test_vector_store",
89-
embedding_fn=embeddings
90-
)
87+
persist_path="/tmp/awel_rag_test_vector_store"
88+
),
89+
name="test_vstore",
90+
embedding_fn=embeddings
9191
)
9292
9393
with DAG("load_knowledge_dag") as knowledge_dag:
@@ -274,10 +274,10 @@ shutil.rmtree("/tmp/awel_rag_test_vector_store", ignore_errors=True)
274274
275275
vector_store = ChromaStore(
276276
vector_store_config=ChromaVectorConfig(
277-
name="test_vstore",
278277
persist_path="/tmp/awel_rag_test_vector_store",
279-
embedding_fn=embeddings
280278
),
279+
name="test_vstore",
280+
embedding_fn=embeddings
281281
)
282282
283283
with DAG("load_knowledge_dag") as knowledge_dag:

docs/docs/awel/cookbook/write_your_chat_database.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ 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.7.0" -U
32+
pip install "dbgpt[rag, agent, client, simple_framework]>=0.7.0" "dbgpt_ext>=0.7.0" -U
33+
pip install openai
3334
````
3435

3536
## Build Knowledge Base
@@ -92,17 +93,17 @@ shutil.rmtree("/tmp/awel_with_data_vector_store", ignore_errors=True)
9293
vector_store = ChromaStore(
9394
ChromaVectorConfig(
9495
persist_path="/tmp/tmp_ltm_vector_store",
95-
name="ltm_vector_store",
96-
embedding_fn=embeddings,
97-
)
96+
),
97+
name="ltm_vector_store",
98+
embedding_fn=embeddings,
9899
)
99100
100101
with DAG("load_schema_dag") as load_schema_dag:
101102
input_task = InputOperator.dummy_input()
102103
# Load database schema to vector store
103104
assembler_task = DBSchemaAssemblerOperator(
104105
connector=db_conn,
105-
index_store=vector_store,
106+
table_vector_store_connector=vector_store,
106107
chunk_parameters=ChunkParameters(chunk_strategy="CHUNK_BY_SIZE")
107108
)
108109
input_task >> assembler_task
@@ -122,7 +123,8 @@ with DAG("retrieve_schema_dag") as retrieve_schema_dag:
122123
# Retrieve database schema from vector store
123124
retriever_task = DBSchemaRetrieverOperator(
124125
top_k=1,
125-
index_store=vector_store,
126+
table_vector_store_connector=vector_store,
127+
field_vector_store_connector=vector_store
126128
)
127129
input_task >> retriever_task
128130
@@ -487,10 +489,10 @@ db_conn.create_temp_tables(
487489
488490
vector_store = ChromaStore(
489491
ChromaVectorConfig(
490-
embedding_fn=embeddings,
491-
name="db_schema_vector_store",
492492
persist_path="/tmp/awel_with_data_vector_store",
493-
)
493+
),
494+
embedding_fn=embeddings,
495+
name="db_schema_vector_store",
494496
)
495497
496498
antv_charts = [
@@ -623,7 +625,7 @@ with DAG("load_schema_dag") as load_schema_dag:
623625
# Load database schema to vector store
624626
assembler_task = DBSchemaAssemblerOperator(
625627
connector=db_conn,
626-
index_store=vector_store,
628+
table_vector_store_connector=vector_store,
627629
chunk_parameters=ChunkParameters(chunk_strategy="CHUNK_BY_SIZE"),
628630
)
629631
input_task >> assembler_task

examples/awel/simple_nl_schema_sql_chart_example.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@
5151

5252
def _create_vector_connector():
5353
"""Create vector connector."""
54-
config = ChromaVectorConfig(
55-
persist_path=PILOT_PATH,
54+
config = ChromaVectorConfig(persist_path=PILOT_PATH)
55+
56+
return ChromaStore(
57+
config,
5658
name="embedding_rag_test",
5759
embedding_fn=DefaultEmbeddingFactory(
5860
default_model_name=os.path.join(MODEL_PATH, "text2vec-large-chinese"),
5961
).create(),
6062
)
6163

62-
return ChromaStore(config)
63-
6464

6565
def _create_temporary_connection():
6666
"""Create a temporary database connection for testing."""

examples/sdk/chat_data_with_awel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
}
6161
)
6262

63-
config = ChromaVectorConfig(
64-
persist_path=PILOT_PATH,
63+
config = ChromaVectorConfig(persist_path=PILOT_PATH)
64+
vector_store = ChromaStore(
65+
config,
6566
name="db_schema_vector_store",
6667
embedding_fn=embeddings,
6768
)
68-
vector_store = ChromaStore(config)
6969

7070
antv_charts = [
7171
{"response_line_chart": "used to display comparative trend analysis data"},

packages/dbgpt-core/src/dbgpt/agent/core/memory/hybrid.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,9 @@ def from_chroma(
9494
vstore_path = vstore_path or os.path.join(DATA_DIR, "agent_memory")
9595

9696
vector_store = ChromaStore(
97-
ChromaVectorConfig(
98-
name=vstore_name,
99-
persist_path=vstore_path,
100-
embedding_fn=embeddings,
101-
)
97+
ChromaVectorConfig(persist_path=vstore_path),
98+
name=vstore_name,
99+
embedding_fn=embeddings,
102100
)
103101
return cls.from_vstore(
104102
vector_store=vector_store,

0 commit comments

Comments
 (0)