From e0bef2188a1c31eb33bd0d73029b3c1979ea97e5 Mon Sep 17 00:00:00 2001 From: avanteijlingen <57176642+avanteijlingen@users.noreply.github.com> Date: Tue, 26 Sep 2023 22:43:58 +0200 Subject: [PATCH] Revert "turn back on features" This reverts commit 064adf162461465ea9d70dbd28325ae3a88caa03. --- chemcrow/__init__.py | 6 +++--- chemcrow/agents/tools.py | 15 +++------------ chemcrow/tools/__init__.py | 2 +- chemcrow/tools/search.py | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/chemcrow/__init__.py b/chemcrow/__init__.py index eeda285..78db58b 100644 --- a/chemcrow/__init__.py +++ b/chemcrow/__init__.py @@ -1,6 +1,6 @@ -from .tools.databases import * +#from .tools.databases import * from .tools.rdkit import * -from .tools.search import * -from .frontend import * +#from .tools.search import * +#from .frontend import * from .agents import * from .version import __version__ diff --git a/chemcrow/agents/tools.py b/chemcrow/agents/tools.py index c59e5ec..fe33103 100644 --- a/chemcrow/agents/tools.py +++ b/chemcrow/agents/tools.py @@ -11,17 +11,9 @@ def make_tools( api_keys: dict = {}, verbose=True ): - serp_key = api_keys.get('SERP_API_KEY') or os.getenv("SERP_API_KEY") - rxn4chem_api_key = api_keys.get('RXN4CHEM_API_KEY') or os.getenv("RXN4CHEM_API_KEY") - all_tools = agents.load_tools([ - "python_repl", - "ddg-search", - "wikipedia", - #"human" - ]) - all_tools += [ + all_tools = [ Query2SMILES(), Query2CAS(), PatentCheck(), @@ -32,7 +24,6 @@ def make_tools( SafetySummary(llm=llm), #LitSearch(llm=llm, verbose=verbose), ] - if rxn4chem_api_key: - all_tools.append(RXNPredict(rxn4chem_api_key)) - return all_tools \ No newline at end of file + + return all_tools diff --git a/chemcrow/tools/__init__.py b/chemcrow/tools/__init__.py index a8cd1d5..5192f73 100644 --- a/chemcrow/tools/__init__.py +++ b/chemcrow/tools/__init__.py @@ -1,5 +1,5 @@ from .databases import * from .rdkit import * -from .search import * +#from .search import * from .rxn4chem import * from .safety import SafetySummary, ExplosiveCheck diff --git a/chemcrow/tools/search.py b/chemcrow/tools/search.py index 022d0c1..02fc9cf 100644 --- a/chemcrow/tools/search.py +++ b/chemcrow/tools/search.py @@ -3,7 +3,7 @@ from typing import Optional import langchain -import paperqa +#import paperqa import paperscraper from langchain import SerpAPIWrapper from langchain.base_language import BaseLanguageModel