From 18e586bfcaf6dfe954d1bbfd19b6f532510d8e69 Mon Sep 17 00:00:00 2001
From: Jakub Adamski <kuba@exemplum.pl>
Date: Mon, 23 May 2022 12:50:42 +0200
Subject: [PATCH] notifications & parser improvements

---
 semantic_parser/gramatics/notification.jsgf   | 11 ++++++++++
 semantic_parser/{ => gramatics}/pomoc.jsgf    |  0
 .../{ => gramatics}/pullrequest.jsgf          |  0
 semantic_parser/parser.py                     | 21 ++++++++++++++++---
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 semantic_parser/gramatics/notification.jsgf
 rename semantic_parser/{ => gramatics}/pomoc.jsgf (100%)
 rename semantic_parser/{ => gramatics}/pullrequest.jsgf (100%)

diff --git a/semantic_parser/gramatics/notification.jsgf b/semantic_parser/gramatics/notification.jsgf
new file mode 100644
index 0000000..e3cf8c0
--- /dev/null
+++ b/semantic_parser/gramatics/notification.jsgf
@@ -0,0 +1,11 @@
+#JSGF V1.0 UTF-8 pl;
+
+grammar notifications;
+
+public <notifications> = pokaż mi [nowe] powiadomienia [<time>];
+
+<time> = z [ostatniego | ostatnich] <timeunit> {timeunit};
+
+<timeunit> = miesiąca | tygodnia | dnia | <liczba> dni | <liczba> tygodni | <liczba> miesięcy;
+
+<liczba> = dwóch | trzech | czterech | pięciu | sześciu | siedmiu | ośmiu | dziewięciu;
diff --git a/semantic_parser/pomoc.jsgf b/semantic_parser/gramatics/pomoc.jsgf
similarity index 100%
rename from semantic_parser/pomoc.jsgf
rename to semantic_parser/gramatics/pomoc.jsgf
diff --git a/semantic_parser/pullrequest.jsgf b/semantic_parser/gramatics/pullrequest.jsgf
similarity index 100%
rename from semantic_parser/pullrequest.jsgf
rename to semantic_parser/gramatics/pullrequest.jsgf
diff --git a/semantic_parser/parser.py b/semantic_parser/parser.py
index 2396f61..5865103 100644
--- a/semantic_parser/parser.py
+++ b/semantic_parser/parser.py
@@ -1,6 +1,15 @@
 import jsgf
+from os import listdir
+from os.path import isfile, join
 
-book_grammar = jsgf.parse_grammar_file('pullrequest.jsgf')
+mypath = "./gramatics/"
+onlyfiles = [f for f in listdir(mypath) if isfile(join(mypath, f))]
+
+grammars = []
+
+for grammarFile in onlyfiles:
+    grammar = jsgf.parse_grammar_file(mypath + grammarFile)
+    grammars.append(grammar)
 
 def get_dialog_act(rule):
     slots = []
@@ -19,7 +28,11 @@ def get_slots(expansion, slots):
         get_slots(expansion.referenced_rule.expansion, slots)
 
 def nlu(utterance):
-    matched = book_grammar.find_matching_rules(utterance)
+    matched = None
+    for grammar in grammars:
+        matched = grammar.find_matching_rules(utterance)
+        if matched:
+            break
 
     if matched:
         return get_dialog_act(matched[0])
@@ -30,6 +43,8 @@ def nlu(utterance):
 #result = nlu('jakie są dostępne funkcje')
 #result = nlu('w czym możesz mi pomóc')
 
-result = nlu('jakie są nowe pull requesty')
+#result = nlu('jakie są nowe pull requesty')
 #result = nlu('ile jest nowych pull requestów')
+
+result = nlu('pokaż mi nowe powiadomienia z trzech tygodni')
 print(result)
\ No newline at end of file