Profile Handling

Author: Behemyth

cppython/plugins/conan/plugin.py

@@ -108,18 +108,37 @@ def _install_dependencies(self, *, update: bool = False) -> None:
             all_remotes = conan_api.remotes.list()
             logger.debug('Available remotes: %s', [remote.name for remote in all_remotes])
 
-            # Get default profiles, handle case when no default profile exists
-            profile_host, profile_build = self._resolve_profiles(conan_api)
+            # Get profiles with fallback to auto-detection
+            try:
+                profile_host_path = conan_api.profiles.get_default_host()
+                profile_build_path = conan_api.profiles.get_default_build()
+
+                # Check if profile paths exist
+                if profile_host_path is None or profile_build_path is None:
+                    logger.warning('Default profile paths not available, using auto-detection')
+                    raise ValueError('Profile paths are None')
+
+                # Load the actual profile objects
+                profile_host = conan_api.profiles.get_profile([profile_host_path])
+                profile_build = conan_api.profiles.get_profile([profile_build_path])
 
-            logger.debug('Using profiles: host=%s, build=%s', profile_host, profile_build)
+                # Check if profiles are valid (not None)
+                if profile_host is None or profile_build is None:
+                    logger.warning('Default profiles are corrupted/invalid, using auto-detection')
+                    raise ValueError('Profile loading returned None')
+
+                logger.debug('Using existing default profiles')
+            except Exception as e:
+                logger.warning('Default profiles not available (%s), using auto-detection', str(e))
+                # Use Conan's auto-detection to create minimal profiles
+                profile_host = conan_api.profiles.detect()
+                profile_build = conan_api.profiles.detect()
 
-            # 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=path,
                 name=None,
@@ -252,13 +271,32 @@ def publish(self) -> None:
             remotes=all_remotes,  # Use all remotes for dependency resolution during export
         )
 
-        # Step 2: Get default profiles, handle case when no default profile exists
-        profile_host, profile_build = self._resolve_profiles(conan_api)
+        # Step 2: Get profiles with fallback to auto-detection
+        try:
+            profile_host_path = conan_api.profiles.get_default_host()
+            profile_build_path = conan_api.profiles.get_default_build()
+
+            # Check if profile paths exist
+            if profile_host_path is None or profile_build_path is None:
+                raise ValueError('Profile paths are None')
+
+            # Load the actual profile objects
+            profile_host = conan_api.profiles.get_profile([profile_host_path])
+            profile_build = conan_api.profiles.get_profile([profile_build_path])
+
+            # Check if profiles are valid
+            if profile_host is None or profile_build is None:
+                raise ValueError('Profile loading returned None')
+
+        except Exception:
+            # Use Conan's auto-detection to create minimal profiles
+            profile_host = conan_api.profiles.detect()
+            profile_build = conan_api.profiles.detect()
 
         # 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=path,
             name=None,
@@ -308,51 +346,3 @@ def publish(self) -> None:
                 )
             else:
                 raise ProviderInstallationError('conan', 'No packages found to upload')
-
-    def _resolve_profiles(self, conan_api) -> tuple:
-        """Resolve host and build profiles with robust fallback handling.
-
-        Args:
-            conan_api: The Conan API instance
-
-        Returns:
-            Tuple of (profile_host, profile_build)
-        """
-        try:
-            profile_host_path = conan_api.profiles.get_default_host()
-            profile_build_path = conan_api.profiles.get_default_build()
-
-            # 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()
-
-            if profile_build_path is None:
-                profile_build = conan_api.profiles.detect()
-            else:
-                profile_build = conan_api.profiles.get_profile([profile_build_path])
-                if profile_build is None:
-                    profile_build = conan_api.profiles.detect()
-
-            return profile_host, profile_build
-
-        except Exception:
-            # 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

@@ -358,7 +358,7 @@ def test_install_with_profile_exception_fallback_to_detect_works(
         """
         # 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
 
@@ -368,7 +368,7 @@ def test_install_with_profile_exception_fallback_to_detect_works(
         # 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