Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
a43e80dd
Unverified
Commit
a43e80dd
authored
Aug 29, 2023
by
Jyong
Committed by
GitHub
Aug 29, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add qdrant migration (#1046)
Co-authored-by:
jyong
<
jyong@dify.ai
>
parent
ad5f27bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
91 additions
and
5 deletions
+91
-5
commands.py
api/commands.py
+63
-1
base.py
api/core/index/vector_index/base.py
+28
-4
No files found.
api/commands.py
View file @
a43e80dd
...
...
@@ -329,7 +329,7 @@ def create_qdrant_indexes():
except
Exception
:
provider
=
Provider
(
id
=
'provider_id'
,
tenant_id
=
'tenant_id'
,
tenant_id
=
dataset
.
tenant_id
,
provider_name
=
'openai'
,
provider_type
=
ProviderType
.
CUSTOM
.
value
,
encrypted_config
=
json
.
dumps
({
'openai_api_key'
:
'TEST'
}),
...
...
@@ -369,6 +369,67 @@ def create_qdrant_indexes():
click
.
echo
(
click
.
style
(
'Congratulations! Create {} dataset indexes.'
.
format
(
create_count
),
fg
=
'green'
))
@
click
.
command
(
'update-qdrant-indexes'
,
help
=
'Update qdrant indexes.'
)
def
update_qdrant_indexes
():
click
.
echo
(
click
.
style
(
'Start Update qdrant indexes.'
,
fg
=
'green'
))
create_count
=
0
page
=
1
while
True
:
try
:
datasets
=
db
.
session
.
query
(
Dataset
)
.
filter
(
Dataset
.
indexing_technique
==
'high_quality'
)
\
.
order_by
(
Dataset
.
created_at
.
desc
())
.
paginate
(
page
=
page
,
per_page
=
50
)
except
NotFound
:
break
page
+=
1
for
dataset
in
datasets
:
if
dataset
.
index_struct_dict
:
if
dataset
.
index_struct_dict
[
'type'
]
!=
'qdrant'
:
try
:
click
.
echo
(
'Update dataset qdrant index: {}'
.
format
(
dataset
.
id
))
try
:
embedding_model
=
ModelFactory
.
get_embedding_model
(
tenant_id
=
dataset
.
tenant_id
,
model_provider_name
=
dataset
.
embedding_model_provider
,
model_name
=
dataset
.
embedding_model
)
except
Exception
:
provider
=
Provider
(
id
=
'provider_id'
,
tenant_id
=
dataset
.
tenant_id
,
provider_name
=
'openai'
,
provider_type
=
ProviderType
.
CUSTOM
.
value
,
encrypted_config
=
json
.
dumps
({
'openai_api_key'
:
'TEST'
}),
is_valid
=
True
,
)
model_provider
=
OpenAIProvider
(
provider
=
provider
)
embedding_model
=
OpenAIEmbedding
(
name
=
"text-embedding-ada-002"
,
model_provider
=
model_provider
)
embeddings
=
CacheEmbedding
(
embedding_model
)
from
core.index.vector_index.qdrant_vector_index
import
QdrantVectorIndex
,
QdrantConfig
index
=
QdrantVectorIndex
(
dataset
=
dataset
,
config
=
QdrantConfig
(
endpoint
=
current_app
.
config
.
get
(
'QDRANT_URL'
),
api_key
=
current_app
.
config
.
get
(
'QDRANT_API_KEY'
),
root_path
=
current_app
.
root_path
),
embeddings
=
embeddings
)
if
index
:
index
.
update_qdrant_dataset
(
dataset
)
create_count
+=
1
else
:
click
.
echo
(
'passed.'
)
except
Exception
as
e
:
click
.
echo
(
click
.
style
(
'Create dataset index error: {} {}'
.
format
(
e
.
__class__
.
__name__
,
str
(
e
)),
fg
=
'red'
))
continue
click
.
echo
(
click
.
style
(
'Congratulations! Update {} dataset indexes.'
.
format
(
create_count
),
fg
=
'green'
))
def
register_commands
(
app
):
app
.
cli
.
add_command
(
reset_password
)
app
.
cli
.
add_command
(
reset_email
)
...
...
@@ -378,3 +439,4 @@ def register_commands(app):
app
.
cli
.
add_command
(
sync_anthropic_hosted_providers
)
app
.
cli
.
add_command
(
clean_unused_dataset_indexes
)
app
.
cli
.
add_command
(
create_qdrant_indexes
)
app
.
cli
.
add_command
(
update_qdrant_indexes
)
\ No newline at end of file
api/core/index/vector_index/base.py
View file @
a43e80dd
...
...
@@ -15,12 +15,12 @@ from models.dataset import Document as DatasetDocument
class
BaseVectorIndex
(
BaseIndex
):
def
__init__
(
self
,
dataset
:
Dataset
,
embeddings
:
Embeddings
):
super
()
.
__init__
(
dataset
)
self
.
_embeddings
=
embeddings
self
.
_vector_store
=
None
def
get_type
(
self
)
->
str
:
raise
NotImplementedError
...
...
@@ -143,7 +143,7 @@ class BaseVectorIndex(BaseIndex):
DocumentSegment
.
status
==
'completed'
,
DocumentSegment
.
enabled
==
True
)
.
all
()
for
segment
in
segments
:
document
=
Document
(
page_content
=
segment
.
content
,
...
...
@@ -218,4 +218,28 @@ class BaseVectorIndex(BaseIndex):
except
Exception
as
e
:
raise
e
logging
.
info
(
f
"Dataset {dataset.id} recreate successfully."
)
\ No newline at end of file
logging
.
info
(
f
"Dataset {dataset.id} recreate successfully."
)
def
update_qdrant_dataset
(
self
,
dataset
:
Dataset
):
logging
.
info
(
f
"update_qdrant_dataset {dataset.id}"
)
segment
=
db
.
session
.
query
(
DocumentSegment
)
.
filter
(
DocumentSegment
.
dataset_id
==
dataset
.
id
,
DocumentSegment
.
status
==
'completed'
,
DocumentSegment
.
enabled
==
True
)
.
first
()
if
segment
:
try
:
exist
=
self
.
text_exists
(
segment
.
index_node_id
)
if
exist
:
index_struct
=
{
"type"
:
'qdrant'
,
"vector_store"
:
{
"class_prefix"
:
dataset
.
index_struct_dict
[
'vector_store'
][
'class_prefix'
]}
}
dataset
.
index_struct
=
json
.
dumps
(
index_struct
)
db
.
session
.
commit
()
except
Exception
as
e
:
raise
e
logging
.
info
(
f
"Dataset {dataset.id} recreate successfully."
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment