Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Oct 16, 2024
Merged

Add expr ID set as a field to CelUnknownSet. #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
assertThat(result).isTrue();
}

@Test
public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.BOOL)
.addVar("y", SimpleType.BOOL)
.setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
assertThat(result.attributes()).isEmpty();
}

@Test
public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
Cel cel =
CelFactory.standardCelBuilder()
.addVar("x", SimpleType.BOOL)
.addFunctionDeclarations(
newFunctionDeclaration(
"foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
.setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
.build();
CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

assertThat(result.unknownExprIds()).containsExactly(2L);
assertThat(result.attributes()).isEmpty();
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
13 changes: 13 additions & 0 deletions common/src/main/java/dev/cel/common/CelOptions.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

public abstract boolean adaptUnknownValueSetToNativeType();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
.enableCelValue(false)
.comprehensionMaxIterations(-1)
.unwrapWellKnownTypesOnFunctionDispatch(true)
.adaptUnknownValueSetToNativeType(false)
.fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
}

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
*/
public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

/**
* If enabled, when the result of an evaluation is a set of unknown values, a native-type
* equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
* eval.proto} is returned instead.
*
* <p>This is a temporary flag. It will be removed once the consumers have migrated to the
* native-type representation.
*/
public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

public abstract CelOptions build();
}
}
2 changes: 2 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
"TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
"Activation.java",
"CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
],
deps = [
":base",
":unknown_attributes",
"//common/annotations",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
25 changes: 18 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
private final ArrayList<Long> exprIds;
private Optional<CelUnknownSet> unknowns;
private final RuntimeUnknownResolver resolver;
private final boolean acceptPartial;
private Optional<CelUnknownSet> unknowns;

private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
exprIds = new ArrayList<>();
unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
this.resolver = resolver;
this.acceptPartial = acceptPartial;
}
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

// support for ExprValue unknowns.
if (InterpreterUtil.isUnknown(arg.value())) {
ExprValue exprValue = (ExprValue) arg.value();
exprIds.addAll(exprValue.getUnknown().getExprsList());
if (InterpreterUtil.isExprValueUnknown(arg.value())) {
ExprValue exprValue = (ExprValue) arg.value();
exprIds.addAll(exprValue.getUnknown().getExprsList());
} else if (resolver.getAdaptUnknownValueSetOption()) {
CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
exprIds.addAll(unknownSet.unknownExprIds());
}
}
}

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
}

if (!exprIds.isEmpty()) {
return Optional.of(
ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
if (resolver.getAdaptUnknownValueSetOption()) {
return Optional.of(CelUnknownSet.create(exprIds));
} else {
return Optional.of(
ExprValue.newBuilder()
.setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
.build());
}
}

return Optional.empty();
Expand Down
31 changes: 28 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
*/
@AutoValue
public abstract class CelUnknownSet {

/**
* Set of attributes with a series of selection or index operations marked unknown. This set is
* always empty if enableUnknownTracking is disabled in {@code CelOptions}.
*/
public abstract ImmutableSet<CelAttribute> attributes();

public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
return new AutoValue_CelUnknownSet(attributes);
}
/** Set of subexpression IDs that were decided to be unknown and in the critical path. */
public abstract ImmutableSet<Long> unknownExprIds();

public static CelUnknownSet create(CelAttribute attribute) {
return create(ImmutableSet.of(attribute));
}

public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
return create(attributes, ImmutableSet.of());
}

static CelUnknownSet create(Long... unknownExprIds) {
return create(ImmutableSet.copyOf(unknownExprIds));
}

static CelUnknownSet create(Iterable<Long> unknownExprIds) {
return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
}

private static CelUnknownSet create(
ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
}

public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
return create(
ImmutableSet.<CelAttribute>builder()
.addAll(lhs.attributes())
.addAll(rhs.attributes())
.build(),
ImmutableSet.<Long>builder()
.addAll(lhs.unknownExprIds())
.addAll(rhs.unknownExprIds())
.build());
}

Expand Down
16 changes: 9 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
}
}

public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
this(typeProvider, dispatcher, CelOptions.LEGACY);
}

/**
* Creates a new interpreter
*
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
@Override
public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
throws InterpreterException {
return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
return evalTrackingUnknowns(
RuntimeUnknownResolver.fromResolver(
resolver, celOptions.adaptUnknownValueSetToNativeType()),
listener);
}

@Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
Object fieldValue = typeProvider.selectField(operand, field);

return IntermediateResult.create(
attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
attribute,
InterpreterUtil.valueOrUnknown(
fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
}

private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

// Otherwise fallback to normal impl
return IntermediateResult.create(
InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
InterpreterUtil.shortcircuitUnknownOrThrowable(
lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
}

private enum ShortCircuitableOperators {
Expand Down
64 changes: 43 additions & 21 deletions runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
* @return boolean value if object is unknown.
*/
public static boolean isUnknown(Object obj) {
return obj instanceof ExprValue
&& ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
if (isExprValueUnknown(obj)) {
return true;
}
return obj instanceof CelUnknownSet;
}

/** TODO: Remove once clients have been migrated. */
static boolean isExprValueUnknown(Object obj) {
if (obj instanceof ExprValue) {
return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
}

return false;
}

/**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
* @return A new ExprValue object which has all unknown expr ids from input objects, without
* duplication.
*/
public static ExprValue combineUnknownExprValue(Object... objs) {
static ExprValue combineUnknownProtoExprValue(Object... objs) {
UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
Set<Long> ids = new LinkedHashSet<>();
for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
}

/** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
public static ExprValue createUnknownExprValue(Long... ids) {
return createUnknownExprValue(Arrays.asList(ids));
static CelUnknownSet combineUnknownExprValue(Object... objs) {
Set<Long> ids = new LinkedHashSet<>();
for (Object object : objs) {
if (isUnknown(object)) {
ids.addAll(((CelUnknownSet) object).unknownExprIds());
}
}

return CelUnknownSet.create(ids);
}

/**
* Create an ExprValue object has UnknownSet, from a list of unknown expr ids
*
* @param ids List of unknown expr ids
* @param id unknown expr id
* @return A new ExprValue object which has all unknown expr ids from input list
*/
public static ExprValue createUnknownExprValue(List<Long> ids) {
ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
return exprValueBuilder.build();
private static ExprValue createUnknownExprValue(long id) {
return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
}

/**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
* from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
* both of these operators.
*/
public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
public static Object shortcircuitUnknownOrThrowable(
Object left, Object right, boolean adaptUnknownValueSetToNativeType)
throws InterpreterException {
// unknown <op> unknown ==> unknown combined
if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
return InterpreterUtil.combineUnknownExprValue(left, right);
return adaptUnknownValueSetToNativeType
? InterpreterUtil.combineUnknownExprValue(left, right)
: InterpreterUtil.combineUnknownProtoExprValue(left, right);
}
// unknown <op> <error> ==> unknown
// unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
"Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
}

public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
public static Object valueOrUnknown(
@Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
// Handle the unknown value case.
if (isUnknown(valueOrThrowable)) {
ExprValue value = (ExprValue) valueOrThrowable;
if (value.getUnknown().getExprsCount() != 0) {
return valueOrThrowable;
if (adaptUnknownValueSet) {
return CelUnknownSet.create(id);
} else {
// TODO: Remove once clients have been migrated.
ExprValue value = (ExprValue) valueOrThrowable;
if (value.getUnknown().getExprsCount() != 0) {
return valueOrThrowable;
}
return createUnknownExprValue(id);
}
return createUnknownExprValue(id);
}
// Handle the null value case.
if (valueOrThrowable == null) {
return createUnknownExprValue(id);
return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
}
return valueOrThrowable;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Oct 16, 2024
 Merged


Add expr ID set as a field to CelUnknownSet.
#471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addVar("y", SimpleType.BOOL)
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addFunctionDeclarations(
 newFunctionDeclaration(
 "foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(2L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

 public abstract boolean adaptUnknownValueSetToNativeType();

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
 .enableCelValue(false)
 .comprehensionMaxIterations(-1)
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .adaptUnknownValueSetToNativeType(false)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
 }

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
 */
 public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

 /**
 * If enabled, when the result of an evaluation is a set of unknown values, a native-type
 * equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
 * eval.proto} is returned instead.
 *
 * <p>This is a temporary flag. It will be removed once the consumers have migrated to the
 * native-type representation.
 */
 public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

 public abstract CelOptions build();
 }
}

2 changes: 2 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
 "TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
 "Activation.java",
 "CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
 ],
 deps = [
 ":base",
 ":unknown_attributes",
 "//common/annotations",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand Down

25 changes: 18 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
 private final ArrayList<Long> exprIds;
 private Optional<CelUnknownSet> unknowns;
 private final RuntimeUnknownResolver resolver;
 private final boolean acceptPartial;
 private Optional<CelUnknownSet> unknowns;

 private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
 exprIds = new ArrayList<>();
 unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
 this.resolver = resolver;
 this.acceptPartial = acceptPartial;
 }
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

 // support for ExprValue unknowns.
 if (InterpreterUtil.isUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 if (InterpreterUtil.isExprValueUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 } else if (resolver.getAdaptUnknownValueSetOption()) {
 CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
 exprIds.addAll(unknownSet.unknownExprIds());
 }
 }
 }

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
 }

 if (!exprIds.isEmpty()) {
 return Optional.of(
 ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
 if (resolver.getAdaptUnknownValueSetOption()) {
 return Optional.of(CelUnknownSet.create(exprIds));
 } else {
 return Optional.of(
 ExprValue.newBuilder()
 .setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
 .build());
 }
 }

 return Optional.empty();
Expand Down

31 changes: 28 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
 */
@AutoValue
public abstract class CelUnknownSet {

 /**
 * Set of attributes with a series of selection or index operations marked unknown. This set is
 * always empty if enableUnknownTracking is disabled in {@code CelOptions}.
 */
 public abstract ImmutableSet<CelAttribute> attributes();

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return new AutoValue_CelUnknownSet(attributes);
 }
 /** Set of subexpression IDs that were decided to be unknown and in the critical path. */
 public abstract ImmutableSet<Long> unknownExprIds();

 public static CelUnknownSet create(CelAttribute attribute) {
 return create(ImmutableSet.of(attribute));
 }

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return create(attributes, ImmutableSet.of());
 }

 static CelUnknownSet create(Long... unknownExprIds) {
 return create(ImmutableSet.copyOf(unknownExprIds));
 }

 static CelUnknownSet create(Iterable<Long> unknownExprIds) {
 return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
 }

 private static CelUnknownSet create(
 ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
 return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
 }

 public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
 return create(
 ImmutableSet.<CelAttribute>builder()
 .addAll(lhs.attributes())
 .addAll(rhs.attributes())
 .build(),
 ImmutableSet.<Long>builder()
 .addAll(lhs.unknownExprIds())
 .addAll(rhs.unknownExprIds())
 .build());
 }

Expand Down

16 changes: 9 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
 }
 }

 public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
 this(typeProvider, dispatcher, CelOptions.LEGACY);
 }

 /**
 * Creates a new interpreter
 *
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
 @Override
 public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws InterpreterException {
 return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
 return evalTrackingUnknowns(
 RuntimeUnknownResolver.fromResolver(
 resolver, celOptions.adaptUnknownValueSetToNativeType()),
 listener);
 }

 @Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
 attribute,
 InterpreterUtil.valueOrUnknown(
 fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

 // Otherwise fallback to normal impl
 return IntermediateResult.create(
 InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
 InterpreterUtil.shortcircuitUnknownOrThrowable(
 lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private enum ShortCircuitableOperators {
Expand Down

64 changes: 43 additions & 21 deletions
runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
 * @return boolean value if object is unknown.
 */
 public static boolean isUnknown(Object obj) {
 return obj instanceof ExprValue
 && ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 if (isExprValueUnknown(obj)) {
 return true;
 }
 return obj instanceof CelUnknownSet;
 }

 /** TODO: Remove once clients have been migrated. */
 static boolean isExprValueUnknown(Object obj) {
 if (obj instanceof ExprValue) {
 return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 }

 return false;
 }

 /**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
 * @return A new ExprValue object which has all unknown expr ids from input objects, without
 * duplication.
 */
public static ExprValue combineUnknownExprValue(Object... objs) {
 static ExprValue combineUnknownProtoExprValue(Object... objs) {
 UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
 return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
 }

 /** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
 public static ExprValue createUnknownExprValue(Long... ids) {
 return createUnknownExprValue(Arrays.asList(ids));
 static CelUnknownSet combineUnknownExprValue(Object... objs) {
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
 if (isUnknown(object)) {
 ids.addAll(((CelUnknownSet) object).unknownExprIds());
 }
 }

 return CelUnknownSet.create(ids);
 }

 /**
 * Create an ExprValue object has UnknownSet, from a list of unknown expr ids
 *
 * @param ids List of unknown expr ids
 * @param id unknown expr id
 * @return A new ExprValue object which has all unknown expr ids from input list
 */
 public static ExprValue createUnknownExprValue(List<Long> ids) {
 ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
 exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
 return exprValueBuilder.build();
 private static ExprValue createUnknownExprValue(long id) {
 return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
 }

 /**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
 * from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
 * both of these operators.
 */
 public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 public static Object shortcircuitUnknownOrThrowable(
 Object left, Object right, boolean adaptUnknownValueSetToNativeType)
 throws InterpreterException {
 // unknown <op> unknown ==> unknown combined
 if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
 return InterpreterUtil.combineUnknownExprValue(left, right);
 return adaptUnknownValueSetToNativeType
 ? InterpreterUtil.combineUnknownExprValue(left, right)
 : InterpreterUtil.combineUnknownProtoExprValue(left, right);
 }
 // unknown <op> <error> ==> unknown
 // unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 "Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
 }

 public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
 public static Object valueOrUnknown(
 @Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
 // Handle the unknown value case.
 if (isUnknown(valueOrThrowable)) {
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 if (adaptUnknownValueSet) {
 return CelUnknownSet.create(id);
 } else {
 // TODO: Remove once clients have been migrated.
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 }
 return createUnknownExprValue(id);
 }
 return createUnknownExprValue(id);
 }
 // Handle the null value case.
 if (valueOrThrowable == null) {
 return createUnknownExprValue(id);
 return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
 }
 return valueOrThrowable;
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Oct 16, 2024
 Merged


Add expr ID set as a field to CelUnknownSet.
#471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addVar("y", SimpleType.BOOL)
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addFunctionDeclarations(
 newFunctionDeclaration(
 "foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(2L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

 public abstract boolean adaptUnknownValueSetToNativeType();

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
 .enableCelValue(false)
 .comprehensionMaxIterations(-1)
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .adaptUnknownValueSetToNativeType(false)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
 }

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
 */
 public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

 /**
 * If enabled, when the result of an evaluation is a set of unknown values, a native-type
 * equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
 * eval.proto} is returned instead.
 *
 * <p>This is a temporary flag. It will be removed once the consumers have migrated to the
 * native-type representation.
 */
 public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

 public abstract CelOptions build();
 }
}

2 changes: 2 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
 "TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
 "Activation.java",
 "CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
 ],
 deps = [
 ":base",
 ":unknown_attributes",
 "//common/annotations",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand Down

25 changes: 18 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
 private final ArrayList<Long> exprIds;
 private Optional<CelUnknownSet> unknowns;
 private final RuntimeUnknownResolver resolver;
 private final boolean acceptPartial;
 private Optional<CelUnknownSet> unknowns;

 private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
 exprIds = new ArrayList<>();
 unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
 this.resolver = resolver;
 this.acceptPartial = acceptPartial;
 }
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

 // support for ExprValue unknowns.
 if (InterpreterUtil.isUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 if (InterpreterUtil.isExprValueUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 } else if (resolver.getAdaptUnknownValueSetOption()) {
 CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
 exprIds.addAll(unknownSet.unknownExprIds());
 }
 }
 }

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
 }

 if (!exprIds.isEmpty()) {
 return Optional.of(
 ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
 if (resolver.getAdaptUnknownValueSetOption()) {
 return Optional.of(CelUnknownSet.create(exprIds));
 } else {
 return Optional.of(
 ExprValue.newBuilder()
 .setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
 .build());
 }
 }

 return Optional.empty();
Expand Down

31 changes: 28 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
 */
@AutoValue
public abstract class CelUnknownSet {

 /**
 * Set of attributes with a series of selection or index operations marked unknown. This set is
 * always empty if enableUnknownTracking is disabled in {@code CelOptions}.
 */
 public abstract ImmutableSet<CelAttribute> attributes();

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return new AutoValue_CelUnknownSet(attributes);
 }
 /** Set of subexpression IDs that were decided to be unknown and in the critical path. */
 public abstract ImmutableSet<Long> unknownExprIds();

 public static CelUnknownSet create(CelAttribute attribute) {
 return create(ImmutableSet.of(attribute));
 }

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return create(attributes, ImmutableSet.of());
 }

 static CelUnknownSet create(Long... unknownExprIds) {
 return create(ImmutableSet.copyOf(unknownExprIds));
 }

 static CelUnknownSet create(Iterable<Long> unknownExprIds) {
 return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
 }

 private static CelUnknownSet create(
 ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
 return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
 }

 public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
 return create(
 ImmutableSet.<CelAttribute>builder()
 .addAll(lhs.attributes())
 .addAll(rhs.attributes())
 .build(),
 ImmutableSet.<Long>builder()
 .addAll(lhs.unknownExprIds())
 .addAll(rhs.unknownExprIds())
 .build());
 }

Expand Down

16 changes: 9 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
 }
 }

 public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
 this(typeProvider, dispatcher, CelOptions.LEGACY);
 }

 /**
 * Creates a new interpreter
 *
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
 @Override
 public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws InterpreterException {
 return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
 return evalTrackingUnknowns(
 RuntimeUnknownResolver.fromResolver(
 resolver, celOptions.adaptUnknownValueSetToNativeType()),
 listener);
 }

 @Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
 attribute,
 InterpreterUtil.valueOrUnknown(
 fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

 // Otherwise fallback to normal impl
 return IntermediateResult.create(
 InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
 InterpreterUtil.shortcircuitUnknownOrThrowable(
 lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private enum ShortCircuitableOperators {
Expand Down

64 changes: 43 additions & 21 deletions
runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
 * @return boolean value if object is unknown.
 */
 public static boolean isUnknown(Object obj) {
 return obj instanceof ExprValue
 && ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 if (isExprValueUnknown(obj)) {
 return true;
 }
 return obj instanceof CelUnknownSet;
 }

 /** TODO: Remove once clients have been migrated. */
 static boolean isExprValueUnknown(Object obj) {
 if (obj instanceof ExprValue) {
 return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 }

 return false;
 }

 /**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
 * @return A new ExprValue object which has all unknown expr ids from input objects, without
 * duplication.
 */
public static ExprValue combineUnknownExprValue(Object... objs) {
 static ExprValue combineUnknownProtoExprValue(Object... objs) {
 UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
 return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
 }

 /** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
 public static ExprValue createUnknownExprValue(Long... ids) {
 return createUnknownExprValue(Arrays.asList(ids));
 static CelUnknownSet combineUnknownExprValue(Object... objs) {
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
 if (isUnknown(object)) {
 ids.addAll(((CelUnknownSet) object).unknownExprIds());
 }
 }

 return CelUnknownSet.create(ids);
 }

 /**
 * Create an ExprValue object has UnknownSet, from a list of unknown expr ids
 *
 * @param ids List of unknown expr ids
 * @param id unknown expr id
 * @return A new ExprValue object which has all unknown expr ids from input list
 */
 public static ExprValue createUnknownExprValue(List<Long> ids) {
 ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
 exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
 return exprValueBuilder.build();
 private static ExprValue createUnknownExprValue(long id) {
 return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
 }

 /**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
 * from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
 * both of these operators.
 */
 public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 public static Object shortcircuitUnknownOrThrowable(
 Object left, Object right, boolean adaptUnknownValueSetToNativeType)
 throws InterpreterException {
 // unknown <op> unknown ==> unknown combined
 if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
 return InterpreterUtil.combineUnknownExprValue(left, right);
 return adaptUnknownValueSetToNativeType
 ? InterpreterUtil.combineUnknownExprValue(left, right)
 : InterpreterUtil.combineUnknownProtoExprValue(left, right);
 }
 // unknown <op> <error> ==> unknown
 // unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 "Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
 }

 public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
 public static Object valueOrUnknown(
 @Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
 // Handle the unknown value case.
 if (isUnknown(valueOrThrowable)) {
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 if (adaptUnknownValueSet) {
 return CelUnknownSet.create(id);
 } else {
 // TODO: Remove once clients have been migrated.
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 }
 return createUnknownExprValue(id);
 }
 return createUnknownExprValue(id);
 }
 // Handle the null value case.
 if (valueOrThrowable == null) {
 return createUnknownExprValue(id);
 return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
 }
 return valueOrThrowable;
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Oct 16, 2024
 Merged


Add expr ID set as a field to CelUnknownSet.
#471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addVar("y", SimpleType.BOOL)
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addFunctionDeclarations(
 newFunctionDeclaration(
 "foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(2L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

 public abstract boolean adaptUnknownValueSetToNativeType();

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
 .enableCelValue(false)
 .comprehensionMaxIterations(-1)
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .adaptUnknownValueSetToNativeType(false)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
 }

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
 */
 public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

 /**
 * If enabled, when the result of an evaluation is a set of unknown values, a native-type
 * equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
 * eval.proto} is returned instead.
 *
 * <p>This is a temporary flag. It will be removed once the consumers have migrated to the
 * native-type representation.
 */
 public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

 public abstract CelOptions build();
 }
}

2 changes: 2 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
 "TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
 "Activation.java",
 "CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
 ],
 deps = [
 ":base",
 ":unknown_attributes",
 "//common/annotations",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand Down

25 changes: 18 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
 private final ArrayList<Long> exprIds;
 private Optional<CelUnknownSet> unknowns;
 private final RuntimeUnknownResolver resolver;
 private final boolean acceptPartial;
 private Optional<CelUnknownSet> unknowns;

 private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
 exprIds = new ArrayList<>();
 unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
 this.resolver = resolver;
 this.acceptPartial = acceptPartial;
 }
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

 // support for ExprValue unknowns.
 if (InterpreterUtil.isUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 if (InterpreterUtil.isExprValueUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 } else if (resolver.getAdaptUnknownValueSetOption()) {
 CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
 exprIds.addAll(unknownSet.unknownExprIds());
 }
 }
 }

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
 }

 if (!exprIds.isEmpty()) {
 return Optional.of(
 ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
 if (resolver.getAdaptUnknownValueSetOption()) {
 return Optional.of(CelUnknownSet.create(exprIds));
 } else {
 return Optional.of(
 ExprValue.newBuilder()
 .setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
 .build());
 }
 }

 return Optional.empty();
Expand Down

31 changes: 28 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
 */
@AutoValue
public abstract class CelUnknownSet {

 /**
 * Set of attributes with a series of selection or index operations marked unknown. This set is
 * always empty if enableUnknownTracking is disabled in {@code CelOptions}.
 */
 public abstract ImmutableSet<CelAttribute> attributes();

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return new AutoValue_CelUnknownSet(attributes);
 }
 /** Set of subexpression IDs that were decided to be unknown and in the critical path. */
 public abstract ImmutableSet<Long> unknownExprIds();

 public static CelUnknownSet create(CelAttribute attribute) {
 return create(ImmutableSet.of(attribute));
 }

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return create(attributes, ImmutableSet.of());
 }

 static CelUnknownSet create(Long... unknownExprIds) {
 return create(ImmutableSet.copyOf(unknownExprIds));
 }

 static CelUnknownSet create(Iterable<Long> unknownExprIds) {
 return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
 }

 private static CelUnknownSet create(
 ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
 return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
 }

 public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
 return create(
 ImmutableSet.<CelAttribute>builder()
 .addAll(lhs.attributes())
 .addAll(rhs.attributes())
 .build(),
 ImmutableSet.<Long>builder()
 .addAll(lhs.unknownExprIds())
 .addAll(rhs.unknownExprIds())
 .build());
 }

Expand Down

16 changes: 9 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
 }
 }

 public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
 this(typeProvider, dispatcher, CelOptions.LEGACY);
 }

 /**
 * Creates a new interpreter
 *
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
 @Override
 public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws InterpreterException {
 return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
 return evalTrackingUnknowns(
 RuntimeUnknownResolver.fromResolver(
 resolver, celOptions.adaptUnknownValueSetToNativeType()),
 listener);
 }

 @Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
 attribute,
 InterpreterUtil.valueOrUnknown(
 fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

 // Otherwise fallback to normal impl
 return IntermediateResult.create(
 InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
 InterpreterUtil.shortcircuitUnknownOrThrowable(
 lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private enum ShortCircuitableOperators {
Expand Down

64 changes: 43 additions & 21 deletions
runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
 * @return boolean value if object is unknown.
 */
 public static boolean isUnknown(Object obj) {
 return obj instanceof ExprValue
 && ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 if (isExprValueUnknown(obj)) {
 return true;
 }
 return obj instanceof CelUnknownSet;
 }

 /** TODO: Remove once clients have been migrated. */
 static boolean isExprValueUnknown(Object obj) {
 if (obj instanceof ExprValue) {
 return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 }

 return false;
 }

 /**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
 * @return A new ExprValue object which has all unknown expr ids from input objects, without
 * duplication.
 */
public static ExprValue combineUnknownExprValue(Object... objs) {
 static ExprValue combineUnknownProtoExprValue(Object... objs) {
 UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
 return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
 }

 /** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
 public static ExprValue createUnknownExprValue(Long... ids) {
 return createUnknownExprValue(Arrays.asList(ids));
 static CelUnknownSet combineUnknownExprValue(Object... objs) {
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
 if (isUnknown(object)) {
 ids.addAll(((CelUnknownSet) object).unknownExprIds());
 }
 }

 return CelUnknownSet.create(ids);
 }

 /**
 * Create an ExprValue object has UnknownSet, from a list of unknown expr ids
 *
 * @param ids List of unknown expr ids
 * @param id unknown expr id
 * @return A new ExprValue object which has all unknown expr ids from input list
 */
 public static ExprValue createUnknownExprValue(List<Long> ids) {
 ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
 exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
 return exprValueBuilder.build();
 private static ExprValue createUnknownExprValue(long id) {
 return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
 }

 /**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
 * from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
 * both of these operators.
 */
 public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 public static Object shortcircuitUnknownOrThrowable(
 Object left, Object right, boolean adaptUnknownValueSetToNativeType)
 throws InterpreterException {
 // unknown <op> unknown ==> unknown combined
 if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
 return InterpreterUtil.combineUnknownExprValue(left, right);
 return adaptUnknownValueSetToNativeType
 ? InterpreterUtil.combineUnknownExprValue(left, right)
 : InterpreterUtil.combineUnknownProtoExprValue(left, right);
 }
 // unknown <op> <error> ==> unknown
 // unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 "Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
 }

 public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
 public static Object valueOrUnknown(
 @Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
 // Handle the unknown value case.
 if (isUnknown(valueOrThrowable)) {
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 if (adaptUnknownValueSet) {
 return CelUnknownSet.create(id);
 } else {
 // TODO: Remove once clients have been migrated.
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 }
 return createUnknownExprValue(id);
 }
 return createUnknownExprValue(id);
 }
 // Handle the null value case.
 if (valueOrThrowable == null) {
 return createUnknownExprValue(id);
 return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
 }
 return valueOrThrowable;
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Oct 16, 2024
 Merged


Add expr ID set as a field to CelUnknownSet.
#471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addVar("y", SimpleType.BOOL)
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addFunctionDeclarations(
 newFunctionDeclaration(
 "foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(2L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

 public abstract boolean adaptUnknownValueSetToNativeType();

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
 .enableCelValue(false)
 .comprehensionMaxIterations(-1)
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .adaptUnknownValueSetToNativeType(false)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
 }

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
 */
 public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

 /**
 * If enabled, when the result of an evaluation is a set of unknown values, a native-type
 * equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
 * eval.proto} is returned instead.
 *
 * <p>This is a temporary flag. It will be removed once the consumers have migrated to the
 * native-type representation.
 */
 public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

 public abstract CelOptions build();
 }
}

2 changes: 2 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
 "TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
 "Activation.java",
 "CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
 ],
 deps = [
 ":base",
 ":unknown_attributes",
 "//common/annotations",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand Down

25 changes: 18 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
 private final ArrayList<Long> exprIds;
 private Optional<CelUnknownSet> unknowns;
 private final RuntimeUnknownResolver resolver;
 private final boolean acceptPartial;
 private Optional<CelUnknownSet> unknowns;

 private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
 exprIds = new ArrayList<>();
 unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
 this.resolver = resolver;
 this.acceptPartial = acceptPartial;
 }
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

 // support for ExprValue unknowns.
 if (InterpreterUtil.isUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 if (InterpreterUtil.isExprValueUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 } else if (resolver.getAdaptUnknownValueSetOption()) {
 CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
 exprIds.addAll(unknownSet.unknownExprIds());
 }
 }
 }

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
 }

 if (!exprIds.isEmpty()) {
 return Optional.of(
 ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
 if (resolver.getAdaptUnknownValueSetOption()) {
 return Optional.of(CelUnknownSet.create(exprIds));
 } else {
 return Optional.of(
 ExprValue.newBuilder()
 .setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
 .build());
 }
 }

 return Optional.empty();
Expand Down

31 changes: 28 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
 */
@AutoValue
public abstract class CelUnknownSet {

 /**
 * Set of attributes with a series of selection or index operations marked unknown. This set is
 * always empty if enableUnknownTracking is disabled in {@code CelOptions}.
 */
 public abstract ImmutableSet<CelAttribute> attributes();

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return new AutoValue_CelUnknownSet(attributes);
 }
 /** Set of subexpression IDs that were decided to be unknown and in the critical path. */
 public abstract ImmutableSet<Long> unknownExprIds();

 public static CelUnknownSet create(CelAttribute attribute) {
 return create(ImmutableSet.of(attribute));
 }

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return create(attributes, ImmutableSet.of());
 }

 static CelUnknownSet create(Long... unknownExprIds) {
 return create(ImmutableSet.copyOf(unknownExprIds));
 }

 static CelUnknownSet create(Iterable<Long> unknownExprIds) {
 return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
 }

 private static CelUnknownSet create(
 ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
 return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
 }

 public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
 return create(
 ImmutableSet.<CelAttribute>builder()
 .addAll(lhs.attributes())
 .addAll(rhs.attributes())
 .build(),
 ImmutableSet.<Long>builder()
 .addAll(lhs.unknownExprIds())
 .addAll(rhs.unknownExprIds())
 .build());
 }

Expand Down

16 changes: 9 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
 }
 }

 public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
 this(typeProvider, dispatcher, CelOptions.LEGACY);
 }

 /**
 * Creates a new interpreter
 *
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
 @Override
 public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws InterpreterException {
 return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
 return evalTrackingUnknowns(
 RuntimeUnknownResolver.fromResolver(
 resolver, celOptions.adaptUnknownValueSetToNativeType()),
 listener);
 }

 @Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
 attribute,
 InterpreterUtil.valueOrUnknown(
 fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

 // Otherwise fallback to normal impl
 return IntermediateResult.create(
 InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
 InterpreterUtil.shortcircuitUnknownOrThrowable(
 lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private enum ShortCircuitableOperators {
Expand Down

64 changes: 43 additions & 21 deletions
runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
 * @return boolean value if object is unknown.
 */
 public static boolean isUnknown(Object obj) {
 return obj instanceof ExprValue
 && ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 if (isExprValueUnknown(obj)) {
 return true;
 }
 return obj instanceof CelUnknownSet;
 }

 /** TODO: Remove once clients have been migrated. */
 static boolean isExprValueUnknown(Object obj) {
 if (obj instanceof ExprValue) {
 return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 }

 return false;
 }

 /**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
 * @return A new ExprValue object which has all unknown expr ids from input objects, without
 * duplication.
 */
public static ExprValue combineUnknownExprValue(Object... objs) {
 static ExprValue combineUnknownProtoExprValue(Object... objs) {
 UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
 return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
 }

 /** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
 public static ExprValue createUnknownExprValue(Long... ids) {
 return createUnknownExprValue(Arrays.asList(ids));
 static CelUnknownSet combineUnknownExprValue(Object... objs) {
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
 if (isUnknown(object)) {
 ids.addAll(((CelUnknownSet) object).unknownExprIds());
 }
 }

 return CelUnknownSet.create(ids);
 }

 /**
 * Create an ExprValue object has UnknownSet, from a list of unknown expr ids
 *
 * @param ids List of unknown expr ids
 * @param id unknown expr id
 * @return A new ExprValue object which has all unknown expr ids from input list
 */
 public static ExprValue createUnknownExprValue(List<Long> ids) {
 ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
 exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
 return exprValueBuilder.build();
 private static ExprValue createUnknownExprValue(long id) {
 return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
 }

 /**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
 * from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
 * both of these operators.
 */
 public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 public static Object shortcircuitUnknownOrThrowable(
 Object left, Object right, boolean adaptUnknownValueSetToNativeType)
 throws InterpreterException {
 // unknown <op> unknown ==> unknown combined
 if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
 return InterpreterUtil.combineUnknownExprValue(left, right);
 return adaptUnknownValueSetToNativeType
 ? InterpreterUtil.combineUnknownExprValue(left, right)
 : InterpreterUtil.combineUnknownProtoExprValue(left, right);
 }
 // unknown <op> <error> ==> unknown
 // unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 "Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
 }

 public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
 public static Object valueOrUnknown(
 @Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
 // Handle the unknown value case.
 if (isUnknown(valueOrThrowable)) {
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 if (adaptUnknownValueSet) {
 return CelUnknownSet.create(id);
 } else {
 // TODO: Remove once clients have been migrated.
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 }
 return createUnknownExprValue(id);
 }
 return createUnknownExprValue(id);
 }
 // Handle the null value case.
 if (valueOrThrowable == null) {
 return createUnknownExprValue(id);
 return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
 }
 return valueOrThrowable;
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Oct 16, 2024
 Merged


Add expr ID set as a field to CelUnknownSet.
#471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addVar("y", SimpleType.BOOL)
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addFunctionDeclarations(
 newFunctionDeclaration(
 "foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(2L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

 public abstract boolean adaptUnknownValueSetToNativeType();

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
 .enableCelValue(false)
 .comprehensionMaxIterations(-1)
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .adaptUnknownValueSetToNativeType(false)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
 }

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
 */
 public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

 /**
 * If enabled, when the result of an evaluation is a set of unknown values, a native-type
 * equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
 * eval.proto} is returned instead.
 *
 * <p>This is a temporary flag. It will be removed once the consumers have migrated to the
 * native-type representation.
 */
 public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

 public abstract CelOptions build();
 }
}

2 changes: 2 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
 "TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
 "Activation.java",
 "CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
 ],
 deps = [
 ":base",
 ":unknown_attributes",
 "//common/annotations",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand Down

25 changes: 18 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
 private final ArrayList<Long> exprIds;
 private Optional<CelUnknownSet> unknowns;
 private final RuntimeUnknownResolver resolver;
 private final boolean acceptPartial;
 private Optional<CelUnknownSet> unknowns;

 private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
 exprIds = new ArrayList<>();
 unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
 this.resolver = resolver;
 this.acceptPartial = acceptPartial;
 }
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

 // support for ExprValue unknowns.
 if (InterpreterUtil.isUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 if (InterpreterUtil.isExprValueUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 } else if (resolver.getAdaptUnknownValueSetOption()) {
 CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
 exprIds.addAll(unknownSet.unknownExprIds());
 }
 }
 }

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
 }

 if (!exprIds.isEmpty()) {
 return Optional.of(
 ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
 if (resolver.getAdaptUnknownValueSetOption()) {
 return Optional.of(CelUnknownSet.create(exprIds));
 } else {
 return Optional.of(
 ExprValue.newBuilder()
 .setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
 .build());
 }
 }

 return Optional.empty();
Expand Down

31 changes: 28 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
 */
@AutoValue
public abstract class CelUnknownSet {

 /**
 * Set of attributes with a series of selection or index operations marked unknown. This set is
 * always empty if enableUnknownTracking is disabled in {@code CelOptions}.
 */
 public abstract ImmutableSet<CelAttribute> attributes();

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return new AutoValue_CelUnknownSet(attributes);
 }
 /** Set of subexpression IDs that were decided to be unknown and in the critical path. */
 public abstract ImmutableSet<Long> unknownExprIds();

 public static CelUnknownSet create(CelAttribute attribute) {
 return create(ImmutableSet.of(attribute));
 }

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return create(attributes, ImmutableSet.of());
 }

 static CelUnknownSet create(Long... unknownExprIds) {
 return create(ImmutableSet.copyOf(unknownExprIds));
 }

 static CelUnknownSet create(Iterable<Long> unknownExprIds) {
 return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
 }

 private static CelUnknownSet create(
 ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
 return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
 }

 public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
 return create(
 ImmutableSet.<CelAttribute>builder()
 .addAll(lhs.attributes())
 .addAll(rhs.attributes())
 .build(),
 ImmutableSet.<Long>builder()
 .addAll(lhs.unknownExprIds())
 .addAll(rhs.unknownExprIds())
 .build());
 }

Expand Down

16 changes: 9 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
 }
 }

 public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
 this(typeProvider, dispatcher, CelOptions.LEGACY);
 }

 /**
 * Creates a new interpreter
 *
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
 @Override
 public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws InterpreterException {
 return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
 return evalTrackingUnknowns(
 RuntimeUnknownResolver.fromResolver(
 resolver, celOptions.adaptUnknownValueSetToNativeType()),
 listener);
 }

 @Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
 attribute,
 InterpreterUtil.valueOrUnknown(
 fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

 // Otherwise fallback to normal impl
 return IntermediateResult.create(
 InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
 InterpreterUtil.shortcircuitUnknownOrThrowable(
 lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private enum ShortCircuitableOperators {
Expand Down

64 changes: 43 additions & 21 deletions
runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
 * @return boolean value if object is unknown.
 */
 public static boolean isUnknown(Object obj) {
 return obj instanceof ExprValue
 && ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 if (isExprValueUnknown(obj)) {
 return true;
 }
 return obj instanceof CelUnknownSet;
 }

 /** TODO: Remove once clients have been migrated. */
 static boolean isExprValueUnknown(Object obj) {
 if (obj instanceof ExprValue) {
 return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 }

 return false;
 }

 /**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
 * @return A new ExprValue object which has all unknown expr ids from input objects, without
 * duplication.
 */
public static ExprValue combineUnknownExprValue(Object... objs) {
 static ExprValue combineUnknownProtoExprValue(Object... objs) {
 UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
 return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
 }

 /** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
 public static ExprValue createUnknownExprValue(Long... ids) {
 return createUnknownExprValue(Arrays.asList(ids));
 static CelUnknownSet combineUnknownExprValue(Object... objs) {
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
 if (isUnknown(object)) {
 ids.addAll(((CelUnknownSet) object).unknownExprIds());
 }
 }

 return CelUnknownSet.create(ids);
 }

 /**
 * Create an ExprValue object has UnknownSet, from a list of unknown expr ids
 *
 * @param ids List of unknown expr ids
 * @param id unknown expr id
 * @return A new ExprValue object which has all unknown expr ids from input list
 */
 public static ExprValue createUnknownExprValue(List<Long> ids) {
 ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
 exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
 return exprValueBuilder.build();
 private static ExprValue createUnknownExprValue(long id) {
 return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
 }

 /**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
 * from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
 * both of these operators.
 */
 public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 public static Object shortcircuitUnknownOrThrowable(
 Object left, Object right, boolean adaptUnknownValueSetToNativeType)
 throws InterpreterException {
 // unknown <op> unknown ==> unknown combined
 if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
 return InterpreterUtil.combineUnknownExprValue(left, right);
 return adaptUnknownValueSetToNativeType
 ? InterpreterUtil.combineUnknownExprValue(left, right)
 : InterpreterUtil.combineUnknownProtoExprValue(left, right);
 }
 // unknown <op> <error> ==> unknown
 // unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 "Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
 }

 public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
 public static Object valueOrUnknown(
 @Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
 // Handle the unknown value case.
 if (isUnknown(valueOrThrowable)) {
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 if (adaptUnknownValueSet) {
 return CelUnknownSet.create(id);
 } else {
 // TODO: Remove once clients have been migrated.
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 }
 return createUnknownExprValue(id);
 }
 return createUnknownExprValue(id);
 }
 // Handle the null value case.
 if (valueOrThrowable == null) {
 return createUnknownExprValue(id);
 return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
 }
 return valueOrThrowable;
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Oct 16, 2024
 Merged


Add expr ID set as a field to CelUnknownSet.
#471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addVar("y", SimpleType.BOOL)
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addFunctionDeclarations(
 newFunctionDeclaration(
 "foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(2L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

 public abstract boolean adaptUnknownValueSetToNativeType();

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
 .enableCelValue(false)
 .comprehensionMaxIterations(-1)
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .adaptUnknownValueSetToNativeType(false)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
 }

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
 */
 public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

 /**
 * If enabled, when the result of an evaluation is a set of unknown values, a native-type
 * equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
 * eval.proto} is returned instead.
 *
 * <p>This is a temporary flag. It will be removed once the consumers have migrated to the
 * native-type representation.
 */
 public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

 public abstract CelOptions build();
 }
}

2 changes: 2 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
 "TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
 "Activation.java",
 "CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
 ],
 deps = [
 ":base",
 ":unknown_attributes",
 "//common/annotations",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand Down

25 changes: 18 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
 private final ArrayList<Long> exprIds;
 private Optional<CelUnknownSet> unknowns;
 private final RuntimeUnknownResolver resolver;
 private final boolean acceptPartial;
 private Optional<CelUnknownSet> unknowns;

 private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
 exprIds = new ArrayList<>();
 unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
 this.resolver = resolver;
 this.acceptPartial = acceptPartial;
 }
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

 // support for ExprValue unknowns.
 if (InterpreterUtil.isUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 if (InterpreterUtil.isExprValueUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 } else if (resolver.getAdaptUnknownValueSetOption()) {
 CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
 exprIds.addAll(unknownSet.unknownExprIds());
 }
 }
 }

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
 }

 if (!exprIds.isEmpty()) {
 return Optional.of(
 ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
 if (resolver.getAdaptUnknownValueSetOption()) {
 return Optional.of(CelUnknownSet.create(exprIds));
 } else {
 return Optional.of(
 ExprValue.newBuilder()
 .setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
 .build());
 }
 }

 return Optional.empty();
Expand Down

31 changes: 28 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
 */
@AutoValue
public abstract class CelUnknownSet {

 /**
 * Set of attributes with a series of selection or index operations marked unknown. This set is
 * always empty if enableUnknownTracking is disabled in {@code CelOptions}.
 */
 public abstract ImmutableSet<CelAttribute> attributes();

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return new AutoValue_CelUnknownSet(attributes);
 }
 /** Set of subexpression IDs that were decided to be unknown and in the critical path. */
 public abstract ImmutableSet<Long> unknownExprIds();

 public static CelUnknownSet create(CelAttribute attribute) {
 return create(ImmutableSet.of(attribute));
 }

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return create(attributes, ImmutableSet.of());
 }

 static CelUnknownSet create(Long... unknownExprIds) {
 return create(ImmutableSet.copyOf(unknownExprIds));
 }

 static CelUnknownSet create(Iterable<Long> unknownExprIds) {
 return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
 }

 private static CelUnknownSet create(
 ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
 return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
 }

 public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
 return create(
 ImmutableSet.<CelAttribute>builder()
 .addAll(lhs.attributes())
 .addAll(rhs.attributes())
 .build(),
 ImmutableSet.<Long>builder()
 .addAll(lhs.unknownExprIds())
 .addAll(rhs.unknownExprIds())
 .build());
 }

Expand Down

16 changes: 9 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
 }
 }

 public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
 this(typeProvider, dispatcher, CelOptions.LEGACY);
 }

 /**
 * Creates a new interpreter
 *
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
 @Override
 public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws InterpreterException {
 return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
 return evalTrackingUnknowns(
 RuntimeUnknownResolver.fromResolver(
 resolver, celOptions.adaptUnknownValueSetToNativeType()),
 listener);
 }

 @Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
 attribute,
 InterpreterUtil.valueOrUnknown(
 fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

 // Otherwise fallback to normal impl
 return IntermediateResult.create(
 InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
 InterpreterUtil.shortcircuitUnknownOrThrowable(
 lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private enum ShortCircuitableOperators {
Expand Down

64 changes: 43 additions & 21 deletions
runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
 * @return boolean value if object is unknown.
 */
 public static boolean isUnknown(Object obj) {
 return obj instanceof ExprValue
 && ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 if (isExprValueUnknown(obj)) {
 return true;
 }
 return obj instanceof CelUnknownSet;
 }

 /** TODO: Remove once clients have been migrated. */
 static boolean isExprValueUnknown(Object obj) {
 if (obj instanceof ExprValue) {
 return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 }

 return false;
 }

 /**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
 * @return A new ExprValue object which has all unknown expr ids from input objects, without
 * duplication.
 */
public static ExprValue combineUnknownExprValue(Object... objs) {
 static ExprValue combineUnknownProtoExprValue(Object... objs) {
 UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
 return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
 }

 /** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
 public static ExprValue createUnknownExprValue(Long... ids) {
 return createUnknownExprValue(Arrays.asList(ids));
 static CelUnknownSet combineUnknownExprValue(Object... objs) {
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
 if (isUnknown(object)) {
 ids.addAll(((CelUnknownSet) object).unknownExprIds());
 }
 }

 return CelUnknownSet.create(ids);
 }

 /**
 * Create an ExprValue object has UnknownSet, from a list of unknown expr ids
 *
 * @param ids List of unknown expr ids
 * @param id unknown expr id
 * @return A new ExprValue object which has all unknown expr ids from input list
 */
 public static ExprValue createUnknownExprValue(List<Long> ids) {
 ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
 exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
 return exprValueBuilder.build();
 private static ExprValue createUnknownExprValue(long id) {
 return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
 }

 /**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
 * from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
 * both of these operators.
 */
 public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 public static Object shortcircuitUnknownOrThrowable(
 Object left, Object right, boolean adaptUnknownValueSetToNativeType)
 throws InterpreterException {
 // unknown <op> unknown ==> unknown combined
 if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
 return InterpreterUtil.combineUnknownExprValue(left, right);
 return adaptUnknownValueSetToNativeType
 ? InterpreterUtil.combineUnknownExprValue(left, right)
 : InterpreterUtil.combineUnknownProtoExprValue(left, right);
 }
 // unknown <op> <error> ==> unknown
 // unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 "Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
 }

 public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
 public static Object valueOrUnknown(
 @Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
 // Handle the unknown value case.
 if (isUnknown(valueOrThrowable)) {
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 if (adaptUnknownValueSet) {
 return CelUnknownSet.create(id);
 } else {
 // TODO: Remove once clients have been migrated.
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 }
 return createUnknownExprValue(id);
 }
 return createUnknownExprValue(id);
 }
 // Handle the null value case.
 if (valueOrThrowable == null) {
 return createUnknownExprValue(id);
 return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
 }
 return valueOrThrowable;
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add expr ID set as a field to CelUnknownSet.#471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Oct 16, 2024
 Merged


Add expr ID set as a field to CelUnknownSet.
#471
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1926,6 +1926,40 @@ public void program_functionParamWithWellKnownType() throws Exception {
 assertThat(result).isTrue();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asIdentifiers() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addVar("y", SimpleType.BOOL)
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("x || y").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(1L, 3L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void program_nativeTypeUnknownsEnabled_asCallArguments() throws Exception {
 Cel cel =
 CelFactory.standardCelBuilder()
 .addVar("x", SimpleType.BOOL)
 .addFunctionDeclarations(
 newFunctionDeclaration(
 "foo", newGlobalOverload("foo_bool", SimpleType.BOOL, SimpleType.BOOL)))
 .setOptions(CelOptions.current().adaptUnknownValueSetToNativeType(true).build())
 .build();
 CelAbstractSyntaxTree ast = cel.compile("foo(x)").getAst();

 CelUnknownSet result = (CelUnknownSet) cel.createProgram(ast).eval();

 assertThat(result.unknownExprIds()).containsExactly(2L);
 assertThat(result.attributes()).isEmpty();
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

13 changes: 13 additions & 0 deletions
common/src/main/java/dev/cel/common/CelOptions.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,8 @@ public enum ProtoUnsetFieldOptions {

 public abstract ProtoUnsetFieldOptions fromProtoUnsetFieldOption();

 public abstract boolean adaptUnknownValueSetToNativeType();

 public abstract Builder toBuilder();

 public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -200,6 +202,7 @@ public static Builder newBuilder() {
 .enableCelValue(false)
 .comprehensionMaxIterations(-1)
 .unwrapWellKnownTypesOnFunctionDispatch(true)
 .adaptUnknownValueSetToNativeType(false)
 .fromProtoUnsetFieldOption(ProtoUnsetFieldOptions.BIND_DEFAULT);
 }

Expand DownExpand Up@@ -504,6 +507,16 @@ public abstract static class Builder {
 */
 public abstract Builder fromProtoUnsetFieldOption(ProtoUnsetFieldOptions value);

 /**
 * If enabled, when the result of an evaluation is a set of unknown values, a native-type
 * equivalent {@code CelUnknownSet} is returned as a result. Otherwise, ExprValue from {@code
 * eval.proto} is returned instead.
 *
 * <p>This is a temporary flag. It will be removed once the consumers have migrated to the
 * native-type representation.
 */
 public abstract Builder adaptUnknownValueSetToNativeType(boolean value);

 public abstract CelOptions build();
 }
}

2 changes: 2 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ BASE_SOURCES = [
 "TypeResolver.java",
]

# keep sorted
INTERPRETER_SOURCES = [
 "Activation.java",
 "CallArgumentChecker.java",
Expand DownExpand Up@@ -249,6 +250,7 @@ java_library(
 ],
 deps = [
 ":base",
 ":unknown_attributes",
 "//common/annotations",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
Expand Down

25 changes: 18 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/CallArgumentChecker.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,13 +32,13 @@
@Internal
class CallArgumentChecker {
 private final ArrayList<Long> exprIds;
 private Optional<CelUnknownSet> unknowns;
 private final RuntimeUnknownResolver resolver;
 private final boolean acceptPartial;
 private Optional<CelUnknownSet> unknowns;

 private CallArgumentChecker(RuntimeUnknownResolver resolver, boolean acceptPartial) {
 exprIds = new ArrayList<>();
 unknowns = Optional.empty();
this.exprIds = new ArrayList<>();
this.unknowns = Optional.empty();
 this.resolver = resolver;
 this.acceptPartial = acceptPartial;
 }
Expand DownExpand Up@@ -76,8 +76,13 @@ void checkArg(DefaultInterpreter.IntermediateResult arg) {

 // support for ExprValue unknowns.
 if (InterpreterUtil.isUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 if (InterpreterUtil.isExprValueUnknown(arg.value())) {
 ExprValue exprValue = (ExprValue) arg.value();
 exprIds.addAll(exprValue.getUnknown().getExprsList());
 } else if (resolver.getAdaptUnknownValueSetOption()) {
 CelUnknownSet unknownSet = (CelUnknownSet) arg.value();
 exprIds.addAll(unknownSet.unknownExprIds());
 }
 }
 }

Expand All@@ -98,8 +103,14 @@ Optional<Object> maybeUnknowns() {
 }

 if (!exprIds.isEmpty()) {
 return Optional.of(
 ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds)).build());
 if (resolver.getAdaptUnknownValueSetOption()) {
 return Optional.of(CelUnknownSet.create(exprIds));
 } else {
 return Optional.of(
 ExprValue.newBuilder()
 .setUnknown(UnknownSet.newBuilder().addAllExprs(exprIds))
 .build());
 }
 }

 return Optional.empty();
Expand Down

31 changes: 28 additions & 3 deletions
runtime/src/main/java/dev/cel/runtime/CelUnknownSet.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,21 +28,46 @@
 */
@AutoValue
public abstract class CelUnknownSet {

 /**
 * Set of attributes with a series of selection or index operations marked unknown. This set is
 * always empty if enableUnknownTracking is disabled in {@code CelOptions}.
 */
 public abstract ImmutableSet<CelAttribute> attributes();

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return new AutoValue_CelUnknownSet(attributes);
 }
 /** Set of subexpression IDs that were decided to be unknown and in the critical path. */
 public abstract ImmutableSet<Long> unknownExprIds();

 public static CelUnknownSet create(CelAttribute attribute) {
 return create(ImmutableSet.of(attribute));
 }

 public static CelUnknownSet create(ImmutableSet<CelAttribute> attributes) {
 return create(attributes, ImmutableSet.of());
 }

 static CelUnknownSet create(Long... unknownExprIds) {
 return create(ImmutableSet.copyOf(unknownExprIds));
 }

 static CelUnknownSet create(Iterable<Long> unknownExprIds) {
 return create(ImmutableSet.of(), ImmutableSet.copyOf(unknownExprIds));
 }

 private static CelUnknownSet create(
 ImmutableSet<CelAttribute> attributes, ImmutableSet<Long> unknownExprIds) {
 return new AutoValue_CelUnknownSet(attributes, unknownExprIds);
 }

 public static CelUnknownSet union(CelUnknownSet lhs, CelUnknownSet rhs) {
 return create(
 ImmutableSet.<CelAttribute>builder()
 .addAll(lhs.attributes())
 .addAll(rhs.attributes())
 .build(),
 ImmutableSet.<Long>builder()
 .addAll(lhs.unknownExprIds())
 .addAll(rhs.unknownExprIds())
 .build());
 }

Expand Down

16 changes: 9 additions & 7 deletions
runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,10 +108,6 @@ static IntermediateResult create(Object value) {
 }
 }

 public DefaultInterpreter(RuntimeTypeProvider typeProvider, Dispatcher dispatcher) {
 this(typeProvider, dispatcher, CelOptions.LEGACY);
 }

 /**
 * Creates a new interpreter
 *
Expand DownExpand Up@@ -167,7 +163,10 @@ public Object eval(GlobalResolver resolver) throws InterpreterException {
 @Override
 public Object eval(GlobalResolver resolver, CelEvaluationListener listener)
 throws InterpreterException {
 return evalTrackingUnknowns(RuntimeUnknownResolver.fromResolver(resolver), listener);
 return evalTrackingUnknowns(
 RuntimeUnknownResolver.fromResolver(
 resolver, celOptions.adaptUnknownValueSetToNativeType()),
 listener);
 }

 @Override
Expand DownExpand Up@@ -333,7 +332,9 @@ private IntermediateResult evalFieldSelect(
 Object fieldValue = typeProvider.selectField(operand, field);

 return IntermediateResult.create(
 attribute, InterpreterUtil.valueOrUnknown(fieldValue, expr.id()));
 attribute,
 InterpreterUtil.valueOrUnknown(
 fieldValue, expr.id(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private IntermediateResult evalCall(ExecutionFrame frame, CelExpr expr, CelCall callExpr)
Expand DownExpand Up@@ -486,7 +487,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed

 // Otherwise fallback to normal impl
 return IntermediateResult.create(
 InterpreterUtil.shortcircuitUnknownOrThrowable(lhs.value(), rhs.value()));
 InterpreterUtil.shortcircuitUnknownOrThrowable(
 lhs.value(), rhs.value(), celOptions.adaptUnknownValueSetToNativeType()));
 }

 private enum ShortCircuitableOperators {
Expand Down

64 changes: 43 additions & 21 deletions
runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,7 @@
import dev.cel.expr.ExprValue;
import dev.cel.expr.UnknownSet;
import dev.cel.common.annotations.Internal;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.jspecify.annotations.Nullable;

Expand DownExpand Up@@ -56,8 +54,19 @@ public static Object strict(Object valueOrThrowable) throws InterpreterException
 * @return boolean value if object is unknown.
 */
 public static boolean isUnknown(Object obj) {
 return obj instanceof ExprValue
 && ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 if (isExprValueUnknown(obj)) {
 return true;
 }
 return obj instanceof CelUnknownSet;
 }

 /** TODO: Remove once clients have been migrated. */
 static boolean isExprValueUnknown(Object obj) {
 if (obj instanceof ExprValue) {
 return ((ExprValue) obj).getKindCase() == ExprValue.KindCase.UNKNOWN;
 }

 return false;
 }

 /**
Expand All@@ -67,7 +76,7 @@ public static boolean isUnknown(Object obj) {
 * @return A new ExprValue object which has all unknown expr ids from input objects, without
 * duplication.
 */
public static ExprValue combineUnknownExprValue(Object... objs) {
 static ExprValue combineUnknownProtoExprValue(Object... objs) {
 UnknownSet.Builder unknownsetBuilder = UnknownSet.newBuilder();
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
Expand All@@ -79,21 +88,25 @@ public static ExprValue combineUnknownExprValue(Object... objs) {
 return ExprValue.newBuilder().setUnknown(unknownsetBuilder).build();
 }

 /** Create a {@code ExprValue} for one or more {@code ids} representing an unknown set. */
 public static ExprValue createUnknownExprValue(Long... ids) {
 return createUnknownExprValue(Arrays.asList(ids));
 static CelUnknownSet combineUnknownExprValue(Object... objs) {
 Set<Long> ids = new LinkedHashSet<>();
 for (Object object : objs) {
 if (isUnknown(object)) {
 ids.addAll(((CelUnknownSet) object).unknownExprIds());
 }
 }

 return CelUnknownSet.create(ids);
 }

 /**
 * Create an ExprValue object has UnknownSet, from a list of unknown expr ids
 *
 * @param ids List of unknown expr ids
 * @param id unknown expr id
 * @return A new ExprValue object which has all unknown expr ids from input list
 */
 public static ExprValue createUnknownExprValue(List<Long> ids) {
 ExprValue.Builder exprValueBuilder = ExprValue.newBuilder();
 exprValueBuilder.setUnknown(UnknownSet.newBuilder().addAllExprs(ids));
 return exprValueBuilder.build();
 private static ExprValue createUnknownExprValue(long id) {
 return ExprValue.newBuilder().setUnknown(UnknownSet.newBuilder().addExprs(id)).build();
 }

 /**
Expand All@@ -104,11 +117,14 @@ public static ExprValue createUnknownExprValue(List<Long> ids) {
 * from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
 * both of these operators.
 */
 public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 public static Object shortcircuitUnknownOrThrowable(
 Object left, Object right, boolean adaptUnknownValueSetToNativeType)
 throws InterpreterException {
 // unknown <op> unknown ==> unknown combined
 if (InterpreterUtil.isUnknown(left) && InterpreterUtil.isUnknown(right)) {
 return InterpreterUtil.combineUnknownExprValue(left, right);
 return adaptUnknownValueSetToNativeType
 ? InterpreterUtil.combineUnknownExprValue(left, right)
 : InterpreterUtil.combineUnknownProtoExprValue(left, right);
 }
 // unknown <op> <error> ==> unknown
 // unknown <op> t|f ==> unknown
Expand All@@ -132,18 +148,24 @@ public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
 "Left or/and right object is neither bool, unknown nor error, unexpected behavior.");
 }

 public static Object valueOrUnknown(@Nullable Object valueOrThrowable, Long id) {
 public static Object valueOrUnknown(
 @Nullable Object valueOrThrowable, Long id, boolean adaptUnknownValueSet) {
 // Handle the unknown value case.
 if (isUnknown(valueOrThrowable)) {
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 if (adaptUnknownValueSet) {
 return CelUnknownSet.create(id);
 } else {
 // TODO: Remove once clients have been migrated.
 ExprValue value = (ExprValue) valueOrThrowable;
 if (value.getUnknown().getExprsCount() != 0) {
 return valueOrThrowable;
 }
 return createUnknownExprValue(id);
 }
 return createUnknownExprValue(id);
 }
 // Handle the null value case.
 if (valueOrThrowable == null) {
 return createUnknownExprValue(id);
 return adaptUnknownValueSet ? CelUnknownSet.create(id) : createUnknownExprValue(id);
 }
 return valueOrThrowable;
 }
Expand Down
Loading