Removed manual version edit

Removed specific OpenAIPersonaSolver class to use OpenAIChatCompletionsSolver
Moved specifics for system_prompt to OpenAIChatCompletionsSolver
Updated docs to reflect changes

Author: Delfshkrimm

README.md

@@ -13,7 +13,7 @@ Spoken answers api with OpenAI or [LocalAI](https://github.com/go-skynet/LocalAI
 from ovos_solver_openai_persona import OpenAIPersonaSolver
 
 bot = OpenAIPersonaSolver({"key": "sk-XXX",
-                           "system_prompt": "helpful, creative, clever, and very friendly"})
+                           "system_prompt": "You are a helpful assistant."})
 print(bot.get_spoken_answer("describe quantum mechanics in simple terms"))
 # Quantum mechanics is a branch of physics that deals with the behavior of particles on a very small scale, such as atoms and subatomic particles. It explores the idea that particles can exist in multiple states at once and that their behavior is not predictable in the traditional sense.
 print(bot.spoken_answer("Quem encontrou o caminho maritimo para o Brazil", {"lang": "pt-pt"}))

ovos_solver_openai_persona/__init__.py

@@ -1,46 +1,5 @@
-from typing import Optional, Iterable, List, Dict
-
 from ovos_solver_openai_persona.engines import OpenAIChatCompletionsSolver
 
-
-class OpenAIPersonaSolver(OpenAIChatCompletionsSolver):
-    """default "Persona" engine"""
-
-    def __init__(self, config=None):
-        # defaults to gpt-3.5-turbo
-        super().__init__(config=config)
-        self.system_prompt = config.get("system_prompt") or "You are a helpful assistant. You are creative, clever, and very friendly."
-
-    def get_chat_history(self, persona=None):
-        return super().get_chat_history(self.system_prompt)
-
-    # officially exported Solver methods
-    def get_spoken_answer(self, query: str,
-                          lang: Optional[str] = None,
-                          units: Optional[str] = None) -> Optional[str]:
-        """
-        Obtain the spoken answer for a given query.
-
-        Args:
-            query (str): The query text.
-            lang (Optional[str]): Optional language code. Defaults to None.
-            units (Optional[str]): Optional units for the query. Defaults to None.
-
-        Returns:
-            str: The spoken answer as a text response.
-        """
-        answer = super().get_spoken_answer(query, lang, units)
-        if not answer or not answer.strip("?") or not answer.strip("_"):
-            return None
-        return answer
-
-    def stream_chat_utterances(self, messages: List[Dict[str, str]],
-                               lang: Optional[str] = None,
-                               units: Optional[str] = None) -> Iterable[str]:
-        messages = [{"role": "system", "content": self.system_prompt }] + messages
-        answer = super().stream_chat_utterances(messages, lang, units)
-        yield from answer
-
 # for ovos-persona
 LLAMA_DEMO = {
   "name": "Remote LLama",
@@ -53,9 +12,8 @@ def stream_chat_utterances(self, messages: List[Dict[str, str]],
   }
 }
 
-
 if __name__ == "__main__":
-    bot = OpenAIPersonaSolver(LLAMA_DEMO["ovos-solver-openai-persona-plugin"])
+    bot = OpenAIChatCompletionsSolver(LLAMA_DEMO["ovos-solver-openai-persona-plugin"])
     #for utt in bot.stream_utterances("describe quantum mechanics in simple terms"):
     #    print(utt)
         #  Quantum mechanics is a branch of physics that studies the behavior of atoms and particles at the smallest scales.

ovos_solver_openai_persona/dialog_transformers.py

@@ -12,7 +12,7 @@ def __init__(self, name="ovos-dialog-transformer-openai-plugin", priority=10, co
             "key": self.config.get("key"),
             'api_url': self.config.get('api_url', 'https://api.openai.com/v1'),
             "enable_memory": False,
-            "initial_prompt": "your task is to rewrite text as if it was spoken by a different character"
+            "system_prompt": "Your task is to rewrite text as if it was spoken by a different character"
         })
 
     def transform(self, dialog: str, context: dict = None) -> Tuple[str, dict]:

ovos_solver_openai_persona/engines.py

@@ -216,6 +216,7 @@ def stream_chat_utterances(self, messages: List[Dict[str, str]],
         Returns:
             Iterable[str]: An iterable of utterances.
         """
+        messages = [{"role": "system", "content": self.system_prompt }] + messages
         answer = ""
         query = messages[-1]["content"]
         if self.memory:
@@ -266,4 +267,7 @@ def get_spoken_answer(self, query: str,
         """
         messages = self.get_messages(query)
         # just for api compat since it's a subclass, shouldn't be directly used
-        return self.continue_chat(messages=messages, lang=lang, units=units)
+        answer = self.continue_chat(messages=messages, lang=lang, units=units)
+        if not answer or not answer.strip("?") or not answer.strip("_"):
+            return None
+        return answer

ovos_solver_openai_persona/version.py

@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
-VERSION_MAJOR = 2
-VERSION_MINOR = 0
-VERSION_BUILD = 0
+VERSION_MAJOR = 1
+VERSION_MINOR = 1
+VERSION_BUILD = 2
 VERSION_ALPHA = 0
 # END_VERSION_BLOCK

setup.py

@@ -48,7 +48,7 @@ def get_version():
 
 
 PERSONA_ENTRY_POINT = 'Remote Llama=ovos_solver_openai_persona:LLAMA_DEMO'
-PLUGIN_ENTRY_POINT = 'ovos-solver-openai-persona-plugin=ovos_solver_openai_persona:OpenAIPersonaSolver'
+PLUGIN_ENTRY_POINT = 'ovos-solver-openai-persona-plugin=ovos_solver_openai_persona.engines:OpenAIChatCompletionsSolver'
 DIALOG_PLUGIN_ENTRY_POINT = 'ovos-dialog-transformer-openai-plugin=ovos_solver_openai_persona.dialog_transformers:OpenAIDialogTransformer'