Move SSD event JSON to typed Kotlin
ober
6fda69f0efb773b6f7a3ee0080d4e97fcb9b106e
--- a/.build.yml +++ b/.build.yml @@ -5,7 +5,7 @@ packages: - make=4.4.1-r4 sources: # Build dependency: full immutable commit, mirrored in dependencies.lock.json. - - "https://git.sr.ht/~lisp/jerboa#1668be75bfbde97ecbf729e038c656cba6d3ffab" + - "https://git.sr.ht/~lisp/jerboa#4e842a4908d69ef7b0e797548bcb6d2600c3962c" # The second source is the build subject selected by the SourceHut submitter. - https://git.sr.ht/~lisp/jerboa-android tasks: @@ -14,6 +14,6 @@ tasks: test "$(apk info -v chez-scheme)" = chez-scheme-10.3.0-r2 test "$(apk info -v git)" = git-2.54.0-r0 test "$(apk info -v make)" = make-4.4.1-r4 - test "$(git -C ../jerboa rev-parse HEAD)" = 1668be75bfbde97ecbf729e038c656cba6d3ffab - test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 75d8ab23e37c03002c2ca593ef3920f8857a9ca8 + test "$(git -C ../jerboa rev-parse HEAD)" = 4e842a4908d69ef7b0e797548bcb6d2600c3962c + test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = ba29fe6f6815eb1ebddb124d1f3b1b8101aa6769 JERBOA="chez --libdirs .:../jerboa/lib --script" make test --- a/dependencies.lock.json +++ b/dependencies.lock.json @@ -11,8 +11,8 @@ "generator_runtime": { "name": "jerboa", "repository": "https://git.sr.ht/~lisp/jerboa", - "commit": "1668be75bfbde97ecbf729e038c656cba6d3ffab", - "tree": "75d8ab23e37c03002c2ca593ef3920f8857a9ca8" + "commit": "4e842a4908d69ef7b0e797548bcb6d2600c3962c", + "tree": "ba29fe6f6815eb1ebddb124d1f3b1b8101aa6769" }, "assurance_tools": { "osv_scanner": { --- a/scripts/verify-supply-chain.sh +++ b/scripts/verify-supply-chain.sh @@ -3,8 +3,8 @@ set -eu repo=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd -P) lock="$repo/dependencies.lock.json" -jerboa_commit=1668be75bfbde97ecbf729e038c656cba6d3ffab # gitsafe:ignore -jerboa_tree=75d8ab23e37c03002c2ca593ef3920f8857a9ca8 # gitsafe:ignore +jerboa_commit=4e842a4908d69ef7b0e797548bcb6d2600c3962c # gitsafe:ignore +jerboa_tree=ba29fe6f6815eb1ebddb124d1f3b1b8101aa6769 # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -3444,6 +3444,48 @@ (json-object-put-string! out "native_error" nativeError) out))))) + (typed-kotlin-file "com/sfb/ssdreview/EventJson.kt" + (kotlin-imports (org json JSONObject)) + (typed-library (com sfb ssdreview) + (export groundTruthPathDetails snapshotEventJson sessionEventJson) + (type JSONObject) + (type Int32) + (type String) + (def (groundTruthPathDetails (path : String)) : JSONObject + (let ((out (json-object-empty))) + (begin + (json-object-put-string! out "ground_truth_path" path) + out))) + (def (baseEventJson (eventType : String) + (sessionId : String) + (sourceKey : String) + (details : JSONObject)) : JSONObject + (let ((out (json-object-empty))) + (begin + (json-object-put-int32! out "schema_version" (int32 1)) + (json-object-put-int! out "created_at" (system-current-time-millis)) + (json-object-put-string! out "type" eventType) + (json-object-put-string! out "session_id" sessionId) + (json-object-put-string! out "source_key" sourceKey) + (json-object-put-json-object! out "details" details) + out))) + (def (snapshotEventJson (sessionId : String) + (sourceKey : String) + (truthFileName : String)) : JSONObject + (baseEventJson + "save_snapshot" + sessionId + sourceKey + (groundTruthPathDetails truthFileName))) + (def (sessionEventJson (eventType : String) + (session : SsdSession) + (details : JSONObject)) : JSONObject + (baseEventJson + eventType + (SsdSession-sessionId session) + (SsdSession-sourceKey session) + details)))) + (typed-kotlin-file "com/sfb/ssdreview/TruthIndexSelect.kt" (typed-library (com sfb ssdreview) (export bestTruthIndexForSession) @@ -6372,13 +6414,7 @@ " val sessionId = truth.optString(\"session_id\", sourceKey.ifBlank { \"unknown\" })" " val reviewFile = containedLeaf(reviewsDir, \"review-${sha256Hex(sessionId.toByteArray())}.review.json\")" " atomicWriteText(reviewFile, truth.toString(2))" - " val event = JSONObject()" - " .put(\"schema_version\", 1)" - " .put(\"created_at\", System.currentTimeMillis())" - " .put(\"type\", \"save_snapshot\")" - " .put(\"session_id\", sessionId)" - " .put(\"source_key\", sourceKey)" - " .put(\"details\", JSONObject().put(\"ground_truth_path\", truthFile.name))" + " val event = snapshotEventJson(sessionId, sourceKey, truthFile.name)" " appendJsonLine(containedLeaf(eventsDir, \"events-${sha256Hex(sessionId.toByteArray())}.events.jsonl\"), event)" " appendJsonLine(containedLeaf(eventsDir, \"all-events.jsonl\"), event)" " rebuildLearnedExamples()" @@ -6387,13 +6423,7 @@ " }" "" " fun appendEvent(type: String, session: SsdSession, details: JSONObject = JSONObject()) {" - " val event = JSONObject()" - " .put(\"schema_version\", 1)" - " .put(\"created_at\", System.currentTimeMillis())" - " .put(\"type\", type)" - " .put(\"session_id\", session.sessionId)" - " .put(\"source_key\", session.sourceKey)" - " .put(\"details\", details)" + " val event = sessionEventJson(type, session, details)" " appendJsonLine(containedLeaf(eventsDir, \"events-${sha256Hex(session.sessionId.toByteArray())}.events.jsonl\"), event)" " appendJsonLine(containedLeaf(eventsDir, \"all-events.jsonl\"), event)" " }"