Issue/16 legacy code (#54)

* Refactory dialog to Watson alternative component

* #16 Create Google adapter

* #16 adjust output field

Author: ralphg6

david/__main__.py

@@ -4,8 +4,7 @@
 import david.config
 from david.adapters.adapter import MessageAdapter
 from david.assistant import Assistant
-from david.dialog import fetch_dialog
-from david.googleadap import GoogleWebHook
+from david.constants import CONFIG_DEFAULT_ADAPTER
 from david.registry import Registry
 
 # from david.brain import fetch_model, fetch_know
@@ -14,14 +13,10 @@
 CORS(app)
 
 # [TODO] This kwargs must from CLI args
-kwargs = {"default_adapter": MessageAdapter.name()}
+kwargs = {CONFIG_DEFAULT_ADAPTER: MessageAdapter.name()}
 
 config = david.config.load(None, **kwargs)
-
-Registry.registryAdapter(MessageAdapter)
-
 assistant = Assistant(config)
-googleWH = GoogleWebHook(assistant)
 
 
 @app.route("/")
@@ -54,21 +49,6 @@ def dialog():
     return jsonify(responseData)
 
 
-@app.route("/google", methods=["POST"])
-def google():
-    data = request.get_json()
-    return jsonify(googleWH.handle(data))
-
-
-# @app.route('/data/dialog')
-# def data_dialog():
-# return jsonify(fetch_dialog())
-
-# @app.route('/data/know')
-# def data_know():
-# return jsonify(fetch_know())
-
-
 def main() -> None:
     app.run(host="0.0.0.0")
 

david/adapters/__init__.py

@@ -0,0 +1,2 @@
+from david.adapters.adapter import Adapter, MessageAdapter
+from david.adapters.adapters.google import GoogleAdapter

david/adapters/adapter.py

@@ -2,7 +2,7 @@
 from abc import abstractmethod
 from typing import Dict, List, Text
 
-from david.registry import Module
+from david.registry import Module, Registry
 from david.typing import Message
 
 
@@ -38,3 +38,6 @@ def input(cls, payload: Dict) -> Message:
     @classmethod
     def output(cls, message: Message) -> Dict:
         return message.__dict__
+
+
+Registry.registryAdapter(MessageAdapter)

david/adapters/adapters/__init__.py

@@ -0,0 +1,29 @@
+from typing import Dict
+
+from david.adapters.adapter import Adapter
+from david.constants import OUTPUT_TEXT_ATTRIBUTE
+from david.registry import Registry
+from david.typing import Message
+
+
+class GoogleAdapter(Adapter):
+    @classmethod
+    def name(cls):
+        return "google"
+
+    @classmethod
+    def validade_data(cls, payload: Dict) -> bool:
+        return "queryResult" in payload and "queryText" in payload["queryResult"]
+
+    @classmethod
+    def input(cls, payload: Dict) -> Message:
+        input = payload["queryResult"]["queryText"]
+        return Message.build(input)
+
+    @classmethod
+    def output(cls, message: Message) -> Dict:
+        text = message.get(OUTPUT_TEXT_ATTRIBUTE)
+        return {"fulfillmentText": text}
+
+
+Registry.registryAdapter(GoogleAdapter)

david/adapters/adapters/google.py

@@ -1,43 +1,33 @@
-from david.brain import Brain
+from david.components.dialogue import WatsonAlternative
+from david.components.nlu import SimpleNLU
 from david.config import DavidConfig
-from david.constants import (
-    CONTEXT_ATTRIBUTE,
-    ENTITIES_ATTRIBUTE,
-    INTENTS_ATTRIBUTE,
-    TEXT_ATTRIBUTE,
-)
-from david.dialog import Dialog
+from david.constants import DEFAULT_DATA_PATH, DEFAULT_MODELS_PATH, TEXT_ATTRIBUTE
+from david.training_data.formats import JsonReader
+from david.typing import Message
+
+MODEL_FILE = "intent_model.json"
+DIALOG_FILE = "dialog.json"
 
 
 class Assistant:
     def __init__(self, config: DavidConfig):
-        self.brain = Brain(config)
-        self.dialog = Dialog()
+        self.config = config
+        self.dialog = WatsonAlternative.load(
+            {"file": DIALOG_FILE}, model_dir=DEFAULT_DATA_PATH
+        )
+        self.nlu = SimpleNLU.create({}, self.config)
         self.train()
 
     def train(self):
-        self.brain.train()
-        self.dialog.train()
+        training_data = JsonReader.load(self.config)
+        self.nlu.train(training_data, self.config)
+        self.nlu.persist(file_name=MODEL_FILE, model_dir=DEFAULT_MODELS_PATH)
 
     def respond(self, message, context={}):
         text = message.get(TEXT_ATTRIBUTE)
+        message = Message.build(text)
 
-        message = self.brain.process(text)
-
-        intents = message.get(INTENTS_ATTRIBUTE)
-        entities = message.get(ENTITIES_ATTRIBUTE)
-        context = message.get(CONTEXT_ATTRIBUTE)
-
-        # print("intents", intents)
-        dialog_node = self.dialog.dialog(input, context, intents, entities)
-
-        message.output = dialog_node["output"]
-
-        # return {
-        #     "context": context,
-        #     "intents": intents,
-        #     "entities": entities,
-        #     "output": dialog_node["output"],
-        # }
+        self.nlu.process(message)
+        self.dialog.process(message)
 
         return message

david/assistant.py

@@ -0,0 +1 @@
+from david.components.dialogue.watsonalternative import WatsonAlternative

david/brain.py

@@ -0,0 +1,88 @@
+import json
+import os
+from typing import Any, Dict, Optional, Text
+
+from david.components.component import Component
+from david.constants import (
+    CONTEXT_ATTRIBUTE,
+    ENTITIES_ATTRIBUTE,
+    INTENTS_ATTRIBUTE,
+    OUTPUT_TEXT_ATTRIBUTE,
+    TEXT_ATTRIBUTE,
+)
+from david.typing import Message
+from david.typing.model import Metadata
+
+
+def get_dialog_welcome(dialog_nodes):
+    return dialog_nodes[0]
+
+
+def get_dialog_anythinelse(dialog_nodes):
+    return dialog_nodes[len(dialog_nodes) - 1]
+
+
+def evalCondition(condition, context, intent, entities):
+    return condition == "#" + intent
+
+
+class WatsonAlternative(Component):
+    def __init__(
+        self,
+        component_config: Optional[Dict[Text, Any]] = None,
+        dialog_nodes: Dict = None,
+    ) -> None:
+        super().__init__(component_config)
+
+        self.dialog_nodes = dialog_nodes
+
+    @classmethod
+    def load(
+        cls,
+        meta: Dict[Text, Any],
+        model_dir: Optional[Text] = None,
+        model_metadata: Optional["Metadata"] = None,
+        cached_component: Optional["Component"] = None,
+        **kwargs: Any,
+    ) -> "Component":
+        """Load this component from file.
+        After a component has been trained, it will be persisted by
+        calling `persist`. When the pipeline gets loaded again,
+        this component needs to be able to restore itself.
+        Components can rely on any context attributes that are
+        created by :meth:`components.Component.create`
+        calls to components previous
+        to this one."""
+
+        file_name = meta.get("file")
+        model_file = os.path.join(model_dir, file_name)
+
+        if os.path.exists(model_file):
+            with open(model_file) as f:
+                dialog_nodes = json.load(f)
+                return cls(meta, dialog_nodes)
+        else:
+            return cls(meta)
+
+    def process(self, message: Message, **kwargs: Any) -> None:
+
+        text = message.get(TEXT_ATTRIBUTE)
+        intents = message.get(INTENTS_ATTRIBUTE)
+        entities = message.get(ENTITIES_ATTRIBUTE)
+        context = message.get(CONTEXT_ATTRIBUTE)
+
+        dialog_node = self.__dialog(text, context, intents, entities)
+
+        message.set(OUTPUT_TEXT_ATTRIBUTE, dialog_node["output"]["text"])
+
+    def __dialog(self, input, context, intents, entities):
+        if input == "":
+            return get_dialog_welcome(self.dialog_nodes)
+
+        if len(intents) > 0:
+            intent = intents[0]["intent"]
+            for dialog_node in self.dialog_nodes:
+                if evalCondition(dialog_node["condition"], context, intent, entities):
+                    return dialog_node
+
+        return get_dialog_anythinelse(self.dialog_nodes)

david/components/dialogue/__init__.py

@@ -0,0 +1 @@
+from david.components.nlu.simplenlu import SimpleNLU

david/components/dialogue/watsonalternative.py

@@ -23,9 +23,6 @@ def simmilarity(a, b):
 
 
 class SimpleNLU(Component):
-    def __init__(self):
-        print("SimpleNLU")
-
     def __init__(
         self,
         component_config: Optional[Dict[Text, Any]] = None,

david/components/nlu/__init__.py

@@ -1,3 +1,5 @@
+OUTPUT_TEXT_ATTRIBUTE = "output_text"
+
 TEXT_ATTRIBUTE = "text"
 
 INTENTS_ATTRIBUTE = "intents"
@@ -8,10 +10,14 @@
 
 DEFAULT_DATA_PATH = "data"
 
+DEFAULT_MODELS_PATH = "models"
+
 DEFAULT_CONFIG_PATH = "config.yml"
 
 TRAIN_DATA_FILE = "know.json"
 
 DEFAULT_LOG_LEVEL = "INFO"
 
 ENV_LOG_LEVEL = "LOG_LEVEL"
+
+CONFIG_DEFAULT_ADAPTER = "default_adapter"