Allow google.protobuf.Timestamp and google.protobuf.Duration to be created for planner

PiperOrigin-RevId: 872117591

Author: l46kok

common/src/main/java/dev/cel/common/values/ProtoCelValueConverter.java

@@ -151,9 +151,15 @@ public Object fromProtoMessageFieldToCelValue(Message message, FieldDescriptor f
 
         return toRuntimeValue(result);
       case UINT32:
-        return UnsignedLong.valueOf((int) result);
+        if (!fieldDescriptor.isRepeated()) {
+          return UnsignedLong.valueOf((int) result);
+        }
+        break;
       case UINT64:
-        return UnsignedLong.fromLongBits((long) result);
+        if (!fieldDescriptor.isRepeated()) {
+          return UnsignedLong.fromLongBits((long) result);
+        }
+        break;
       default:
         break;
     }

runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel

@@ -297,7 +297,7 @@ java_library(
     deps = [
         ":execution_frame",
         ":planned_interpretable",
-        "//common/types",
+        "//common/types:type_providers",
         "//common/values",
         "//common/values:cel_value_provider",
         "//runtime:evaluation_exception",

runtime/src/main/java/dev/cel/runtime/planner/EvalCreateStruct.java

@@ -15,7 +15,7 @@
 package dev.cel.runtime.planner;
 
 import com.google.errorprone.annotations.Immutable;
-import dev.cel.common.types.StructType;
+import dev.cel.common.types.CelType;
 import dev.cel.common.values.CelValueProvider;
 import dev.cel.common.values.StructValue;
 import dev.cel.runtime.CelEvaluationException;
@@ -28,7 +28,7 @@
 final class EvalCreateStruct extends PlannedInterpretable {
 
   private final CelValueProvider valueProvider;
-  private final StructType structType;
+  private final CelType structType;
 
   // Array contents are not mutated
   @SuppressWarnings("Immutable")
@@ -50,7 +50,8 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) throws CelEval
     Object value =
         valueProvider
             .newValue(structType.name(), Collections.unmodifiableMap(fieldValues))
-            .orElseThrow(() -> new IllegalArgumentException("Type name not found: " + structType));
+            .orElseThrow(
+                () -> new IllegalArgumentException("Type name not found: " + structType.name()));
 
     if (value instanceof StructValue) {
       return ((StructValue) value).value();
@@ -62,7 +63,7 @@ public Object eval(GlobalResolver resolver, ExecutionFrame frame) throws CelEval
   static EvalCreateStruct create(
       long exprId,
       CelValueProvider valueProvider,
-      StructType structType,
+      CelType structType,
       String[] keys,
       PlannedInterpretable[] values) {
     return new EvalCreateStruct(exprId, valueProvider, structType, keys, values);
@@ -71,7 +72,7 @@ static EvalCreateStruct create(
   private EvalCreateStruct(
       long exprId,
       CelValueProvider valueProvider,
-      StructType structType,
+      CelType structType,
       String[] keys,
       PlannedInterpretable[] values) {
     super(exprId);

runtime/src/main/java/dev/cel/runtime/planner/ProgramPlanner.java

@@ -41,7 +41,6 @@
 import dev.cel.common.types.CelType;
 import dev.cel.common.types.CelTypeProvider;
 import dev.cel.common.types.SimpleType;
-import dev.cel.common.types.StructType;
 import dev.cel.common.types.TypeType;
 import dev.cel.common.values.CelValueConverter;
 import dev.cel.common.values.CelValueProvider;
@@ -277,7 +276,7 @@ private PlannedInterpretable planCall(CelExpr expr, PlannerContext ctx) {
 
   private PlannedInterpretable planCreateStruct(CelExpr celExpr, PlannerContext ctx) {
     CelStruct struct = celExpr.struct();
-    StructType structType = resolveStructType(struct);
+    CelType structType = resolveStructType(struct);
 
     ImmutableList<Entry> entries = struct.entries();
     String[] keys = new String[entries.size()];
@@ -414,21 +413,25 @@ private ResolvedFunction resolveFunction(
     return ResolvedFunction.newBuilder().setFunctionName(functionName).setTarget(target).build();
   }
 
-  private StructType resolveStructType(CelStruct struct) {
+  private CelType resolveStructType(CelStruct struct) {
     String messageName = struct.messageName();
     for (String typeName : container.resolveCandidateNames(messageName)) {
       CelType structType = typeProvider.findType(typeName).orElse(null);
       if (structType == null) {
         continue;
       }
 
-      if (!structType.kind().equals(CelKind.STRUCT)) {
+      CelKind kind = structType.kind();
+
+      if (!kind.equals(CelKind.STRUCT)
+          && !kind.equals(CelKind.TIMESTAMP)
+          && !kind.equals(CelKind.DURATION)) {
         throw new IllegalArgumentException(
             String.format(
                 "Expected struct type for %s, got %s", structType.name(), structType.kind()));
       }
 
-      return (StructType) structType;
+      return structType;
     }
 
     throw new IllegalArgumentException("Undefined type name: " + messageName);

runtime/src/test/java/dev/cel/runtime/PlannerInterpreterTest.java

@@ -51,10 +51,4 @@ public void jsonFieldNames() throws Exception {
     // TODO: Support JSON field names for planner
     skipBaselineVerification();
   }
-
-  @Override
-  public void wrappers() throws Exception {
-    // TODO: Fix for planner
-    skipBaselineVerification();
-  }
 }