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.

laya-go: delta-review fixes for digests and falsy temperature maps

Adeshina Lasisie71405dcd4a7
diff --git a/laya-go/internal/decode/decode_test.go b/laya-go/internal/decode/decode_test.go
index ca701a64..bd77e4c7 100644
--- a/laya-go/internal/decode/decode_test.go
+++ b/laya-go/internal/decode/decode_test.go
@@ -710,7 +710,7 @@ func TestQuotientOverflowIsRefused(t *testing.T) {
}
func TestNewTemperaturesFalsyByOptionsIsEmpty(t *testing.T) {
- for _, v := range []any{false, 0, 0.0, "", []any{}, map[string]any{}, nil} {
+ for _, v := range []any{false, 0, 0.0, "", []any{}, map[string]any{}, nil, json.Number("0"), json.Number("0.0")} {
if _, err := NewTemperatures(nil, nil, map[string]any{"de": map[string]any{"temperature_by_options": v}}); err != nil {
t.Errorf("%#v: %v", v, err)
}
diff --git a/laya-go/internal/decode/temperature.go b/laya-go/internal/decode/temperature.go
index 09e26dc5..3ea529c7 100644
--- a/laya-go/internal/decode/temperature.go
+++ b/laya-go/internal/decode/temperature.go
@@ -248,6 +248,10 @@ func isRange(err error) bool {
// falsy is Python truthiness for the values `cfg.get(...) or {}` meets: None, False, zero, "" and
// an empty container.
func falsy(v any) bool {
+ if n, ok := v.(json.Number); ok { // a string kind: checked before the reflect switch
+ f, err := n.Float64()
+ return err == nil && f == 0
+ }
rv := reflect.ValueOf(v)
switch rv.Kind() {
case reflect.Invalid:
@@ -263,9 +267,5 @@ func falsy(v any) bool {
case reflect.String, reflect.Slice, reflect.Array, reflect.Map:
return rv.Len() == 0
}
- if n, ok := v.(json.Number); ok {
- f, err := n.Float64()
- return err == nil && f == 0
- }
return false
}
diff --git a/laya-go/internal/digest/digest.go b/laya-go/internal/digest/digest.go
index 5fecd39f..fa9865d0 100644
--- a/laya-go/internal/digest/digest.go
+++ b/laya-go/internal/digest/digest.go
@@ -64,7 +64,7 @@ func File(fsys fs.FS, rel, want string) error {
if err != nil {
return err
}
- if strings.HasSuffix(strings.ReplaceAll(rel, "\\", "/"), "/") { // "x/" names a directory, never the file x
+ if r := strings.ReplaceAll(rel, "\\", "/"); strings.HasSuffix(r, "/") || strings.HasSuffix(r, "/.") { // "x/", "x/." name a directory, never the file x
return fmt.Errorf("laya: cannot verify %q: not a file: %w", rel, fs.ErrNotExist)
}
// Stat before Open: opening a FIFO blocks, and a device never ends. Python's isfile refuses both.
@@ -78,6 +78,12 @@ func File(fsys fs.FS, rel, want string) error {
return fmt.Errorf("laya: cannot verify %q: %w", rel, err)
}
defer f.Close()
+ // Again after Open: the path can be swapped for a device between Stat and Open.
+ if st, err := f.Stat(); err != nil {
+ return fmt.Errorf("laya: cannot verify %q: %w", rel, err)
+ } else if !st.Mode().IsRegular() {
+ return fmt.Errorf("laya: cannot verify %q: not a regular file: %w", rel, fs.ErrNotExist)
+ }
got, err := Sum(f)
if err != nil {
return fmt.Errorf("laya: cannot verify %q: %w", rel, err)
diff --git a/laya-go/internal/digest/digest_r_test.go b/laya-go/internal/digest/digest_r_test.go
index eb5ca4db..7b931e46 100644
--- a/laya-go/internal/digest/digest_r_test.go
+++ b/laya-go/internal/digest/digest_r_test.go
@@ -11,8 +11,40 @@ import (
func TestFileRefusesTrailingSlash(t *testing.T) {
fsys := fstest.MapFS{"a/b.bin": {Data: []byte("graph")}}
- err := File(fsys, "a/b.bin/", hexOf("graph"))
- if !errors.Is(err, fs.ErrNotExist) {
+ for _, rel := range []string{"a/b.bin/", "a/b.bin/."} {
+ if err := File(fsys, rel, hexOf("graph")); !errors.Is(err, fs.ErrNotExist) {
+ t.Fatalf("%s: err = %v", rel, err)
+ }
+ }
+}
+
+// swapFS reports a regular file at Stat, then opens a device: the path swapped between the two.
+type swapFS struct{ fstest.MapFS }
+
+type deviceFile struct{ fs.File }
+
+func (d deviceFile) Stat() (fs.FileInfo, error) {
+ st, err := d.File.Stat()
+ return deviceInfo{st}, err
+}
+
+type deviceInfo struct{ fs.FileInfo }
+
+func (deviceInfo) Mode() fs.FileMode { return fs.ModeDevice | fs.ModeCharDevice }
+
+func (s swapFS) Open(name string) (fs.File, error) {
+ f, err := s.MapFS.Open(name)
+ if err != nil {
+ return nil, err
+ }
+ return deviceFile{f}, nil
+}
+
+func (s swapFS) Stat(name string) (fs.FileInfo, error) { return s.MapFS.Stat(name) }
+
+func TestFileRefusesADeviceSwappedInAfterStat(t *testing.T) {
+ fsys := swapFS{fstest.MapFS{"g.onnx": {Data: []byte("graph")}}}
+ if err := File(fsys, "g.onnx", hexOf("graph")); !errors.Is(err, fs.ErrNotExist) {
t.Fatalf("err = %v", err)
}
}