AP-25234: Adapt to move knime-scripting-editor to knime-core-ui

HedgehogCode · HedgehogCode · commit 5b53c9574017 · 2025-11-17T15:13:19.000+01:00
AP-25234 (Allow usage of JSONForms dialogs generated from NodeParameters in Scripting Editors)
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -174,7 +174,6 @@ def runPython3MultiversionWorkflowTestConfig(String environmentFile, String base
                         'knime-conda-channels',
                         'knime-python-nodes-testing',
                         'knime-base-views',
-                        'knime-scripting-editor',
                         'knime-gateway',
                         'knime-credentials-base',
                         'knime-google',
diff --git a/org.knime.python3.scripting.nodes.tests/src/test/java/org/knime/python3/scripting/nodes2/ConsoleOutputUtilsTest.java b/org.knime.python3.scripting.nodes.tests/src/test/java/org/knime/python3/scripting/nodes2/ConsoleOutputUtilsTest.java
@@ -58,7 +58,7 @@
 
 import org.junit.Test;
 import org.knime.core.util.PathUtils;
-import org.knime.scripting.editor.ScriptingService.ConsoleText;
+import org.knime.core.webui.node.dialog.scripting.ScriptingService.ConsoleText;
 
 /**
  * Unit tests for the ConsoleOutputUtils.
diff --git a/org.knime.python3.scripting.nodes.tests/src/test/java/org/knime/python3/scripting/nodes2/PythonScriptingInputOutputModelUtilsTest.java b/org.knime.python3.scripting.nodes.tests/src/test/java/org/knime/python3/scripting/nodes2/PythonScriptingInputOutputModelUtilsTest.java
@@ -66,8 +66,8 @@
 import org.knime.core.node.port.PortType;
 import org.knime.core.node.port.image.ImagePortObject;
 import org.knime.core.node.workflow.FlowVariable;
+import org.knime.core.webui.node.dialog.scripting.WorkflowControl.InputPortInfo;
 import org.knime.python2.port.PickledObjectFileStorePortObject;
-import org.knime.scripting.editor.WorkflowControl.InputPortInfo;
 
 /**
  * Unit tests for the {@link PythonScriptingInputOutputModelUtils}.
diff --git a/org.knime.python3.scripting.nodes/META-INF/MANIFEST.MF b/org.knime.python3.scripting.nodes/META-INF/MANIFEST.MF
@@ -20,7 +20,6 @@ Require-Bundle: org.knime.core;bundle-version="[5.9.0,6.0.0)",
  org.knime.python3.views;bundle-version="[5.9.0,6.0.0)",
  org.knime.python3.arrow;bundle-version="[5.9.0,6.0.0)",
  org.knime.ext.py4j;bundle-version="[0.10.9.2,1.0.0)",
- org.knime.scripting.editor;bundle-version="[5.9.0,6.0.0)",
  org.eclipse.ui;bundle-version="3.119.0",
  org.knime.conda;bundle-version="[5.9.0,6.0.0)",
  org.knime.conda.envbundling;bundle-version="[5.9.0,6.0.0)",
diff --git a/org.knime.python3.scripting.nodes/js-src/README.md b/org.knime.python3.scripting.nodes/js-src/README.md
@@ -14,14 +14,14 @@ npm install
 
 ### Link the @knime/scripting-editor dependency
 
-To use local changes to the [`@knime/scripting-editor`](https://bitbucket.org/KNIME/knime-scripting-editor/src/master/org.knime.scripting.editor.js/) package it has to be linked with [`npm-link`](https://docs.npmjs.com/cli/v9/commands/npm-link).
+To use local changes to the [`@knime/scripting-editor`](https://github.com/knime/knime-core-ui/tree/master/js-src/packages/scripting-editor) package it has to be linked with [`npm-link`](https://docs.npmjs.com/cli/v9/commands/npm-link).
 
 ### Compile and Hot-Reload for Development
 
 If linked with `@knime/scripting-editor`, automatically build changes in `@knime/scripting-editor` with
 
 ```sh
-npm run build-watch  # pwd: .../knime-scripting-editor/org.knime.scripting.editor.js/
+npm run build-watch  # pwd: .../knime-core-ui/js-src/packages/scripting-editor/
 ```
 
 #### Mocked Browser Preview
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/ConsoleOutputUtils.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/ConsoleOutputUtils.java
@@ -73,9 +73,9 @@
 import org.knime.core.table.row.ReadAccessRow;
 import org.knime.core.table.schema.ColumnarSchema;
 import org.knime.core.util.PathUtils;
+import org.knime.core.webui.node.dialog.scripting.ScriptingService.ConsoleText;
 import org.knime.python3.arrow.PythonArrowDataUtils;
 import org.knime.python3.scripting.nodes2.ConsoleOutputUtils.ConsoleOutputStorage;
-import org.knime.scripting.editor.ScriptingService.ConsoleText;
 
 /**
  * Utilities for saving and loading the standard streams output of a process.
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonCodeAssistant.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonCodeAssistant.java
@@ -48,12 +48,12 @@
  */
 package org.knime.python3.scripting.nodes2;
 
-import org.knime.scripting.editor.CodeGenerationRequest;
-import org.knime.scripting.editor.CodeGenerationRequest.Inputs;
-import org.knime.scripting.editor.CodeGenerationRequest.Outputs;
-import org.knime.scripting.editor.CodeGenerationRequest.RequestBody;
-import org.knime.scripting.editor.InputOutputModel;
-import org.knime.scripting.editor.InputOutputModelNameAndTypeUtils;
+import org.knime.core.webui.node.dialog.scripting.CodeGenerationRequest;
+import org.knime.core.webui.node.dialog.scripting.CodeGenerationRequest.Inputs;
+import org.knime.core.webui.node.dialog.scripting.CodeGenerationRequest.Outputs;
+import org.knime.core.webui.node.dialog.scripting.CodeGenerationRequest.RequestBody;
+import org.knime.core.webui.node.dialog.scripting.InputOutputModel;
+import org.knime.core.webui.node.dialog.scripting.InputOutputModelNameAndTypeUtils;
 
 /**
  * This class provides methods to generate Python code with the help of AI
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonLanguageServer.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonLanguageServer.java
@@ -51,8 +51,8 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.knime.core.webui.node.dialog.scripting.lsp.LanguageServerProxy;
 import org.knime.python3.scripting.nodes.prefs.Python3ScriptingPreferences;
-import org.knime.scripting.editor.lsp.LanguageServerProxy;
 
 import com.google.gson.Gson;
 
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptNodeDialog.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptNodeDialog.java
@@ -58,11 +58,11 @@
 import org.knime.core.webui.node.dialog.NodeDialog;
 import org.knime.core.webui.node.dialog.NodeSettingsService;
 import org.knime.core.webui.node.dialog.SettingsType;
+import org.knime.core.webui.node.dialog.scripting.GenericInitialDataBuilder;
+import org.knime.core.webui.node.dialog.scripting.GenericInitialDataBuilder.DataSupplier;
+import org.knime.core.webui.node.dialog.scripting.ScriptingNodeSettingsService;
+import org.knime.core.webui.node.dialog.scripting.WorkflowControl;
 import org.knime.core.webui.page.Page;
-import org.knime.scripting.editor.GenericInitialDataBuilder;
-import org.knime.scripting.editor.GenericInitialDataBuilder.DataSupplier;
-import org.knime.scripting.editor.ScriptingNodeSettingsService;
-import org.knime.scripting.editor.WorkflowControl;
 
 /**
  * The node dialog implementation of the Python Scripting nodes.
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptNodeModel.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptNodeModel.java
@@ -85,6 +85,7 @@
 import org.knime.core.node.workflow.VariableType;
 import org.knime.core.node.workflow.VariableTypeRegistry;
 import org.knime.core.util.asynclose.AsynchronousCloseableTracker;
+import org.knime.core.webui.node.dialog.scripting.ScriptingService.ConsoleText;
 import org.knime.python3.PythonCommand;
 import org.knime.python3.PythonProcessTerminatedException;
 import org.knime.python3.scripting.nodes2.ConsoleOutputUtils.ConsoleOutputStorage;
@@ -93,7 +94,6 @@
 import org.knime.python3.scripting.nodes2.PythonScriptingSession.FileStoreHandlerSupplier;
 import org.knime.python3.utils.FlowVariableUtils;
 import org.knime.python3.views.PythonNodeViewStoragePath;
-import org.knime.scripting.editor.ScriptingService.ConsoleText;
 
 import py4j.Py4JException;
 
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptNodeSettings.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptNodeSettings.java
@@ -65,8 +65,8 @@
 import org.knime.core.webui.node.dialog.VariableSettingsWO;
 import org.knime.core.webui.node.dialog.configmapping.ConfigMappings;
 import org.knime.core.webui.node.dialog.configmapping.NodeSettingsCorrectionUtil;
-import org.knime.scripting.editor.GenericSettingsIOManager;
-import org.knime.scripting.editor.ScriptingNodeSettings;
+import org.knime.core.webui.node.dialog.scripting.GenericSettingsIOManager;
+import org.knime.core.webui.node.dialog.scripting.ScriptingNodeSettings;
 
 /**
  * The settings of a Python scripting node.
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptingInputOutputModelUtils.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptingInputOutputModelUtils.java
@@ -62,9 +62,9 @@
 import org.knime.core.node.port.flowvariable.FlowVariablePortObject;
 import org.knime.core.node.port.image.ImagePortObject;
 import org.knime.core.node.workflow.FlowVariable;
+import org.knime.core.webui.node.dialog.scripting.InputOutputModel;
+import org.knime.core.webui.node.dialog.scripting.WorkflowControl.InputPortInfo;
 import org.knime.python2.port.PickledObjectFileStorePortObject;
-import org.knime.scripting.editor.InputOutputModel;
-import org.knime.scripting.editor.WorkflowControl.InputPortInfo;
 
 /**
  * Utilities for providing the {@link InputOutputModel} for the scripting editor dialog.
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptingService.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptingService.java
@@ -72,14 +72,14 @@
 import org.knime.core.node.workflow.NodeContext;
 import org.knime.core.util.ThreadUtils;
 import org.knime.core.webui.data.DataServiceContext;
+import org.knime.core.webui.node.dialog.scripting.CodeGenerationRequest;
+import org.knime.core.webui.node.dialog.scripting.InputOutputModel;
+import org.knime.core.webui.node.dialog.scripting.ScriptingService;
 import org.knime.python3.scripting.nodes2.PythonScriptingService.ExecutableOption.ExecutableOptionType;
 import org.knime.python3.scripting.nodes2.PythonScriptingSession.ExecutionInfo;
 import org.knime.python3.scripting.nodes2.PythonScriptingSession.ExecutionStatus;
 import org.knime.python3.scripting.nodes2.PythonScriptingSession.FileStoreHandlerSupplier;
 import org.knime.python3.views.PythonNodeViewStoragePath;
-import org.knime.scripting.editor.CodeGenerationRequest;
-import org.knime.scripting.editor.InputOutputModel;
-import org.knime.scripting.editor.ScriptingService;
 
 /**
  * A special {@link ScriptingService} for the Python scripting node.
@@ -221,8 +221,8 @@ private void clearSession() {
     }
 
     /**
-     * An extension of the {@link org.knime.scripting.editor.ScriptingService.RpcService} that provides additional
-     * methods to the frontend of the Python scripting node.
+     * An extension of the {@link org.knime.core.webui.node.dialog.scripting.ScriptingService.RpcService} that provides
+     * additional methods to the frontend of the Python scripting node.
      *
      * NB: Must be public for the JSON-RPC server
      */
@@ -379,7 +379,8 @@ public String getLanguageServerConfig(final String executableSelection) {
         @Override
         protected CodeGenerationRequest getCodeSuggestionRequest(final String userPrompt, final String currentCode,
             final InputOutputModel[] inputOutputModels) {
-            return PythonCodeAssistant.createCodeGenerationRequest(userPrompt, currentCode, inputOutputModels, m_hasView);
+            return PythonCodeAssistant.createCodeGenerationRequest(userPrompt, currentCode, inputOutputModels,
+                m_hasView);
         }
     }
 
diff --git a/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptingSession.java b/org.knime.python3.scripting.nodes/src/main/java/org/knime/python3/scripting/nodes2/PythonScriptingSession.java
@@ -84,6 +84,7 @@
 import org.knime.core.util.ThreadUtils;
 import org.knime.core.util.asynclose.AsynchronousCloseable;
 import org.knime.core.util.pathresolve.ResolverUtil;
+import org.knime.core.webui.node.dialog.scripting.ScriptingService.ConsoleText;
 import org.knime.python3.Activator;
 import org.knime.python3.Python3SourceDirectory;
 import org.knime.python3.PythonCommand;
@@ -106,7 +107,6 @@
 import org.knime.python3.views.Python3ViewsSourceDirectory;
 import org.knime.python3.views.PythonNodeViewStoragePath;
 import org.knime.python3.views.PythonViewsExtension;
-import org.knime.scripting.editor.ScriptingService.ConsoleText;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
diff --git a/pom.xml b/pom.xml
@@ -43,11 +43,6 @@
 	</modules>
 	<!-- List all required repositories here. The variables are defined in knime-maven-parent/pom.xml. -->
 	<repositories>
-		<repository>
-			<id>p2-knime-scripting-editor</id>
-			<layout>p2</layout>
-			<url>${knime.scripting.editor.p2}</url>
-		</repository>
 		<repository>
 			<id>p2-knime-core-columnar</id>
 			<layout>p2</layout>
