Update app.py

app.py

@@ -695,12 +695,13 @@ should be called before this tool.
 '''
   res = chat_model.invoke(prompt)
 
+  none_list = [None, '', 'None', 'none']
   tool_choices = str(res).split('<|assistant|>')[1].split('#')[0].strip()
   tool_choices = tool_choices.split(',')
 
   if len(tool_choices) == 1:
     tool1 = tool_choices[0].strip()
-    if ('get_bioactives' in tool1) and (state['query_chembl'] == None):
+    if ('get_bioactives' in tool1) and (state['query_chembl'] in none_list):
         tool1 = 'list_bioactives_tool'
     if tool1.lower() == 'none':
       tool_choice = (None, None)
@@ -709,9 +710,9 @@ should be called before this tool.
   elif len(tool_choices) == 2:
     tool1 = tool_choices[0].strip()
     tool2 = tool_choices[1].strip()
-    if ('get_bioactives' in tool1) and (state['query_chembl'] == None):
+    if ('get_bioactives' in tool1) and (state['query_chembl'] in none_list):
         tool1 = 'list_bioactives_tool'
-    if ('get_bioactives' in tool2) and (state['query_chembl'] == None):
+    if ('get_bioactives' in tool2) and (state['query_chembl'] in none_list):
         tool2 = 'list_bioactives_tool'
     if tool1.lower() == 'none' and tool2.lower() == 'none':
       tool_choice = (None, None)
@@ -798,7 +799,7 @@ should be called before this tool.
 
   if len(tool_choices) == 1:
     tool1 = tool_choices[0].strip()
-    if ('get_bioactives' in tool1) and (state['query_chembl'] == None):
+    if ('get_bioactives' in tool1) and (state['query_chembl'] in none_list):
         tool1 = 'list_bioactives_tool'
     if tool1.lower() == 'none':
       tool_choice = (None, None)
@@ -807,9 +808,9 @@ should be called before this tool.
   elif len(tool_choices) == 2:
     tool1 = tool_choices[0].strip()
     tool2 = tool_choices[1].strip()
-    if ('get_bioactives' in tool1) and (state['query_chembl'] == None):
+    if ('get_bioactives' in tool1) and (state['query_chembl'] in none_list):
         tool1 = 'list_bioactives_tool'
-    if ('get_bioactives' in tool2) and (state['query_chembl'] == None):
+    if ('get_bioactives' in tool2) and (state['query_chembl'] in none_list):
         tool2 = 'list_bioactives_tool'
     if tool1.lower() == 'none' and tool2.lower() == 'none':
       tool_choice = (None, None)