Skip to content

Commit ddb9cc9

Browse files
committed
chore: lint code
1 parent 0b0b7a1 commit ddb9cc9

File tree

1 file changed

+2
-37
lines changed

1 file changed

+2
-37
lines changed

models/hybrid_search_retreiver.py

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@
2121
from typing import Union
2222

2323
# pinecone integration
24-
import pinecone
2524
from langchain.cache import InMemoryCache
2625
from langchain.chat_models import ChatOpenAI
2726

2827
# embedding
29-
from langchain.embeddings import OpenAIEmbeddings
3028
from langchain.globals import set_llm_cache
3129

3230
# prompting and chat
@@ -36,12 +34,11 @@
3634
# hybrid search capability
3735
from langchain.retrievers import PineconeHybridSearchRetriever
3836
from langchain.schema import BaseMessage, HumanMessage, SystemMessage
39-
from langchain.vectorstores.pinecone import Pinecone
4037
from pinecone_text.sparse import BM25Encoder
4138

4239
# this project
4340
from models.const import Config, Credentials
44-
from models.pinecone import PineConeIndex, TextSplitter
41+
from models.pinecone import PineConeIndex
4542

4643

4744
###############################################################################
@@ -54,16 +51,12 @@ class HybridSearchRetriever:
5451
"""Hybrid Search Retriever"""
5552

5653
_chat: ChatOpenAI = None
57-
_openai_embeddings: OpenAIEmbeddings = None
58-
_vector_store: Pinecone = None
59-
_text_splitter: TextSplitter = None
6054
_b25_encoder: BM25Encoder = None
6155
_pinecone: PineConeIndex = None
6256
_retriever: PineconeHybridSearchRetriever = None
6357

6458
def __init__(self):
6559
"""Constructor"""
66-
pinecone.init(api_key=Credentials.PINECONE_API_KEY, environment=Config.PINECONE_ENVIRONMENT)
6760
set_llm_cache(InMemoryCache())
6861

6962
@property
@@ -88,34 +81,6 @@ def chat(self) -> ChatOpenAI:
8881
)
8982
return self._chat
9083

91-
# embeddings
92-
@property
93-
def openai_embeddings(self) -> OpenAIEmbeddings:
94-
"""OpenAIEmbeddings lazy read-only property."""
95-
if self._openai_embeddings is None:
96-
self._openai_embeddings = OpenAIEmbeddings(
97-
api_key=Credentials.OPENAI_API_KEY, organization=Credentials.OPENAI_API_ORGANIZATION
98-
)
99-
return self._openai_embeddings
100-
101-
@property
102-
def vector_store(self) -> Pinecone:
103-
"""Pinecone lazy read-only property."""
104-
if self._vector_store is None:
105-
self._vector_store = Pinecone(
106-
index=self.pinecone.index,
107-
embedding=self.openai_embeddings,
108-
text_key=Config.PINECONE_VECTORSTORE_TEXT_KEY,
109-
)
110-
return self._vector_store
111-
112-
@property
113-
def text_splitter(self) -> TextSplitter:
114-
"""TextSplitter lazy read-only property."""
115-
if self._text_splitter is None:
116-
self._text_splitter = TextSplitter()
117-
return self._text_splitter
118-
11984
@property
12085
def bm25_encoder(self) -> BM25Encoder:
12186
"""BM25Encoder lazy read-only property."""
@@ -128,7 +93,7 @@ def retriever(self) -> PineconeHybridSearchRetriever:
12893
"""PineconeHybridSearchRetriever lazy read-only property."""
12994
if self._retriever is None:
13095
self._retriever = PineconeHybridSearchRetriever(
131-
embeddings=self.openai_embeddings, sparse_encoder=self.bm25_encoder, index=self.pinecone.index
96+
embeddings=self.pinecone.openai_embeddings, sparse_encoder=self.bm25_encoder, index=self.pinecone.index
13297
)
13398
return self._retriever
13499

0 commit comments

Comments
 (0)