fix: remove worker dependency on plugins/config.yaml

Signed-off-by: habeck <habeck@us.ibm.com>

Author: tedhabeck

cpex/framework/isolated/worker.py

@@ -25,7 +25,7 @@
 from cpex.framework.loader.config import ConfigLoader
 from cpex.framework.loader.plugin import ALLOWED_PLUGIN_DIRS
 from cpex.framework.manager import PluginExecutor
-from cpex.framework.models import PluginContext
+from cpex.framework.models import PluginConfig, PluginContext
 from cpex.framework.utils import parse_class_name
 
 logger = logging.getLogger(__name__)
@@ -71,25 +71,6 @@ def get_environment_info():
         "installed_packages": [str(d) for d in importlib.metadata.entry_points()][:10],  # First 10 packages
     }
 
-
-def get_proper_config(name):
-    """
-    Load a config which has all it's proper decorations
-    """
-    plugin_config_file = os.environ.get("PLUGINS_CONFIG_FILE", "plugins/config.yaml")
-    plugin_loader_config = ConfigLoader.load_config(Path(plugin_config_file).resolve(), use_jinja=False)
-    plugins: list[dict] = []
-    config = None
-    if plugin_loader_config.plugins:
-        for plug in plugin_loader_config.plugins:
-            plugins.append(plug.model_dump())
-            if plug.name == name:
-                # config = plug.model_dump()
-                config = plug
-                return config
-    return None
-
-
 async def process_task(task_data, tp: TaskProcessor):
     """Process the task received from parent."""
     task_type = task_data.get("task_type")
@@ -120,7 +101,7 @@ async def process_task(task_data, tp: TaskProcessor):
 
         if tp.config_hash != tp.compute_hash(json_config):
             # pull the resolved plugin path and only add the module path if it has the same root
-            config = get_proper_config(config_raw.get("name"))
+            config: PluginConfig = PluginConfig(**config_raw)
             hook_type = task_data.get(HOOK_TYPE)
             cls_name: str = task_data.get("class_name")
             mod_name, n_cls_name = parse_class_name(cls_name)

tests/unit/cpex/framework/isolated/test_worker.py

@@ -16,7 +16,7 @@
 
 import pytest
 
-from cpex.framework.isolated.worker import TaskProcessor, get_environment_info, get_proper_config, main, process_task
+from cpex.framework.isolated.worker import TaskProcessor, get_environment_info, main, process_task
 
 
 class TestWorkerFunctions:
@@ -49,47 +49,6 @@ def test_get_environment_info(self):
         assert isinstance(info["installed_packages"], list)
         assert len(info["installed_packages"]) <= 10  # Limited to first 10
 
-    @patch("cpex.framework.isolated.worker.ConfigLoader.load_config")
-    def test_get_proper_config_found(self, mock_load_config):
-        """Test getting proper config when plugin is found."""
-        # Create mock plugin config
-        mock_plugin = MagicMock()
-        mock_plugin.name = "test_plugin"
-        mock_plugin.model_dump.return_value = {"name": "test_plugin", "kind": "isolated_venv", "config": {}}
-
-        mock_config = MagicMock()
-        mock_config.plugins = [mock_plugin]
-        mock_load_config.return_value = mock_config
-
-        result = get_proper_config("test_plugin")
-
-        assert result is not None
-        assert result.name == "test_plugin"
-
-    @patch("cpex.framework.isolated.worker.ConfigLoader.load_config")
-    def test_get_proper_config_not_found(self, mock_load_config):
-        """Test getting proper config when plugin is not found."""
-        mock_plugin = MagicMock()
-        mock_plugin.name = "other_plugin"
-
-        mock_config = MagicMock()
-        mock_config.plugins = [mock_plugin]
-        mock_load_config.return_value = mock_config
-
-        result = get_proper_config("test_plugin")
-
-        assert result is None
-
-    @patch("cpex.framework.isolated.worker.ConfigLoader.load_config")
-    def test_get_proper_config_no_plugins(self, mock_load_config):
-        """Test getting proper config when no plugins exist."""
-        mock_config = MagicMock()
-        mock_config.plugins = None
-        mock_load_config.return_value = mock_config
-
-        result = get_proper_config("test_plugin")
-
-        assert result is None
 
     @pytest.mark.asyncio
     async def test_process_task_info(self):
@@ -154,26 +113,6 @@ async def test_process_task_load_and_run_hook_success(self, mock_executor_class,
         mock_executor.execute_plugin.assert_called_once()
         self.cleanup_mock_plugin_dirs()
 
-    @pytest.mark.asyncio
-    @patch("cpex.framework.isolated.worker.get_proper_config")
-    async def test_process_task_load_and_run_hook_no_config(self, mock_get_config):
-        """Test processing load_and_run_hook task when config not found."""
-        mock_get_config.return_value = None
-
-        config_dict = {"name": "test_plugin", "kind": "isolated_venv"}
-        task_data = {
-            "task_type": "load_and_run_hook",
-            "config": json.dumps(config_dict),
-            "class_name": "test_plugin.TestPlugin",
-            "hook_type": "tool_pre_invoke",
-            "payload": {},
-            "context": {"state": {}, "global_context": {}, "metadata": {}},
-        }
-        tp = TaskProcessor()
-        # Should raise an error or return None
-        with pytest.raises((AttributeError, TypeError)):
-            await process_task(task_data, tp)
-
     @pytest.mark.asyncio
     @patch("cpex.framework.isolated.worker.get_proper_config")
     @patch("cpex.framework.isolated.worker.importlib.import_module")