Merge pull request #67 from fractalego/llm-webserving

Llm webserving

setup.py

@@ -24,6 +24,7 @@
         "wafl.events",
         "wafl.extractors",
         "wafl.filter",
+        "wafl.inference",
         "wafl.interface",
         "wafl.knowledge",
         "wafl.listener",

wafl/command_line.py

@@ -10,7 +10,7 @@
     download_models,
 )
 from wafl.runners.run_from_audio import run_from_audio
-from wafl.runners.selector import run_server
+from wafl.runners.routes import run_app
 
 
 def print_help():
@@ -19,6 +19,7 @@ def print_help():
     print("> wafl init: Initialize the current folder")
     print("> wafl run-cli: Run a cli version of the chatbot")
     print("> wafl run-audio: Run a voice-powered version of the chatbot")
+    print("> wafl run-server: Run a webserver version of the chatbot")
     print("> wafl run-tests: Run the tests in testcases.txt")
     print()
 
@@ -48,7 +49,7 @@ def process_cli():
             remove_preprocessed("/")
 
         elif command == "run-server":
-            run_server()
+            run_app()
             remove_preprocessed("/")
 
         elif command == "run-tests":

wafl/run.py

@@ -4,7 +4,7 @@
 from wafl.exceptions import CloseConversation
 from wafl.events.conversation_events import ConversationEvents
 from wafl.interface.command_line_interface import CommandLineInterface
-from wafl.knowledge.project_knowledge import ProjectKnowledge
+from wafl.knowledge.single_file_knowledge import SingleFileKnowledge
 from wafl.logger.local_file_logger import LocalFileLogger
 from wafl.testcases import ConversationTestCases
 from wafl.variables import get_variables
@@ -21,7 +21,9 @@ def print_incipit():
 def run_from_command_line():
     interface = CommandLineInterface()
     config = Configuration.load_local_config()
-    knowledge = ProjectKnowledge(config, "rules.wafl", logger=_logger)
+    knowledge = SingleFileKnowledge(
+        config, open(config.get_value("rules")).read(), logger=_logger
+    )
     conversation_events = ConversationEvents(
         knowledge,
         interface=interface,
@@ -42,7 +44,9 @@ def run_from_command_line():
 def run_testcases():
     print("Running the testcases in testcases.txt\n")
     config = Configuration.load_local_config()
-    knowledge = ProjectKnowledge(config, "rules.wafl")
+    knowledge = SingleFileKnowledge(
+        config, open(config.get_value("rules")).read(), logger=_logger
+    )
     test_cases_text = open("testcases.txt").read()
     testcases = ConversationTestCases(
         config,

wafl/runners/selector.py → wafl/runners/routes.py

@@ -7,13 +7,12 @@
 from flask import Flask, render_template, redirect, url_for
 from wafl.config import Configuration
 from wafl.events.conversation_events import ConversationEvents
-from wafl.filter.base_filter import BaseAnswerFilter
 from wafl.interface.queue_interface import QueueInterface
 from wafl.knowledge.single_file_knowledge import SingleFileKnowledge
 from wafl.logger.local_file_logger import LocalFileLogger
 from wafl.scheduler.conversation_loop import ConversationLoop
 from wafl.scheduler.scheduler import Scheduler
-from wafl.scheduler.web_interface.web_loop import WebLoop
+from wafl.scheduler.web_loop import WebLoop
 
 _path = os.path.dirname(__file__)
 _logger = LocalFileLogger()

wafl/runners/run_from_audio.py

@@ -3,7 +3,7 @@
 from wafl.events.events_from_module_name import EventsCreatorFromModuleName
 from wafl.events.generated_events import GeneratedEvents
 from wafl.interface.voice_interface import VoiceInterface
-from wafl.knowledge.project_knowledge import ProjectKnowledge
+from wafl.knowledge.single_file_knowledge import SingleFileKnowledge
 from wafl.logger.local_file_logger import LocalFileLogger
 from wafl.scheduler.conversation_loop import ConversationLoop
 from wafl.scheduler.generated_event_loop import GeneratedEventLoop
@@ -14,7 +14,9 @@
 
 def run_from_audio():
     config = Configuration.load_local_config()
-    knowledge = ProjectKnowledge(config, "rules.wafl", logger=_logger)
+    knowledge = SingleFileKnowledge(
+        config, open(config.get_value("rules")).read(), logger=_logger
+    )
     interface = VoiceInterface(config)
     conversation_events = ConversationEvents(
         knowledge,

wafl/runners/run_web_interface.py

@@ -1,4 +1,4 @@
-from wafl.runners.selector import run_app
+from wafl.runners.routes import run_app
 
 
 if __name__ == "__main__":

wafl/scheduler/web_interface/web_loop.py → wafl/scheduler/web_loop.py

@@ -4,7 +4,7 @@
 from flask import render_template, request, jsonify
 from wafl.interface.queue_interface import QueueInterface
 from wafl.logger.history_logger import HistoryLogger
-from wafl.scheduler.web_interface.web_interface_implementation import (
+from wafl.scheduler.web_interface_implementation import (
     get_html_from_dialogue_item,
 )