You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pd...@apache.org on 2022/09/12 08:59:23 UTC
[zeppelin] branch branch-0.10 updated: [ZEPPELIN-5810] Allow both package names jupyter_client and jupyter-client (#4455)
This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch branch-0.10
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.10 by this push:
new f4f04791c6 [ZEPPELIN-5810] Allow both package names jupyter_client and jupyter-client (#4455)
f4f04791c6 is described below
commit f4f04791c675751b6f8fb6316b88c7f2b804e3ee
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Mon Sep 12 10:53:53 2022 +0200
[ZEPPELIN-5810] Allow both package names jupyter_client and jupyter-client (#4455)
---
.../apache/zeppelin/python/IPythonInterpreter.java | 15 +++++---
.../zeppelin/jupyter/JupyterKernelInterpreter.java | 40 ++++++++++++++--------
.../zeppelin/jupyter/PythonPackagePredicate.java | 40 ++++++++++++++++++++++
3 files changed, 76 insertions(+), 19 deletions(-)
diff --git a/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
index e482585c46..8e881f6376 100644
--- a/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
+++ b/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
@@ -27,6 +27,7 @@ import org.apache.zeppelin.interpreter.jupyter.proto.ExecuteResponse;
import org.apache.zeppelin.interpreter.jupyter.proto.ExecuteStatus;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterUtils;
import org.apache.zeppelin.jupyter.JupyterKernelInterpreter;
+import org.apache.zeppelin.jupyter.PythonPackagePredicate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import py4j.GatewayServer;
@@ -67,10 +68,16 @@ public class IPythonInterpreter extends JupyterKernelInterpreter {
}
@Override
- public List<String> getRequiredPackages() {
- List<String> requiredPackages = super.getRequiredPackages();
- requiredPackages.add("ipython");
- requiredPackages.add("ipykernel");
+ public List<PythonPackagePredicate<String>> getRequiredPackagesPredicates() {
+ List<PythonPackagePredicate<String>> requiredPackages = super.getRequiredPackagesPredicates();
+ requiredPackages.add(
+ new PythonPackagePredicate<>("ipython",
+ packages -> packages.contains("ipython ") ||
+ packages.contains("ipython=")));
+ requiredPackages.add(
+ new PythonPackagePredicate<>("ipykernel",
+ packages -> packages.contains("ipykernel ") ||
+ packages.contains("ipykernel=")));
return requiredPackages;
}
diff --git a/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
index 38a4061700..a954e1dfa9 100644
--- a/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
+++ b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
@@ -96,11 +96,28 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
return this.kernel;
}
- public List<String> getRequiredPackages() {
- List<String> requiredPackages = new ArrayList<>();
- requiredPackages.add("jupyter-client");
- requiredPackages.add("grpcio");
- requiredPackages.add("protobuf");
+ public List<PythonPackagePredicate<String>> getRequiredPackagesPredicates() {
+ /**
+ * Example line, if the Python package is installed with pip:
+ * grpcio==1.18.0
+ * Example line, if the Python package is installed with conda:
+ * grpcio @ file:///home/conda/feedstock_root/build_artifacts/grpcio_1604365513151/work
+ */
+ List<PythonPackagePredicate<String>> requiredPackages = new ArrayList<>();
+ requiredPackages.add(
+ new PythonPackagePredicate<>("jupyter-client or jupyter_client",
+ packages -> packages.contains("jupyter-client ") ||
+ packages.contains("jupyter-client=") ||
+ packages.contains("jupyter_client ") ||
+ packages.contains("jupyter_client=")));
+ requiredPackages.add(
+ new PythonPackagePredicate<>("grpcio",
+ packages -> packages.contains("grpcio ") ||
+ packages.contains("grpcio=")));
+ requiredPackages.add(
+ new PythonPackagePredicate<>("protobuf",
+ packages -> packages.contains("protobuf ") ||
+ packages.contains("protobuf=")));
return requiredPackages;
}
@@ -172,16 +189,9 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
}
try (FileInputStream in = new FileInputStream(stdoutFile)) {
String freezeOutput = IOUtils.toString(in, StandardCharsets.UTF_8);
- for (String packageName : getRequiredPackages()) {
- /**
- * Example line, if the Python package is installed with pip:
- * grpcio==1.18.0
- * Example line, if the Python package is installed with conda:
- * grpcio @ file:///home/conda/feedstock_root/build_artifacts/grpcio_1604365513151/work
- */
- if (!freezeOutput.contains(packageName + "=") &&
- !freezeOutput.contains(packageName + " ")) {
- return packageName + " is not installed, installed packages:\n" + freezeOutput;
+ for (PythonPackagePredicate<String> packagePredicate : getRequiredPackagesPredicates()) {
+ if (!packagePredicate.test(freezeOutput)) {
+ return packagePredicate + " is not installed, installed packages:\n" + freezeOutput;
}
}
LOGGER.info("Prerequisite for kernel {} is met", getKernelName());
diff --git a/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/PythonPackagePredicate.java b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/PythonPackagePredicate.java
new file mode 100644
index 0000000000..9577d32d5a
--- /dev/null
+++ b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/PythonPackagePredicate.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zeppelin.jupyter;
+
+import java.util.function.Predicate;
+
+public class PythonPackagePredicate<T> implements Predicate<T> {
+ private final String name;
+ private final Predicate<T> predicate;
+
+ public PythonPackagePredicate(String name, Predicate<T> predicate) {
+ this.name = name;
+ this.predicate = predicate;
+ }
+
+ @Override
+ public boolean test(T t) {
+ return predicate.test(t);
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+}