Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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
Mar 7, 2025
Merged

Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts #623

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
147 changes: 90 additions & 57 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
private final Interpreter interpreter;
private final CelOptions options;

// Builder is mutable by design. APIs must guarantee a new instance to be returned.
private final boolean standardEnvironmentEnabled;

// Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
// CEL-Internal-4
private final ExtensionRegistry extensionRegistry;

// A user-provided custom type factory should presumably be thread-safe. This is documented, but
// not enforced.
// CEL-Internal-4
private final Function<String, Message.Builder> customTypeFactory;

private final CelStandardFunctions overriddenStandardFunctions;
private final CelValueProvider celValueProvider;
private final ImmutableSet<FileDescriptor> fileDescriptors;

// This does not affect the evaluation behavior in any manner.
// CEL-Internal-4
private final Builder runtimeBuilder;
private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

@Override
public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

@Override
public CelRuntimeBuilder toRuntimeBuilder() {
return new Builder(runtimeBuilder);
CelRuntimeBuilder builder =
new Builder()
.setOptions(options)
.setStandardEnvironmentEnabled(standardEnvironmentEnabled)
.setExtensionRegistry(extensionRegistry)
.addFileTypes(fileDescriptors)
.addLibraries(celRuntimeLibraries)
.addFunctionBindings(celFunctionBindings);

if (customTypeFactory != null) {
builder.setTypeFactory(customTypeFactory);
}

if (overriddenStandardFunctions != null) {
builder.setStandardFunctions(overriddenStandardFunctions);
}

if (celValueProvider != null) {
builder.setValueProvider(celValueProvider);
}

return builder;
}

/** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
/** Builder class for {@code CelRuntimeLegacyImpl}. */
public static final class Builder implements CelRuntimeBuilder {

private final ImmutableSet.Builder<FileDescriptor> fileTypes;
private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
// The following properties are for testing purposes only. Do not expose to public.
@VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

@VisibleForTesting
final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

@VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

@VisibleForTesting Function<String, Message.Builder> customTypeFactory;
@VisibleForTesting CelValueProvider celValueProvider;
@VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

@SuppressWarnings("unused")
private CelOptions options;

private boolean standardEnvironmentEnabled;
private Function<String, Message.Builder> customTypeFactory;
private ExtensionRegistry extensionRegistry;
private CelValueProvider celValueProvider;
private CelStandardFunctions overriddenStandardFunctions;

private boolean standardEnvironmentEnabled;

@Override
public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
return this;
}

// The following getters exist for asserting immutability for collections held by this builder,
// and shouldn't be exposed to the public.
@VisibleForTesting
Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
return this.customFunctionBindings;
}

@VisibleForTesting
ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
return this.celRuntimeLibraries;
}

@VisibleForTesting
ImmutableSet.Builder<FileDescriptor> getFileTypes() {
return this.fileTypes;
}

/** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
@Override
public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
"setStandardEnvironmentEnabled must be set to false to override standard function"
+ " bindings.");
}

ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
// Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
CelDescriptors celDescriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

CelDescriptorPool celDescriptorPool =
newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
}

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
new DefaultInterpreter(
DescriptorTypeResolver.create(),
runtimeTypeProvider,
dispatcher.immutableCopy(),
options),
options);

return new CelRuntimeLegacyImpl(
interpreter,
options,
this);
standardEnvironmentEnabled,
extensionRegistry,
customTypeFactory,
overriddenStandardFunctions,
celValueProvider,
fileDescriptors,
runtimeLibraries,
ImmutableList.copyOf(customFunctionBindings.values()));
}

private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
this.customTypeFactory = null;
}

private Builder(Builder builder) {
// The following properties are either immutable or simple primitives, thus can be assigned
// directly.
this.options = builder.options;
this.extensionRegistry = builder.extensionRegistry;
this.customTypeFactory = builder.customTypeFactory;
this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
this.celValueProvider = builder.celValueProvider;
// The following needs to be deep copied as they are collection builders
this.fileTypes = deepCopy(builder.fileTypes);
this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
}

private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
newBuilder.addAll(builderToCopy.build());
return newBuilder;
}
}

private CelRuntimeLegacyImpl(
Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
Interpreter interpreter,
CelOptions options,
boolean standardEnvironmentEnabled,
ExtensionRegistry extensionRegistry,
@Nullable Function<String, Message.Builder> customTypeFactory,
@Nullable CelStandardFunctions overriddenStandardFunctions,
@Nullable CelValueProvider celValueProvider,
ImmutableSet<FileDescriptor> fileDescriptors,
ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
this.interpreter = interpreter;
this.options = options;
this.runtimeBuilder = new Builder(runtimeBuilder);
this.standardEnvironmentEnabled = standardEnvironmentEnabled;
this.extensionRegistry = extensionRegistry;
this.customTypeFactory = customTypeFactory;
this.overriddenStandardFunctions = overriddenStandardFunctions;
this.celValueProvider = celValueProvider;
this.fileDescriptors = fileDescriptors;
this.celRuntimeLibraries = celRuntimeLibraries;
this.celFunctionBindings = celFunctionBindings;
}
}
1 change: 1 addition & 0 deletions runtime/src/test/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
"//common/types",
"//common/types:cel_v1alpha1_types",
"//common/types:message_type_provider",
"//common/values:cel_value_provider",
"//compiler",
"//compiler:compiler_builder",
"//extensions:optional_library",
Expand Down
44 changes: 36 additions & 8 deletions runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
(CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
}

@Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
int originalFileTypesSize =
((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
(CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
}

@Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
}

@Test
public void toRuntimeBuilder_optionalProperties() {
Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
CelStandardFunctions overriddenStandardFunctions =
CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
CelRuntimeBuilder celRuntimeBuilder =
CelRuntimeFactory.standardCelRuntimeBuilder()
.setStandardEnvironmentEnabled(false)
.setTypeFactory(customTypeFactory)
.setStandardFunctions(overriddenStandardFunctions)
.setValueProvider(noOpValueProvider);
CelRuntime celRuntime = celRuntimeBuilder.build();

CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
(CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
assertThat(newRuntimeBuilder.overriddenStandardFunctions)
.isEqualTo(overriddenStandardFunctions);
assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
}
}
, '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
Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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

Mar 7, 2025
 Merged


Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts
#623
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


147 changes: 90 additions & 57 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
 private final Interpreter interpreter;
 private final CelOptions options;

 // Builder is mutable by design. APIs must guarantee a new instance to be returned.
 private final boolean standardEnvironmentEnabled;

 // Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
 // CEL-Internal-4
 private final ExtensionRegistry extensionRegistry;

 // A user-provided custom type factory should presumably be thread-safe. This is documented, but
 // not enforced.
 // CEL-Internal-4
 private final Function<String, Message.Builder> customTypeFactory;

 private final CelStandardFunctions overriddenStandardFunctions;
 private final CelValueProvider celValueProvider;
 private final ImmutableSet<FileDescriptor> fileDescriptors;

 // This does not affect the evaluation behavior in any manner.
 // CEL-Internal-4
 private final Builder runtimeBuilder;
 private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

 private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

 @Override
 public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

 @Override
 public CelRuntimeBuilder toRuntimeBuilder() {
 return new Builder(runtimeBuilder);
 CelRuntimeBuilder builder =
 new Builder()
 .setOptions(options)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .setExtensionRegistry(extensionRegistry)
 .addFileTypes(fileDescriptors)
 .addLibraries(celRuntimeLibraries)
 .addFunctionBindings(celFunctionBindings);

 if (customTypeFactory != null) {
 builder.setTypeFactory(customTypeFactory);
 }

 if (overriddenStandardFunctions != null) {
 builder.setStandardFunctions(overriddenStandardFunctions);
 }

 if (celValueProvider != null) {
 builder.setValueProvider(celValueProvider);
 }

 return builder;
 }

 /** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
 /** Builder class for {@code CelRuntimeLegacyImpl}. */
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 // The following properties are for testing purposes only. Do not expose to public.
 @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

 @VisibleForTesting
 final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

 @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @VisibleForTesting Function<String, Message.Builder> customTypeFactory;
 @VisibleForTesting CelValueProvider celValueProvider;
 @VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

 @SuppressWarnings("unused")
 private CelOptions options;

 private boolean standardEnvironmentEnabled;
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 private boolean standardEnvironmentEnabled;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
 return this.customFunctionBindings;
 }

 @VisibleForTesting
 ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
 return this.celRuntimeLibraries;
 }

 @VisibleForTesting
 ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 return this.fileTypes;
 }

 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }

 ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
 // Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

 ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
 CelDescriptors celDescriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

 CelDescriptorPool celDescriptorPool =
 newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
 runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
 }

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options);

 return new CelRuntimeLegacyImpl(
 interpreter,
 options,
 this);
 standardEnvironmentEnabled,
 extensionRegistry,
 customTypeFactory,
 overriddenStandardFunctions,
 celValueProvider,
 fileDescriptors,
 runtimeLibraries,
 ImmutableList.copyOf(customFunctionBindings.values()));
 }

 private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.options = builder.options;
 this.extensionRegistry = builder.extensionRegistry;
 this.customTypeFactory = builder.customTypeFactory;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
 this.celValueProvider = builder.celValueProvider;
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 }
 }

 private CelRuntimeLegacyImpl(
 Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
 Interpreter interpreter,
 CelOptions options,
 boolean standardEnvironmentEnabled,
 ExtensionRegistry extensionRegistry,
 @Nullable Function<String, Message.Builder> customTypeFactory,
 @Nullable CelStandardFunctions overriddenStandardFunctions,
 @Nullable CelValueProvider celValueProvider,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
 ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
 this.interpreter = interpreter;
 this.options = options;
 this.runtimeBuilder = new Builder(runtimeBuilder);
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.extensionRegistry = extensionRegistry;
 this.customTypeFactory = customTypeFactory;
 this.overriddenStandardFunctions = overriddenStandardFunctions;
 this.celValueProvider = celValueProvider;
 this.fileDescriptors = fileDescriptors;
 this.celRuntimeLibraries = celRuntimeLibraries;
 this.celFunctionBindings = celFunctionBindings;
 }
}

1 change: 1 addition & 0 deletions
runtime/src/test/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
 "//common/types",
 "//common/types:cel_v1alpha1_types",
 "//common/types:message_type_provider",
 "//common/values:cel_value_provider",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:optional_library",
Expand Down

44 changes: 36 additions & 8 deletions
runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 }

 @Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
 int originalFileTypesSize =
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
 CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
 assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
 assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
 assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
 }

 @Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

 assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
 assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
 }

 @Test
 public void toRuntimeBuilder_optionalProperties() {
 Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
 CelStandardFunctions overriddenStandardFunctions =
 CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
 CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
 CelRuntimeBuilder celRuntimeBuilder =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .setStandardEnvironmentEnabled(false)
 .setTypeFactory(customTypeFactory)
 .setStandardFunctions(overriddenStandardFunctions)
 .setValueProvider(noOpValueProvider);
 CelRuntime celRuntime = celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
 assertThat(newRuntimeBuilder.overriddenStandardFunctions)
 .isEqualTo(overriddenStandardFunctions);
 assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
 }
}

, '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
Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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

Mar 7, 2025
 Merged


Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts
#623
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


147 changes: 90 additions & 57 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
 private final Interpreter interpreter;
 private final CelOptions options;

 // Builder is mutable by design. APIs must guarantee a new instance to be returned.
 private final boolean standardEnvironmentEnabled;

 // Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
 // CEL-Internal-4
 private final ExtensionRegistry extensionRegistry;

 // A user-provided custom type factory should presumably be thread-safe. This is documented, but
 // not enforced.
 // CEL-Internal-4
 private final Function<String, Message.Builder> customTypeFactory;

 private final CelStandardFunctions overriddenStandardFunctions;
 private final CelValueProvider celValueProvider;
 private final ImmutableSet<FileDescriptor> fileDescriptors;

 // This does not affect the evaluation behavior in any manner.
 // CEL-Internal-4
 private final Builder runtimeBuilder;
 private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

 private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

 @Override
 public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

 @Override
 public CelRuntimeBuilder toRuntimeBuilder() {
 return new Builder(runtimeBuilder);
 CelRuntimeBuilder builder =
 new Builder()
 .setOptions(options)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .setExtensionRegistry(extensionRegistry)
 .addFileTypes(fileDescriptors)
 .addLibraries(celRuntimeLibraries)
 .addFunctionBindings(celFunctionBindings);

 if (customTypeFactory != null) {
 builder.setTypeFactory(customTypeFactory);
 }

 if (overriddenStandardFunctions != null) {
 builder.setStandardFunctions(overriddenStandardFunctions);
 }

 if (celValueProvider != null) {
 builder.setValueProvider(celValueProvider);
 }

 return builder;
 }

 /** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
 /** Builder class for {@code CelRuntimeLegacyImpl}. */
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 // The following properties are for testing purposes only. Do not expose to public.
 @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

 @VisibleForTesting
 final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

 @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @VisibleForTesting Function<String, Message.Builder> customTypeFactory;
 @VisibleForTesting CelValueProvider celValueProvider;
 @VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

 @SuppressWarnings("unused")
 private CelOptions options;

 private boolean standardEnvironmentEnabled;
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 private boolean standardEnvironmentEnabled;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
 return this.customFunctionBindings;
 }

 @VisibleForTesting
 ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
 return this.celRuntimeLibraries;
 }

 @VisibleForTesting
 ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 return this.fileTypes;
 }

 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }

 ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
 // Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

 ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
 CelDescriptors celDescriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

 CelDescriptorPool celDescriptorPool =
 newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
 runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
 }

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options);

 return new CelRuntimeLegacyImpl(
 interpreter,
 options,
 this);
 standardEnvironmentEnabled,
 extensionRegistry,
 customTypeFactory,
 overriddenStandardFunctions,
 celValueProvider,
 fileDescriptors,
 runtimeLibraries,
 ImmutableList.copyOf(customFunctionBindings.values()));
 }

 private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.options = builder.options;
 this.extensionRegistry = builder.extensionRegistry;
 this.customTypeFactory = builder.customTypeFactory;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
 this.celValueProvider = builder.celValueProvider;
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 }
 }

 private CelRuntimeLegacyImpl(
 Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
 Interpreter interpreter,
 CelOptions options,
 boolean standardEnvironmentEnabled,
 ExtensionRegistry extensionRegistry,
 @Nullable Function<String, Message.Builder> customTypeFactory,
 @Nullable CelStandardFunctions overriddenStandardFunctions,
 @Nullable CelValueProvider celValueProvider,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
 ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
 this.interpreter = interpreter;
 this.options = options;
 this.runtimeBuilder = new Builder(runtimeBuilder);
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.extensionRegistry = extensionRegistry;
 this.customTypeFactory = customTypeFactory;
 this.overriddenStandardFunctions = overriddenStandardFunctions;
 this.celValueProvider = celValueProvider;
 this.fileDescriptors = fileDescriptors;
 this.celRuntimeLibraries = celRuntimeLibraries;
 this.celFunctionBindings = celFunctionBindings;
 }
}

1 change: 1 addition & 0 deletions
runtime/src/test/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
 "//common/types",
 "//common/types:cel_v1alpha1_types",
 "//common/types:message_type_provider",
 "//common/values:cel_value_provider",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:optional_library",
Expand Down

44 changes: 36 additions & 8 deletions
runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 }

 @Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
 int originalFileTypesSize =
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
 CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
 assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
 assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
 assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
 }

 @Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

 assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
 assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
 }

 @Test
 public void toRuntimeBuilder_optionalProperties() {
 Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
 CelStandardFunctions overriddenStandardFunctions =
 CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
 CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
 CelRuntimeBuilder celRuntimeBuilder =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .setStandardEnvironmentEnabled(false)
 .setTypeFactory(customTypeFactory)
 .setStandardFunctions(overriddenStandardFunctions)
 .setValueProvider(noOpValueProvider);
 CelRuntime celRuntime = celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
 assertThat(newRuntimeBuilder.overriddenStandardFunctions)
 .isEqualTo(overriddenStandardFunctions);
 assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
 }
}

, '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
Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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

Mar 7, 2025
 Merged


Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts
#623
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


147 changes: 90 additions & 57 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
 private final Interpreter interpreter;
 private final CelOptions options;

 // Builder is mutable by design. APIs must guarantee a new instance to be returned.
 private final boolean standardEnvironmentEnabled;

 // Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
 // CEL-Internal-4
 private final ExtensionRegistry extensionRegistry;

 // A user-provided custom type factory should presumably be thread-safe. This is documented, but
 // not enforced.
 // CEL-Internal-4
 private final Function<String, Message.Builder> customTypeFactory;

 private final CelStandardFunctions overriddenStandardFunctions;
 private final CelValueProvider celValueProvider;
 private final ImmutableSet<FileDescriptor> fileDescriptors;

 // This does not affect the evaluation behavior in any manner.
 // CEL-Internal-4
 private final Builder runtimeBuilder;
 private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

 private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

 @Override
 public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

 @Override
 public CelRuntimeBuilder toRuntimeBuilder() {
 return new Builder(runtimeBuilder);
 CelRuntimeBuilder builder =
 new Builder()
 .setOptions(options)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .setExtensionRegistry(extensionRegistry)
 .addFileTypes(fileDescriptors)
 .addLibraries(celRuntimeLibraries)
 .addFunctionBindings(celFunctionBindings);

 if (customTypeFactory != null) {
 builder.setTypeFactory(customTypeFactory);
 }

 if (overriddenStandardFunctions != null) {
 builder.setStandardFunctions(overriddenStandardFunctions);
 }

 if (celValueProvider != null) {
 builder.setValueProvider(celValueProvider);
 }

 return builder;
 }

 /** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
 /** Builder class for {@code CelRuntimeLegacyImpl}. */
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 // The following properties are for testing purposes only. Do not expose to public.
 @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

 @VisibleForTesting
 final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

 @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @VisibleForTesting Function<String, Message.Builder> customTypeFactory;
 @VisibleForTesting CelValueProvider celValueProvider;
 @VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

 @SuppressWarnings("unused")
 private CelOptions options;

 private boolean standardEnvironmentEnabled;
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 private boolean standardEnvironmentEnabled;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
 return this.customFunctionBindings;
 }

 @VisibleForTesting
 ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
 return this.celRuntimeLibraries;
 }

 @VisibleForTesting
 ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 return this.fileTypes;
 }

 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }

 ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
 // Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

 ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
 CelDescriptors celDescriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

 CelDescriptorPool celDescriptorPool =
 newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
 runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
 }

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options);

 return new CelRuntimeLegacyImpl(
 interpreter,
 options,
 this);
 standardEnvironmentEnabled,
 extensionRegistry,
 customTypeFactory,
 overriddenStandardFunctions,
 celValueProvider,
 fileDescriptors,
 runtimeLibraries,
 ImmutableList.copyOf(customFunctionBindings.values()));
 }

 private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.options = builder.options;
 this.extensionRegistry = builder.extensionRegistry;
 this.customTypeFactory = builder.customTypeFactory;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
 this.celValueProvider = builder.celValueProvider;
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 }
 }

 private CelRuntimeLegacyImpl(
 Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
 Interpreter interpreter,
 CelOptions options,
 boolean standardEnvironmentEnabled,
 ExtensionRegistry extensionRegistry,
 @Nullable Function<String, Message.Builder> customTypeFactory,
 @Nullable CelStandardFunctions overriddenStandardFunctions,
 @Nullable CelValueProvider celValueProvider,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
 ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
 this.interpreter = interpreter;
 this.options = options;
 this.runtimeBuilder = new Builder(runtimeBuilder);
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.extensionRegistry = extensionRegistry;
 this.customTypeFactory = customTypeFactory;
 this.overriddenStandardFunctions = overriddenStandardFunctions;
 this.celValueProvider = celValueProvider;
 this.fileDescriptors = fileDescriptors;
 this.celRuntimeLibraries = celRuntimeLibraries;
 this.celFunctionBindings = celFunctionBindings;
 }
}

1 change: 1 addition & 0 deletions
runtime/src/test/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
 "//common/types",
 "//common/types:cel_v1alpha1_types",
 "//common/types:message_type_provider",
 "//common/values:cel_value_provider",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:optional_library",
Expand Down

44 changes: 36 additions & 8 deletions
runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 }

 @Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
 int originalFileTypesSize =
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
 CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
 assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
 assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
 assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
 }

 @Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

 assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
 assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
 }

 @Test
 public void toRuntimeBuilder_optionalProperties() {
 Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
 CelStandardFunctions overriddenStandardFunctions =
 CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
 CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
 CelRuntimeBuilder celRuntimeBuilder =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .setStandardEnvironmentEnabled(false)
 .setTypeFactory(customTypeFactory)
 .setStandardFunctions(overriddenStandardFunctions)
 .setValueProvider(noOpValueProvider);
 CelRuntime celRuntime = celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
 assertThat(newRuntimeBuilder.overriddenStandardFunctions)
 .isEqualTo(overriddenStandardFunctions);
 assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
 }
}

, '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
Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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

Mar 7, 2025
 Merged


Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts
#623
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


147 changes: 90 additions & 57 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
 private final Interpreter interpreter;
 private final CelOptions options;

 // Builder is mutable by design. APIs must guarantee a new instance to be returned.
 private final boolean standardEnvironmentEnabled;

 // Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
 // CEL-Internal-4
 private final ExtensionRegistry extensionRegistry;

 // A user-provided custom type factory should presumably be thread-safe. This is documented, but
 // not enforced.
 // CEL-Internal-4
 private final Function<String, Message.Builder> customTypeFactory;

 private final CelStandardFunctions overriddenStandardFunctions;
 private final CelValueProvider celValueProvider;
 private final ImmutableSet<FileDescriptor> fileDescriptors;

 // This does not affect the evaluation behavior in any manner.
 // CEL-Internal-4
 private final Builder runtimeBuilder;
 private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

 private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

 @Override
 public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

 @Override
 public CelRuntimeBuilder toRuntimeBuilder() {
 return new Builder(runtimeBuilder);
 CelRuntimeBuilder builder =
 new Builder()
 .setOptions(options)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .setExtensionRegistry(extensionRegistry)
 .addFileTypes(fileDescriptors)
 .addLibraries(celRuntimeLibraries)
 .addFunctionBindings(celFunctionBindings);

 if (customTypeFactory != null) {
 builder.setTypeFactory(customTypeFactory);
 }

 if (overriddenStandardFunctions != null) {
 builder.setStandardFunctions(overriddenStandardFunctions);
 }

 if (celValueProvider != null) {
 builder.setValueProvider(celValueProvider);
 }

 return builder;
 }

 /** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
 /** Builder class for {@code CelRuntimeLegacyImpl}. */
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 // The following properties are for testing purposes only. Do not expose to public.
 @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

 @VisibleForTesting
 final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

 @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @VisibleForTesting Function<String, Message.Builder> customTypeFactory;
 @VisibleForTesting CelValueProvider celValueProvider;
 @VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

 @SuppressWarnings("unused")
 private CelOptions options;

 private boolean standardEnvironmentEnabled;
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 private boolean standardEnvironmentEnabled;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
 return this.customFunctionBindings;
 }

 @VisibleForTesting
 ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
 return this.celRuntimeLibraries;
 }

 @VisibleForTesting
 ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 return this.fileTypes;
 }

 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }

 ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
 // Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

 ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
 CelDescriptors celDescriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

 CelDescriptorPool celDescriptorPool =
 newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
 runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
 }

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options);

 return new CelRuntimeLegacyImpl(
 interpreter,
 options,
 this);
 standardEnvironmentEnabled,
 extensionRegistry,
 customTypeFactory,
 overriddenStandardFunctions,
 celValueProvider,
 fileDescriptors,
 runtimeLibraries,
 ImmutableList.copyOf(customFunctionBindings.values()));
 }

 private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.options = builder.options;
 this.extensionRegistry = builder.extensionRegistry;
 this.customTypeFactory = builder.customTypeFactory;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
 this.celValueProvider = builder.celValueProvider;
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 }
 }

 private CelRuntimeLegacyImpl(
 Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
 Interpreter interpreter,
 CelOptions options,
 boolean standardEnvironmentEnabled,
 ExtensionRegistry extensionRegistry,
 @Nullable Function<String, Message.Builder> customTypeFactory,
 @Nullable CelStandardFunctions overriddenStandardFunctions,
 @Nullable CelValueProvider celValueProvider,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
 ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
 this.interpreter = interpreter;
 this.options = options;
 this.runtimeBuilder = new Builder(runtimeBuilder);
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.extensionRegistry = extensionRegistry;
 this.customTypeFactory = customTypeFactory;
 this.overriddenStandardFunctions = overriddenStandardFunctions;
 this.celValueProvider = celValueProvider;
 this.fileDescriptors = fileDescriptors;
 this.celRuntimeLibraries = celRuntimeLibraries;
 this.celFunctionBindings = celFunctionBindings;
 }
}

1 change: 1 addition & 0 deletions
runtime/src/test/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
 "//common/types",
 "//common/types:cel_v1alpha1_types",
 "//common/types:message_type_provider",
 "//common/values:cel_value_provider",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:optional_library",
Expand Down

44 changes: 36 additions & 8 deletions
runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 }

 @Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
 int originalFileTypesSize =
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
 CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
 assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
 assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
 assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
 }

 @Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

 assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
 assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
 }

 @Test
 public void toRuntimeBuilder_optionalProperties() {
 Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
 CelStandardFunctions overriddenStandardFunctions =
 CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
 CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
 CelRuntimeBuilder celRuntimeBuilder =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .setStandardEnvironmentEnabled(false)
 .setTypeFactory(customTypeFactory)
 .setStandardFunctions(overriddenStandardFunctions)
 .setValueProvider(noOpValueProvider);
 CelRuntime celRuntime = celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
 assertThat(newRuntimeBuilder.overriddenStandardFunctions)
 .isEqualTo(overriddenStandardFunctions);
 assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
 }
}

, '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
Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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

Mar 7, 2025
 Merged


Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts
#623
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


147 changes: 90 additions & 57 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
 private final Interpreter interpreter;
 private final CelOptions options;

 // Builder is mutable by design. APIs must guarantee a new instance to be returned.
 private final boolean standardEnvironmentEnabled;

 // Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
 // CEL-Internal-4
 private final ExtensionRegistry extensionRegistry;

 // A user-provided custom type factory should presumably be thread-safe. This is documented, but
 // not enforced.
 // CEL-Internal-4
 private final Function<String, Message.Builder> customTypeFactory;

 private final CelStandardFunctions overriddenStandardFunctions;
 private final CelValueProvider celValueProvider;
 private final ImmutableSet<FileDescriptor> fileDescriptors;

 // This does not affect the evaluation behavior in any manner.
 // CEL-Internal-4
 private final Builder runtimeBuilder;
 private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

 private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

 @Override
 public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

 @Override
 public CelRuntimeBuilder toRuntimeBuilder() {
 return new Builder(runtimeBuilder);
 CelRuntimeBuilder builder =
 new Builder()
 .setOptions(options)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .setExtensionRegistry(extensionRegistry)
 .addFileTypes(fileDescriptors)
 .addLibraries(celRuntimeLibraries)
 .addFunctionBindings(celFunctionBindings);

 if (customTypeFactory != null) {
 builder.setTypeFactory(customTypeFactory);
 }

 if (overriddenStandardFunctions != null) {
 builder.setStandardFunctions(overriddenStandardFunctions);
 }

 if (celValueProvider != null) {
 builder.setValueProvider(celValueProvider);
 }

 return builder;
 }

 /** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
 /** Builder class for {@code CelRuntimeLegacyImpl}. */
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 // The following properties are for testing purposes only. Do not expose to public.
 @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

 @VisibleForTesting
 final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

 @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @VisibleForTesting Function<String, Message.Builder> customTypeFactory;
 @VisibleForTesting CelValueProvider celValueProvider;
 @VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

 @SuppressWarnings("unused")
 private CelOptions options;

 private boolean standardEnvironmentEnabled;
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 private boolean standardEnvironmentEnabled;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
 return this.customFunctionBindings;
 }

 @VisibleForTesting
 ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
 return this.celRuntimeLibraries;
 }

 @VisibleForTesting
 ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 return this.fileTypes;
 }

 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }

 ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
 // Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

 ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
 CelDescriptors celDescriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

 CelDescriptorPool celDescriptorPool =
 newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
 runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
 }

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options);

 return new CelRuntimeLegacyImpl(
 interpreter,
 options,
 this);
 standardEnvironmentEnabled,
 extensionRegistry,
 customTypeFactory,
 overriddenStandardFunctions,
 celValueProvider,
 fileDescriptors,
 runtimeLibraries,
 ImmutableList.copyOf(customFunctionBindings.values()));
 }

 private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.options = builder.options;
 this.extensionRegistry = builder.extensionRegistry;
 this.customTypeFactory = builder.customTypeFactory;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
 this.celValueProvider = builder.celValueProvider;
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 }
 }

 private CelRuntimeLegacyImpl(
 Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
 Interpreter interpreter,
 CelOptions options,
 boolean standardEnvironmentEnabled,
 ExtensionRegistry extensionRegistry,
 @Nullable Function<String, Message.Builder> customTypeFactory,
 @Nullable CelStandardFunctions overriddenStandardFunctions,
 @Nullable CelValueProvider celValueProvider,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
 ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
 this.interpreter = interpreter;
 this.options = options;
 this.runtimeBuilder = new Builder(runtimeBuilder);
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.extensionRegistry = extensionRegistry;
 this.customTypeFactory = customTypeFactory;
 this.overriddenStandardFunctions = overriddenStandardFunctions;
 this.celValueProvider = celValueProvider;
 this.fileDescriptors = fileDescriptors;
 this.celRuntimeLibraries = celRuntimeLibraries;
 this.celFunctionBindings = celFunctionBindings;
 }
}

1 change: 1 addition & 0 deletions
runtime/src/test/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
 "//common/types",
 "//common/types:cel_v1alpha1_types",
 "//common/types:message_type_provider",
 "//common/values:cel_value_provider",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:optional_library",
Expand Down

44 changes: 36 additions & 8 deletions
runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 }

 @Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
 int originalFileTypesSize =
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
 CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
 assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
 assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
 assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
 }

 @Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

 assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
 assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
 }

 @Test
 public void toRuntimeBuilder_optionalProperties() {
 Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
 CelStandardFunctions overriddenStandardFunctions =
 CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
 CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
 CelRuntimeBuilder celRuntimeBuilder =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .setStandardEnvironmentEnabled(false)
 .setTypeFactory(customTypeFactory)
 .setStandardFunctions(overriddenStandardFunctions)
 .setValueProvider(noOpValueProvider);
 CelRuntime celRuntime = celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
 assertThat(newRuntimeBuilder.overriddenStandardFunctions)
 .isEqualTo(overriddenStandardFunctions);
 assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
 }
}

, '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
Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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

Mar 7, 2025
 Merged


Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts
#623
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


147 changes: 90 additions & 57 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
 private final Interpreter interpreter;
 private final CelOptions options;

 // Builder is mutable by design. APIs must guarantee a new instance to be returned.
 private final boolean standardEnvironmentEnabled;

 // Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
 // CEL-Internal-4
 private final ExtensionRegistry extensionRegistry;

 // A user-provided custom type factory should presumably be thread-safe. This is documented, but
 // not enforced.
 // CEL-Internal-4
 private final Function<String, Message.Builder> customTypeFactory;

 private final CelStandardFunctions overriddenStandardFunctions;
 private final CelValueProvider celValueProvider;
 private final ImmutableSet<FileDescriptor> fileDescriptors;

 // This does not affect the evaluation behavior in any manner.
 // CEL-Internal-4
 private final Builder runtimeBuilder;
 private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

 private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

 @Override
 public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

 @Override
 public CelRuntimeBuilder toRuntimeBuilder() {
 return new Builder(runtimeBuilder);
 CelRuntimeBuilder builder =
 new Builder()
 .setOptions(options)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .setExtensionRegistry(extensionRegistry)
 .addFileTypes(fileDescriptors)
 .addLibraries(celRuntimeLibraries)
 .addFunctionBindings(celFunctionBindings);

 if (customTypeFactory != null) {
 builder.setTypeFactory(customTypeFactory);
 }

 if (overriddenStandardFunctions != null) {
 builder.setStandardFunctions(overriddenStandardFunctions);
 }

 if (celValueProvider != null) {
 builder.setValueProvider(celValueProvider);
 }

 return builder;
 }

 /** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
 /** Builder class for {@code CelRuntimeLegacyImpl}. */
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 // The following properties are for testing purposes only. Do not expose to public.
 @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

 @VisibleForTesting
 final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

 @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @VisibleForTesting Function<String, Message.Builder> customTypeFactory;
 @VisibleForTesting CelValueProvider celValueProvider;
 @VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

 @SuppressWarnings("unused")
 private CelOptions options;

 private boolean standardEnvironmentEnabled;
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 private boolean standardEnvironmentEnabled;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
 return this.customFunctionBindings;
 }

 @VisibleForTesting
 ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
 return this.celRuntimeLibraries;
 }

 @VisibleForTesting
 ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 return this.fileTypes;
 }

 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }

 ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
 // Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

 ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
 CelDescriptors celDescriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

 CelDescriptorPool celDescriptorPool =
 newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
 runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
 }

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options);

 return new CelRuntimeLegacyImpl(
 interpreter,
 options,
 this);
 standardEnvironmentEnabled,
 extensionRegistry,
 customTypeFactory,
 overriddenStandardFunctions,
 celValueProvider,
 fileDescriptors,
 runtimeLibraries,
 ImmutableList.copyOf(customFunctionBindings.values()));
 }

 private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.options = builder.options;
 this.extensionRegistry = builder.extensionRegistry;
 this.customTypeFactory = builder.customTypeFactory;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
 this.celValueProvider = builder.celValueProvider;
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 }
 }

 private CelRuntimeLegacyImpl(
 Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
 Interpreter interpreter,
 CelOptions options,
 boolean standardEnvironmentEnabled,
 ExtensionRegistry extensionRegistry,
 @Nullable Function<String, Message.Builder> customTypeFactory,
 @Nullable CelStandardFunctions overriddenStandardFunctions,
 @Nullable CelValueProvider celValueProvider,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
 ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
 this.interpreter = interpreter;
 this.options = options;
 this.runtimeBuilder = new Builder(runtimeBuilder);
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.extensionRegistry = extensionRegistry;
 this.customTypeFactory = customTypeFactory;
 this.overriddenStandardFunctions = overriddenStandardFunctions;
 this.celValueProvider = celValueProvider;
 this.fileDescriptors = fileDescriptors;
 this.celRuntimeLibraries = celRuntimeLibraries;
 this.celFunctionBindings = celFunctionBindings;
 }
}

1 change: 1 addition & 0 deletions
runtime/src/test/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
 "//common/types",
 "//common/types:cel_v1alpha1_types",
 "//common/types:message_type_provider",
 "//common/values:cel_value_provider",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:optional_library",
Expand Down

44 changes: 36 additions & 8 deletions
runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 }

 @Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
 int originalFileTypesSize =
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
 CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
 assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
 assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
 assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
 }

 @Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

 assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
 assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
 }

 @Test
 public void toRuntimeBuilder_optionalProperties() {
 Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
 CelStandardFunctions overriddenStandardFunctions =
 CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
 CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
 CelRuntimeBuilder celRuntimeBuilder =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .setStandardEnvironmentEnabled(false)
 .setTypeFactory(customTypeFactory)
 .setStandardFunctions(overriddenStandardFunctions)
 .setValueProvider(noOpValueProvider);
 CelRuntime celRuntime = celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
 assertThat(newRuntimeBuilder.overriddenStandardFunctions)
 .isEqualTo(overriddenStandardFunctions);
 assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
 }
}

, '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
Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts#623

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

Mar 7, 2025
 Merged


Augment runtime's toBuilder method to reinstantiate a builder from stored artifacts
#623
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


147 changes: 90 additions & 57 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;
Expand All@@ -66,9 +65,26 @@ public final class CelRuntimeLegacyImpl implements CelRuntime {
 private final Interpreter interpreter;
 private final CelOptions options;

 // Builder is mutable by design. APIs must guarantee a new instance to be returned.
 private final boolean standardEnvironmentEnabled;

 // Extension registry is thread-safe. Just not marked as such from Protobuf's implementation.
 // CEL-Internal-4
 private final ExtensionRegistry extensionRegistry;

 // A user-provided custom type factory should presumably be thread-safe. This is documented, but
 // not enforced.
 // CEL-Internal-4
 private final Function<String, Message.Builder> customTypeFactory;

 private final CelStandardFunctions overriddenStandardFunctions;
 private final CelValueProvider celValueProvider;
 private final ImmutableSet<FileDescriptor> fileDescriptors;

 // This does not affect the evaluation behavior in any manner.
 // CEL-Internal-4
 private final Builder runtimeBuilder;
 private final ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries;

 private final ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings;

 @Override
 public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {
Expand All@@ -78,7 +94,28 @@ public CelRuntime.Program createProgram(CelAbstractSyntaxTree ast) {

 @Override
 public CelRuntimeBuilder toRuntimeBuilder() {
 return new Builder(runtimeBuilder);
 CelRuntimeBuilder builder =
 new Builder()
 .setOptions(options)
 .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
 .setExtensionRegistry(extensionRegistry)
 .addFileTypes(fileDescriptors)
 .addLibraries(celRuntimeLibraries)
 .addFunctionBindings(celFunctionBindings);

 if (customTypeFactory != null) {
 builder.setTypeFactory(customTypeFactory);
 }

 if (overriddenStandardFunctions != null) {
 builder.setStandardFunctions(overriddenStandardFunctions);
 }

 if (celValueProvider != null) {
 builder.setValueProvider(celValueProvider);
 }

 return builder;
 }

 /** Create a new builder for constructing a {@code CelRuntime} instance. */
Expand All@@ -89,18 +126,23 @@ public static CelRuntimeBuilder newBuilder() {
 /** Builder class for {@code CelRuntimeLegacyImpl}. */
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;
 // The following properties are for testing purposes only. Do not expose to public.
 @VisibleForTesting final ImmutableSet.Builder<FileDescriptor> fileTypes;

 @VisibleForTesting
 final HashMap<String, dev.cel.runtime.CelFunctionBinding> customFunctionBindings;

 @VisibleForTesting final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @VisibleForTesting Function<String, Message.Builder> customTypeFactory;
 @VisibleForTesting CelValueProvider celValueProvider;
 @VisibleForTesting CelStandardFunctions overriddenStandardFunctions;

 @SuppressWarnings("unused")
 private CelOptions options;

 private boolean standardEnvironmentEnabled;
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 private boolean standardEnvironmentEnabled;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand DownExpand Up@@ -191,23 +233,6 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 return this;
 }

 // The following getters exist for asserting immutability for collections held by this builder,
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, dev.cel.runtime.CelFunctionBinding> getFunctionBindings() {
 return this.customFunctionBindings;
 }

 @VisibleForTesting
 ImmutableSet.Builder<CelRuntimeLibrary> getRuntimeLibraries() {
 return this.celRuntimeLibraries;
 }

 @VisibleForTesting
 ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 return this.fileTypes;
 }

 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
Expand All@@ -216,12 +241,15 @@ public CelRuntimeLegacyImpl build() {
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }

 ImmutableSet<CelRuntimeLibrary> runtimeLibraries = celRuntimeLibraries.build();
 // Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));
runtimeLibraries.forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

 ImmutableSet<FileDescriptor> fileDescriptors = fileTypes.build();
 CelDescriptors celDescriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(
fileTypes.build(), options.resolveTypeDependencies());
fileDescriptors, options.resolveTypeDependencies());

 CelDescriptorPool celDescriptorPool =
 newDescriptorPool(
Expand DownExpand Up@@ -279,14 +307,24 @@ public CelRuntimeLegacyImpl build() {
 runtimeTypeProvider = new DescriptorMessageProvider(runtimeTypeFactory, options);
 }

return new CelRuntimeLegacyImpl(
DefaultInterpreter interpreter =
 new DefaultInterpreter(
 DescriptorTypeResolver.create(),
 runtimeTypeProvider,
 dispatcher.immutableCopy(),
 options),
 options);

 return new CelRuntimeLegacyImpl(
 interpreter,
 options,
 this);
 standardEnvironmentEnabled,
 extensionRegistry,
 customTypeFactory,
 overriddenStandardFunctions,
 celValueProvider,
 fileDescriptors,
 runtimeLibraries,
 ImmutableList.copyOf(customFunctionBindings.values()));
 }

 private ImmutableSet<dev.cel.runtime.CelFunctionBinding> newStandardFunctionBindings(
Expand DownExpand Up@@ -374,33 +412,28 @@ private Builder() {
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
 }

 private Builder(Builder builder) {
 // The following properties are either immutable or simple primitives, thus can be assigned
 // directly.
 this.options = builder.options;
 this.extensionRegistry = builder.extensionRegistry;
 this.customTypeFactory = builder.customTypeFactory;
 this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
 this.overriddenStandardFunctions = builder.overriddenStandardFunctions;
 this.celValueProvider = builder.celValueProvider;
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
 ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
 newBuilder.addAll(builderToCopy.build());
 return newBuilder;
 }
 }

 private CelRuntimeLegacyImpl(
 Interpreter interpreter, CelOptions options, Builder runtimeBuilder) {
 Interpreter interpreter,
 CelOptions options,
 boolean standardEnvironmentEnabled,
 ExtensionRegistry extensionRegistry,
 @Nullable Function<String, Message.Builder> customTypeFactory,
 @Nullable CelStandardFunctions overriddenStandardFunctions,
 @Nullable CelValueProvider celValueProvider,
 ImmutableSet<FileDescriptor> fileDescriptors,
 ImmutableSet<CelRuntimeLibrary> celRuntimeLibraries,
 ImmutableList<dev.cel.runtime.CelFunctionBinding> celFunctionBindings) {
 this.interpreter = interpreter;
 this.options = options;
 this.runtimeBuilder = new Builder(runtimeBuilder);
 this.standardEnvironmentEnabled = standardEnvironmentEnabled;
 this.extensionRegistry = extensionRegistry;
 this.customTypeFactory = customTypeFactory;
 this.overriddenStandardFunctions = overriddenStandardFunctions;
 this.celValueProvider = celValueProvider;
 this.fileDescriptors = fileDescriptors;
 this.celRuntimeLibraries = celRuntimeLibraries;
 this.celFunctionBindings = celFunctionBindings;
 }
}

1 change: 1 addition & 0 deletions
runtime/src/test/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,7 @@ java_library(
 "//common/types",
 "//common/types:cel_v1alpha1_types",
 "//common/types:message_type_provider",
 "//common/values:cel_value_provider",
 "//compiler",
 "//compiler:compiler_builder",
 "//extensions:optional_library",
Expand Down

44 changes: 36 additions & 8 deletions
runtime/src/test/java/dev/cel/runtime/CelRuntimeLegacyImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,15 @@

import static com.google.common.truth.Truth.assertThat;

import com.google.protobuf.Message;
import dev.cel.common.CelException;
import dev.cel.common.values.CelValueProvider;
import dev.cel.compiler.CelCompiler;
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.runtime.CelStandardFunctions.StandardFunction;
import java.util.Optional;
import java.util.function.Function;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -57,7 +62,7 @@ public void toRuntimeBuilder_isImmutable() {
 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 }

 @Test
Expand All@@ -68,15 +73,15 @@ public void toRuntimeBuilder_collectionProperties_copied() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});
 int originalFileTypesSize =
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).getFileTypes().build().size();
 ((CelRuntimeLegacyImpl.Builder) celRuntimeBuilder).fileTypes.build().size();
 CelRuntimeLegacyImpl celRuntime = (CelRuntimeLegacyImpl) celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.getFunctionBindings()).hasSize(1);
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).hasSize(1);
 assertThat(newRuntimeBuilder.getFileTypes().build()).hasSize(originalFileTypesSize);
 assertThat(newRuntimeBuilder.customFunctionBindings).hasSize(1);
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).hasSize(1);
 assertThat(newRuntimeBuilder.fileTypes.build()).hasSize(originalFileTypesSize);
 }

 @Test
Expand All@@ -92,8 +97,31 @@ public void toRuntimeBuilder_collectionProperties_areImmutable() {
 celRuntimeBuilder.addFunctionBindings(CelFunctionBinding.from("test", Integer.class, arg -> 1));
 celRuntimeBuilder.addLibraries(runtimeBuilder -> {});

 assertThat(newRuntimeBuilder.getFunctionBindings()).isEmpty();
 assertThat(newRuntimeBuilder.getRuntimeLibraries().build()).isEmpty();
 assertThat(newRuntimeBuilder.getFileTypes().build()).isEmpty();
 assertThat(newRuntimeBuilder.customFunctionBindings).isEmpty();
 assertThat(newRuntimeBuilder.celRuntimeLibraries.build()).isEmpty();
 assertThat(newRuntimeBuilder.fileTypes.build()).isEmpty();
 }

 @Test
 public void toRuntimeBuilder_optionalProperties() {
 Function<String, Message.Builder> customTypeFactory = (typeName) -> TestAllTypes.newBuilder();
 CelStandardFunctions overriddenStandardFunctions =
 CelStandardFunctions.newBuilder().includeFunctions(StandardFunction.ADD).build();
 CelValueProvider noOpValueProvider = (structType, fields) -> Optional.empty();
 CelRuntimeBuilder celRuntimeBuilder =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .setStandardEnvironmentEnabled(false)
 .setTypeFactory(customTypeFactory)
 .setStandardFunctions(overriddenStandardFunctions)
 .setValueProvider(noOpValueProvider);
 CelRuntime celRuntime = celRuntimeBuilder.build();

 CelRuntimeLegacyImpl.Builder newRuntimeBuilder =
 (CelRuntimeLegacyImpl.Builder) celRuntime.toRuntimeBuilder();

 assertThat(newRuntimeBuilder.customTypeFactory).isEqualTo(customTypeFactory);
 assertThat(newRuntimeBuilder.overriddenStandardFunctions)
 .isEqualTo(overriddenStandardFunctions);
 assertThat(newRuntimeBuilder.celValueProvider).isEqualTo(noOpValueProvider);
 }
}