Skip to content

Commit

Permalink
Merge pull request #108 from fractalego/new-version
Browse files Browse the repository at this point in the history
various issues, mainly the cache that was not being used
  • Loading branch information
fractalego committed Jul 21, 2024
2 parents 3408ecd + 5e9730b commit 92b0d3e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 9 deletions.
8 changes: 5 additions & 3 deletions todo.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
* dependabot!!!
* update readme with index.

* use poetry

/* why is the cache not working? The system re-loads the knowledge every time

/* dependabot!!!
/* update readme with index.


/* interruptible speech

Expand Down
4 changes: 4 additions & 0 deletions wafl/events/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ def input_is_valid(text):

def remove_text_between_brackets(text: str) -> str:
return re.sub(r"(\[.*?\])", "", text)


def remove_unclear(text: str) -> str:
return text.replace("[unclear]", "").strip()
4 changes: 2 additions & 2 deletions wafl/interface/voice_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import random
import re

from wafl.events.utils import remove_text_between_brackets
from wafl.events.utils import remove_text_between_brackets, remove_unclear
from wafl.interface.base_interface import BaseInterface
from wafl.interface.utils import not_good_enough
from wafl.listener.whisper_listener import WhisperListener
Expand Down Expand Up @@ -80,7 +80,7 @@ async def input(self) -> str:
if utterance.strip():
self._insert_utterance(speaker="user", text=text)

return text
return remove_unclear(text)

def bot_has_spoken(self, to_set: bool = None):
if to_set != None:
Expand Down
9 changes: 6 additions & 3 deletions wafl/knowledge/indexing_implementation.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ async def load_knowledge(config, logger=None):
with open(index_filename) as file:
index_txt = file.read()

if os.path.exists(config.get_value("cache_filename")):
knowledge = joblib.load(config.get_value("cache_filename"))
if knowledge.hash == hash(rules_txt + index_txt):
cache_filename = config.get_value("cache_filename")
if os.path.exists(cache_filename):
knowledge = joblib.load(cache_filename)
if knowledge.hash == hash(rules_txt) and os.path.getmtime(
cache_filename
) > os.path.getmtime(index_filename):
return knowledge

knowledge = SingleFileKnowledge(config, rules_txt, logger=logger)
Expand Down
2 changes: 1 addition & 1 deletion wafl/speaker/fairseq_speaker.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def __init__(self, config):
self._connector = SpeakerConnectorFactory.get_connector(config)
self._p = pyaudio.PyAudio()
self._input_chunk_size = 1024
self._output_chunk_size = 4096
self._output_chunk_size = 16384
self._volume_threshold = (
config.get_value("listener_model")["listener_volume_threshold"] / 5e3
)
Expand Down

0 comments on commit 92b0d3e

Please sign in to comment.