enh: use cached repo object

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

Author: tedhabeck

cpex/framework/utils.py

@@ -411,7 +411,7 @@ def render(self, content: Any) -> bytes:
         )
 
 
-def find_package_path( package_name: str) -> Path:
+def find_package_path(package_name: str) -> Path:
     """Locate installed package directory using importlib.metadata.
 
     Args:
@@ -448,4 +448,4 @@ def find_package_path( package_name: str) -> Path:
     except Exception as e:
         if isinstance(e, RuntimeError):
             raise
-        raise RuntimeError(f"Error locating package {package_name}: {str(e)}") from e
+        raise RuntimeError(f"Error locating package {package_name}: {str(e)}") from e

cpex/tools/catalog.py

@@ -151,7 +151,7 @@ def download_contents(self, git_url: str, headers, path: str, repo_url: httpx.UR
         else:
             logger.error("Failed to download file: %s status_code: %d", git_url, result.status_code)
 
-    def download_file(self, repo_path: str, item: dict, headers) -> str | None:
+    def download_file(self, repo_path: str, item: dict, headers, gh_repo) -> str | None:
         """Download the content of a github file
 
            Args:
@@ -163,7 +163,6 @@ def download_file(self, repo_path: str, item: dict, headers) -> str | None:
         """
         # Get the repository using PyGithub
         try:
-            gh_repo = self.gh.get_repo(repo_path)
             file_content = gh_repo.get_contents(item["path"])
             content = file_content.decoded_content.decode("utf-8")
             return content
@@ -245,6 +244,7 @@ def _process_manifest_item(
         headers,
         relpath: Path,
         repo_path: str,
+        gh_repo,
     ) -> bool:
         """Process a single manifest search result item.
 
@@ -265,7 +265,7 @@ def _process_manifest_item(
             return False
 
         # manifest_data = self.download_file(repo_path=repo_path, git_url=item["git_url"], headers=headers)
-        manifest_data = self.download_file(repo_path=repo_path, item=item, headers=headers)
+        manifest_data = self.download_file(repo_path=repo_path, item=item, headers=headers, gh_repo=gh_repo)
         if manifest_data is None:
             logger.error("Failed to download plugin-manifest from %s", member)
             return False
@@ -278,7 +278,7 @@ def _process_manifest_item(
         return True
 
     def find_and_save_plugin_manifest(
-        self, member: str, name: str, repo_url: httpx.URL, headers
+        self, member: str, name: str, repo_url: httpx.URL, headers, gh_repo
     ) -> PluginManifest | None:
         """Find the plugin-manifest.yaml relative to the supplied member folder,
         download and save the manifest, updating the monorepo's package_folder, package_source and repo_url attributes
@@ -303,7 +303,7 @@ def find_and_save_plugin_manifest(
             return None
 
         for item in items:
-            if self._process_manifest_item(item, name, member, repo_url, headers, relpath, repo_path):
+            if self._process_manifest_item(item, name, member, repo_url, headers, relpath, repo_path, gh_repo):
                 break  # Successfully processed first valid manifest
 
         return None
@@ -336,7 +336,7 @@ def _process_pyproject(self, gh_repo, item, repo_url: httpx.URL, headers) -> Non
 
         # Find and save the plugin manifest
         self.find_and_save_plugin_manifest(
-            member=member, name=project_data["project"]["name"], repo_url=repo_url, headers=headers
+            member=member, name=project_data["project"]["name"], repo_url=repo_url, headers=headers, gh_repo=gh_repo
         )
 
     def update_catalog_with_pyproject(self) -> bool:

tests/unit/cpex/tools/test_catalog.py

@@ -13,6 +13,7 @@
 import subprocess
 import sys
 from pathlib import Path
+from unittest import mock
 from unittest.mock import MagicMock, Mock, patch, mock_open
 
 # Third-Party
@@ -424,7 +425,7 @@ def test_install_from_pypi_success(self, tmp_path, mock_github_env):
         """Test successful installation from PyPI."""
         with (
             patch("cpex.tools.catalog.subprocess.run") as mock_subprocess,
-            patch("cpex.tools.catalog.importlib.metadata.distributions") as mock_distributions,
+            patch("cpex.framework.utils.importlib.metadata.distributions") as mock_distributions,
         ):
             # Create manifest file
             package_dir = tmp_path / "test_package"
@@ -469,8 +470,8 @@ def test_install_from_pypi_package_not_found(self, mock_github_env):
         """Test when package is not found after installation."""
         with (
             patch("cpex.tools.catalog.subprocess.run"),
-            patch("cpex.tools.catalog.importlib.metadata.distributions", return_value=[]),
-            patch("cpex.tools.catalog.importlib.util.find_spec", return_value=None),
+            patch("cpex.framework.utils.importlib.metadata.distributions", return_value=[]),
+            patch("cpex.framework.utils.importlib.util.find_spec", return_value=None),
         ):
             catalog = PluginCatalog()
             with pytest.raises(RuntimeError, match="Could not find installed package"):
@@ -480,7 +481,7 @@ def test_install_from_pypi_manifest_not_found(self, tmp_path, mock_github_env):
         """Test when manifest file is not found in package."""
         with (
             patch("cpex.tools.catalog.subprocess.run"),
-            patch("cpex.tools.catalog.importlib.metadata.distributions") as mock_distributions,
+            patch("cpex.framework.utils.importlib.metadata.distributions") as mock_distributions,
         ):
             # Setup mock distribution without plugin-manifest.yaml file
             mock_dist = Mock()
@@ -503,7 +504,7 @@ def test_install_from_pypi_invalid_manifest(self, tmp_path, mock_github_env):
         """Test when manifest file is invalid."""
         with (
             patch("cpex.tools.catalog.subprocess.run"),
-            patch("cpex.tools.catalog.importlib.metadata.distributions") as mock_distributions,
+            patch("cpex.framework.utils.importlib.metadata.distributions") as mock_distributions,
         ):
             package_dir = tmp_path / "test_package"
             package_dir.mkdir()
@@ -605,20 +606,19 @@ def test_download_file_success(self, mock_github_env):
         catalog.gh.get_repo = Mock(return_value=mock_repo)
 
         item = {"path": "test_plugin/plugin-manifest.yaml"}
-        result = catalog.download_file("org/repo", item, {})
+        result = catalog.download_file("org/repo", item, {}, mock_repo)
 
         assert result == manifest_content
 
     def test_download_file_failure(self, mock_github_env):
         """Test failed file download."""
         with patch("cpex.tools.catalog.logger") as mock_logger:
             catalog = PluginCatalog()
-            
             # Mock the GitHub repository to raise an exception
-            catalog.gh.get_repo = Mock(side_effect=Exception("Not found"))
-            
+            mock_repo = Mock(side_effect=Exception("Not found"))
+            mock_repo.get_contents.return_value = Exception("Not found")
             item = {"path": "test_plugin/plugin-manifest.yaml"}
-            result = catalog.download_file("org/repo", item, {})
+            result = catalog.download_file("org/repo", item, {}, mock_repo)
 
             assert result is None
             mock_logger.error.assert_called_once()
@@ -654,7 +654,7 @@ def test_find_and_save_plugin_manifest_success(self, tmp_path, mock_github_env):
         catalog.gh.get_repo = Mock(return_value=mock_repo)
 
         repo_url = httpx.URL("https://github.com/org/repo")
-        catalog.find_and_save_plugin_manifest("test_plugin", "test_plugin", repo_url, {})
+        catalog.find_and_save_plugin_manifest("test_plugin", "test_plugin", repo_url, {}, mock_repo)
 
         saved_file = tmp_path / "catalog" / "test_plugin" / "plugin-manifest.yaml"
         assert saved_file.exists()
@@ -738,7 +738,7 @@ def test_install_from_pypi_with_version_constraint(self, tmp_path, mock_github_e
         """Test installation with version constraint."""
         with (
             patch("cpex.tools.catalog.subprocess.run") as mock_subprocess,
-            patch("cpex.tools.catalog.importlib.metadata.distributions") as mock_distributions,
+            patch("cpex.framework.utils.importlib.metadata.distributions") as mock_distributions,
         ):
             package_dir = tmp_path / "test_package"
             package_dir.mkdir()
@@ -777,7 +777,7 @@ def test_install_from_pypi_with_default_configs(self, tmp_path, mock_github_env)
         """Test installation with default_configs field."""
         with (
             patch("cpex.tools.catalog.subprocess.run") as mock_subprocess,
-            patch("cpex.tools.catalog.importlib.metadata.distributions") as mock_distributions,
+            patch("cpex.framework.utils.importlib.metadata.distributions") as mock_distributions,
         ):
             package_dir = tmp_path / "test_package"
             package_dir.mkdir()
@@ -813,7 +813,7 @@ def test_install_from_pypi_with_existing_package_info(self, tmp_path, mock_githu
         """Test installation with existing package_info."""
         with (
             patch("cpex.tools.catalog.subprocess.run") as mock_subprocess,
-            patch("cpex.tools.catalog.importlib.metadata.distributions") as mock_distributions,
+            patch("cpex.framework.utils.importlib.metadata.distributions") as mock_distributions,
         ):
             package_dir = tmp_path / "test_package"
             package_dir.mkdir()
@@ -855,7 +855,7 @@ def test_install_from_pypi_with_null_default_configs_in_manifest(self, tmp_path,
         """Test installation with null default_configs in manifest."""
         with (
             patch("cpex.tools.catalog.subprocess.run") as mock_subprocess,
-            patch("cpex.tools.catalog.importlib.metadata.distributions") as mock_distributions,
+            patch("cpex.framework.utils.importlib.metadata.distributions") as mock_distributions,
         ):
             package_dir = tmp_path / "test_package"
             package_dir.mkdir()
@@ -1001,8 +1001,8 @@ def test_process_manifest_item_not_yaml(self, tmp_path, mock_github_env):
 
             repo_url = httpx.URL("https://github.com/org/repo")
             relpath = tmp_path / "catalog" / "plugin1" / "plugin-manifest.yaml"
-            
-            result = catalog._process_manifest_item(item, "plugin1", "plugin1", repo_url, {}, relpath, "org/repo")
+            mock_repo = Mock()
+            result = catalog._process_manifest_item(item, "plugin1", "plugin1", repo_url, {}, relpath, "org/repo", gh_repo=mock_repo)
 
             assert result is False
             mock_logger.warning.assert_called()
@@ -1021,11 +1021,11 @@ def test_process_manifest_item_download_failure(self, tmp_path, mock_github_env)
                 "path": "plugin1/plugin-manifest.yaml",
                 "git_url": "https://api.github.com/file"
             }
-            
+            mock_repo = Mock()
             repo_url = httpx.URL("https://github.com/org/repo")
             relpath = tmp_path / "catalog" / "plugin1" / "plugin-manifest.yaml"
 
-            result = catalog._process_manifest_item(item, "plugin1", "plugin1", repo_url, {}, relpath, "org/repo")
+            result = catalog._process_manifest_item(item, "plugin1", "plugin1", repo_url, {}, relpath, "org/repo", gh_repo=mock_repo)
 
             assert result is False
             mock_logger.error.assert_called()
@@ -1041,9 +1041,9 @@ def test_find_and_save_plugin_manifest_search_returns_none(self, tmp_path, mock_
 
         # Mock _search_github_code to return None
         catalog._search_github_code = Mock(return_value=None)
-        
+        mock_repo = Mock()
         repo_url = httpx.URL("https://github.com/org/repo")
-        result = catalog.find_and_save_plugin_manifest("plugin1", "plugin1", repo_url, {})
+        result = catalog.find_and_save_plugin_manifest("plugin1", "plugin1", repo_url, {}, mock_repo)
 
         assert result is None
 
@@ -1132,9 +1132,10 @@ def test_download_file_with_exception_message(self, mock_github_env):
 
             # Mock to raise exception
             catalog.gh.get_repo = Mock(side_effect=Exception("API error"))
-            
+            mock_repo = Mock()
+            mock_repo.get_contents = Mock(side_effect=Exception("API error"))
             item = {"path": "test/file.yaml"}
-            result = catalog.download_file("org/repo", item, {})
+            result = catalog.download_file("org/repo", item, {}, gh_repo=mock_repo)
 
             assert result is None
             # Check that error was logged with the item path