Enh/ap 25245 pixi env creator

org.knime.python3.arrow.tests/META-INF/MANIFEST.MF

@@ -12,5 +12,6 @@ Require-Bundle: org.junit;bundle-version="[4.13.0,5.0.0)",
  org.apache.commons.lang3;bundle-version="[3.9.0,4.0.0)",
  org.knime.core.columnar;bundle-version="[5.6.0,6.0.0)",
  org.knime.core.data.columnar;bundle-version="[5.6.0,6.0.0)",
- org.knime.python3.testing;bundle-version="[5.6.0,6.0.0)"
+ org.knime.python3.testing;bundle-version="[5.6.0,6.0.0)",
+ org.knime.externalprocessprovider;bundle-version="[5.11.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.arrow.tests

org.knime.python3.arrow.tests/src/test/java/org/knime/python3/arrow/TestUtils.java

@@ -53,9 +53,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python3.DefaultPythonGateway;
 import org.knime.python3.Python3SourceDirectory;
-import org.knime.python3.PythonCommand;
 import org.knime.python3.PythonDataSink;
 import org.knime.python3.PythonDataSource;
 import org.knime.python3.PythonEntryPoint;
@@ -83,7 +83,7 @@ private TestUtils() {
      * @throws InterruptedException
      */
     public static PythonGateway<ArrowTestsEntryPoint> openPythonGateway() throws IOException, InterruptedException {
-        final PythonCommand command = Python3TestUtils.getPythonCommand();
+        final ExternalProcessProvider command = Python3TestUtils.getPythonCommand();
         final String launcherPath =
             Paths.get(System.getProperty("user.dir"), "src/test/python", "tests_launcher.py").toString();
         final PythonPath pythonPath = (new PythonPathBuilder()) //

org.knime.python3.arrow.types.tests/META-INF/MANIFEST.MF

@@ -16,6 +16,7 @@ Require-Bundle: org.knime.core.table;bundle-version="[5.6.0,6.0.0)",
  org.knime.core.data.columnar;bundle-version="[5.6.0,6.0.0)",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.12.1,3.0.0)",
  org.knime.python3.types;bundle-version="[5.6.0,6.0.0)",
- org.knime.python3.testing;bundle-version="[5.6.0,6.0.0)"
+ org.knime.python3.testing;bundle-version="[5.6.0,6.0.0)",
+ org.knime.externalprocessprovider;bundle-version="[5.11.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.arrow.types.tests
 Export-Package: org.knime.python3.arrow.types

org.knime.python3.arrow.types.tests/src/test/java/org/knime/python3/arrow/types/KnimeArrowExtensionTypesTest.java

@@ -164,6 +164,7 @@
 import org.knime.core.table.schema.DataSpecs.DataSpecWithTraits;
 import org.knime.core.table.schema.DefaultColumnarSchema;
 import org.knime.core.table.schema.traits.LogicalTypeTrait;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.filehandling.core.connections.FSCategory;
 import org.knime.filehandling.core.connections.FSLocation;
 import org.knime.filehandling.core.data.location.FSLocationValue;
@@ -172,7 +173,6 @@
 import org.knime.filehandling.core.data.location.cell.SimpleFSLocationCellFactory;
 import org.knime.python3.DefaultPythonGateway;
 import org.knime.python3.Python3SourceDirectory;
-import org.knime.python3.PythonCommand;
 import org.knime.python3.PythonDataSink;
 import org.knime.python3.PythonDataSource;
 import org.knime.python3.PythonEntryPoint;
@@ -893,7 +893,7 @@ interface TriConsumer<A, B, C> {
 
 	private static <E extends PythonEntryPoint> PythonGateway<E> openPythonGateway(final Class<E> entryPointClass,
 			final String launcherModule, final PythonModule... modules) throws IOException, InterruptedException {
-		final PythonCommand command = Python3TestUtils.getPythonCommand();
+		final ExternalProcessProvider command = Python3TestUtils.getPythonCommand();
 		final String launcherPath = Paths.get(System.getProperty("user.dir"), "src/test/python", launcherModule)
 				.toString();
 		final PythonPathBuilder builder = PythonPath.builder()//

org.knime.python3.nodes/META-INF/MANIFEST.MF

@@ -36,7 +36,8 @@ Require-Bundle: org.knime.core;bundle-version="[5.10.0,6.0.0)",
  com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.13.2,3.0.0)",
  org.knime.workflowservices;bundle-version="[5.10.0,6.0.0)",
  org.apache.commons.lang3;bundle-version="[3.9.0,4.0.0)",
- org.knime.gateway.impl;bundle-version="[5.10.0,6.0.0)"
+ org.knime.gateway.impl;bundle-version="[5.10.0,6.0.0)",
+ org.knime.externalprocessprovider;bundle-version="[5.11.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.nodes
 Eclipse-RegisterBuddy: org.knime.ext.py4j
 Eclipse-BundleShape: dir

org.knime.python3.nodes/src/main/java/org/knime/python3/nodes/PythonExtensionPreferences.java

@@ -61,8 +61,8 @@
 
 import org.knime.conda.prefs.CondaPreferences;
 import org.knime.core.node.NodeLogger;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python3.CondaPythonCommand;
-import org.knime.python3.PythonCommand;
 import org.knime.python3.SimplePythonCommand;
 import org.yaml.snakeyaml.Yaml;
 
@@ -91,7 +91,7 @@ static Stream<Path> getPathsToCustomExtensions() {
             .map(Optional::get);
     }
 
-    static Optional<PythonCommand> getCustomPythonCommand(final String extensionId) {
+    static Optional<ExternalProcessProvider> getCustomPythonCommand(final String extensionId) {
         return loadConfigs()//
             .filter(e -> extensionId.equals(e.m_id))//
             .findFirst()//
@@ -307,7 +307,7 @@ Optional<Path> getSrcPath() {
             }
         }
 
-        Optional<PythonCommand> getCommand() {
+        Optional<ExternalProcessProvider> getCommand() {
             if (m_condaEnvPath != null) {
                 if (m_pythonExecutable != null) {
                     LOGGER.warnWithFormat("Both conda_env_path and python_executable are provided for extension '%s'."

org.knime.python3.nodes/src/main/java/org/knime/python3/nodes/PythonNodeGatewayFactory.java

@@ -53,11 +53,11 @@
 import java.util.Objects;
 
 import org.knime.conda.envbundling.environment.CondaEnvironmentRegistry;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python3.Activator;
 import org.knime.python3.BundledPythonCommand;
 import org.knime.python3.FreshPythonGatewayFactory;
 import org.knime.python3.Python3SourceDirectory;
-import org.knime.python3.PythonCommand;
 import org.knime.python3.PythonEntryPointUtils;
 import org.knime.python3.PythonGateway;
 import org.knime.python3.PythonGatewayFactory;
@@ -141,12 +141,12 @@ public PythonGateway<KnimeNodeBackend> create() throws IOException, InterruptedE
         return gateway;
     }
 
-    private static PythonCommand createCommand(final String extensionId, final String environmentName) {
+    private static ExternalProcessProvider createCommand(final String extensionId, final String environmentName) {
         return PythonExtensionPreferences.getCustomPythonCommand(extensionId)//
             .orElseGet(() -> getPythonCommandForEnvironment(environmentName));
     }
 
-    private static PythonCommand getPythonCommandForEnvironment(final String environmentName) {
+    private static ExternalProcessProvider getPythonCommandForEnvironment(final String environmentName) {
         final var environment = CondaEnvironmentRegistry.getEnvironment(environmentName);
         if (environment == null) {
             throw new IllegalStateException("Conda environment '" + environmentName + "' not found. "

org.knime.python3.scripting.nodes/META-INF/MANIFEST.MF

@@ -23,6 +23,7 @@ Require-Bundle: org.knime.core;bundle-version="[5.11.0,6.0.0)",
  org.eclipse.ui;bundle-version="3.119.0",
  org.knime.conda;bundle-version="[5.11.0,6.0.0)",
  org.knime.conda.envbundling;bundle-version="[5.10.0,6.0.0)",
+ org.knime.pixi.port;bundle-version="[5.11.0,6.0.0)",
  org.knime.core.ui;bundle-version="[5.11.0,6.0.0)",
  org.knime.workbench.editor;bundle-version="[5.10.0,6.0.0)",
  org.apache.batik.util;bundle-version="[1.16.0,2.0.0)",
@@ -38,7 +39,8 @@ Require-Bundle: org.knime.core;bundle-version="[5.11.0,6.0.0)",
  com.fasterxml.jackson.core.jackson-core;bundle-version="2.13.2",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="2.13.2",
  org.eclipse.orbit.xml-apis-ext;bundle-version="[1.0.0,2.0.0)",
- org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)"
+ org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)",
+ org.knime.externalprocessprovider;bundle-version="[5.11.0,6.0.0)"
 Automatic-Module-Name: org.knime.python3.scripting.nodes
 Export-Package: org.knime.python3.scripting.nodes.prefs
 Eclipse-RegisterBuddy: org.knime.ext.py4j

org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes/AbstractPythonScriptingNodeModel.java

@@ -81,6 +81,7 @@
 import org.knime.core.util.PathUtils;
 import org.knime.core.util.asynclose.AsynchronousCloseableTracker;
 import org.knime.core.webui.node.view.NodeView;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python2.PythonCommand;
 import org.knime.python2.PythonModuleSpec;
 import org.knime.python2.PythonVersion;
@@ -381,14 +382,14 @@ private void pushNewFlowVariable(final FlowVariable variable) {
     }
 
     /**
-     * Wraps a {@link org.knime.python3.PythonCommand} into the legacy implementation for using it in a
+     * Wraps a {@link ExternalProcessProvider} into the legacy implementation for using it in a
      * {@link PythonKernelBackend}.
      */
     private static final class LegacyPythonCommand implements PythonCommand {
 
-        private final org.knime.python3.PythonCommand m_pythonCommand;
+        private final ExternalProcessProvider m_pythonCommand;
 
-        private LegacyPythonCommand(final org.knime.python3.PythonCommand pythonCommand) {
+        private LegacyPythonCommand(final ExternalProcessProvider pythonCommand) {
             m_pythonCommand = pythonCommand;
         }
 

org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes/prefs/CondaEnvironmentConfig.java

@@ -56,8 +56,8 @@
 import org.knime.conda.prefs.CondaPreferences;
 import org.knime.core.node.NodeLogger;
 import org.knime.core.node.defaultnodesettings.SettingsModelString;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python3.CondaPythonCommand;
-import org.knime.python3.PythonCommand;
 
 /**
  * Copied and modified from org.knime.python2.config.
@@ -113,7 +113,7 @@ public ObservableValue<CondaEnvironmentIdentifier[]> getAvailableEnvironments()
     }
 
     @Override
-    public PythonCommand getPythonCommand() {
+    public ExternalProcessProvider getPythonCommand() {
         return new CondaPythonCommand(CondaPreferences.getCondaInstallationDirectory(),
             m_environmentDirectory.getStringValue());
     }

org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes/prefs/ManualEnvironmentConfig.java

@@ -49,7 +49,7 @@
 package org.knime.python3.scripting.nodes.prefs;
 
 import org.knime.core.node.defaultnodesettings.SettingsModelString;
-import org.knime.python3.PythonCommand;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python3.SimplePythonCommand;
 
 /**
@@ -79,7 +79,7 @@ public SettingsModelString getExecutablePath() {
     }
 
     @Override
-    public PythonCommand getPythonCommand() {
+    public ExternalProcessProvider getPythonCommand() {
         return new SimplePythonCommand(m_pythonPath.getStringValue());
     }
 

org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes/prefs/Python3ScriptingPreferences.java

@@ -52,8 +52,8 @@
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.knime.conda.CondaEnvironmentIdentifier;
 import org.knime.conda.prefs.CondaPreferences;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python3.BundledPythonCommand;
-import org.knime.python3.PythonCommand;
 
 /**
  * Convenience front-end of the preference-based configuration of the Python integration.
@@ -110,7 +110,7 @@ public static PythonEnvironmentType getEnvironmentTypePreference() {
     /**
      * @return The currently selected default Python command.
      */
-    public static PythonCommand getPythonCommandPreference() {
+    public static ExternalProcessProvider getPythonCommandPreference() {
         final var envType = getEnvironmentTypePreference();
         PythonEnvironmentsConfig environmentsConfig;
 
@@ -124,7 +124,7 @@ public static PythonCommand getPythonCommandPreference() {
     }
 
     /**
-     * @return The {@link PythonCommand} for the installed bundled environment.
+     * @return The {@link ExternalProcessProvider} for the installed bundled environment.
      */
     public static BundledPythonCommand getBundledPythonCommand() {
         return getBundledCondaEnvironmentConfig().getPythonCommand();

org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes/prefs/PythonEnvironmentConfig.java

@@ -50,7 +50,7 @@
 
 import org.knime.core.node.defaultnodesettings.SettingsModelBoolean;
 import org.knime.core.node.defaultnodesettings.SettingsModelString;
-import org.knime.python3.PythonCommand;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 
 /**
  * Copied from org.knime.python2.config.
@@ -63,7 +63,7 @@ interface PythonEnvironmentConfig extends PythonConfig {
     /**
      * @return The command that executes Python in the Python environment configured by this instance.
      */
-    PythonCommand getPythonCommand();
+    ExternalProcessProvider getPythonCommand();
 
     /**
      * @return If the Python environment configured by this instance is currently the default environment. Not meant for

org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes/prefs/PythonKernelTester.java

@@ -66,7 +66,7 @@
 import org.knime.core.node.NodeLogger;
 import org.knime.core.util.FileUtil;
 import org.knime.core.util.Pair;
-import org.knime.python3.PythonCommand;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 
 /**
  * Copied from org.knime.python2.
@@ -94,7 +94,7 @@ final class PythonKernelTester {
      * Caches previous test results. Mapping from the Python command that was tested to a list of additional required
      * modules that were tested along the command and the test results of these combinations of command and modules.
      */
-    private static final Map<PythonCommand, List<Pair<Set<PythonModuleSpec>, PythonKernelTestResult>>> TEST_RESULTS =
+    private static final Map<ExternalProcessProvider, List<Pair<Set<PythonModuleSpec>, PythonKernelTestResult>>> TEST_RESULTS =
         new ConcurrentHashMap<>();
 
     private static String getPythonKernelTesterPath() throws IOException {
@@ -119,7 +119,7 @@ private PythonKernelTester() {
      * @param force Force the test to be rerun again even if the same configuration was successfully tested before.
      * @return The results of the installation test.
      */
-    public static PythonKernelTestResult testPython3Installation(final PythonCommand python3Command,
+    public static PythonKernelTestResult testPython3Installation(final ExternalProcessProvider python3Command,
         final Collection<PythonModuleSpec> additionalRequiredModules, final boolean force) {
         return testPythonInstallation(python3Command, PYTHON_MAJOR_VERSION_3, PYTHON_MINIMUM_VERSION_3,
             additionalRequiredModules, Collections.emptyList(), force);
@@ -128,7 +128,7 @@ public static PythonKernelTestResult testPython3Installation(final PythonCommand
     /**
      * @param minimumVersion May be {@code null} in the case where no minimum version is required.
      */
-    private static synchronized PythonKernelTestResult testPythonInstallation(final PythonCommand pythonCommand,
+    private static synchronized PythonKernelTestResult testPythonInstallation(final ExternalProcessProvider pythonCommand,
         final String majorVersion, final String minimumVersion,
         final Collection<PythonModuleSpec> additionalRequiredModules,
         final Collection<PythonModuleSpec> additionalOptionalModules, final boolean force) {
@@ -189,7 +189,7 @@ private static synchronized PythonKernelTestResult testPythonInstallation(final
         return testResults;
     }
 
-    private static PythonKernelTestResult getPreviousTestResultsIfApplicable(final PythonCommand pythonCommand,
+    private static PythonKernelTestResult getPreviousTestResultsIfApplicable(final ExternalProcessProvider pythonCommand,
         final Set<PythonModuleSpec> additionalRequiredModules) {
         // If a previous, appropriate Python test already succeeded, we will not have to run it again and return the
         // old results here (except if we're forced to).
@@ -209,7 +209,7 @@ private static PythonKernelTestResult getPreviousTestResultsIfApplicable(final P
         return null;
     }
 
-    private static Process runPythonKernelTester(final PythonCommand pythonCommand, final String majorVersion,
+    private static Process runPythonKernelTester(final ExternalProcessProvider pythonCommand, final String majorVersion,
         final String minimumVersion, final Collection<PythonModuleSpec> additionalRequiredModules,
         final Collection<PythonModuleSpec> additionalOptionalModules, final StringBuilder testLogger)
         throws IOException {

org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/ExecutableSelectionUtils.java

@@ -59,8 +59,8 @@
 import org.knime.conda.CondaEnvironmentPropagation.CondaEnvironmentType;
 import org.knime.conda.prefs.CondaPreferences;
 import org.knime.core.node.workflow.FlowObjectStack;
+import org.knime.externalprocessprovider.ExternalProcessProvider;
 import org.knime.python3.CondaPythonCommand;
-import org.knime.python3.PythonCommand;
 import org.knime.python3.SimplePythonCommand;
 import org.knime.python3.scripting.nodes.prefs.Python3ScriptingPreferences;
 import org.knime.python3.scripting.nodes2.PythonScriptingService.ExecutableOption;
@@ -83,7 +83,7 @@ static Map<String, ExecutableOption> getExecutableOptions(final FlowObjectStack
     }
 
     /** Get the PythonCommand from the selected option */
-    static PythonCommand getPythonCommand(final ExecutableOption option) {
+    static ExternalProcessProvider getPythonCommand(final ExecutableOption option) {
         switch (option.type) {
             case CONDA_ENV_VAR:
                 return commandForConda(option.condaEnvDir);
@@ -106,7 +106,7 @@ static PythonCommand getPythonCommand(final ExecutableOption option) {
     }
 
     /** Get the PythonCommand from the given settings String */
-    static PythonCommand getPythonCommand(final String commandString) {
+    static ExternalProcessProvider getPythonCommand(final String commandString) {
         if (commandString == null || EXEC_SELECTION_PREF_ID.equals(commandString)) {
             // Nothing configured -> Use preferences
             return commandForPreferences();
@@ -126,7 +126,7 @@ static boolean isPathToCondaEnv(final String commandString) {
 
     private static ExecutableOption getPreferenceOption() {
         return new ExecutableOption(getPreferenceOptionType(), EXEC_SELECTION_PREF_ID,
-            commandForPreferences().getPythonExecutablePath().toString(), null, null);
+            commandForPreferences().getExecutablePath().toString(), null, null);
     }
 
     private static ExecutableOptionType getPreferenceOptionType() {
@@ -161,15 +161,15 @@ private static Stream<ExecutableOption> getCondaFlowVariableOptions(final FlowOb
         }
     }
 
-    private static PythonCommand commandForConda(final String condaEnvDir) {
+    private static ExternalProcessProvider commandForConda(final String condaEnvDir) {
         return new CondaPythonCommand(CondaPreferences.getCondaInstallationDirectory(), condaEnvDir);
     }
 
-    private static PythonCommand commandForString(final String pythonExecutable) {
+    private static ExternalProcessProvider commandForString(final String pythonExecutable) {
         return new SimplePythonCommand(pythonExecutable);
     }
 
-    private static PythonCommand commandForPreferences() {
+    private static ExternalProcessProvider commandForPreferences() {
         return Python3ScriptingPreferences.getPythonCommandPreference();
     }
 }