Skip to content

Commit

Permalink
System prompt at App level (mem0ai#484)
Browse files Browse the repository at this point in the history
Co-authored-by: Taranjeet Singh <[email protected]>
  • Loading branch information
Dev-Khant and taranjeet committed Sep 3, 2023
1 parent 9f1f17a commit ec9f454
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 16 deletions.
18 changes: 14 additions & 4 deletions embedchain/apps/App.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from typing import Optional

import openai

from embedchain.config import AppConfig, ChatConfig
Expand All @@ -14,19 +16,27 @@ class App(EmbedChain):
dry_run(query): test your prompt without consuming tokens.
"""

def __init__(self, config: AppConfig = None):
def __init__(self, config: AppConfig = None, system_prompt: Optional[str] = None):
"""
:param config: AppConfig instance to load as configuration. Optional.
:param system_prompt: System prompt string. Optional.
"""
if config is None:
config = AppConfig()

super().__init__(config)
super().__init__(config, system_prompt)

def get_llm_model_answer(self, prompt, config: ChatConfig):
messages = []
if config.system_prompt:
messages.append({"role": "system", "content": config.system_prompt})
system_prompt = (
self.system_prompt
if self.system_prompt is not None
else config.system_prompt
if config.system_prompt is not None
else None
)
if system_prompt:
messages.append({"role": "system", "content": system_prompt})
messages.append({"role": "user", "content": prompt})
response = openai.ChatCompletion.create(
model=config.model or "gpt-3.5-turbo-0613",
Expand Down
8 changes: 6 additions & 2 deletions embedchain/apps/CustomApp.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ class CustomApp(EmbedChain):
dry_run(query): test your prompt without consuming tokens.
"""

def __init__(self, config: CustomAppConfig = None):
def __init__(self, config: CustomAppConfig = None, system_prompt: Optional[str] = None):
"""
:param config: Optional. `CustomAppConfig` instance to load as configuration.
:raises ValueError: Config must be provided for custom app
:param system_prompt: Optional. System prompt string.
"""
if config is None:
raise ValueError("Config must be provided for custom app")
Expand All @@ -34,7 +35,7 @@ def __init__(self, config: CustomAppConfig = None):
# Because these models run locally, they should have an instance running when the custom app is created
self.open_source_app = OpenSourceApp(config=config.open_source_app_config)

super().__init__(config)
super().__init__(config, system_prompt)

def set_llm_model(self, provider: Providers):
self.provider = provider
Expand All @@ -51,6 +52,9 @@ def get_llm_model_answer(self, prompt, config: ChatConfig):
"Streaming responses have not been implemented for this model yet. Please disable."
)

if config.system_prompt is None and self.system_prompt is not None:
config.system_prompt = self.system_prompt

try:
if self.provider == Providers.OPENAI:
return CustomApp._get_openai_answer(prompt, config)
Expand Down
8 changes: 5 additions & 3 deletions embedchain/apps/Llama2App.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
from typing import Optional

from langchain.llms import Replicate

Expand All @@ -15,21 +16,22 @@ class Llama2App(EmbedChain):
query(query): finds answer to the given query using vector database and LLM.
"""

def __init__(self, config: AppConfig = None):
def __init__(self, config: AppConfig = None, system_prompt: Optional[str] = None):
"""
:param config: AppConfig instance to load as configuration. Optional.
:param system_prompt: System prompt string. Optional.
"""
if "REPLICATE_API_TOKEN" not in os.environ:
raise ValueError("Please set the REPLICATE_API_TOKEN environment variable.")

if config is None:
config = AppConfig()

super().__init__(config)
super().__init__(config, system_prompt)

def get_llm_model_answer(self, prompt, config: ChatConfig = None):
# TODO: Move the model and other inputs into config
if config.system_prompt:
if self.system_prompt or config.system_prompt:
raise ValueError("Llama2App does not support `system_prompt`")
llm = Replicate(
model="a16z-infra/llama13b-v2-chat:df7690f1994d94e96ad9d568eac121aecf50684a0b0963b25a41cc40061269e5",
Expand Down
9 changes: 5 additions & 4 deletions embedchain/apps/OpenSourceApp.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import logging
from typing import Iterable, Union
from typing import Iterable, Union, Optional

from embedchain.config import ChatConfig, OpenSourceAppConfig
from embedchain.embedchain import EmbedChain
Expand All @@ -18,10 +18,11 @@ class OpenSourceApp(EmbedChain):
query(query): finds answer to the given query using vector database and LLM.
"""

def __init__(self, config: OpenSourceAppConfig = None):
def __init__(self, config: OpenSourceAppConfig = None, system_prompt: Optional[str] = None):
"""
:param config: OpenSourceAppConfig instance to load as configuration. Optional.
`ef` defaults to open source.
:param system_prompt: System prompt string. Optional.
"""
logging.info("Loading open source embedding model. This may take some time...") # noqa:E501
if not config:
Expand All @@ -33,7 +34,7 @@ def __init__(self, config: OpenSourceAppConfig = None):
self.instance = OpenSourceApp._get_instance(config.model)

logging.info("Successfully loaded open source embedding model.")
super().__init__(config)
super().__init__(config, system_prompt)

def get_llm_model_answer(self, prompt, config: ChatConfig):
return self._get_gpt4all_answer(prompt=prompt, config=config)
Expand All @@ -55,7 +56,7 @@ def _get_gpt4all_answer(self, prompt: str, config: ChatConfig) -> Union[str, Ite
"OpenSourceApp does not support switching models at runtime. Please create a new app instance."
)

if config.system_prompt:
if self.system_prompt or config.system_prompt:
raise ValueError("OpenSourceApp does not support `system_prompt`")

response = self.instance.generate(
Expand Down
4 changes: 3 additions & 1 deletion embedchain/embedchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,17 @@


class EmbedChain:
def __init__(self, config: BaseAppConfig):
def __init__(self, config: BaseAppConfig, system_prompt: Optional[str] = None):
"""
Initializes the EmbedChain instance, sets up a vector DB client and
creates a collection.
:param config: BaseAppConfig instance to load as configuration.
:param system_prompt: Optional. System prompt string.
"""

self.config = config
self.system_prompt = system_prompt
self.collection = self.config.db._get_or_create_collection(self.config.collection_name)
self.db = self.config.db
self.user_asks = []
Expand Down
19 changes: 17 additions & 2 deletions tests/embedchain/test_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_query(self):
mock_answer.assert_called_once()

@patch("openai.ChatCompletion.create")
def test_query_config_passing(self, mock_create):
def test_query_config_app_passing(self, mock_create):
mock_create.return_value = {"choices": [{"message": {"content": "response"}}]} # Mock response

config = AppConfig()
Expand All @@ -52,9 +52,24 @@ def test_query_config_passing(self, mock_create):

app.get_llm_model_answer("Test query", chat_config)

# Test systemp_prompt: Check that the 'create' method was called with the correct 'messages' argument
# Test system_prompt: Check that the 'create' method was called with the correct 'messages' argument
messages_arg = mock_create.call_args.kwargs["messages"]
self.assertEqual(messages_arg[0]["role"], "system")
self.assertEqual(messages_arg[0]["content"], "Test system prompt")

# TODO: Add tests for other config variables

@patch("openai.ChatCompletion.create")
def test_app_passing(self, mock_create):
mock_create.return_value = {"choices": [{"message": {"content": "response"}}]} # Mock response

config = AppConfig()
chat_config = QueryConfig()
app = App(config=config, system_prompt="Test system prompt")

app.get_llm_model_answer("Test query", chat_config)

# Test system_prompt: Check that the 'create' method was called with the correct 'messages' argument
messages_arg = mock_create.call_args.kwargs["messages"]
self.assertEqual(messages_arg[0]["role"], "system")
self.assertEqual(messages_arg[0]["content"], "Test system prompt")

0 comments on commit ec9f454

Please sign in to comment.