Merge pull request #142 from fractalego/removing-dead-code

Removing dead code

setup.py

@@ -22,7 +22,6 @@
         "wafl.connectors.remote",
         "wafl.data_objects",
         "wafl.events",
-        "wafl.extractors",
         "wafl.handlers",
         "wafl.inference",
         "wafl.interface",

tests/test_connection.py

@@ -12,7 +12,7 @@
 class TestConnection(TestCase):
     def test__connection_to_generative_model_can_generate_text(self):
         config = Configuration.load_local_config()
-        connector = RemoteLLMConnector(config.get_value("llm_model"))
+        connector = RemoteLLMConnector(config)
         prediction = asyncio.run(
             connector.predict(
                 PromptCreator.create_from_one_instruction(
@@ -25,7 +25,7 @@ def test__connection_to_generative_model_can_generate_text(self):
 
     def test__connection_to_generative_model_can_generate_text_within_tags(self):
         config = Configuration.load_local_config()
-        connector = RemoteLLMConnector(config.get_value("llm_model"))
+        connector = RemoteLLMConnector(config)
         connector._num_prediction_tokens = 200
         text = 'Generate a full paragraph based on this chapter title " The First Contact". The theme of the paragraph is space opera. Include the characters "Alberto" and "Maria". Write at least three sentences.'
         prompt = f"""
@@ -43,7 +43,7 @@ def test__connection_to_generative_model_can_generate_text_within_tags(self):
 
     def test__connection_to_generative_model_can_generate_a_python_list(self):
         config = Configuration.load_local_config()
-        connector = RemoteLLMConnector(config.get_value("llm_model"))
+        connector = RemoteLLMConnector(config)
         connector._num_prediction_tokens = 200
         prompt = "Generate a Python list of 4 chapters names for a space opera book. The output needs to be a python list of strings: "
         prediction = asyncio.run(

tests/test_entailer.py

@@ -12,7 +12,7 @@
 class TestConnection(TestCase):
     def test__entailer_connector(self):
         config = Configuration.load_local_config()
-        connector = RemoteEntailerConnector(config.get_value("entailer_model"))
+        connector = RemoteEntailerConnector(config)
         prediction = asyncio.run(
             connector.predict(
                 "The first contact is a romance novel set in the middle ages.",

todo.txt

@@ -1,3 +1,7 @@
+* user prior text and response from failed substitutions between [] instead of just iteration number (line 89, dialogue_answerer.py)
+* remove dead code
+* re-fine-tune phi to get better performance
+
 * delete rules and memory from discourse_answerer
 
 * This is wrong - from wafl_ll

wafl/answerer/dialogue_answerer.py

@@ -71,7 +71,9 @@ async def answer(self, query_text: str) -> Answer:
                     rules_text=rules_text,
                     dialogue=conversation,
                 )
-                await self._interface.add_fact(f"The bot predicts: {original_answer_text}")
+                await self._interface.add_fact(
+                    f"The bot predicts: {original_answer_text}"
+                )
                 answer_text, memories = await self._apply_substitutions(
                     original_answer_text
                 )
@@ -86,7 +88,12 @@ async def answer(self, query_text: str) -> Answer:
             except RuntimeError as e:
                 if self._logger:
                     self._logger.write(f"Error in generating answer: {e}")
-                conversation.add_utterance(Utterance(speaker="bot", text=f"[Trying again for the {num_attempts + 2} time.]\n"))
+                conversation.add_utterance(
+                    Utterance(
+                        speaker="bot",
+                        text=f"[when using the answer {original_answer_text} the system says {e}]\n",
+                    )
+                )
 
         if not is_finished:
             final_answer_text += "I was unable to generate a full answer. Please see the logs for more information."

wafl/config.py

@@ -2,7 +2,9 @@
 import os
 import shutil
 
-from wafl.connectors.remote.remote_configuration_connector import RemoteConfigurationConnector
+from wafl.connectors.remote.remote_configuration_connector import (
+    RemoteConfigurationConnector,
+)
 
 _path = os.path.dirname(__file__)
 
@@ -23,7 +25,9 @@ def __init__(self, filename):
         with open(filename) as file:
             self._data = json.load(file)
 
-        self._remote_config = RemoteConfigurationConnector(self._data["backend"]["host"], self._data["backend"]["port"])
+        self._remote_config = RemoteConfigurationConnector(
+            self._data["backend"]["host"], self._data["backend"]["port"]
+        )
 
     def get_value(self, key):
         if key in self._data:

wafl/connectors/remote/remote_configuration_connector.py

@@ -5,6 +5,7 @@
 from typing import Dict
 from wafl.variables import get_variables
 
+
 class RemoteConfigurationConnector:
     _max_tries = 3
 
@@ -19,7 +20,9 @@ def __init__(self, host: str, port: int):
         if (not loop or (loop and not loop.is_running())) and not asyncio.run(
             self.check_connection()
         ):
-            raise RuntimeError("Cannot connect a running Configuration handler. Is WAFL-LLM running?")
+            raise RuntimeError(
+                "Cannot connect a running Configuration handler. Is WAFL-LLM running?"
+            )
 
     async def predict(self) -> Dict[str, str]:
         payload = {"version": get_variables()["version"]}
@@ -45,7 +48,6 @@ async def predict(self) -> Dict[str, str]:
 
         return {}
 
-
     async def check_connection(self) -> bool:
         try:
             async with aiohttp.ClientSession(
@@ -56,4 +58,4 @@ async def check_connection(self) -> bool:
                     return response.status == 200
 
         except Exception:
-            return False
+            return False

wafl/events/conversation_events.py

@@ -80,10 +80,7 @@ async def _process_query(self, text: str):
             ):
                 await self._interface.output("I don't know what to reply")
 
-            if (
-                not text_is_question
-                and not self._interface.get_utterances_list()
-            ):
+            if not text_is_question and not self._interface.get_utterances_list():
                 await self._interface.output("I don't know what to reply")
 
             if (

wafl/variables.py

@@ -1,9 +1,9 @@
 def get_variables():
     return {
-        "version": "0.1.2",
+        "version": "0.1.3",
     }
 
 
 def is_supported(wafl_llm_version):
-    supported_versions = ["0.1.0"]
+    supported_versions = ["0.1.1"]
     return wafl_llm_version in supported_versions