Skip to content

Commit 9f1e5a9

Browse files
committed
Fix: import and lint errors
1 parent 4a2bdd4 commit 9f1e5a9

6 files changed

Lines changed: 9 additions & 14 deletions

File tree

examples/query/rag_pipeline.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,14 @@
4949
# interacting with LLMs using a custom prompt.
5050
prompt_messages = [
5151
ChatMessage.from_system("You are a helpful assistant that answers questions based on the provided documents."),
52-
ChatMessage.from_user(
53-
"""Given these documents, answer the question.
52+
ChatMessage.from_user("""Given these documents, answer the question.
5453
Documents:
5554
{% for doc in documents %}
5655
{{ doc.content }}
5756
{% endfor %}
5857
5958
Question: {{question}}
60-
Answer:"""
61-
),
59+
Answer:"""),
6260
]
6361
rag_pipeline = Pipeline()
6462
rag_pipeline.add_component(

examples/search/rag_pipeline.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@
3737
# interacting with LLMs using a custom prompt.
3838
prompt_messages = [
3939
ChatMessage.from_system("You are a helpful assistant that answers questions based on the provided documents."),
40-
ChatMessage.from_user(
41-
"""Given these documents, answer the question.
40+
ChatMessage.from_user("""Given these documents, answer the question.
4241
Documents:
4342
{% for doc in documents %}
4443
{{ doc.content }}
4544
{% endfor %}
4645
4746
Question: {{question}}
48-
Answer:"""
49-
),
47+
Answer:"""),
5048
]
5149
rag_pipeline = Pipeline()
5250
rag_pipeline.add_component(

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ extra-dependencies = [
5959
"pytest",
6060
"pandas",
6161
"sentence-transformers",
62+
"sentence-transformers-haystack",
6263
]
6364

6465
[tool.hatch.envs.default.scripts]

tests/search_document_store/test_document_store.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
from couchbase.auth import PasswordAuthenticator
1919
from couchbase_haystack import CouchbaseClusterOptions
2020
from couchbase_haystack import CouchbasePasswordAuthenticator
21-
from couchbase.management.logic.search_index_logic import SearchIndex
21+
from couchbase.management.search import SearchIndex
2222
from couchbase.exceptions import SearchIndexNotFoundException
2323
from datetime import timedelta
2424
from sentence_transformers import SentenceTransformer
25-
from couchbase.management.logic.collections_logic import ScopeSpec, CollectionSpec
25+
from couchbase.management.collections import ScopeSpec, CollectionSpec
2626
from couchbase.result import SearchResult
2727

2828
from ..common.common import IS_GLOBAL_LEVEL_INDEX
2929
from ..common import common
3030

31-
3231
model = SentenceTransformer('all-MiniLM-L6-v2')
3332

3433

tests/search_document_store/test_embedding_retrieval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from couchbase.cluster import Cluster, ClusterOptions
1313
from couchbase.options import ClusterOptions, KnownConfigProfiles
1414
from couchbase.auth import PasswordAuthenticator
15-
from couchbase.management.logic.search_index_logic import SearchIndex
15+
from couchbase.management.search import SearchIndex
1616
from couchbase.exceptions import SearchIndexNotFoundException
1717
from couchbase import search
1818
from couchbase_haystack.document_stores.search_filters import NumericRangeQuery

tests/search_document_store/test_retriever.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
from haystack import GeneratedAnswer, Pipeline
1313
from haystack.components.builders.answer_builder import AnswerBuilder
1414
from haystack.components.builders.prompt_builder import PromptBuilder
15-
from haystack.components.embedders import SentenceTransformersTextEmbedder
16-
from haystack.components.generators import HuggingFaceAPIGenerator
15+
from haystack_integrations.components.embedders.sentence_transformers import SentenceTransformersTextEmbedder
1716
import couchbase.search as search
1817
from couchbase.search import SearchQuery
1918
from tests.common.common import IS_GLOBAL_LEVEL_INDEX

0 commit comments

Comments
 (0)