Skip to content

Optimisation #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AmanDevelops wants to merge 12 commits into from
Closed

Optimisation #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cc42e9f
[optimization]: optimized email
AmanDevelops Feb 9, 2025
feb22fa
fixing blacklines
AmanDevelops Feb 9, 2025
7f2b068
[optimization]: optimized brightness control
AmanDevelops Feb 10, 2025
1527620
[optimization]: optimized volume control
AmanDevelops Feb 10, 2025
b5e706c
[optimisation]: optimised weather functionality
AmanDevelops Feb 10, 2025
64dda74
[optimization]: optimized news fetching functionality
AmanDevelops Feb 10, 2025
340beaa
[optimisation]: optimised scroller functionality
AmanDevelops Feb 10, 2025
8814ee4
refactor: replace commands.stop_scrolling with scroller.stop_scrolling
AmanDevelops Feb 10, 2025
114ae80
[optimisation]: optimised basic features like explain featues, run se…
AmanDevelops Feb 10, 2025
8dffbdc
[optimisation]: optimised opener functionality and clear screen support
AmanDevelops Feb 10, 2025
1ea15d6
[optimisation]: minor update
AmanDevelops Feb 10, 2025
23bc527
added docstring
AmanDevelops Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 27 additions & 21 deletions src/assistant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@
import subprocess
from datetime import datetime

import commands
from infra import clear_screen
from utils import load_email_config
from voice_interface import VoiceInterface
from commands import scroller
from commands.basic_features import *
from commands.infra import clear_screen
from commands.modify_settings import *
from commands.news_reporter import fetch_news
from commands.send_email import send_email
from commands.utils import load_email_config
from commands.voice_interface import VoiceInterface
from commands.weather_reporter import weather_reporter
from commands.website_oppener import *

LISTENING_ERROR = "Say that again please..."
MAX_FETCHED_HEADLINES = (
Expand Down Expand Up @@ -69,19 +75,19 @@ def execute_query(self, query: str) -> None:
print("No query detected. Please provide an input.")

elif "what can you do" in query:
commands.explain_features(self.__voice_interface)
explain_features(self.__voice_interface)

elif re.search(r"search .* (in google)?", query):
# to convert to a generalized format
query = query.replace(" in google", "")
search_query = re.findall(r"search (.*)", query)[0]
commands.run_search_query(self.__voice_interface, search_query)
run_search_query(self.__voice_interface, search_query)

elif "wikipedia" in query:
# replace it only once to prevent changing the query
query = query.replace("wikipedia", "", 1)
search_query = query.replace("search", "", 1)
commands.wikipedia_search(self.__voice_interface, search_query, 3)
wikipedia_search(self.__voice_interface, search_query, 3)

elif re.search("open .*", query):
application = re.findall(r"open (.*)", query)
Expand All @@ -90,7 +96,7 @@ def execute_query(self, query: str) -> None:
return
application = application[0]
try:
commands.open_application_website(self.__voice_interface, application)
open_application_website(self.__voice_interface, application)
except ValueError as ve:
print(
f"Error occurred while opening {application}: {ve.__class__.__name__}: {ve}"
Expand All @@ -100,7 +106,7 @@ def execute_query(self, query: str) -> None:
)

elif any(text in query for text in ["the time", "time please"]):
commands.tell_time(self.__voice_interface)
tell_time(self.__voice_interface)

elif "scroll" in query:
direction = re.search(r"(up|down|left|right|top|bottom)", query)
Expand All @@ -114,27 +120,27 @@ def execute_query(self, query: str) -> None:
self.__scrolling_thread is None
): # Only start if not already scrolling
self.__scrolling_thread, self.__stop_scrolling_event = (
commands.start_scrolling(direction)
scroller.start_scrolling(direction)
)
elif "stop scrolling" in query:
if self.__scrolling_thread is None: # Only stop if already scrolling
return
commands.stop_scrolling(
scroller.stop_scrolling(
self.__scrolling_thread, self.__stop_scrolling_event
)
del self.__scrolling_thread
self.__scrolling_thread = None
elif re.search(r"scroll to (up|down|left|right|top|bottom)", query):
commands.scroll_to(direction)
scroller.scroll_to(direction)
elif re.search(r"scroll (up|down|left|right)", query):
commands.simple_scroll(direction)
scroller.simple_scroll(direction)
else:
print("Scroll command not recognized")
elif "weather" in query:
cities = re.findall(
r"\b(?:of|in|at)\s+(\w+)", query
) # Extract the city name just after the word 'of'
commands.weather_reporter(self.__voice_interface, cities[0])
weather_reporter(self.__voice_interface, cities[0])
elif "email" in query:
query = query.lower()

Expand Down Expand Up @@ -191,7 +197,7 @@ def execute_query(self, query: str) -> None:
response = self.listen_for_query()
if "yes" in response.lower() or "sure" in response.lower():
self.__voice_interface.speak("Sending the email")
commands.send_email(self.__voice_interface, receiver, subject, body)
send_email(self.__voice_interface, receiver, subject, body)
else:
self.__voice_interface.speak("Request aborted by user")

Expand All @@ -204,11 +210,11 @@ def execute_query(self, query: str) -> None:
else:
value = min(max(0, int(value[0])), 100)
if "set" in query:
commands.brightness_control(value, False, False)
brightness_control(value, False, False)
else:
toDecrease = "decrease" in query or "reduce" in query
relative = "by" in query
commands.brightness_control(value, relative, toDecrease)
brightness_control(value, relative, toDecrease)

elif "volume" in query:
query = query.lower()
Expand All @@ -219,11 +225,11 @@ def execute_query(self, query: str) -> None:
else:
value = min(max(0, int(value[0])), 100)
if "set" in query:
commands.volume_control(value, False, False)
volume_control(value, False, False)
else:
toDecrease = "decrease" in query or "reduce" in query
relative = "by" in query
commands.volume_control(value, relative, toDecrease)
volume_control(value, relative, toDecrease)

elif "shutdown" in query or "shut down" in query:
self.__voice_interface.speak("Are you sure you want to shut down your PC?")
Expand All @@ -247,7 +253,7 @@ def execute_query(self, query: str) -> None:
else:
self.__voice_interface.speak("Request aborted by user")
elif "news" in query:
commands.fetch_news(self.__voice_interface, MAX_FETCHED_HEADLINES)
fetch_news(self.__voice_interface, MAX_FETCHED_HEADLINES)

else:
self.__voice_interface.speak("could not interpret the query")
Expand All @@ -257,7 +263,7 @@ def close(self):
self.__voice_interface.close()
del self.__voice_interface
if self.__scrolling_thread:
commands.stop_scrolling(
scroller.stop_scrolling(
self.__scrolling_thread, self.__stop_scrolling_event
)
del self.__scrolling_thread
Expand Down
Loading