diff --git a/backend/main.py b/backend/main.py index fa932f2..c6c068f 100644 --- a/backend/main.py +++ b/backend/main.py @@ -10,14 +10,16 @@ from skills.wolfram import Wolfram from NLP import NLP + +print("""\n ██╗ █████╗ ██████╗ ██╗ ██╗██╗███████╗\n ██║██╔══██╗██╔══██╗██║ ██║██║██╔════╝\n ██║███████║██████╔╝██║ ██║██║███████╗\n██ ██║██╔══██║██╔══██╗╚██╗ ██╔╝██║╚════██║\n╚█████╔╝██║ ██║██║ ██║ ╚████╔╝ ██║███████║ + ╚════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝╚══════╝\n""") + import sys -print(sys.version) +print(f"Python Runtime: {sys.version}") skills = [GPT(), Alarms(), Cal(), Gmail(), Reminders(), Timers(), Todos(), Weather(), Wolfram()] skill_names = [skill.trigger_phrase for skill in skills] -print("test") - if __name__ == "__main__": # print("Skill Trigger Phrases: ") diff --git a/backend/skills/alarms.py b/backend/skills/alarms.py index 34f1681..583ff8b 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 parsetime6 -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 diff --git a/backend/skills/cal.py b/backend/skills/cal.py index aff53d2..308735b 100644 --- a/backend/skills/cal.py +++ b/backend/skills/cal.py @@ -11,8 +11,8 @@ Choice: * Both would be more work, but would allow for more flexibility """ -# from skills.skill import Skill -from 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 a7f8fd5..1d934cc 100644 --- a/backend/skills/gmail.py +++ b/backend/skills/gmail.py @@ -6,8 +6,8 @@ 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 skill import Skill +from skills.skill import Skill +# from skill import Skill class Gmail(Skill): diff --git a/backend/skills/gpt.py b/backend/skills/gpt.py index 71c190f..d1e894b 100644 --- a/backend/skills/gpt.py +++ b/backend/skills/gpt.py @@ -1,6 +1,6 @@ -# from skills.skill import Skill -from skill import Skill +from skills.skill import Skill +# from skill import Skill class GPT(Skill): diff --git a/backend/skills/phone.py b/backend/skills/phone.py index 7235319..bd0a4ad 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 b5f964d..3b72bd3 100644 --- a/backend/skills/regexTimeParser.py +++ b/backend/skills/regexTimeParser.py @@ -67,10 +67,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") diff --git a/backend/skills/reminders.py b/backend/skills/reminders.py index 95303a9..b3edcf8 100644 --- a/backend/skills/reminders.py +++ b/backend/skills/reminders.py @@ -12,8 +12,8 @@ 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 skill import Skill +from skills.skill import Skill +# from skill import Skill class Reminders(Skill): # ntfy.sh notification? @@ -47,4 +47,5 @@ class Reminders(Skill): # ntfy.sh notification? pass #Convert verbal location into standardized format def _parse_time(self, time_text): - pass #Convert time into standardized format \ No newline at end of file + pass #Convert time into standardized format + #use parsetime6 from utility.py \ No newline at end of file diff --git a/backend/skills/timers.py b/backend/skills/timers.py index 0ca578f..51dfb24 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 5784875..383b4de 100644 --- a/backend/skills/todos.py +++ b/backend/skills/todos.py @@ -2,8 +2,8 @@ """ -# from skills.skill import Skill -from skill import Skill +from skills.skill import Skill +# from skill import Skill class Todos(Skill): # Notion api? reminders app? diff --git a/backend/skills/translations.py b/backend/skills/translations.py index 773bb4c..698c331 100644 --- a/backend/skills/translations.py +++ b/backend/skills/translations.py @@ -1,10 +1,10 @@ import requests -# 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 +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 c386c09..9902db3 100644 --- a/backend/skills/utility.py +++ b/backend/skills/utility.py @@ -7,10 +7,10 @@ import natural_time from datetime import datetime import time -# if __name__ == '__main__': -from regexTimeParser import RegexTimeParser -# else: - # from skills.regexTimeParser import RegexTimeParser +if __name__ == '__main__': + from regexTimeParser import RegexTimeParser +else: + from skills.regexTimeParser import RegexTimeParser """ Reading Material: diff --git a/backend/skills/weather.py b/backend/skills/weather.py index db0a838..383ad36 100644 --- a/backend/skills/weather.py +++ b/backend/skills/weather.py @@ -1,6 +1,6 @@ -# from skills.skill import Skill -from 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 996ac2f..64d5411 100644 --- a/backend/skills/wolfram.py +++ b/backend/skills/wolfram.py @@ -1,6 +1,6 @@ -# from skills.skill import Skill -from skill import Skill +from skills.skill import Skill +# from skill import Skill class Wolfram(Skill): #wolfram alpha api def __init__(self):