diff --git a/app_config.json b/app_config.json index 05188bb86..06115c8d8 100644 --- a/app_config.json +++ b/app_config.json @@ -1,4 +1,10 @@ { + "gemini-2.0-flash":{ + "api_url": "https://generativelanguage.googleapis.com/v1beta/openai/", + "api_key": "AIzaSyCiURTUJrEGw5J7HxtL1KRNT9GhNKCJsb0", + "model": "gemini-2.0-flash" + }, + "deepseek-chat":{ "api_url": "https://api.deepseek.com", "api_key": "sk-12165b127043441697a8940918e207ac", diff --git a/data/MNIST/raw/t10k-images-idx3-ubyte b/data/MNIST/raw/t10k-images-idx3-ubyte deleted file mode 100644 index 1170b2cae..000000000 Binary files a/data/MNIST/raw/t10k-images-idx3-ubyte and /dev/null differ diff --git a/data/MNIST/raw/t10k-images-idx3-ubyte.gz b/data/MNIST/raw/t10k-images-idx3-ubyte.gz deleted file mode 100644 index 5ace8ea93..000000000 Binary files a/data/MNIST/raw/t10k-images-idx3-ubyte.gz and /dev/null differ diff --git a/data/MNIST/raw/t10k-labels-idx1-ubyte b/data/MNIST/raw/t10k-labels-idx1-ubyte deleted file mode 100644 index d1c3a9706..000000000 Binary files a/data/MNIST/raw/t10k-labels-idx1-ubyte and /dev/null differ diff --git a/data/MNIST/raw/t10k-labels-idx1-ubyte.gz b/data/MNIST/raw/t10k-labels-idx1-ubyte.gz deleted file mode 100644 index a7e141541..000000000 Binary files a/data/MNIST/raw/t10k-labels-idx1-ubyte.gz and /dev/null differ diff --git a/data/MNIST/raw/train-images-idx3-ubyte b/data/MNIST/raw/train-images-idx3-ubyte deleted file mode 100644 index bbce27659..000000000 Binary files a/data/MNIST/raw/train-images-idx3-ubyte and /dev/null differ diff --git a/data/MNIST/raw/train-images-idx3-ubyte.gz b/data/MNIST/raw/train-images-idx3-ubyte.gz deleted file mode 100644 index b50e4b6bc..000000000 Binary files a/data/MNIST/raw/train-images-idx3-ubyte.gz and /dev/null differ diff --git a/data/MNIST/raw/train-labels-idx1-ubyte b/data/MNIST/raw/train-labels-idx1-ubyte deleted file mode 100644 index d6b4c5db3..000000000 Binary files a/data/MNIST/raw/train-labels-idx1-ubyte and /dev/null differ diff --git a/data/MNIST/raw/train-labels-idx1-ubyte.gz b/data/MNIST/raw/train-labels-idx1-ubyte.gz deleted file mode 100644 index 707a576bb..000000000 Binary files a/data/MNIST/raw/train-labels-idx1-ubyte.gz and /dev/null differ diff --git a/mnist_cnn.pth b/mnist_cnn.pth deleted file mode 100644 index fed711f1a..000000000 Binary files a/mnist_cnn.pth and /dev/null differ diff --git a/mnist_cnn_improved.pth b/mnist_cnn_improved.pth deleted file mode 100644 index a7d8843fc..000000000 Binary files a/mnist_cnn_improved.pth and /dev/null differ diff --git a/webpages/__pycache__/SendEmail.cpython-312.pyc b/webpages/__pycache__/SendEmail.cpython-312.pyc index 9d086e0bf..81593896c 100644 Binary files a/webpages/__pycache__/SendEmail.cpython-312.pyc and b/webpages/__pycache__/SendEmail.cpython-312.pyc differ diff --git a/webpages/__pycache__/__init__.cpython-312.pyc b/webpages/__pycache__/__init__.cpython-312.pyc index 993fc751f..68e5d3dd1 100644 Binary files a/webpages/__pycache__/__init__.cpython-312.pyc and b/webpages/__pycache__/__init__.cpython-312.pyc differ diff --git a/webpages/__pycache__/buff_bot.cpython-312.pyc b/webpages/__pycache__/buff_bot.cpython-312.pyc index 3698f3c8b..4428eec7b 100644 Binary files a/webpages/__pycache__/buff_bot.cpython-312.pyc and b/webpages/__pycache__/buff_bot.cpython-312.pyc differ diff --git a/webpages/__pycache__/classroom.cpython-312.pyc b/webpages/__pycache__/classroom.cpython-312.pyc index 615e17656..7f8856bb1 100644 Binary files a/webpages/__pycache__/classroom.cpython-312.pyc and b/webpages/__pycache__/classroom.cpython-312.pyc differ diff --git a/webpages/__pycache__/code_editor.cpython-312.pyc b/webpages/__pycache__/code_editor.cpython-312.pyc index bea0fa418..5d3d7d243 100644 Binary files a/webpages/__pycache__/code_editor.cpython-312.pyc and b/webpages/__pycache__/code_editor.cpython-312.pyc differ diff --git a/webpages/__pycache__/event.cpython-312.pyc b/webpages/__pycache__/event.cpython-312.pyc index 69c99eefd..0b8a55394 100644 Binary files a/webpages/__pycache__/event.cpython-312.pyc and b/webpages/__pycache__/event.cpython-312.pyc differ diff --git a/webpages/__pycache__/home.cpython-312.pyc b/webpages/__pycache__/home.cpython-312.pyc index 2c8b7212c..6c599dd4e 100644 Binary files a/webpages/__pycache__/home.cpython-312.pyc and b/webpages/__pycache__/home.cpython-312.pyc differ diff --git a/webpages/__pycache__/join_us.cpython-312.pyc b/webpages/__pycache__/join_us.cpython-312.pyc index b43f3eb8f..2c8dd71b8 100644 Binary files a/webpages/__pycache__/join_us.cpython-312.pyc and b/webpages/__pycache__/join_us.cpython-312.pyc differ diff --git a/webpages/__pycache__/navigation.cpython-312.pyc b/webpages/__pycache__/navigation.cpython-312.pyc index dc8e3cec9..9447b3b16 100644 Binary files a/webpages/__pycache__/navigation.cpython-312.pyc and b/webpages/__pycache__/navigation.cpython-312.pyc differ diff --git a/webpages/__pycache__/outstanding_members.cpython-312.pyc b/webpages/__pycache__/outstanding_members.cpython-312.pyc index 600e97888..916e506a0 100644 Binary files a/webpages/__pycache__/outstanding_members.cpython-312.pyc and b/webpages/__pycache__/outstanding_members.cpython-312.pyc differ diff --git a/webpages/__pycache__/project.cpython-312.pyc b/webpages/__pycache__/project.cpython-312.pyc index 557042000..c4ae24010 100644 Binary files a/webpages/__pycache__/project.cpython-312.pyc and b/webpages/__pycache__/project.cpython-312.pyc differ diff --git a/webpages/__pycache__/reference.cpython-312.pyc b/webpages/__pycache__/reference.cpython-312.pyc index 65bfa122e..414db5c79 100644 Binary files a/webpages/__pycache__/reference.cpython-312.pyc and b/webpages/__pycache__/reference.cpython-312.pyc differ diff --git a/webpages/__pycache__/testing.cpython-312.pyc b/webpages/__pycache__/testing.cpython-312.pyc index 3dbd45e83..3a249e3c0 100644 Binary files a/webpages/__pycache__/testing.cpython-312.pyc and b/webpages/__pycache__/testing.cpython-312.pyc differ diff --git a/webpages/buff_bot.py b/webpages/buff_bot.py index 469daa840..a02ab407d 100644 --- a/webpages/buff_bot.py +++ b/webpages/buff_bot.py @@ -23,7 +23,7 @@ def buffbot(): st.code(f.read(), language="python") st.divider() # Select AI model for chatbot - model_options = ["deepseek-r1:1.5b", "llama3.2:1b", "deepseek-chat", ] + model_options = ["gemini-2.0-flash", "deepseek-r1:1.5b", "llama3.2:1b", "deepseek-chat", ] # on_change callback to clear chat history when model is changed selected_model = st.selectbox("**👉Please select a model to start**", model_options, on_change=clear_chat) @@ -60,11 +60,19 @@ def buffbot(): # The API key and base URL are loaded based on the selected model with open('app_config.json') as config_file: config = json.load(config_file) + + if selected_model == "gemini-2.0-flash": + api_base_url = config[selected_model]["api_url"] + api_key = config[selected_model]["api_key"] + st.info("Powered by the online [Gemini](https://deepmind.google/technologies/gemini/) API!\ + Just a heads up, you have 10 messages to use.") + # Set the maximum number of user messages + MAX_USER_MESSAGES = 10 + # deepseek-chat model, online API if selected_model == "deepseek-chat": api_base_url = config[selected_model]["api_url"] api_key = config[selected_model]["api_key"] - model = config[selected_model]["model"] st.info("Powered by the online [DeepSeek](https://www.deepseek.com/) API!\ Just a heads up, you have 10 messages to use.") # Set the maximum number of user messages @@ -74,7 +82,6 @@ def buffbot(): if selected_model == "llama3.2:1b": api_base_url = config[selected_model]["api_url"] api_key = config[selected_model]["api_key"] - model = config[selected_model]["model"] st.info("Powered by local llama3.2:1b model via [Ollama](https://ollama.com/library/llama3.2:1b)!\ Just a heads up, you have 100 messages to use.") MAX_USER_MESSAGES = 100 @@ -82,7 +89,6 @@ def buffbot(): if selected_model == "deepseek-r1:1.5b": api_base_url = config[selected_model]["api_url"] api_key = config[selected_model]["api_key"] - model = config[selected_model]["model"] st.info("Powered by local deepseek-r1:1.5b model via [Ollama](https://ollama.com/library/deepseek-r1:1.5b)!\ Just a heads up, you have 100 messages to use.") MAX_USER_MESSAGES = 100 diff --git a/webpages/cis_tech_challenge_pages/__pycache__/cis_tech_challenge_homepage.cpython-312.pyc b/webpages/cis_tech_challenge_pages/__pycache__/cis_tech_challenge_homepage.cpython-312.pyc index 88fc08349..483d219db 100644 Binary files a/webpages/cis_tech_challenge_pages/__pycache__/cis_tech_challenge_homepage.cpython-312.pyc and b/webpages/cis_tech_challenge_pages/__pycache__/cis_tech_challenge_homepage.cpython-312.pyc differ diff --git a/webpages/coreteks_pages/__pycache__/coreteks_homepage.cpython-312.pyc b/webpages/coreteks_pages/__pycache__/coreteks_homepage.cpython-312.pyc index f3b25c25b..25790cb96 100644 Binary files a/webpages/coreteks_pages/__pycache__/coreteks_homepage.cpython-312.pyc and b/webpages/coreteks_pages/__pycache__/coreteks_homepage.cpython-312.pyc differ diff --git a/webpages/pythonx_lessons_pages/__pycache__/pythonx_finance.cpython-312.pyc b/webpages/pythonx_lessons_pages/__pycache__/pythonx_finance.cpython-312.pyc index 224f64aab..d64ef1566 100644 Binary files a/webpages/pythonx_lessons_pages/__pycache__/pythonx_finance.cpython-312.pyc and b/webpages/pythonx_lessons_pages/__pycache__/pythonx_finance.cpython-312.pyc differ diff --git a/webpages/pythonx_lessons_pages/__pycache__/pythonx_geomap.cpython-312.pyc b/webpages/pythonx_lessons_pages/__pycache__/pythonx_geomap.cpython-312.pyc index 30426ed8e..6bd89b323 100644 Binary files a/webpages/pythonx_lessons_pages/__pycache__/pythonx_geomap.cpython-312.pyc and b/webpages/pythonx_lessons_pages/__pycache__/pythonx_geomap.cpython-312.pyc differ diff --git a/webpages/pythonx_lessons_pages/__pycache__/pythonx_homepage.cpython-312.pyc b/webpages/pythonx_lessons_pages/__pycache__/pythonx_homepage.cpython-312.pyc index c2480d346..07a2d5286 100644 Binary files a/webpages/pythonx_lessons_pages/__pycache__/pythonx_homepage.cpython-312.pyc and b/webpages/pythonx_lessons_pages/__pycache__/pythonx_homepage.cpython-312.pyc differ diff --git a/webpages/pythonx_lessons_pages/__pycache__/pythonx_introduction.cpython-312.pyc b/webpages/pythonx_lessons_pages/__pycache__/pythonx_introduction.cpython-312.pyc index 79cf90f16..33e0416c4 100644 Binary files a/webpages/pythonx_lessons_pages/__pycache__/pythonx_introduction.cpython-312.pyc and b/webpages/pythonx_lessons_pages/__pycache__/pythonx_introduction.cpython-312.pyc differ diff --git a/webpages/pythonx_lessons_pages/__pycache__/pythonx_wordcloud.cpython-312.pyc b/webpages/pythonx_lessons_pages/__pycache__/pythonx_wordcloud.cpython-312.pyc index 64d900663..3b3d00e29 100644 Binary files a/webpages/pythonx_lessons_pages/__pycache__/pythonx_wordcloud.cpython-312.pyc and b/webpages/pythonx_lessons_pages/__pycache__/pythonx_wordcloud.cpython-312.pyc differ