Move system_prompt to bottom of evaluate args so easy to version

aceAaronCharles · Aug 3, 2023 · 9b5012f · 9b5012f
1 parent 3dde592
commit 9b5012f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/client/h2ogpt_client/_utils.py b/client/h2ogpt_client/_utils.py
@@ -24,7 +24,6 @@
     iinput_nochat="input_context_for_instruction",
     langchain_mode="langchain_mode",
     add_chat_history_to_context="add_chat_history_to_context",
-    system_prompt="system_prompt",
     langchain_action="langchain_action",
     langchain_agents="langchain_agents",
     top_k_docs="langchain_top_k_docs",
@@ -34,6 +33,7 @@
     document_choice="langchain_document_choice",
     pre_prompt_summary='pre_prompt_summary',
     prompt_summary='prompt_summary',
+    system_prompt="system_prompt",
 )
 
 

diff --git a/src/evaluate_params.py b/src/evaluate_params.py
@@ -33,7 +33,6 @@
                          'iinput_nochat',
                          'langchain_mode',
                          'add_chat_history_to_context',
-                         'system_prompt',
                          'langchain_action',
                          'langchain_agents',
                          'top_k_docs',
@@ -43,6 +42,7 @@
                          'document_choice',
                          'pre_prompt_summary',
                          'prompt_summary',
+                         'system_prompt',
                          ]
 
 # form evaluate defaults for submit_nochat_api

diff --git a/src/gen.py b/src/gen.py
@@ -71,6 +71,7 @@ def main(
         prompt_type: Union[int, str] = None,
         prompt_dict: typing.Dict = None,
         system_prompt: str = '',
+        use_system_prompt: bool = False,
 
         model_lock: typing.List[typing.Dict[str, str]] = None,
         model_lock_columns: int = None,
@@ -177,7 +178,6 @@ def main(
         use_llm_if_no_docs: bool = True,
         load_db_if_exists: bool = True,
         keep_sources_in_context: bool = False,
-        use_system_prompt: bool = False,
         db_type: str = 'chroma',
         use_openai_embedding: bool = False,
         use_openai_model: bool = False,
@@ -239,6 +239,8 @@ def main(
     :param prompt_dict: If prompt_type=custom, then expects (some) items returned by get_prompt(..., return_dict=True)
     :param system_prompt: Universal system prompt to use if model supports, like LLaMa2, regardless of prompt_type definition.
            Useful for langchain case to control behavior, or OpenAI and Replicate.
+    :param use_system_prompt: Whether to use system prompt (e.g. llama2 safe system prompt) present in prompt_type itself
+           Independent of system_prompt, which is used for OpenAI, Replicate.
     :param model_lock: Lock models to specific combinations, for ease of use and extending to many models
            Only used if gradio = True
            List of dicts, each dict has base_model, tokenizer_base_model, lora_weights, inference_server, prompt_type, and prompt_dict
@@ -388,7 +390,6 @@ def main(
     :param use_llm_if_no_docs: Whether to use LLM even if no documents, when langchain_mode=UserData or MyData or custom
     :param load_db_if_exists: Whether to load chroma db if exists or re-generate db
     :param keep_sources_in_context: Whether to keep url sources in context, not helpful usually
-    :param use_system_prompt: Whether to use system prompt (e.g. llama2 safe system prompt and OpenAI).
     :param db_type: 'faiss' for in-memory or 'chroma' or 'weaviate' for persisted on disk
     :param use_openai_embedding: Whether to use OpenAI embeddings for vector db
     :param use_openai_model: Whether to use OpenAI model for use with vector db
@@ -1564,7 +1565,6 @@ def evaluate(
         iinput_nochat,
         langchain_mode,
         add_chat_history_to_context,
-        system_prompt,
         langchain_action,
         langchain_agents,
         top_k_docs,
@@ -1574,6 +1574,7 @@ def evaluate(
         document_choice,
         pre_prompt_summary,
         prompt_summary,
+        system_prompt,
         # END NOTE: Examples must have same order of parameters
         async_output=None,
         num_async=None,
@@ -2688,9 +2689,9 @@ def mean(a):""", ''] + params_list,
 
     # move to correct position
     for example in examples:
-        example += [chat, '', '', LangChainMode.DISABLED.value, True, system_prompt,
+        example += [chat, '', '', LangChainMode.DISABLED.value, True,
                     LangChainAction.QUERY.value, [],
-                    top_k_docs, chunk, chunk_size, DocumentSubset.Relevant.name, [], '', '',
+                    top_k_docs, chunk, chunk_size, DocumentSubset.Relevant.name, [], '', '', system_prompt
                     ]
         # adjust examples if non-chat mode
         if not chat: