From 36267c607c4f2499d560c19040cd2c2118842721 Mon Sep 17 00:00:00 2001 From: samerbam Date: Mon, 11 Sep 2023 20:44:56 -0400 Subject: [PATCH] remove skills. from skills module imports --- backend/skills/alarms.py | 20 ++++++++++---------- backend/skills/cal.py | 3 ++- backend/skills/gmail.py | 4 +++- backend/skills/gpt.py | 4 +++- backend/skills/phone.py | 12 ++++++------ backend/skills/regexTimeParser.py | 10 +++++----- backend/skills/reminders.py | 4 +++- backend/skills/timers.py | 16 ++++++++-------- backend/skills/todos.py | 4 +++- backend/skills/translations.py | 9 ++++++--- backend/skills/utility.py | 18 +++++++++++++++--- backend/skills/weather.py | 3 ++- backend/skills/wolfram.py | 3 ++- 13 files changed, 68 insertions(+), 42 deletions(-) diff --git a/backend/skills/alarms.py b/backend/skills/alarms.py index 5eba1d9..34f1681 100644 --- a/backend/skills/alarms.py +++ b/backend/skills/alarms.py @@ -8,14 +8,14 @@ Maybe we just call timers.py from here? import requests -if __name__ == "__main__": # Handle running this script directly vs as a project - from config import ntfy_url - from utility import parsetime - from skill import Skill -else: - from skills.config import ntfy_url - from skills.utility import parsetime - from skills.skill import Skill +# if __name__ == "__main__": # Handle running this script directly vs as a project +from config import ntfy_url +from utility import parsetime6 +from skill import Skill +# else: + # from skills.config import ntfy_url + # from skills.utility import parsetime + # from skills.skill import Skill import threading import schedule @@ -96,7 +96,7 @@ class Alarms(Skill): def run(self, query="", duration_string="", name=""): if "add" in query: # duration = time.mktime(parsetime2(duration_string).timetuple()) - duration = parsetime(duration_string) + duration = parsetime6(duration_string)[0] self._add_alarm(duration, name) return True # Return true to indicate success if "remove" in query: @@ -110,6 +110,6 @@ class Alarms(Skill): if __name__ == "__main__": dur = Alarms() - dur.run("add", "1 47 in the afternoon", "test alarm") + dur.run("add", "818 in the afternoon", "test alarm") # dur._add_alarm(123, "123") # dur._trigger_alarm("123") \ No newline at end of file diff --git a/backend/skills/cal.py b/backend/skills/cal.py index 97c9b98..aff53d2 100644 --- a/backend/skills/cal.py +++ b/backend/skills/cal.py @@ -11,7 +11,8 @@ Choice: * Both would be more work, but would allow for more flexibility """ -from skills.skill import Skill +# from skills.skill import Skill +from skill import Skill class Cal(Skill): def __init__(self): diff --git a/backend/skills/gmail.py b/backend/skills/gmail.py index ae6addb..a7f8fd5 100644 --- a/backend/skills/gmail.py +++ b/backend/skills/gmail.py @@ -6,7 +6,9 @@ https://developers.google.com/gmail/api/quickstart/python https://git.imsam.ca/sam/ThermalTodos/src/branch/main/application/sync_calendar.py (for autherizing user) """ -from skills.skill import Skill +# from skills.skill import Skill +from skill import Skill + class Gmail(Skill): def __init__(self): diff --git a/backend/skills/gpt.py b/backend/skills/gpt.py index c46f23b..71c190f 100644 --- a/backend/skills/gpt.py +++ b/backend/skills/gpt.py @@ -1,5 +1,7 @@ -from skills.skill import Skill +# from skills.skill import Skill +from skill import Skill + class GPT(Skill): def __init__(self): diff --git a/backend/skills/phone.py b/backend/skills/phone.py index bd0a4ad..7235319 100644 --- a/backend/skills/phone.py +++ b/backend/skills/phone.py @@ -1,11 +1,11 @@ import requests -if __name__ == '__main__': - from skill import Skill - from config import ntfy_url -else: - from skills.skill import Skill - from skills.config import ntfy_url +# if __name__ == '__main__': +from skill import Skill +from config import ntfy_url +# else: + # from skills.skill import Skill + # from skills.config import ntfy_url class Phone(Skill): diff --git a/backend/skills/regexTimeParser.py b/backend/skills/regexTimeParser.py index fcbae9f..4fda47c 100644 --- a/backend/skills/regexTimeParser.py +++ b/backend/skills/regexTimeParser.py @@ -63,10 +63,10 @@ import re from datetime import datetime, timedelta import time -if __name__ == '__main__': - from config import default_morning_time, default_afternoon_time, default_evening_time -else: - from skills.config import default_morning_time, default_afternoon_time, default_evening_time +# if __name__ == '__main__': +from config import default_morning_time, default_afternoon_time, default_evening_time +# else: + # from skills.config import default_morning_time, default_afternoon_time, default_evening_time morning_datetime = datetime.strptime(default_morning_time, "%H:%M") @@ -187,7 +187,7 @@ class RegexTimeParser: if matches[5]: #(monday|tuesday|wednesday|thursday|friday|saturday|sunday) date = date + timedelta(days = (dayofweek_to_number[matches[5][0]] - date.weekday() + 7) % 7) - return [date.strftime("%d-%m-%Y %H:%M"), matches] + return [date, matches] if __name__ == '__main__': diff --git a/backend/skills/reminders.py b/backend/skills/reminders.py index 42fba88..95303a9 100644 --- a/backend/skills/reminders.py +++ b/backend/skills/reminders.py @@ -12,7 +12,9 @@ Even better, use this library: https://github.com/picklepete/pyicloud/blob/maste (icloud reminders api, reads/writes reminders from/to ios reminders app) """ -from skills.skill import Skill +# from skills.skill import Skill +from skill import Skill + class Reminders(Skill): # ntfy.sh notification? def __init__(self): diff --git a/backend/skills/timers.py b/backend/skills/timers.py index 51dfb24..0ca578f 100644 --- a/backend/skills/timers.py +++ b/backend/skills/timers.py @@ -1,13 +1,13 @@ import requests -if __name__ == "__main__": # Handle running this script directly vs as a project - from config import ntfy_url - from utility import parsetime2 - from skill import Skill -else: - from skills.config import ntfy_url - from skills.utility import parsetime2 - from skills.skill import Skill +# if __name__ == "__main__": # Handle running this script directly vs as a project +from config import ntfy_url +from utility import parsetime2 +from skill import Skill +# else: + # from skills.config import ntfy_url + # from skills.utility import parsetime2 + # from skills.skill import Skill import threading import schedule diff --git a/backend/skills/todos.py b/backend/skills/todos.py index cca15b6..5784875 100644 --- a/backend/skills/todos.py +++ b/backend/skills/todos.py @@ -2,7 +2,9 @@ """ -from skills.skill import Skill +# from skills.skill import Skill +from skill import Skill + class Todos(Skill): # Notion api? reminders app? def __init__(self): diff --git a/backend/skills/translations.py b/backend/skills/translations.py index 7c6f196..773bb4c 100644 --- a/backend/skills/translations.py +++ b/backend/skills/translations.py @@ -1,7 +1,10 @@ import requests -from skills.config import deepl_api_key -from skills.config import google_api_key -from skills.skill import Skill +# from skills.config import deepl_api_key +# from skills.config import google_api_key +# from skills.skill import Skill +from config import deepl_api_key +from config import google_api_key +from skill import Skill """ Reading material for this: diff --git a/backend/skills/utility.py b/backend/skills/utility.py index 5ae2bbc..c386c09 100644 --- a/backend/skills/utility.py +++ b/backend/skills/utility.py @@ -7,6 +7,11 @@ import natural_time from datetime import datetime import time +# if __name__ == '__main__': +from regexTimeParser import RegexTimeParser +# else: + # from skills.regexTimeParser import RegexTimeParser + """ Reading Material: @@ -56,6 +61,11 @@ def parsetime5(phrase): return natural_time.natural_time(phrase) +time_parser = RegexTimeParser() +def parsetime6(phrase): + return time_parser.parse_time(phrase) + + if __name__ == "__main__": # t = parsetime('May 5th in the afternoon') # print(t) @@ -67,10 +77,12 @@ if __name__ == "__main__": # print(t66) # t67 = parsetime2('147 in the afternoon') # print(t67) - # t68 = parsetime2('147 after noon') - # print(t68) - t88 = parsetime('one forty seven in the afternoon') + t68 = parsetime6('147 afternoon') + print(t68) + t88 = parsetime6('1 in the afternoon') print(t88) + t89 = parsetime6('thursday at 9 pm') + print(t89) # t89 = parsetime5('147 in the afternoon') # print(t89) # t90 = parsetime5('147 after noon') diff --git a/backend/skills/weather.py b/backend/skills/weather.py index 2de1724..db0a838 100644 --- a/backend/skills/weather.py +++ b/backend/skills/weather.py @@ -1,5 +1,6 @@ -from skills.skill import Skill +# from skills.skill import Skill +from skill import Skill class Weather(Skill): #open weather map api def __init__(self): diff --git a/backend/skills/wolfram.py b/backend/skills/wolfram.py index e76cff9..996ac2f 100644 --- a/backend/skills/wolfram.py +++ b/backend/skills/wolfram.py @@ -1,5 +1,6 @@ -from skills.skill import Skill +# from skills.skill import Skill +from skill import Skill class Wolfram(Skill): #wolfram alpha api def __init__(self):