Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements to MilvusVectorDB Service #1294

Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
79752dc
Updated Milvus vector DB files
bsuryadevara Oct 20, 2023
6ca9c82
Updated Milvus vector DB files
bsuryadevara Oct 20, 2023
8fbcb50
Merge branch 'fea-sherlock' into 1272-fea-improve-the-vectordbservice
bsuryadevara Oct 20, 2023
31aa8d3
Updated Milvus vector DB files
bsuryadevara Oct 20, 2023
fbf2f4b
Updated Milvus vector DB files
bsuryadevara Oct 20, 2023
61d81d5
Merge branch '1272-fea-improve-the-vectordbservice' of github.com:bsu…
bsuryadevara Oct 20, 2023
13cd13c
Merge remote-tracking branch 'upstream/fea-sherlock' into 1272-fea-im…
bsuryadevara Oct 23, 2023
b67882a
collection_conf key
bsuryadevara Oct 23, 2023
13720cf
Updated rss feed processing files
bsuryadevara Oct 24, 2023
3165b79
Updated tests
bsuryadevara Oct 24, 2023
4a54ad1
Removed external url and replaced with mock objects
bsuryadevara Oct 24, 2023
cefcb12
Fixed cannot mix list and non-list bug
bsuryadevara Oct 25, 2023
145c73d
Merge remote-tracking branch 'upstream/fea-sherlock' into 1272-fea-im…
bsuryadevara Oct 25, 2023
27c3f6f
Merge remote-tracking branch 'upstream/fea-sherlock' into 1272-fea-im…
bsuryadevara Oct 25, 2023
ce4f6bc
Fixed datatype mismatch error
bsuryadevara Oct 25, 2023
74730a7
replaced cudf with pandas
bsuryadevara Oct 25, 2023
509aa02
Added callback to service argument and updated write to vdb stage
bsuryadevara Oct 26, 2023
0c253c3
Added callback to service argument and updated write to vdb stage
bsuryadevara Oct 26, 2023
a09c720
Removed private variables from tests
bsuryadevara Oct 26, 2023
9f96fb2
Merge remote-tracking branch 'upstream/fea-sherlock' into 1272-fea-im…
bsuryadevara Oct 26, 2023
1dc7114
Fixed pylint errors
bsuryadevara Oct 27, 2023
11c593a
Merge remote-tracking branch 'upstream/fea-sherlock' into 1272-fea-im…
bsuryadevara Oct 27, 2023
1936115
Updated pymilvus to 2.3.2
bsuryadevara Oct 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/llm/rag/persistant_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
from morpheus.pipeline.pipeline import Pipeline
from morpheus.pipeline.stage import Stage
from morpheus.pipeline.stream_pair import StreamPair
from morpheus.service.milvus_vector_db_service import MilvusVectorDBService
from morpheus.service.vector_db_service import VectorDBResourceService
from morpheus.service.vdb.milvus_vector_db_service import MilvusVectorDBService
from morpheus.service.vdb.utils import VectorDBServiceFactory
from morpheus.service.vdb.vector_db_service import VectorDBResourceService
from morpheus.stages.inference.triton_inference_stage import TritonInferenceStage
from morpheus.stages.input.kafka_source_stage import KafkaSourceStage
from morpheus.stages.output.write_to_kafka_stage import WriteToKafkaStage
from morpheus.stages.output.write_to_vector_db import WriteToVectorDBStage
from morpheus.stages.output.write_to_vector_db_stage import WriteToVectorDBStage
from morpheus.stages.preprocess.deserialize_stage import DeserializeStage
from morpheus.stages.preprocess.preprocess_nlp_stage import PreprocessNLPStage
from morpheus.utils.vector_db_service_utils import VectorDBServiceFactory


class SplitStage(Stage):
Expand Down
4 changes: 2 additions & 2 deletions examples/llm/rag/standalone_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
from morpheus.llm.task_handlers.simple_task_handler import SimpleTaskHandler
from morpheus.messages import ControlMessage
from morpheus.pipeline.linear_pipeline import LinearPipeline
from morpheus.service.milvus_vector_db_service import MilvusVectorDBService
from morpheus.service.vdb.milvus_vector_db_service import MilvusVectorDBService
from morpheus.service.vdb.utils import VectorDBServiceFactory
from morpheus.stages.general.monitor_stage import MonitorStage
from morpheus.stages.input.in_memory_source_stage import InMemorySourceStage
from morpheus.stages.output.in_memory_sink_stage import InMemorySinkStage
from morpheus.stages.preprocess.deserialize_stage import DeserializeStage
from morpheus.utils.vector_db_service_utils import VectorDBServiceFactory

logger = logging.getLogger(__name__)

Expand Down
17 changes: 17 additions & 0 deletions examples/llm/vdb_upload/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
<!--
SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
SPDX-License-Identifier: Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

### Launching Triton

Pull the Docker image for Triton:
Expand Down
2 changes: 1 addition & 1 deletion examples/llm/vdb_upload/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from morpheus.stages.general.trigger_stage import TriggerStage
from morpheus.stages.inference.triton_inference_stage import TritonInferenceStage
from morpheus.stages.input.rss_source_stage import RSSSourceStage
from morpheus.stages.output.write_to_vector_db import WriteToVectorDBStage
from morpheus.stages.output.write_to_vector_db_stage import WriteToVectorDBStage
from morpheus.stages.preprocess.deserialize_stage import DeserializeStage
from morpheus.stages.preprocess.preprocess_nlp_stage import PreprocessNLPStage

Expand Down
2 changes: 1 addition & 1 deletion morpheus/llm/nodes/rag_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from morpheus.llm.nodes.prompt_template_node import PromptTemplateNode
from morpheus.llm.nodes.retriever_node import RetrieverNode
from morpheus.llm.services.llm_service import LLMClient
from morpheus.service.vector_db_service import VectorDBResourceService
from morpheus.service.vdb.vector_db_service import VectorDBResourceService

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion morpheus/llm/nodes/retriever_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from morpheus.llm import LLMContext
from morpheus.llm import LLMNodeBase
from morpheus.service.vector_db_service import VectorDBResourceService
from morpheus.service.vdb.vector_db_service import VectorDBResourceService

logger = logging.getLogger(__name__)

Expand Down
Empty file.
Loading
Loading