Remove Some Custom Detection

Author: Behemyth

cppython/plugins/conan/plugin.py

@@ -113,20 +113,26 @@ def _install_dependencies(self, *, update: bool = False) -> None:
 
             logger.debug('Using profiles: host=%s, build=%s', profile_host, profile_build)
 
-            # Build dependency graph
+            # Build dependency graph - prepare parameters
+            # According to Conan docs, if profiles not specified, it will use defaults
+            path = str(conanfile_path)
+            remotes = all_remotes
+            update_flag = None if not update else True
+            check_updates_flag = update
+            
             deps_graph = conan_api.graph.load_graph_consumer(
-                path=str(conanfile_path),
+                path=path,
                 name=None,
                 version=None,
                 user=None,
                 channel=None,
-                profile_host=profile_host,
-                profile_build=profile_build,
                 lockfile=None,
-                remotes=all_remotes,
-                update=None if not update else True,
-                check_updates=update,
+                remotes=remotes,
+                update=update_flag,
+                check_updates=check_updates_flag,
                 is_build_require=False,
+                profile_host=profile_host,
+                profile_build=profile_build,
             )
 
             logger.debug('Dependency graph loaded with %d nodes', len(deps_graph.nodes))
@@ -249,20 +255,23 @@ def publish(self) -> None:
         # Step 2: Get default profiles, handle case when no default profile exists
         profile_host, profile_build = self._resolve_profiles(conan_api)
 
-        # Step 3: Build dependency graph for the package
+        # Step 3: Build dependency graph for the package - prepare parameters
+        path = str(conanfile_path)
+        remotes = all_remotes  # Use all remotes for dependency resolution
+        
         deps_graph = conan_api.graph.load_graph_consumer(
-            path=str(conanfile_path),
+            path=path,
             name=None,
             version=None,
             user=None,
             channel=None,
-            profile_host=profile_host,
-            profile_build=profile_build,
             lockfile=None,
-            remotes=all_remotes,  # Use all remotes for dependency resolution
+            remotes=remotes,
             update=None,
             check_updates=False,
             is_build_require=False,
+            profile_host=profile_host,
+            profile_build=profile_build,
         )
 
         # Step 4: Analyze binaries and install/build them if needed
@@ -301,7 +310,7 @@ def publish(self) -> None:
                 raise ProviderInstallationError('conan', 'No packages found to upload')
 
     def _resolve_profiles(self, conan_api) -> tuple:
-        """Resolve host and build profiles with fallback to detect().
+        """Resolve host and build profiles with robust fallback handling.
 
         Args:
             conan_api: The Conan API instance
@@ -313,15 +322,14 @@ def _resolve_profiles(self, conan_api) -> tuple:
             profile_host_path = conan_api.profiles.get_default_host()
             profile_build_path = conan_api.profiles.get_default_build()
 
-            # Resolve host profile
+            # Try to load profiles from paths if they exist
             if profile_host_path is None:
                 profile_host = conan_api.profiles.detect()
             else:
                 profile_host = conan_api.profiles.get_profile([profile_host_path])
                 if profile_host is None:
                     profile_host = conan_api.profiles.detect()
 
-            # Resolve build profile
             if profile_build_path is None:
                 profile_build = conan_api.profiles.detect()
             else:
@@ -332,7 +340,19 @@ def _resolve_profiles(self, conan_api) -> tuple:
             return profile_host, profile_build
 
         except Exception:
-            # If profile operations fail, create minimal default profiles with basic settings
-            profile_host = conan_api.profiles.detect()
-            profile_build = conan_api.profiles.detect()
-            return profile_host, profile_build
+            # If profile operations fail with other exceptions, let's try detect() as fallback
+            logger = logging.getLogger('cppython.conan')
+            logger.warning('Profile resolution failed, attempting detect() fallback')
+            
+            try:
+                # Try to use detect() as fallback
+                profile_host = conan_api.profiles.detect()
+                profile_build = conan_api.profiles.detect()
+                
+                # If detect returns None, that's okay - we'll let Conan handle None gracefully
+                return profile_host, profile_build
+                
+            except Exception as detect_error:
+                logger.warning('Profile detect() also failed: %s', str(detect_error))
+                # Return None for both profiles - Conan should handle this according to docs
+                return None, None

tests/unit/plugins/conan/test_install.py

@@ -302,3 +302,77 @@ def test_install_with_get_profile_returning_none_fallback(
         conan_mock_api.graph.load_graph_consumer.assert_called_once()
         conan_mock_api.install.install_binaries.assert_called_once()
         conan_mock_api.install.install_consumer.assert_called_once()
+
+    def test_install_with_detect_returning_none_graceful_handling(
+        self,
+        plugin: ConanProvider,
+        conan_temp_conanfile: Path,
+        conan_mock_dependencies: list[Requirement],
+        conan_setup_mocks: dict[str, Mock],
+        conan_mock_api: Mock,
+    ) -> None:
+        """Test install method when detect() returns None (graceful handling)
+
+        Args:
+            plugin: The plugin instance
+            conan_temp_conanfile: Path to temporary conanfile.py
+            conan_mock_dependencies: List of mock dependencies
+            conan_setup_mocks: Dictionary containing all mocks
+            conan_mock_api: Mock ConanAPI instance
+        """
+        # Configure profiles to not exist and detect to return None
+        conan_mock_api.profiles.get_default_host.return_value = None
+        conan_mock_api.profiles.get_default_build.return_value = None
+        conan_mock_api.profiles.detect.return_value = None  # This should be handled gracefully
+
+        # Setup dependencies
+        plugin.core_data.cppython_data.dependencies = conan_mock_dependencies
+
+        # Execute - should succeed gracefully by letting Conan handle None profiles
+        plugin.install()
+
+        # Verify that detect was called (fallback was attempted)
+        conan_mock_api.profiles.detect.assert_called()
+
+        # Verify the rest of the process continued (profiles were omitted from API call)
+        conan_mock_api.graph.load_graph_consumer.assert_called_once()
+        conan_mock_api.install.install_binaries.assert_called_once()
+        conan_mock_api.install.install_consumer.assert_called_once()
+
+    def test_install_with_profile_exception_fallback_to_detect_works(
+        self,
+        plugin: ConanProvider,
+        conan_temp_conanfile: Path,
+        conan_mock_dependencies: list[Requirement],
+        conan_setup_mocks: dict[str, Mock],
+        conan_mock_api: Mock,
+    ) -> None:
+        """Test install method when profile operations throw exceptions but detect() works
+
+        Args:
+            plugin: The plugin instance
+            conan_temp_conanfile: Path to temporary conanfile.py
+            conan_mock_dependencies: List of mock dependencies
+            conan_setup_mocks: Dictionary containing all mocks
+            conan_mock_api: Mock ConanAPI instance
+        """
+        # Configure the API mock to throw exception on profile calls but detect() works
+        conan_mock_api.profiles.get_default_host.side_effect = Exception('Profile not found')
+        
+        # Setup dependencies
+        plugin.core_data.cppython_data.dependencies = conan_mock_dependencies
+
+        # Execute - should succeed using fallback detect profiles
+        plugin.install()
+
+        # Verify that the fallback was used
+        conan_setup_mocks['conan_api_constructor'].assert_called_once()
+        conan_mock_api.profiles.get_default_host.assert_called_once()
+        
+        # Verify detect was called for fallback (should be called twice for fallback)
+        assert conan_mock_api.profiles.detect.call_count >= EXPECTED_PROFILE_CALLS
+
+        # Verify the rest of the process continued
+        conan_mock_api.graph.load_graph_consumer.assert_called_once()
+        conan_mock_api.install.install_binaries.assert_called_once()
+        conan_mock_api.install.install_consumer.assert_called_once()