diff --git a/example_env.txt b/example_env.txt index 581c71f..6345784 100644 --- a/example_env.txt +++ b/example_env.txt @@ -1,3 +1,15 @@ -OPENAI_API_KEY='OPENAI API KEY HERE' -OLLAMA_MODEL='llama3' -OLLAMA_URL='https://localhost:11434' \ No newline at end of file +OPENAI_API_KEY='' +#LLM_TYPE will take openai, local, or hybrid +LLM_TYPE='openai' +OPENAI_MODEL='gpt-4o-mini' +#OLLAMA_MODEL will take any model you can load in ollama +OLLAMA_MODEL='llama' +OLLAMA_URL='http://10.0.0.231:11434' +spotify_client_id = '' +spotify_client_secret = '' +spotify_redirect_uri = 'http://localhost:8888/callback' + + + + + diff --git a/main.py b/main.py index 49d0e50..df58da7 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,9 @@ from modules import agent import asyncio +import environ + +env = environ.Env() +environ.Env.read_env() loop = asyncio.new_event_loop() asyncio.set_event_loop(loop) diff --git a/modules/agent.py b/modules/agent.py index 7e4f6a8..2226521 100644 --- a/modules/agent.py +++ b/modules/agent.py @@ -3,12 +3,10 @@ import operator from modules import adapter, speak, prompts, spotify, app_launcher, windows_focus from langchain_core.agents import AgentAction, AgentFinish from langchain.agents import create_openai_tools_agent -from langchain.prompts import PromptTemplate, SystemMessagePromptTemplate from langchain import hub from langchain_core.tools import tool from langgraph.graph import StateGraph, END import asyncio -import time import subprocess diff --git a/modules/clippy.png b/modules/clippy.png deleted file mode 100644 index 7e3a2c6..0000000 Binary files a/modules/clippy.png and /dev/null differ diff --git a/modules/clippy2.png b/modules/clippy2.png deleted file mode 100644 index 75c07e9..0000000 Binary files a/modules/clippy2.png and /dev/null differ diff --git a/modules/example_env.txt b/modules/example_env.txt deleted file mode 100644 index 6345784..0000000 --- a/modules/example_env.txt +++ /dev/null @@ -1,15 +0,0 @@ -OPENAI_API_KEY='' -#LLM_TYPE will take openai, local, or hybrid -LLM_TYPE='openai' -OPENAI_MODEL='gpt-4o-mini' -#OLLAMA_MODEL will take any model you can load in ollama -OLLAMA_MODEL='llama' -OLLAMA_URL='http://10.0.0.231:11434' -spotify_client_id = '' -spotify_client_secret = '' -spotify_redirect_uri = 'http://localhost:8888/callback' - - - - - diff --git a/modules/timer_test.py b/modules/timer.py similarity index 57% rename from modules/timer_test.py rename to modules/timer.py index 468e127..3df447b 100644 --- a/modules/timer_test.py +++ b/modules/timer.py @@ -1,15 +1,3 @@ -# import time -# from win10toast import ToastNotifier - -# def start_timer(seconds): -# print(f"Timer started for {seconds} seconds...") -# time.sleep(seconds) -# toaster = ToastNotifier() -# toaster.show_toast("Timer Finished", "Your time is up!", duration=10) - -# # Example: Set a timer for 60 seconds -# start_timer(5) - import time from plyer import notification