diff --git a/common/source/java/ch/systemsx/cisd/common/jython/v27/Evaluator27.java b/common/source/java/ch/systemsx/cisd/common/jython/v27/Evaluator27.java
new file mode 100644
index 0000000000000000000000000000000000000000..6fdd4204b3fb965f4423cbb3028fa46b0bc44ec8
--- /dev/null
+++ b/common/source/java/ch/systemsx/cisd/common/jython/v27/Evaluator27.java
@@ -0,0 +1,518 @@
+/*
+ * Copyright 2009 ETH Zuerich, CISD
+ *
+ * Licensed 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 ch.systemsx.cisd.common.jython.v27;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.python.core.PySystemState;
+import org.python27.core.CompileMode;
+import org.python27.core.CompilerFlags;
+import org.python27.core.Py;
+import org.python27.core.PyBoolean;
+import org.python27.core.PyCode;
+import org.python27.core.PyException;
+import org.python27.core.PyFloat;
+import org.python27.core.PyFunction;
+import org.python27.core.PyInteger;
+import org.python27.core.PyList;
+import org.python27.core.PyLong;
+import org.python27.core.PyNone;
+import org.python27.core.PyObject;
+import org.python27.core.PyString;
+import org.python27.core.PyStringMap;
+import org.python27.core.PyTraceback;
+
+import ch.systemsx.cisd.common.jython.evaluator.EvaluatorException;
+import ch.systemsx.cisd.common.shared.basic.string.CommaSeparatedListBuilder;
+
+/**
+ * A class for evaluating expressions, based on Jython 2.7. This is essentially the same as ch.systemsx.cisd.common.jython.evaluator.Evaluator with
+ * the following differences:
+ * <ol>
+ * <li>It uses classes from Jython 27 jar</li>
+ * <li>"scriptPath" is passed in to the constructor as an additional argument</li>
+ * </ol>
+ *
+ * @author Ganime Akin
+ */
+public final class Evaluator27
+{
+ private final PythonInterpreter27 interpreter;
+
+ private final String expression;
+
+ private final PyCode compiledExpression;
+
+ /**
+ * Call once before using the object to initialize.
+ */
+ public static void initialize()
+ {
+ PySystemState.initialize();
+ }
+
+ /**
+ * The return type of this expression.
+ */
+ public enum ReturnType
+ {
+ BOOLEAN, INTEGER, BIGINT, DOUBLE, STRING, OTHER
+ }
+
+ /**
+ * Creates a new {@link Evaluator27} with file system access blocked.
+ *
+ * @param expression The expression to evaluate.
+ */
+ public Evaluator27(String expression) throws EvaluatorException
+ {
+ this(expression, null, null);
+ }
+
+ /**
+ * Creates a new {@link Evaluator27} with file system access blocked.
+ *
+ * @param expression The expression to evaluate.
+ * @param supportFunctionsOrNull If not <code>null</code>, all public static methods of the given class will be available to the evaluator as
+ * "supporting functions".
+ * @param initialScriptOrNull If not <code>null</code>, this has to be a valid (Python) script which is evaluated initially, e.g. to define some
+ * new functions. Note: this script is trusted, so don't run any unvalidated code here!
+ */
+ public Evaluator27(String expression, Class<?> supportFunctionsOrNull, String initialScriptOrNull)
+ throws EvaluatorException
+ {
+ this(expression, null, null, supportFunctionsOrNull, initialScriptOrNull, true);
+ }
+
+ /**
+ * Creates a new {@link Evaluator27}.
+ *
+ * @param expression The expression to evaluate.
+ * @param scriptPath This is passed in so that we can set the __file__ variable to a fixed path to be able to use third party libraries
+ * copied to the same the folder as the Python script
+ * @param supportFunctionsOrNull If not <code>null</code>, all public static methods of the given class will be available to the evaluator as
+ * "supporting functions".
+ * @param initialScriptOrNull If not <code>null</code>, this has to be a valid (Python) script which is evaluated initially, e.g. to define some
+ * new functions. Note: this script is trusted, so don't run any unvalidated code here!
+ * @param blockFileAccess If <code>true</code> the script will not be able to open files.
+ */
+ public Evaluator27(String expression, String[] pythonPath, String scriptPath, Class<?> supportFunctionsOrNull,
+ String initialScriptOrNull, boolean blockFileAccess) throws EvaluatorException
+ {
+ if (isMultiline(expression))
+ {
+ throw new EvaluatorException("Expression '" + expression + "' contains line breaks");
+ }
+
+ this.interpreter = PythonInterpreter27.createIsolatedPythonInterpreter();
+ this.interpreter.addToPath(pythonPath);
+
+ // Security: do not allow file access.
+ try
+ {
+ if (blockFileAccess)
+ {
+ interpreter.exec("def open():\n pass");
+ }
+ if (supportFunctionsOrNull != null)
+ {
+ interpreter.exec("from " + supportFunctionsOrNull.getCanonicalName() + " import *");
+ }
+ if (initialScriptOrNull != null)
+ {
+ // we need to inject the __file__ variable to import third party python libraries
+ // that are added to the system path inside the python script
+ interpreter.exec("__file__='" + scriptPath + "'");
+ interpreter.exec(initialScriptOrNull);
+ }
+ this.expression = expression;
+
+ this.compiledExpression = doCompile(expression);
+ } catch (PyException ex)
+ {
+ throw toEvaluatorException(ex);
+ }
+ }
+
+ /**
+ * Returns <code>true</code> if specified function is defined in the script.
+ */
+ public boolean hasFunction(String functionName)
+ {
+ PyObject pyObject = interpreter.get(functionName);
+ return pyObject instanceof org.python27.core.PyFunction;
+ }
+
+ /**
+ * Evaluates specified function with specified arguments. The arguments are turned into Python Strings if they are Java {@link String} objects.
+ * The return value of the function is returned as a Java object or <code>null</code>.
+ *
+ * @throws EvaluatorException if evaluation fails.
+ */
+ public Object evalFunction(String functionName, Object... args)
+ {
+ try
+ {
+ PyObject pyObject = interpreter.get(functionName);
+ if (pyObject == null)
+ {
+ throw new PyException(new PyString("Unknown function"), functionName);
+ }
+ if (pyObject instanceof org.python27.core.PyFunction == false)
+ {
+ throw new PyException(new PyString("Not a function"), "'" + functionName
+ + "' is of type " + pyObject.getType().getName() + ".");
+ }
+ PyFunction func = (org.python27.core.PyFunction) pyObject;
+ PyObject[] pyArgs = new PyObject[args.length];
+ for (int i = 0; i < args.length; i++)
+ {
+ pyArgs[i] = translateToPython(args[i]);
+ }
+ PyObject result = func.__call__(pyArgs);
+ return translateToJava(result);
+ } catch (PyException ex)
+ {
+ CommaSeparatedListBuilder builder = new CommaSeparatedListBuilder();
+ for (Object argument : args)
+ {
+ builder.append(argument);
+ }
+ throw toEvaluatorException(ex, functionName + "(" + builder + ")");
+ }
+ }
+
+ private PyObject translateToPython(Object javaObject)
+ {
+ if (javaObject instanceof String)
+ {
+ return new PyString((String) javaObject);
+ }
+ return Py.java2py(javaObject);
+ }
+
+ /**
+ * @return compiled <var>expression</var>
+ * @throws EvaluatorException if compilation fails
+ */
+ private static PyCode doCompile(String expression) throws EvaluatorException
+ {
+ try
+ {
+ return Py.compile_flags("__result__=(" + expression + ")", "expression: " + expression,
+ CompileMode.exec, new CompilerFlags());
+ } catch (PyException ex)
+ {
+ throw toEvaluatorException(ex, expression);
+ }
+ }
+
+ /**
+ * Sets the variable <var>name</var> to <var>value</var> in the evaluator's name space.
+ */
+ public void set(String name, Object value)
+ {
+ interpreter.set(name, value);
+ }
+
+ public Object get(String name)
+ {
+ return interpreter.get(name);
+ }
+
+ /**
+ * Deletes the variable <var>name</var> from the evaluator's name space.
+ */
+ public void delete(String name)
+ {
+ interpreter.getLocals().__delitem__(name);
+ }
+
+ /**
+ * Returns <code>true</code> if and only if the variable <var>name</var> exists in the evaluator's name space.
+ */
+ public boolean has(String name)
+ {
+ return ((PyStringMap) interpreter.getLocals()).has_key(new PyString(name));
+ }
+
+ /**
+ * Returns the {@link ReturnType} of the expression of this evaluator.
+ */
+ public ReturnType getType()
+ {
+ doEval();
+ final Object obj = getInterpreterResult();
+ if (obj instanceof PyBoolean)
+ {
+ return ReturnType.BOOLEAN;
+ } else if (obj instanceof PyInteger)
+ {
+ return ReturnType.INTEGER;
+ } else if (obj instanceof PyLong)
+ {
+ return ReturnType.BIGINT;
+ } else if (obj instanceof PyFloat)
+ {
+ return ReturnType.DOUBLE;
+ } else if (obj instanceof PyString)
+ {
+ return ReturnType.STRING;
+ } else
+ {
+ return ReturnType.OTHER;
+ }
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result. Use this method if you do not know what will be the result type.
+ * <p>
+ * <i>This is a legacy function to mimic the old Jython 2.2 Evaluator's behavior which will only return Long, Double or String and doesn't know
+ * boolean.</i>
+ *
+ * @return evaluation result which can be of Long, Double or String type. All other types are converted to String representation except
+ * {@link PyNone} that represents null value and will be converted to <code>null</code>.
+ */
+ public Object evalLegacy2_2()
+ {
+ doEval();
+ final PyObject obj = getInterpreterResult();
+ Object result = translateToJavaLegacy(obj);
+ if (result != null && result instanceof Long == false && result instanceof Double == false
+ && result instanceof String == false)
+ {
+ return result.toString();
+ }
+ return result;
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result. Use this method if you do not know what will be the result type.
+ *
+ * @return evaluation result as translated by the Jython interpreter..
+ */
+ public Object eval()
+ {
+ doEval();
+ return translateToJava(getInterpreterResult());
+ }
+
+ private Object translateToJavaLegacy(final PyObject obj)
+ {
+ if (obj instanceof PyInteger)
+ {
+ return new Long(((PyInteger) obj).getValue());
+ } else if (obj instanceof PyLong)
+ {
+ return new Long(((PyLong) obj).getValue().longValue());
+ } else if (obj instanceof PyFloat)
+ {
+ return new Double(((PyFloat) obj).getValue());
+ } else if (obj instanceof PyNone)
+ {
+ return null;
+ } else if (obj instanceof PyList)
+ {
+ PyList pyList = (PyList) obj;
+ PyObject[] array = pyList.getArray();
+ List<Object> list = new ArrayList<Object>();
+ for (int i = 0, n = pyList.size(); i < n; i++)
+ {
+ list.add(translateToJavaLegacy(array[i]));
+ }
+ return list;
+ } else
+ {
+ return translateToJava(obj);
+ }
+ }
+
+ private Object translateToJava(final PyObject obj)
+ {
+ return (obj == null) ? null : obj.__tojava__(Object.class);
+ }
+
+ private PyObject getInterpreterResult()
+ {
+ return interpreter.get("__result__");
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result, assuming that the expression has a boolean return type.
+ */
+ public boolean evalToBoolean() throws EvaluatorException
+ {
+ doEval();
+ try
+ {
+ return ((PyBoolean) getInterpreterResult()).getBooleanValue();
+ } catch (ClassCastException ex)
+ {
+ final ReturnType type = getType();
+ throw new EvaluatorException("Expected a result of type " + ReturnType.BOOLEAN
+ + ", found " + type);
+ }
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result, assuming that the expression has an integer return type.
+ */
+ public int evalToInt() throws EvaluatorException
+ {
+ doEval();
+ try
+ {
+ return ((PyInteger) getInterpreterResult()).getValue();
+ } catch (ClassCastException ex)
+ {
+ final ReturnType type = getType();
+ throw new EvaluatorException("Expected a result of type " + ReturnType.INTEGER
+ + ", found " + type);
+ }
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result, assuming that the expression has a big integer return type.
+ */
+ public BigInteger evalToBigInt() throws EvaluatorException
+ {
+ doEval();
+ try
+ {
+ return ((PyLong) getInterpreterResult()).getValue();
+ } catch (ClassCastException ex)
+ {
+ final ReturnType type = getType();
+ throw new EvaluatorException("Expected a result of type " + ReturnType.BIGINT
+ + ", found " + type);
+ }
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result, assuming that the expression has a floating point (double) return type.
+ */
+ public double evalToDouble() throws EvaluatorException
+ {
+ doEval();
+ try
+ {
+ return ((PyFloat) getInterpreterResult()).getValue();
+ } catch (ClassCastException ex)
+ {
+ final ReturnType type = getType();
+ throw new EvaluatorException("Expected a result of type " + ReturnType.DOUBLE
+ + ", found " + type);
+ }
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result as a String. This method can always be called.
+ * <p>
+ * <i>This is a legacy function to mimic the old Jython 2.2 Evaluator's behavior which first translates to Long and Double and doesn't know
+ * boolean.</i>
+ * <p>
+ * NOTE: null will be returned if expression results in {@link PyNone}
+ */
+ public String evalAsStringLegacy2_2() throws EvaluatorException
+ {
+ Object result = evalLegacy2_2();
+ return result == null ? null : result.toString();
+ }
+
+ /**
+ * Evaluates the expression of this evaluator and returns the result as a String. This method can always be called.
+ * <p>
+ * NOTE: null will be returned if expression results in {@link PyNone}
+ */
+ public String evalAsString() throws EvaluatorException
+ {
+ Object result = eval();
+ return result == null ? null : result.toString();
+ }
+
+ private void doEval() throws EvaluatorException
+ {
+ try
+ {
+ interpreter.exec(compiledExpression);
+ } catch (PyException ex)
+ {
+ throw toEvaluatorException(ex);
+ }
+ }
+
+ private EvaluatorException toEvaluatorException(PyException ex)
+ {
+ return toEvaluatorException(ex, expression);
+ }
+
+ private static EvaluatorException toEvaluatorException(PyException ex, String expressionOrNull)
+ {
+ Throwable exception = ex;
+ PyObject value = ex.value;
+ Object object = value.__tojava__(Object.class);
+ if (object instanceof Throwable)
+ {
+ exception = (Throwable) object;
+ }
+ String msg = extractExceptionMessage(ex);
+ if (expressionOrNull != null)
+ {
+ PyTraceback traceback = ex.traceback;
+ String details =
+ traceback == null ? "" : "occurred in line " + traceback.tb_lineno
+ + " of the script when ";
+ msg = "Error " + details + "evaluating '" + expressionOrNull + "': " + msg;
+ }
+ return new EvaluatorException(msg, exception);
+ }
+
+ private static String extractExceptionMessage(PyException ex)
+ {
+ final String[] description = StringUtils.split(ex.toString(), '\n');
+ return description[description.length - 1];
+ }
+
+ public static boolean isMultiline(String expression)
+ {
+ return expression.indexOf('\n') >= 0;
+ }
+
+ public void releaseResources()
+ {
+ interpreter.releaseResources();
+ }
+
+ public Collection<String> getGlobalVariables()
+ {
+ Set<String> results = new HashSet<String>();
+ PyStringMap locals = (PyStringMap) interpreter.getLocals();
+ for (Object key : locals.keys())
+ {
+ results.add(key.toString());
+ }
+ return Collections.unmodifiableCollection(results);
+ }
+
+}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
index 68aeea12d4607091791bc812b365a579fd7f5d53..cf14dc1abcb5d3d032d0c234f46d2290b5e47186 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
@@ -29,6 +29,7 @@ import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.jython.JythonUtils;
import ch.systemsx.cisd.common.jython.evaluator.Evaluator;
import ch.systemsx.cisd.common.jython.evaluator.EvaluatorException;
+import ch.systemsx.cisd.common.jython.v27.Evaluator27;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.resource.IReleasable;
@@ -177,7 +178,7 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
try
{
- Evaluator evaluator = createEvaluatorWithContentProviders(context, scriptString, pythonPath);
+ Evaluator27 evaluator = createEvaluator27WithContentProviders(context, scriptString, pythonPath);
return new RequestHandlerPluginScriptRunner(evaluator);
} catch (EvaluatorException ex)
@@ -186,6 +187,36 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
}
}
+ private Evaluator27 createEvaluator27WithContentProviders(DataSetProcessingContext context, String scriptString, String[] pythonPath)
+ {
+ final Evaluator27 evaluator = new Evaluator27("", pythonPath, scriptPath, null, scriptString, false);
+
+ evaluator.set(SEARCH_SERVICE_VARIABLE_NAME, createUserSearchService(context));
+ evaluator.set(SEARCH_SERVICE_UNFILTERED_VARIABLE_NAME, createUnfilteredSearchService());
+
+ evaluator.set(MAIL_SERVICE_VARIABLE_NAME, createMailService(context));
+ evaluator.set(DATA_SOURCE_QUERY_SERVICE_VARIABLE_NAME, createDataSourceQueryService());
+ evaluator.set(AUTHORIZATION_SERVICE, createAuthorizationService());
+ evaluator.set(USER_ID, context.getUserId());
+ evaluator.set(USER_SESSION_TOKEN, context.trySessionToken());
+ final ISessionWorkspaceProvider workspaceProvider =
+ context.tryGetSessionWorkspaceProvider();
+ if (workspaceProvider != null)
+ {
+ evaluator.set(SESSION_WORKSPACE_PROVIDER_NAME, workspaceProvider);
+ }
+
+ DataSetContentProvider contentProvider =
+ new DataSetContentProvider(context.getHierarchicalContentProvider());
+ evaluator.set(CONTENT_PROVIDER_VARIABLE_NAME, contentProvider);
+
+ DataSetContentProvider contentProviderUnfiltered =
+ new DataSetContentProvider(context.getHierarchicalContentProviderUnfiltered());
+ evaluator.set(CONTENT_PROVIDER_UNFILTERED_VARIABLE_NAME, contentProviderUnfiltered);
+
+ return evaluator;
+ }
+
protected Evaluator createEvaluator(String scriptString, String[] pythonPath, DataSetProcessingContext context)
{
final Evaluator evaluator = new Evaluator("", pythonPath, null, scriptString, false);
@@ -436,9 +467,9 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
{
private final static String FUNCTION_NAME = "handle";
- private final Evaluator evaluator;
+ private final Evaluator27 evaluator;
- RequestHandlerPluginScriptRunner(Evaluator evaluator)
+ RequestHandlerPluginScriptRunner(Evaluator27 evaluator)
{
this.evaluator = evaluator;
if (false == evaluator.hasFunction(FUNCTION_NAME))