reshaping code and fixing tests

tests/unit/test_plugins.py

@@ -1,10 +1,51 @@
 import pytest
-from autogpt.plugins import inspect_zip_for_module, scan_plugins, load_plugins
+from autogpt.plugins import inspect_zip_for_module, scan_plugins, blacklist_whitelist_check
 from autogpt.config import Config
 
 PLUGINS_TEST_DIR = "tests/unit/data/test_plugins"
 PLUGIN_TEST_ZIP_FILE = "Auto-GPT-Plugin-Test-master.zip"
-PLUGIN_TEST_INIT_PY = "Auto-GPT-Plugin-Test-master/src/auto_gpt_plugin_template/__init__.py"
+PLUGIN_TEST_INIT_PY = "Auto-GPT-Plugin-Test-master/src/auto_gpt_vicuna/__init__.py"
+PLUGIN_TEST_OPENAI = 'https://weathergpt.vercel.app/'
+
+
+def test_inspect_zip_for_module():
+    result = inspect_zip_for_module(str(f'{PLUGINS_TEST_DIR}/{PLUGIN_TEST_ZIP_FILE}'))
+    assert result == PLUGIN_TEST_INIT_PY
+
+
+@pytest.fixture
+def mock_config_blacklist_whitelist_check():
+    class MockConfig:
+        plugins_blacklist = ["BadPlugin"]
+        plugins_whitelist = ["GoodPlugin"]
+
+    return MockConfig()
+
+
+def test_blacklist_whitelist_check_blacklist(mock_config_blacklist_whitelist_check,
+                                             monkeypatch):
+    monkeypatch.setattr("builtins.input", lambda _: "y")
+    assert not blacklist_whitelist_check("BadPlugin", mock_config_blacklist_whitelist_check)
+
+
+def test_blacklist_whitelist_check_whitelist(mock_config_blacklist_whitelist_check, monkeypatch):
+    monkeypatch.setattr("builtins.input", lambda _: "y")
+    assert blacklist_whitelist_check("GoodPlugin", mock_config_blacklist_whitelist_check)
+
+
+def test_blacklist_whitelist_check_user_input_yes(mock_config_blacklist_whitelist_check, monkeypatch):
+    monkeypatch.setattr("builtins.input", lambda _: "y")
+    assert blacklist_whitelist_check("UnknownPlugin", mock_config_blacklist_whitelist_check)
+
+
+def test_blacklist_whitelist_check_user_input_no(mock_config_blacklist_whitelist_check, monkeypatch):
+    monkeypatch.setattr("builtins.input", lambda _: "n")
+    assert not blacklist_whitelist_check("UnknownPlugin", mock_config_blacklist_whitelist_check)
+
+
+def test_blacklist_whitelist_check_user_input_invalid(mock_config_blacklist_whitelist_check, monkeypatch):
+    monkeypatch.setattr("builtins.input", lambda _: "invalid")
+    assert not blacklist_whitelist_check("UnknownPlugin", mock_config_blacklist_whitelist_check)
 
 
 @pytest.fixture
@@ -15,17 +56,33 @@ def config_with_plugins():
     return cfg
 
 
-def test_inspect_zip_for_module():
-    result = inspect_zip_for_module(str(f'{PLUGINS_TEST_DIR}/{PLUGIN_TEST_ZIP_FILE}'))
-    assert result == PLUGIN_TEST_INIT_PY
+@pytest.fixture
+def mock_config_openai_plugin():
+    class MockConfig:
+        plugins_dir = PLUGINS_TEST_DIR
+        plugins_openai = [PLUGIN_TEST_OPENAI]
+        plugins_blacklist = ["AutoGPTPVicuna"]
+        plugins_whitelist = [PLUGIN_TEST_OPENAI]
 
-def test_scan_plugins(config_with_plugins):
-    result = scan_plugins(config_with_plugins, debug=True)
+    return MockConfig()
+
+
+def test_scan_plugins_openai(mock_config_openai_plugin):
+    result = scan_plugins(mock_config_openai_plugin, debug=True)
     assert len(result) == 1
-    assert result[0][0] == PLUGIN_TEST_INIT_PY
 
 
-def test_load_plugins_blacklisted(config_with_plugins):
-    config_with_plugins.plugins_blacklist = ['AbstractSingleton']
-    result = load_plugins(cfg=config_with_plugins)
-    assert len(result) == 0
+@pytest.fixture
+def mock_config_generic_plugin():
+    class MockConfig:
+        plugins_dir = PLUGINS_TEST_DIR
+        plugins_openai = []
+        plugins_blacklist = []
+        plugins_whitelist = ["AutoGPTPVicuna"]
+
+    return MockConfig()
+
+
+def test_scan_plugins_generic(mock_config_generic_plugin):
+    result = scan_plugins(mock_config_generic_plugin, debug=True)
+    assert len(result) == 1