Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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

Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna
, '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

Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna
, '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 \u003e 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

Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna
, '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

Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna
, '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

Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna
, '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

Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna
, '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

Switch to dev.cel:cel - #303

Merged
srikrsna-buf merged 5 commits into
mainfrom
sk/cel
Jun 6, 2025
Merged

Switch to dev.cel:cel#303
srikrsna-buf merged 5 commits into
mainfrom
sk/cel

Conversation

@srikrsna-buf

@srikrsna-bufsrikrsna-buf commented Jun 6, 2025

Copy link
Copy Markdown
Contributor

Switch to Google's CEL implementation.

  • Type checking is stricter, which meant:
    • Converting to CEL types (Long, UnsignedLong, Double, etc...) before passing it to the runtime. Eg: Floats and Double are different for something as simple as - operator and using Floats doesn't work with any function.
    • Changing zero values to CEL supported ones.
    • Declaring separate function overloads based on type. Resulting in a slight increase in function definitions.
  • Functions bindings are based on java types.
  • Partial evaluation is not well documented so it is not implemented in the PR. Also unsure if it is working on main, more on this in a comment.
  • Global variables per program/runtime are not supported. All the variables need to be passed to eval.

Deliberately didn't refactor to keep relatively easier to review.

@srikrsna-buf
srikrsna-buf requested review from a user and smaye81June 6, 2025 07:03
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For google.rpc.Status

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the cel protos we generate code for

Comment on lines +1 to +9
standard_rules/bytes:
- pattern/invalid/not_utf8
# input: [ type.googleapis.com/buf.validate.conformance.cases.BytesPattern ]:{val:"\x99"}
# want: runtime error: value must be valid UTF-8 to apply regexp
# got: validation error (1 violation)
# 1. rule_id: "bytes.pattern"
# message: "value must match regex pattern `^[\\x00-\\x7F]+$`"
# field: "val" elements:{field_number:1 field_name:"val" field_type:TYPE_BYTES}
# rule: "bytes.pattern" elements:{field_number:15 field_name:"bytes" field_type:TYPE_MESSAGE} elements:{field_number:4 field_name:"pattern" field_type:TYPE_STRING} No newline at end of file

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be solved if we override the bytes_to_string: #304

Comment on lines -141 to -159
Program program = ruleEnv.program(rule.astExpression.ast, globals, PARTIAL_EVAL_OPTIONS);
Program.EvalResult evalResult = program.eval(Activation.emptyActivation());
Val value = evalResult.getVal();
if (value != null) {
Object val = value.value();
if (val instanceof Boolean && value.booleanValue()) {
continue;
}
if (val instanceof String && val.equals("")) {
continue;
}
}
Ast residual = ruleEnv.residualAst(rule.astExpression.ast, evalResult.getEvalDetails());
programs.add(
new CompiledProgram(
ruleEnv.program(residual, globals),
rule.astExpression.source,
rule.rulePath,
ruleValue));

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From an internal feature standpoint this is the only step we skipped.

I am also not sure if it ever worked. It seems we have to tell which variables/attrs are not available by passing a PartialActivation type to eval. See here.

@timostammtimostamm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great so far, but I wasn't able to review everything in this pass.

Comment on lines +26 to +31
/**
* CEL supports protobuf natively but when we pass it field values (like scalars, repeated, and
* maps) it has no way to treat them like a proto message field. This class has methods to convert
* to a cel values.
*/
final class ProtoAdapter {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

* for accessing the variable `now` that's constant within an evaluation.
*/
class NowVariable implements Activation {
class NowVariable implements CelVariableResolver {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, we had a bug early on where now was cached for a validator instance, instead of for a validation pass. The conformance tests can't catch it. Would be good to be sure we don't regress here.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know that. I checked the references for NowVariable class, it is only created here alongside this variable.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found the issue: #185

Comment threadsrc/main/java/build/buf/protovalidate/RuleCache.java Outdated
Comment threadconformance/src/test/java/build/buf/protovalidate/ValidatorTest.java Outdated
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Signed-off-by: Sri Krishna <skrishna@buf.build>
Comment threadsrc/main/java/build/buf/protovalidate/CompiledProgram.java Outdated
Comment threadbuild.gradle.kts
buf("build.buf:buf:${libs.versions.buf.get()}:${osdetector.classifier}@exe")

testImplementation(libs.assertj)
testImplementation(libs.grpc.protobuf)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is that used?

@ghostghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I think you could also roll #304 into this too, if you wanted, but fine either way.

Co-authored-by: Steve Ayers <smaye81@gmail.com>
@srikrsna-buf
srikrsna-buf merged commit 3c060a2 into mainJun 6, 2025
@srikrsna-buf
srikrsna-buf deleted the sk/cel branch June 6, 2025 19:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@srikrsna-buf@smaye81@timostamm@srikrsna