Skip to content

Commit

Permalink
Merge pull request #79 from fractalego/removing-local-llm
Browse files Browse the repository at this point in the history
Removing local llm
  • Loading branch information
fractalego authored Dec 21, 2023
2 parents 973788c + b24ccdb commit 2d28bfc
Show file tree
Hide file tree
Showing 24 changed files with 30 additions and 461 deletions.
10 changes: 2 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
flask[async]==2.0.1
flask-cors==3.0.10
flask_dropzone==1.6.0
accelerate==0.20.3
bitsandbytes==0.41.3
torch==2.0.0
optimum==1.15.0
transformers==4.35.2
nltk==3.6.2
gensim==4.3.1
sklearn==0.0
Expand All @@ -21,6 +16,5 @@ sphinx==6.1.3
sphinx-rtd-theme==1.2.0
bluepy==1.3.0
einops==0.6.1
sentence_transformers==2.2.2
fairseq==0.12.2
g2p-en==2.1.0
g2p-en==2.1.0
pyyaml==6.0.1
10 changes: 1 addition & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
"wafl.connectors",
"wafl.connectors.bridges",
"wafl.connectors.factories",
"wafl.connectors.local",
"wafl.connectors.remote",
"wafl.entailment",
"wafl.events",
"wafl.extractors",
"wafl.filter",
Expand Down Expand Up @@ -50,11 +48,6 @@
"flask-cors==3.0.10",
"flask_dropzone==1.6.0",
"werkzeug==2.1.2",
"accelerate==0.20.3",
"bitsandbytes==0.41.3",
"torch==2.0.0",
"optimum==1.15.0",
"transformers==4.35.2",
"nltk==3.6.2",
"gensim==4.3.1",
"sklearn==0.0",
Expand All @@ -67,9 +60,8 @@
"word2number==1.1",
"aiohttp==3.8.4",
"einops==0.6.1",
"sentence_transformers==2.2.2",
"fairseq==0.12.2",
"g2p-en==2.1.0",
"pyyaml==6.0.1",
],
classifiers=[
"License :: OSI Approved :: MIT License",
Expand Down
3 changes: 3 additions & 0 deletions todo.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
### TODO

* no local llms, only remote
* make it easy to run the llm on the server (something more than docker perhaps)?

/* re-train the whisper model using the distilled version
/* make rules reloadable
/* nicer UI?
Expand Down
1 change: 0 additions & 1 deletion wafl/answerer/dialogue_answerer.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from wafl.connectors.bridges.llm_chitchat_answer_bridge import LLMChitChatAnswerBridge
from wafl.exceptions import CloseConversation
from wafl.extractors.dataclasses import Query, Answer
from wafl.inference.utils import cluster_facts
from wafl.simple_text_processing.questions import is_question


Expand Down
3 changes: 2 additions & 1 deletion wafl/command_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ def process_cli():

else:
print("Unknown argument.\n")
print_help()
else:
print_help()


def main():
Expand Down
2 changes: 0 additions & 2 deletions wafl/connectors/base_llm_connector.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import logging
import re
import torch


from wafl.connectors.utils import select_best_answer

_system_logger = logging.getLogger(__file__)

device = "cuda" if torch.cuda.is_available() else "cpu"
model = None
tokenizer = None

Expand Down
4 changes: 0 additions & 4 deletions wafl/connectors/factories/llm_connector_factory.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
from wafl.connectors.local.local_llm_connector import LocalLLMConnector
from wafl.connectors.remote.remote_llm_connector import RemoteLLMConnector


class LLMConnectorFactory:
@staticmethod
def get_connector(config):
if config.get_value("llm_model")["model_is_local"]:
return LocalLLMConnector(config.get_value("llm_model"))

return RemoteLLMConnector(config.get_value("llm_model"))
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
from wafl.connectors.local.local_sentence_embedder_connector import (
LocalSentenceEmbedderConnector,
)
from wafl.connectors.remote.remote_sentence_embedder_connector import (
RemoteSentenceEmbedderConnector,
)
Expand All @@ -9,9 +6,4 @@
class SentenceEmbedderConnectorFactory:
@staticmethod
def get_connector(model_name, config):
if config.get_value(model_name)["model_is_local"]:
return LocalSentenceEmbedderConnector(
config.get_value(model_name)["local_model"]
)

return RemoteSentenceEmbedderConnector(config.get_value(model_name))
6 changes: 1 addition & 5 deletions wafl/connectors/factories/speaker_connector_factory.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
from wafl.connectors.local.local_speaker_connector import LocalSpeakerConnector
from wafl.connectors.remote.remote_speaker_connector import RemoteSpeakerConnector


class SpeakerConnectorFactory:
@staticmethod
def get_connector(config):
if config.get_value("speaker_model")["model_is_local"]:
return LocalSpeakerConnector(config.get_value("speaker_model"))

return RemoteSpeakerConnector(config.get_value("speaker_model")["remote_model"])
return RemoteSpeakerConnector(config.get_value("speaker_model"))
6 changes: 1 addition & 5 deletions wafl/connectors/factories/whisper_connector_factory.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
from wafl.connectors.local.local_whisper_connector import LocalWhisperConnector
from wafl.connectors.remote.remote_whisper_connector import RemoteWhisperConnector


class WhisperConnectorFactory:
@staticmethod
def get_connector(config):
if config.get_value("listener_model")["model_is_local"]:
return LocalWhisperConnector(config.get_value("listener_model"))

return RemoteWhisperConnector(
config.get_value("listener_model")["remote_model"]
config.get_value("listener_model")
)
Empty file removed wafl/connectors/local/__init__.py
Empty file.
40 changes: 0 additions & 40 deletions wafl/connectors/local/local_entailment_connector.py

This file was deleted.

86 changes: 0 additions & 86 deletions wafl/connectors/local/local_llm_connector.py

This file was deleted.

22 changes: 0 additions & 22 deletions wafl/connectors/local/local_sentence_embedder_connector.py

This file was deleted.

34 changes: 0 additions & 34 deletions wafl/connectors/local/local_speaker_connector.py

This file was deleted.

Loading

0 comments on commit 2d28bfc

Please sign in to comment.