Skip to content

armgit / laya

Public Imported from GitHub
0

Non-autoregressive System 1 decision engine. Typed choice, score and yes/no decisions over any text in a single forward pass, in 100+ languages, with a router that picks the right checkpoint per request.

fix(java): what CodeQL found once it was run locally, and the three fixes it earns

Adeshina Lasisi521c55327ac4
diff --git a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Agent.java b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Agent.java
index 5424c55d..6bd3f0d8 100644
--- a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Agent.java
+++ b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Agent.java
@@ -112,6 +112,7 @@ public final class Agent implements AutoCloseable, Predictor {
}
/** Asks every question about one state, with no language override. */
+ @Override
public Prediction predict(Object state, Map<String, Question> questions) {
return predict(state, questions, null);
}
diff --git a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Router.java b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Router.java
index fcc10755..a155e8ba 100644
--- a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Router.java
+++ b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Router.java
@@ -1298,6 +1298,7 @@ public final class Router implements AutoCloseable, Predictor {
}
/** Route this state and answer its questions on whichever checkpoint wins. */
+ @Override
public Prediction predict(Object state, Map<String, Question> questions) {
return predict(state, questions, RouteOptions.none());
}
diff --git a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/sequence/SequenceBuilder.java b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/sequence/SequenceBuilder.java
index 811859b1..1b259b28 100644
--- a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/sequence/SequenceBuilder.java
+++ b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/sequence/SequenceBuilder.java
@@ -89,7 +89,7 @@ public final class SequenceBuilder {
boolean truncateLeft, int[] stateIds) {
Head head = buildHead(tok, question, headMaxLen, optionOrder);
List<Integer> ids = new ArrayList<>(head.ids());
- int sep = required(tok.sepId(), "sep_token", tok);
+ int sep = required(tok.sepId(), "sep_token");
// `room` already reserves the closing [SEP], so every state token it admits survives the
// final clamp to `maxLen`.
@@ -130,9 +130,9 @@ public final class SequenceBuilder {
*/
public static Head buildHead(Tokenizer tok, Question question, int headMaxLen,
int[] optionOrder) {
- int cls = required(tok.clsId(), "cls_token", tok);
- int sep = required(tok.sepId(), "sep_token", tok);
- int mask = required(tok.maskId(), "mask_token", tok);
+ int cls = required(tok.clsId(), "cls_token");
+ int sep = required(tok.sepId(), "sep_token");
+ int mask = required(tok.maskId(), "mask_token");
List<String> options = question.renderOptions();
int[] order = optionOrder != null ? optionOrder : naturalOrder(options.size());
@@ -237,7 +237,7 @@ public final class SequenceBuilder {
return text.replace(mask, " ");
}
- private static int required(java.util.OptionalInt id, String role, Tokenizer tok) {
+ private static int required(java.util.OptionalInt id, String role) {
if (id.isEmpty()) {
throw new IllegalStateException(
"this checkpoint's tokenizer_config.json names no " + role
diff --git a/laya-java/scripts/check_java_dependencies.py b/laya-java/scripts/check_java_dependencies.py
index fe665ae1..67c15550 100755
--- a/laya-java/scripts/check_java_dependencies.py
+++ b/laya-java/scripts/check_java_dependencies.py
@@ -21,6 +21,8 @@ dependencies are clean".
import io
import json
import re
+import shutil
+import subprocess
import sys
import urllib.error
import urllib.request
@@ -54,15 +56,37 @@ def coordinates(text):
def query(pairs):
- """OSV's batch endpoint, one query per coordinate, in the same order."""
- payload = {"queries": [
+ """OSV's batch endpoint, one query per coordinate, in the same order.
+
+ Tries `urllib` first and falls back to `curl`. Not belt-and-braces: a sandboxed developer
+ environment can permit `curl` while Python's own socket layer cannot reach anything --
+ measured here, where `urllib` failed against both api.osv.dev and api.github.com while curl
+ returned 200 for the same request in under a second. A gate that depends on one HTTP client
+ stops running for reasons that have nothing to do with the dependencies it audits, and a gate
+ that stops running is the thing this file exists to prevent.
+ """
+ payload = json.dumps({"queries": [
{"version": version, "package": {"name": name, "ecosystem": "Maven"}}
- for name, version in pairs]}
- request = urllib.request.Request(
- OSV, data=json.dumps(payload).encode("utf-8"),
- headers={"Content-Type": "application/json"})
- with urllib.request.urlopen(request, timeout=60) as response:
- return json.loads(response.read().decode("utf-8"))
+ for name, version in pairs]}).encode("utf-8")
+
+ try:
+ request = urllib.request.Request(
+ OSV, data=payload, headers={"Content-Type": "application/json"})
+ with urllib.request.urlopen(request, timeout=60) as response:
+ return json.loads(response.read().decode("utf-8"))
+ except (urllib.error.URLError, OSError, ValueError) as urllib_problem:
+ curl = shutil.which("curl")
+ if curl is None:
+ raise
+ done = subprocess.run(
+ [curl, "-sS", "--max-time", "60", "-X", "POST", OSV,
+ "-H", "Content-Type: application/json", "--data-binary", "@-"],
+ input=payload, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False)
+ if done.returncode != 0:
+ raise OSError("urllib failed (%s) and curl failed (%s)"
+ % (urllib_problem, done.stderr.decode("utf-8", "replace").strip()))
+ print(" (urllib could not reach OSV here, so this used curl: %s)" % urllib_problem)
+ return json.loads(done.stdout.decode("utf-8"))
def main(argv):