Update tools.py

tools.py

@@ -5,8 +5,7 @@ from langchain.base_language import BaseLanguageModel
 
 from tool import *
 
-
-def make_tools(llm: BaseLanguageModel, api_keys: dict = {}, verbose=True,  image_path = r"...", file_path = r"..."):
+def drug_tools(llm: BaseLanguageModel, api_keys: dict = {}, verbose=True,  image_path = None, file_path = None):
     serp_api_key = api_keys.get("SERP_API_KEY") or os.getenv("SERP_API_KEY")
     image_path = image_path 
     file_path = file_path
@@ -17,22 +16,84 @@ def make_tools(llm: BaseLanguageModel, api_keys: dict = {}, verbose=True,  image
     semantic_scholar_api_key = api_keys.get("SEMANTIC_SCHOLAR_API_KEY") or os.getenv(
         "SEMANTIC_SCHOLAR_API_KEY"
     )
-    
+
     all_tools = load_tools(
         [
             #"python_repl",
             # "ddg-search",
             "wikipedia",
-            # "human"
+            "human"
         ]
     )
- 
+
     all_tools += [
-        browseruse(openai_api_key),
+        browseruse(),
+        
+        rag(),
+        codewriter(),
         
-        rag(openai_api_key),
-        codewriter(llm=llm ,openai_api_key=  openai_api_key),
+        Query2SMILES(chemspace_api_key),
+        Mol2SMILES(chemspace_api_key) ,
+        Query2CAS(),
+        SMILES2Name(),
+        SMILES2SAScore(),
+        SMILES2LogP(),
+        SMILES2Properties(),
+        MolSimilarity(),
+        SMILES2Weight(),
+        FuncGroups(),
+        druglike(),
+        ADMETLab(),
+  
         graphconverter(),
+        molgen(),
+         
+        LiteratureSearch(
+            llm=llm,
+            openai_api_key=openai_api_key,
+            semantic_scholar_api_key=semantic_scholar_api_key        ),
+    ]
+    
+    if serp_api_key:
+        all_tools += [WebSearch(serp_api_key)
+    ]
+    if image_path is not None:
+            all_tools += [Imageanalysis(image_path),
+                          
+        ]   
+    if file_path is not None:
+            all_tools += [pdfreader(file_path),
+        ]               
+ 
+    return all_tools
+
+def make_tools(llm: BaseLanguageModel, api_keys: dict = {}, verbose=True,  image_path = None, file_path = None):
+    serp_api_key = api_keys.get("SERP_API_KEY") or os.getenv("SERP_API_KEY")
+    image_path = image_path 
+    file_path = file_path
+    openai_api_key = api_keys.get("OPENAI_API_KEY") or os.getenv("OPENAI_API_KEY")
+    chemspace_api_key = api_keys.get("CHEMSPACE_API_KEY") or os.getenv(
+        "CHEMSPACE_API_KEY"
+    )
+    semantic_scholar_api_key = api_keys.get("SEMANTIC_SCHOLAR_API_KEY") or os.getenv(
+        "SEMANTIC_SCHOLAR_API_KEY"
+    )
+
+    all_tools = load_tools(
+        [
+            #"python_repl",
+            # "ddg-search",
+            "wikipedia",
+            "human"
+        ]
+    )
+
+    all_tools += [
+        browseruse(),
+        
+        rag(),
+        codewriter(),
+        
         Query2SMILES(chemspace_api_key),
         Mol2SMILES(chemspace_api_key) ,
         Query2CAS(),
@@ -47,18 +108,15 @@ def make_tools(llm: BaseLanguageModel, api_keys: dict = {}, verbose=True,  image
         acceptor_predictor(),
         homolumo_predictor(),
         dap_screen(),
-        
+        graphconverter(),
         molgen(),
         dap_predictor(),
-  
+        LiteratureSearch(
+            llm=llm,
+            openai_api_key=openai_api_key,
+            semantic_scholar_api_key=semantic_scholar_api_key        ),
     ]
-    if semantic_scholar_api_key:
-        all_tools += [       LiteratureSearch(
-                  llm=llm,
-                  openai_api_key=openai_api_key,
-                  semantic_scholar_api_key=semantic_scholar_api_key        ),
-    ]
-        
+    
     if serp_api_key:
         all_tools += [WebSearch(serp_api_key)
     ]
@@ -68,7 +126,6 @@ def make_tools(llm: BaseLanguageModel, api_keys: dict = {}, verbose=True,  image
         ]   
     if file_path is not None:
             all_tools += [pdfreader(file_path),
-        ]             
+        ]               
  
-    return all_tools
-
+    return all_tools