Skip to content

Change lite runtime to directly accept a list of standard function #709

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Change lite runtime to directly accept a list of standard function #709

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
4 changes: 2 additions & 2 deletions common/internal/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ java_library(
)

cel_android_library(
name = "proto_time_util_android",
exports = ["//common/src/main/java/dev/cel/common/internal:proto_time_util_android"],
name = "proto_time_utils_android",
exports = ["//common/src/main/java/dev/cel/common/internal:proto_time_utils_android"],
)
2 changes: 1 addition & 1 deletion common/src/main/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ java_library(
)

cel_android_library(
name = "proto_time_util_android",
name = "proto_time_utils_android",
srcs = ["ProtoTimeUtils.java"],
tags = [
],
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/cel/common/values/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ cel_android_library(
":cel_value_android",
":values_android",
"//common/annotations",
"//common/internal:proto_time_util_android",
"//common/internal:proto_time_utils_android",
"//common/internal:well_known_proto_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand Down
97 changes: 87 additions & 10 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,18 +592,51 @@ java_library(
deps = [
":function_binding",
":runtime_equality",
":runtime_helpers",
"//common:error_codes",
"//common:options",
"//common:runtime_exception",
"//common/annotations",
"//common/internal:comparison_functions",
"//common/internal:proto_time_utils",
"//common/internal:safe_string_formatter",
"//runtime/standard:add",
"//runtime/standard:bool",
"//runtime/standard:bytes",
"//runtime/standard:contains",
"//runtime/standard:divide",
"//runtime/standard:double",
"//runtime/standard:duration",
"//runtime/standard:dyn",
"//runtime/standard:ends_with",
"//runtime/standard:equals",
"//runtime/standard:get_date",
"//runtime/standard:get_day_of_month",
"//runtime/standard:get_day_of_week",
"//runtime/standard:get_day_of_year",
"//runtime/standard:get_full_year",
"//runtime/standard:get_hours",
"//runtime/standard:get_milliseconds",
"//runtime/standard:get_minutes",
"//runtime/standard:get_month",
"//runtime/standard:get_seconds",
"//runtime/standard:greater",
"//runtime/standard:greater_equals",
"//runtime/standard:in",
"//runtime/standard:index",
"//runtime/standard:int",
"//runtime/standard:less",
"//runtime/standard:less_equals",
"//runtime/standard:logical_not",
"//runtime/standard:matches",
"//runtime/standard:modulo",
"//runtime/standard:multiply",
"//runtime/standard:negate",
"//runtime/standard:not_equals",
"//runtime/standard:optional",
"//runtime/standard:size",
"//runtime/standard:standard_function",
"//runtime/standard:starts_with",
"//runtime/standard:string",
"//runtime/standard:subtract",
"//runtime/standard:timestamp",
"//runtime/standard:uint",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven_android//:com_google_protobuf_protobuf_javalite",
],
)

Expand All @@ -621,8 +654,49 @@ cel_android_library(
"//common:runtime_exception",
"//common/annotations",
"//common/internal:comparison_functions_android",
"//common/internal:proto_time_util_android",
"//common/internal:proto_time_utils_android",
"//common/internal:safe_string_formatter",
"//runtime/standard:add_android",
"//runtime/standard:bool_android",
"//runtime/standard:bytes_android",
"//runtime/standard:contains_android",
"//runtime/standard:divide_android",
"//runtime/standard:double_android",
"//runtime/standard:duration_android",
"//runtime/standard:dyn_android",
"//runtime/standard:ends_with_android",
"//runtime/standard:equals_android",
"//runtime/standard:get_date_android",
"//runtime/standard:get_day_of_month_android",
"//runtime/standard:get_day_of_week_android",
"//runtime/standard:get_day_of_year_android",
"//runtime/standard:get_full_year_android",
"//runtime/standard:get_hours_android",
"//runtime/standard:get_milliseconds_android",
"//runtime/standard:get_minutes_android",
"//runtime/standard:get_month_android",
"//runtime/standard:get_seconds_android",
"//runtime/standard:greater_android",
"//runtime/standard:greater_equals_android",
"//runtime/standard:in_android",
"//runtime/standard:index_android",
"//runtime/standard:int_android",
"//runtime/standard:less_android",
"//runtime/standard:less_equals_android",
"//runtime/standard:logical_not_android",
"//runtime/standard:matches_android",
"//runtime/standard:modulo_android",
"//runtime/standard:multiply_android",
"//runtime/standard:negate_android",
"//runtime/standard:not_equals_android",
"//runtime/standard:optional_android",
"//runtime/standard:size_android",
"//runtime/standard:standard_function_android",
"//runtime/standard:starts_with_android",
"//runtime/standard:string_android",
"//runtime/standard:subtract_android",
"//runtime/standard:timestamp_android",
"//runtime/standard:uint_android",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven_android//:com_google_guava_guava",
Expand Down Expand Up @@ -755,11 +829,11 @@ java_library(
":evaluation_exception",
":function_binding",
":function_resolver",
":standard_functions",
"//:auto_value",
"//common:cel_ast",
"//common:options",
"//common/values:cel_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand Down Expand Up @@ -790,6 +864,7 @@ java_library(
"//common:cel_ast",
"//common:options",
"//common/values:cel_value_provider",
"//runtime/standard:standard_function",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand Down Expand Up @@ -820,6 +895,7 @@ cel_android_library(
"//common:cel_ast_android",
"//common:options",
"//common/values:cel_value_provider_android",
"//runtime/standard:standard_function_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand Down Expand Up @@ -1015,6 +1091,7 @@ cel_android_library(
"//common:cel_ast_android",
"//common:options",
"//common/values:cel_value_provider_android",
"//runtime/standard:standard_function_android",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand Down
12 changes: 9 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/CelLiteRuntimeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.CelOptions;
import dev.cel.common.values.CelValueProvider;
import dev.cel.runtime.standard.CelStandardFunction;

/** Interface for building an instance of {@link CelLiteRuntime} */
public interface CelLiteRuntimeBuilder {
Expand All @@ -27,11 +28,16 @@ public interface CelLiteRuntimeBuilder {
CelLiteRuntimeBuilder setOptions(CelOptions options);

/**
* Override the standard functions for the runtime. This can be used to subset the standard
* environment to only expose the desired function overloads to the runtime.
* Set the standard functions to enable in the runtime. These can be found in {@code
* dev.cel.runtime.standard} package. By default, lite runtime does not include any standard
* functions on its own.
*/
@CanIgnoreReturnValue
CelLiteRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);
CelLiteRuntimeBuilder setStandardFunctions(CelStandardFunction... standardFunctions);

@CanIgnoreReturnValue
CelLiteRuntimeBuilder setStandardFunctions(
Iterable<? extends CelStandardFunction> standardFunctions);

/** Add one or more {@link CelFunctionBinding} objects to the CEL runtime. */
@CanIgnoreReturnValue
Expand Down
Loading