Update to use openworm_ai>=0.3.1

app.py

@@ -5,16 +5,20 @@ import streamlit as st
 
 from ring import PREF_ORDER_LLMS
 
-from ring import requires_openai_key
-from ring import get_openai_api_key
 from ring import generate_response
 from ring import generate_panel_response
 
 from openworm_ai import __version__ as openworm_ai_version
 
+from openworm_ai.utils.llms import OPENAI_LLMS
+
 import socket
 
-__version__ = "0.4.8"
+__version__ = "0.5.0"
+
+
+def requires_openai_key(llm_ver):
+    return llm_ver in OPENAI_LLMS
 
 
 col1, col2 = st.columns([3, 1])
@@ -24,7 +28,10 @@ with col1:
     st.markdown(
         "Testing the use of LLMs and other AI technology for _C. elegans_ research and computational modelling of the worm. Part of the [OpenWorm](https://openworm.org) project."
     )
-    st.markdown("**v%s** (openworm_ai **v%s**) - Note: this is a work in progress!" % (__version__, openworm_ai_version))
+    st.markdown(
+        "GUI **v%s** (openworm_ai **v%s**) - Note: this is a work in progress!"
+        % (__version__, openworm_ai_version)
+    )
 
 with col2:
     st.image("images/OpenWormLogo.png")
@@ -74,17 +81,17 @@ with tab_free:
 
         temperature = st.text_input("Temperature", value=0.1)
 
-        allow_all_topics = 'MBP' in socket.gethostname()
+        allow_all_topics = "MBP" in socket.gethostname()
 
         only_celegans = st.checkbox(
-            "Only answer questions related to _C. elegans_", value=not allow_all_topics, disabled=not allow_all_topics
+            "Only answer questions related to _C. elegans_",
+            value=not allow_all_topics,
+            disabled=not allow_all_topics,
         )
 
         submitted = st.form_submit_button("Submit")
 
-        if requires_openai_key(llm_ver) and not get_openai_api_key():
-            st.info("Please add your OpenAI API key to continue.")
-        elif submitted:
+        if submitted:
             response = generate_response(text, llm_ver, temperature, only_celegans)
 
             st.info(response)
@@ -137,8 +144,6 @@ with tab_panel:
             st.markdown("Please choose a panelist that is not the panel lead.")
         elif len(selected_options) == 0:
             st.markdown("Please choose one or more panelists to join the panel lead.")
-        elif requires_openai_key(llm_ver) and not get_openai_api_key():
-            st.info("Please add your OpenAI API key to continue.")
         elif submitted:
             # Create new list of LLMs that does not include panel lead
             llm_panelists = [llm for llm in selected_options if llm != panel_lead]

requirements.txt

@@ -1,4 +1,5 @@
 
+openworm_ai>=0.3.1
 openai
 asyncio
 wormneuroatlas
@@ -7,8 +8,5 @@ matplotlib
 pylems
 pyneuroml
 langchain-google-genai
-langchain_ai21
-langchain_anthropic
 langchain_cohere
-streamlit
-openworm-ai[dev]>=0.2.9
+streamlit

ring.py

@@ -1,18 +1,12 @@
 import os
 
-from langchain.prompts import PromptTemplate
 from langchain_core.output_parsers import StrOutputParser
+from langchain_core.prompts import PromptTemplate
 
 from openworm_ai.utils.llms import GENERAL_QUERY_PROMPT_TEMPLATE
-from openworm_ai.utils.llms import GENERAL_QUERY_LIMITED_PROMPT_TEMPLATE
 
 from openworm_ai.utils.llms import get_llm as get_llm_via_openworm_ai
 
-from openworm_ai.utils.llms import requires_openai_key
-from openworm_ai.utils.llms import get_openai_api_key
-from openworm_ai.utils.llms import get_gemini_api_key
-from openworm_ai.utils.llms import generate_response
-
 
 from openworm_ai.utils.llms import LLM_GPT35
 from openworm_ai.utils.llms import LLM_GPT4
@@ -23,19 +17,21 @@ from openworm_ai.utils.llms import LLM_OLLAMA_MISTRAL
 from openworm_ai.utils.llms import LLM_OLLAMA_OLMO2_7B
 from openworm_ai.utils.llms import LLM_COHERE
 
+from openworm_ai.utils.llms import generate_response
+
 
 OPENAI_LLMS = [LLM_GPT35, LLM_GPT4, LLM_GPT4o]
 
 OLLAMA_LLMS = [LLM_OLLAMA_LLAMA32_1B, LLM_OLLAMA_MISTRAL, LLM_OLLAMA_OLMO2_7B]
 
-OPENWORM_AI_LLMS = [LLM_GEMINI_2F] + OPENAI_LLMS + [LLM_COHERE]  # + oLLAMA_LLMS
+OPENWORM_AI_LLMS = [LLM_GEMINI_2F] + OPENAI_LLMS + [LLM_COHERE]  # + OLLAMA_LLMS
 
 LLM_LLAMA2 = "LLAMA2"
-LLM_GEMINI = "gemini-1.5-pro"
+# LLM_GEMINI = "gemini-1.5-pro"
 LLM_CLAUDE2 = "Claude2.1"
 
 
-PREF_ORDER_LLMS = [LLM_GEMINI] + OPENWORM_AI_LLMS # + [LLM_LLAMA2, LLM_CLAUDE2]
+PREF_ORDER_LLMS = OPENWORM_AI_LLMS  # + [LLM_LLAMA2, LLM_CLAUDE2]
 
 
 def get_llamaapi_key():

test.py

@@ -1,8 +1,8 @@
-from ring import LLM_GPT35
-from ring import LLM_LLAMA2
-from ring import LLM_GEMINI
-from ring import LLM_CLAUDE2
-from ring import LLM_COHERE
+from openworm_ai.utils.llms import LLM_GPT4o
+from openworm_ai.utils.llms import LLM_LLAMA2
+from openworm_ai.utils.llms import LLM_GEMINI_2F
+from openworm_ai.utils.llms import LLM_GEMINI_25F
+from openworm_ai.utils.llms import LLM_COHERE
 
 
 from ring import generate_response
@@ -11,17 +11,18 @@ import sys
 
 question = "What is the most common type of neuron in the brain?"
 
-llm_ver = LLM_GPT35
+llm_ver = LLM_GPT4o
 
-if "-g" in sys.argv:
-    llm_ver = LLM_GEMINI
+
+if "-g2" in sys.argv:
+    llm_ver = LLM_GEMINI_2F
+
+if "-g25" in sys.argv:
+    llm_ver = LLM_GEMINI_25F
 
 if "-l" in sys.argv:
     llm_ver = LLM_LLAMA2
 
-if "-cl" in sys.argv:
-    llm_ver = LLM_CLAUDE2
-
 if "-co" in sys.argv:
     llm_ver = LLM_COHERE
 

test.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -ex
+
+ruff format *.py
+#ruff check *.py
+
+pip install -r requirements.txt
+
+python test.py -co
+
+echo
+echo "  Success!"
+echo
+  
+