Remove redundant check for "active" plugins on npe2api (#1335)

* Ensure pypi-normalized names when fetching from npe2api

* Fix tests, cleanup

* Blacken

* Remove 'is_active' check now that npe2api is source of truth

* Revert "Ensure pypi-normalized names when fetching from npe2api"

This reverts commit a7919ec.

* Remove unnecessary test

data-workflows/plugin/processor.py

@@ -2,7 +2,6 @@
 from concurrent import futures
 from typing import Optional
 
-from plugin.classifier_adapter import is_plugin_active
 from plugin.lambda_adapter import LambdaAdapter
 from nhcommons.models.plugin_utils import PluginMetadataType
 from nhcommons.utils import pypi_adapter
@@ -42,19 +41,14 @@ def _is_new_plugin(plugin_version_pair):
         pypi_plugin_version = pypi_latest_plugins.get(name)
         if pypi_plugin_version == version:
             continue
-        if pypi_plugin_version is None and is_plugin_active(name, version):
-            logger.info(
-                f"Skipping marking plugin={name} version={version} stale as the "
-                f"plugin is still active in npe2api"
-            )
-            continue
 
         logger.info(f"Updating old plugin={name} version={version}")
         put_plugin_metadata(
             plugin=name,
             version=version,
             plugin_metadata_type=PluginMetadataType.PYPI,
         )
+
         if pypi_plugin_version is None:
             zulip.plugin_no_longer_on_hub(name)
 

data-workflows/plugin/tests/test_processor.py

@@ -3,7 +3,6 @@
 import pytest
 
 import plugin.lambda_adapter
-import plugin.classifier_adapter
 import plugin.metadata
 from nhcommons.models.plugin_utils import PluginMetadataType as PMType
 
@@ -69,15 +68,6 @@ def mock_lambda_adapter(self, monkeypatch) -> Mock:
         monkeypatch.setattr(processor, "LambdaAdapter", mock)
         return mock
 
-    @pytest.fixture
-    def mock_classifier_adapter(self, monkeypatch) -> Mock:
-        mock = Mock(
-            side_effect=lambda _, __: self._is_plugin_live,
-            spec=plugin.classifier_adapter,
-        )
-        monkeypatch.setattr(processor, "is_plugin_active", mock)
-        return mock
-
     @pytest.fixture
     def mock_zulip(self, monkeypatch) -> Mock:
         mock = Mock(spec=zulip)
@@ -93,7 +83,6 @@ def setup(
         mock_get_existing_types,
         mock_get_formatted_metadata,
         mock_lambda_adapter,
-        mock_classifier_adapter,
         mock_zulip,
     ) -> None:
         self._get_latest_plugins = mock_get_latest_plugins
@@ -102,7 +91,6 @@ def setup(
         self._get_existing_types = mock_get_existing_types
         self._get_formatted_metadata = mock_get_formatted_metadata
         self._lambda_adapter = mock_lambda_adapter
-        self._classifier_adapter = mock_classifier_adapter
         self._zulip = mock_zulip
 
     @pytest.fixture
@@ -115,7 +103,6 @@ def _verify_calls(
             get_formatted_metadata_called: bool = False,
             lambda_invoked: bool = False,
             put_pm_calls: list = None,
-            classifier_adapter_not_called: bool = True,
         ) -> None:
             verify_call(True, self._get_latest_plugins, empty_call_list)
             verify_call(True, self._get_all_plugins, empty_call_list)
@@ -138,8 +125,6 @@ def _verify_calls(
                     default_call_list
                     == self._lambda_adapter.return_value.invoke.call_args_list
                 )
-            if classifier_adapter_not_called:
-                self._classifier_adapter.assert_not_called()
 
         return _verify_calls
 
@@ -153,27 +138,19 @@ def test_all_latest_plugin_in_dynamo(self, verify_calls):
         verify_calls()
         self._zulip.assert_not_called()
 
-    @pytest.mark.parametrize("is_plugin_live", [False, True])
     def test_stale_plugin_in_dynamo(
         self,
-        is_plugin_live,
         verify_calls,
     ):
         self._dynamo_latest_plugins = {PLUGIN: VERSION, "bar": "2.4.6"}
         self._pypi_latest_plugins = {"bar": "2.4.6"}
-        self._is_plugin_live = is_plugin_live
 
         processor.update_plugin()
 
-        if is_plugin_live:
-            assert len(self._zulip.method_calls) == 0
-            put_pm_calls = []
-        else:
-            assert len(self._zulip.method_calls) == 1
-            self._zulip.plugin_no_longer_on_hub.assert_called_once_with(PLUGIN)
-            put_pm_calls = [_create_put_pm_call(PMType.PYPI)]
-        verify_calls(put_pm_calls=put_pm_calls, classifier_adapter_not_called=False)
-        self._classifier_adapter.assert_called_once_with(PLUGIN, VERSION)
+        assert len(self._zulip.method_calls) == 1
+        self._zulip.plugin_no_longer_on_hub.assert_called_once_with(PLUGIN)
+        put_pm_calls = [_create_put_pm_call(PMType.PYPI)]
+        verify_calls(put_pm_calls=put_pm_calls)
 
     @pytest.mark.parametrize(
         "existing_types, put_pm_data, formatted_metadata",

napari-hub-commons/src/nhcommons/tests/utils/test_pypi_adapter.py

@@ -139,7 +139,9 @@ def setup_method(self, monkeypatch):
 
     def _mocked_requests_get(self, *args, **kwargs):
         if args[0] == "https://api.napari.org/api/plugins":
-            return MockResponse(content=json.dumps({name: version for name, version in plugins()}))
+            return MockResponse(
+                content=json.dumps({name: version for name, version in plugins()})
+            )
         elif args[0] == "https://pypi.org/pypi/napari-demo/json":
             return MockResponse(content=valid_pypi_data())
         elif args[0] == "https://pypi.org/pypi/default-demo/json":