Skip to content

Commit 9b02ee6

Browse files
authored
Merge pull request #10 from lpm0073/next
style: rename main class to HybridSearchRetriever
2 parents 9e4555a + a86f0ae commit 9b02ee6

11 files changed

+27
-27
lines changed

models/examples/load.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"""Sales Support Model (SSM) Retrieval Augmented Generation (RAG)"""
33
import argparse
44

5-
from ..ssm import SalesSupportModel
5+
from models.hybrid_search_retreiver import HybridSearchRetriever
66

77

8-
ssm = SalesSupportModel()
8+
ssm = HybridSearchRetriever()
99

1010
if __name__ == "__main__":
1111
parser = argparse.ArgumentParser(description="RAG example")

models/examples/prompt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"""Sales Support Model (SSM)"""
33
import argparse
44

5-
from ..ssm import SalesSupportModel
5+
from models.hybrid_search_retreiver import HybridSearchRetriever
66

77

8-
ssm = SalesSupportModel()
8+
ssm = HybridSearchRetriever()
99

1010

1111
if __name__ == "__main__":

models/examples/rag.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"""Sales Support Model (SSM) Retrieval Augmented Generation (RAG)"""
33
import argparse
44

5-
from ..ssm import SalesSupportModel
5+
from models.hybrid_search_retreiver import HybridSearchRetriever
66

77

8-
ssm = SalesSupportModel()
8+
ssm = HybridSearchRetriever()
99

1010
if __name__ == "__main__":
1111
parser = argparse.ArgumentParser(description="RAG example")

models/examples/training_services.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"""Sales Support Model (SSM) for the LangChain project."""
33
import argparse
44

5-
from ..prompt_templates import NetecPromptTemplates
6-
from ..ssm import SalesSupportModel
5+
from models.hybrid_search_retreiver import HybridSearchRetriever
6+
from models.prompt_templates import NetecPromptTemplates
77

88

9-
ssm = SalesSupportModel()
9+
ssm = HybridSearchRetriever()
1010
templates = NetecPromptTemplates()
1111

1212
if __name__ == "__main__":

models/examples/training_services_oracle.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"""Sales Support Model (SSM) for the LangChain project."""
33
import argparse
44

5-
from ..prompt_templates import NetecPromptTemplates
6-
from ..ssm import SalesSupportModel
5+
from models.hybrid_search_retreiver import HybridSearchRetriever
6+
from models.prompt_templates import NetecPromptTemplates
77

88

9-
ssm = SalesSupportModel()
9+
ssm = HybridSearchRetriever()
1010
templates = NetecPromptTemplates()
1111

1212
if __name__ == "__main__":

models/ssm.py renamed to models/hybrid_search_retreiver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def create_documents(self, texts):
6464
return documents
6565

6666

67-
class SalesSupportModel:
67+
class HybridSearchRetriever:
6868
"""Sales Support Model (SSM)."""
6969

7070
# prompting wrapper

models/tests/test_ssm.py renamed to models/tests/test_hsr.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@
88
from langchain.embeddings import OpenAIEmbeddings
99
from pinecone import Index
1010

11-
from models.ssm import SalesSupportModel, TextSplitter
11+
from models.hybrid_search_retreiver import HybridSearchRetriever, TextSplitter
1212

1313

1414
class TestSalesSupportModel:
15-
"""Test SalesSupportModel class."""
15+
"""Test HybridSearchRetriever class."""
1616

1717
def test_01_basic(self):
1818
"""Ensure that we can instantiate the class."""
1919

2020
# pylint: disable=broad-except
2121
try:
22-
SalesSupportModel()
22+
HybridSearchRetriever()
2323
except Exception as e:
24-
assert False, f"initialization of SalesSupportModel() failed with exception: {e}"
24+
assert False, f"initialization of HybridSearchRetriever() failed with exception: {e}"
2525

2626
def test_02_class_aatribute_types(self):
2727
"""ensure that class attributes are of the correct type"""
2828

29-
ssm = SalesSupportModel()
29+
ssm = HybridSearchRetriever()
3030
assert isinstance(ssm.chat, ChatOpenAI)
3131
assert isinstance(ssm.pinecone_index, Index)
3232
assert isinstance(ssm.text_splitter, TextSplitter)

models/tests/test_openai.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
"""
77
import pytest # pylint: disable=unused-import
88

9-
from ..ssm import SalesSupportModel
9+
from models.hybrid_search_retreiver import HybridSearchRetriever
1010

1111

1212
class TestOpenAI:
13-
"""Test SalesSupportModel class."""
13+
"""Test HybridSearchRetriever class."""
1414

1515
def test_03_test_openai_connectivity(self):
1616
"""Ensure that we have connectivity to OpenAI."""
1717

18-
ssm = SalesSupportModel()
18+
ssm = HybridSearchRetriever()
1919
retval = ssm.cached_chat_request(
2020
"your are a helpful assistant", "please return the value 'CORRECT' in all upper case."
2121
)

models/tests/test_pinecone.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
class TestPinecone:
16-
"""Test SalesSupportModel class."""
16+
"""Test HybridSearchRetriever class."""
1717

1818
def test_01_test_pinecone_connectivity(self):
1919
"""Ensure that we have connectivity to Pinecone."""

models/tests/test_prompt_templates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
class TestPromptTemplates:
14-
"""Test SalesSupportModel class."""
14+
"""Test HybridSearchRetriever class."""
1515

1616
def test_01_prompt_with_template(self):
1717
"""Ensure that all properties of the template class are PromptTemplate instances."""

0 commit comments

Comments
 (0)