diff --git a/go.mod b/go.mod index 1d73035b..e453a164 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,10 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/hexops/autogold/v2 v2.1.0 github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 + github.com/mholt/archiver/v4 v4.0.0-alpha.8 github.com/olahol/melody v1.1.4 github.com/rs/cors v1.10.1 + github.com/samber/lo v1.38.1 github.com/sashabaranov/go-openai v1.20.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 @@ -22,33 +24,49 @@ require ( require ( github.com/acorn-io/baaah v0.0.0-20240119160309-2a58ee757bbd // indirect + github.com/andybalholm/brotli v1.0.4 // indirect + github.com/bodgit/plumbing v1.2.0 // indirect + github.com/bodgit/sevenzip v1.3.0 // indirect + github.com/bodgit/windows v1.0.0 // indirect github.com/bombsimon/logrusr/v4 v4.0.0 // indirect + github.com/connesc/cipherio v0.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dsnet/compress v0.0.1 // indirect github.com/fatih/color v1.16.0 // indirect github.com/go-logr/logr v1.4.1 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-containerregistry v0.16.1 // indirect github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect github.com/gorilla/websocket v1.5.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect github.com/hexops/valast v1.4.3 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/klauspost/compress v1.16.5 // indirect + github.com/klauspost/pgzip v1.2.5 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/nightlyone/lockfile v1.0.0 // indirect + github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/onsi/ginkgo/v2 v2.13.0 // indirect github.com/onsi/gomega v1.29.0 // indirect + github.com/pierrec/lz4/v4 v4.1.15 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/samber/lo v1.38.1 // indirect github.com/samber/slog-logrus v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect + github.com/therootcompany/xz v1.0.1 // indirect + github.com/ulikunitz/xz v0.5.10 // indirect + go4.org v0.0.0-20200411211856-f5505b9728dd // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/mod v0.15.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.110.1 // indirect diff --git a/go.sum b/go.sum index 4ad85942..0baa25d7 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,24 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU= github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/acorn-io/baaah v0.0.0-20240119160309-2a58ee757bbd h1:Zbau2J6sEPl1H4gqnEx4/TI55eZncQR5cjfPOcG2lxE= github.com/acorn-io/baaah v0.0.0-20240119160309-2a58ee757bbd/go.mod h1:13nTO3svO8zTD3j9E5c86tCtK5YrKsK5sxca4Lwkbc0= github.com/acorn-io/broadcaster v0.0.0-20240105011354-bfadd4a7b45d h1:hfpNQkJ4I2b8+DbMr8m97gG67ku0uPsMzUfskVu3cHU= @@ -8,24 +27,68 @@ github.com/acorn-io/cmd v0.0.0-20240203032901-e9e631185ddb h1:UVs3i5r0bOh3KEZV5d github.com/acorn-io/cmd v0.0.0-20240203032901-e9e631185ddb/go.mod h1:J0xhtXVfrJk3Fz1HYz3AoJ/ON9gaHu/baTkqOvywcfo= github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= +github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/bodgit/plumbing v1.2.0 h1:gg4haxoKphLjml+tgnecR4yLBV5zo4HAZGCtAh3xCzM= +github.com/bodgit/plumbing v1.2.0/go.mod h1:b9TeRi7Hvc6Y05rjm8VML3+47n4XTZPtQ/5ghqic2n8= +github.com/bodgit/sevenzip v1.3.0 h1:1ljgELgtHqvgIp8W8kgeEGHIWP4ch3xGI8uOBZgLVKY= +github.com/bodgit/sevenzip v1.3.0/go.mod h1:omwNcgZTEooWM8gA/IJ2Nk/+ZQ94+GsytRzOJJ8FBlM= +github.com/bodgit/windows v1.0.0 h1:rLQ/XjsleZvx4fR1tB/UxQrK+SJ2OFHzfPjLWWOhDIA= +github.com/bodgit/windows v1.0.0/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM= github.com/bombsimon/logrusr/v4 v4.0.0 h1:Pm0InGphX0wMhPqC02t31onlq9OVyJ98eP/Vh63t1Oo= github.com/bombsimon/logrusr/v4 v4.0.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/connesc/cipherio v0.2.1 h1:FGtpTPMbKNNWByNrr9aEBtaJtXjqOzkIXNYJp6OEycw= +github.com/connesc/cipherio v0.2.1/go.mod h1:ukY0MWJDFnJEbXMQtOcn2VmTpRfzcTz4OoVrWGGJZcA= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q= +github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= +github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -34,12 +97,25 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.16.1 h1:rUEt426sR6nyrL3gt+18ibRcvYpKYdpsa5ZW7MA08dQ= github.com/google/go-containerregistry v0.16.1/go.mod h1:u0qB2l7mvtWVR5kNcbFIhFY1hLbf8eeGapA+vbFDCtQ= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hexops/autogold v0.8.1/go.mod h1:97HLDXyG23akzAoRYJh/2OBs3kd80eHyKPvZw0S5ZBY= github.com/hexops/autogold v1.3.1 h1:YgxF9OHWbEIUjhDbpnLhgVsjUDsiHDTyDfy2lrfdlzo= github.com/hexops/autogold v1.3.1/go.mod h1:sQO+mQUCVfxOKPht+ipDSkJ2SCJ7BNJVHZexsXqWMx4= @@ -49,10 +125,20 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hexops/valast v1.4.3 h1:oBoGERMJh6UZdRc6cduE1CTPK+VAdXA59Y1HFgu3sm0= github.com/hexops/valast v1.4.3/go.mod h1:Iqx2kLj3Jn47wuXpj3wX40xn6F93QNFBHuiKBerkTGA= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA= github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= +github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -71,8 +157,12 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mholt/archiver/v4 v4.0.0-alpha.8 h1:tRGQuDVPh66WCOelqe6LIGh0gwmfwxUrSSDunscGsRM= +github.com/mholt/archiver/v4 v4.0.0-alpha.8/go.mod h1:5f7FUYGXdJWUjESffJaYR4R60VhnHxb2X3T1teMyv5A= github.com/nightlyone/lockfile v1.0.0 h1:RHep2cFKK4PonZJDdEl4GmkabuhbsRMgk/k3uAmxBiA= github.com/nightlyone/lockfile v1.0.0/go.mod h1:rywoIealpdNse2r832aiD9jRk8ErCatROs6LzC841CI= +github.com/nwaples/rardecode/v2 v2.0.0-beta.2 h1:e3mzJFJs4k83GXBEiTaQ5HgSc/kOK8q0rDaRO0MPaOk= +github.com/nwaples/rardecode/v2 v2.0.0-beta.2/go.mod h1:yntwv/HfMc/Hbvtq9I19D1n58te3h6KsqCf3GxyfBGY= github.com/olahol/melody v1.1.4 h1:RQHfKZkQmDxI0+SLZRNBCn4LiXdqxLKRGSkT8Dyoe/E= github.com/olahol/melody v1.1.4/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -81,9 +171,13 @@ github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4 github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= +github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= @@ -91,6 +185,7 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/samber/slog-logrus v1.0.0 h1:SsrN0p9akjCEaYd42Q5GtisMdHm0q11UD4fp4XCZi04= @@ -106,32 +201,107 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw= +github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY= +github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= +github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go4.org v0.0.0-20200411211856-f5505b9728dd h1:BNJlw5kRTzdmyfh5U8F93HA2OwkP7ZGwA51eJ/0wKOU= +go4.org v0.0.0-20200411211856-f5505b9728dd/go.mod h1:CIiUVy99QCPfoE13bO4EZaz5GZMZXMSBGhxRdsvzbkg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -151,32 +321,102 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo= mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index ab44fedf..af006060 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -22,7 +22,7 @@ type Options struct { CacheDir string `usage:"Directory to store cache (default: $XDG_CACHE_HOME/gptscript)"` } -func complete(opts ...Options) (result Options) { +func Complete(opts ...Options) (result Options) { for _, opt := range opts { result.CacheDir = types.FirstSet(opt.CacheDir, result.CacheDir) result.Cache = types.FirstSet(opt.Cache, result.Cache) @@ -48,7 +48,7 @@ func WithNoCache(ctx context.Context) context.Context { } func New(opts ...Options) (*Client, error) { - opt := complete(opts...) + opt := Complete(opts...) if err := os.MkdirAll(opt.CacheDir, 0755); err != nil { return nil, err } diff --git a/pkg/cli/gptscript.go b/pkg/cli/gptscript.go index f2833256..ddffe9cc 100644 --- a/pkg/cli/gptscript.go +++ b/pkg/cli/gptscript.go @@ -18,6 +18,7 @@ import ( "github.com/gptscript-ai/gptscript/pkg/monitor" "github.com/gptscript-ai/gptscript/pkg/mvl" "github.com/gptscript-ai/gptscript/pkg/openai" + "github.com/gptscript-ai/gptscript/pkg/repos/runtimes" "github.com/gptscript-ai/gptscript/pkg/runner" "github.com/gptscript-ai/gptscript/pkg/server" "github.com/gptscript-ai/gptscript/pkg/types" @@ -225,6 +226,7 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) error { MonitorFactory: monitor.NewConsole(monitor.Options(r.DisplayOptions), monitor.Options{ DisplayProgress: !*r.Quiet, }), + RuntimeManager: runtimes.Default(cache.Complete(cache.Options(r.CacheOptions)).CacheDir), }) if err != nil { return err diff --git a/pkg/debugcmd/debug.go b/pkg/debugcmd/debug.go new file mode 100644 index 00000000..ed43f853 --- /dev/null +++ b/pkg/debugcmd/debug.go @@ -0,0 +1,20 @@ +package debugcmd + +import ( + "context" + "os" + "os/exec" +) + +func New(ctx context.Context, arg string, args ...string) *exec.Cmd { + cmd := exec.CommandContext(ctx, arg, args...) + SetupDebug(cmd) + return cmd +} + +func SetupDebug(cmd *exec.Cmd) { + if log.IsDebug() { + cmd.Stdout = os.Stdout + } + cmd.Stderr = os.Stderr +} diff --git a/pkg/debugcmd/log.go b/pkg/debugcmd/log.go new file mode 100644 index 00000000..b5d00c2d --- /dev/null +++ b/pkg/debugcmd/log.go @@ -0,0 +1,5 @@ +package debugcmd + +import "github.com/gptscript-ai/gptscript/pkg/mvl" + +var log = mvl.Package() diff --git a/pkg/engine/cmd.go b/pkg/engine/cmd.go index a00d8856..0159811a 100644 --- a/pkg/engine/cmd.go +++ b/pkg/engine/cmd.go @@ -8,6 +8,8 @@ import ( "io" "os" "os/exec" + "path/filepath" + "sort" "strings" "sync/atomic" @@ -40,12 +42,7 @@ func (e *Engine) runCommand(ctx context.Context, tool types.Tool, input string) return tool.BuiltinFunc(ctx, e.Env, input) } - var extraEnv []string - if tool.WorkingDir != "" { - extraEnv = append(extraEnv, "GPTSCRIPT_TOOL_DIR="+tool.WorkingDir) - } - - cmd, stop, err := e.newCommand(ctx, extraEnv, tool.Instructions, input) + cmd, stop, err := e.newCommand(ctx, nil, tool, input) if err != nil { return "", err } @@ -74,62 +71,106 @@ func (e *Engine) runCommand(ctx context.Context, tool types.Tool, input string) return output.String(), nil } -func (e *Engine) newCommand(ctx context.Context, extraEnv []string, instructions, input string) (*exec.Cmd, func(), error) { - env := append(e.Env[:], extraEnv...) - data := map[string]any{} - - dec := json.NewDecoder(bytes.NewReader([]byte(input))) - dec.UseNumber() +func (e *Engine) getRuntimeEnv(ctx context.Context, tool types.Tool, cmd, env []string) ([]string, error) { + var ( + workdir = tool.WorkingDir + err error + ) + if e.RuntimeManager != nil { + workdir, env, err = e.RuntimeManager.GetContext(ctx, tool, cmd, env) + if err != nil { + return nil, err + } + workdir = filepath.Join(workdir, tool.Source.Repo.Path) + } + return append(env, "GPTSCRIPT_TOOL_DIR="+workdir), nil +} +func envAsMapAndDeDup(env []string) (sortedEnv []string, _ map[string]string) { envMap := map[string]string{} + var keys []string for _, env := range env { key, value, _ := strings.Cut(env, "=") + if _, existing := envMap[key]; !existing { + keys = append(keys, key) + } envMap[key] = value } + sort.Strings(keys) + for _, key := range keys { + sortedEnv = append(sortedEnv, key+"="+envMap[key]) + } + + return sortedEnv, envMap +} + +var ignoreENV = map[string]struct{}{ + "PATH": {}, + "GPTSCRIPT_TOOL_DIR": {}, +} + +func appendEnv(env []string, k, v string) []string { + for _, k := range []string{k, strings.ToUpper(strings.ReplaceAll(k, "-", "_"))} { + if _, ignore := ignoreENV[k]; !ignore { + env = append(env, k+"="+v) + } + } + return env +} + +func appendInputAsEnv(env []string, input string) []string { + data := map[string]any{} + dec := json.NewDecoder(bytes.NewReader([]byte(input))) + dec.UseNumber() + + if err := json.Unmarshal([]byte(input), &data); err != nil { + // ignore invalid JSON + return env + } - if err := json.Unmarshal([]byte(input), &data); err == nil { - for k, v := range data { - envName := strings.ToUpper(strings.ReplaceAll(k, "-", "_")) - switch val := v.(type) { - case string: - envMap[envName] = val - env = append(env, envName+"="+val) - envMap[k] = val - env = append(env, k+"="+val) - case json.Number: - envMap[envName] = string(val) - env = append(env, envName+"="+string(val)) - envMap[k] = string(val) - env = append(env, k+"="+string(val)) - case bool: - envMap[envName] = fmt.Sprint(val) - env = append(env, envName+"="+fmt.Sprint(val)) - envMap[k] = fmt.Sprint(val) - env = append(env, k+"="+fmt.Sprint(val)) - default: - data, err := json.Marshal(val) - if err == nil { - envMap[envName] = string(data) - env = append(env, envName+"="+string(data)) - envMap[k] = string(data) - env = append(env, k+"="+string(data)) - } + for k, v := range data { + switch val := v.(type) { + case string: + env = appendEnv(env, k, val) + case json.Number: + env = appendEnv(env, k, string(val)) + case bool: + env = appendEnv(env, k, fmt.Sprint(val)) + default: + data, err := json.Marshal(val) + if err == nil { + env = appendEnv(env, k, string(data)) } } } - interpreter, rest, _ := strings.Cut(instructions, "\n") - interpreter = strings.TrimSpace(interpreter)[2:] + return env +} - interpreter = os.Expand(interpreter, func(s string) string { - return envMap[s] - }) +func (e *Engine) newCommand(ctx context.Context, extraEnv []string, tool types.Tool, input string) (*exec.Cmd, func(), error) { + env := append(e.Env[:], extraEnv...) + env = appendInputAsEnv(env, input) + + interpreter, rest, _ := strings.Cut(tool.Instructions, "\n") + interpreter = strings.TrimSpace(interpreter)[2:] args, err := shlex.Split(interpreter) if err != nil { return nil, nil, err } + env, err = e.getRuntimeEnv(ctx, tool, args, env) + if err != nil { + return nil, nil, err + } + + env, envMap := envAsMapAndDeDup(env) + for i, arg := range args { + args[i] = os.Expand(arg, func(s string) string { + return envMap[s] + }) + } + var ( cmdArgs = args[1:] stop = func() {} diff --git a/pkg/engine/daemon.go b/pkg/engine/daemon.go index 63c7d718..fe884c52 100644 --- a/pkg/engine/daemon.go +++ b/pkg/engine/daemon.go @@ -74,6 +74,7 @@ func (e *Engine) startDaemon(_ context.Context, tool types.Tool) (string, error) instructions := strings.TrimPrefix(tool.Instructions, types.DaemonPrefix) instructions, path := getPath(instructions) + tool.Instructions = types.CommandPrefix + instructions port, ok := daemonPorts[tool.ID] url := fmt.Sprintf("http://127.0.0.1:%d%s", port, path) @@ -92,7 +93,7 @@ func (e *Engine) startDaemon(_ context.Context, tool types.Tool) (string, error) cmd, stop, err := e.newCommand(ctx, []string{ fmt.Sprintf("PORT=%d", port), }, - types.CommandPrefix+instructions, + tool, "{}", ) if err != nil { diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index c8fc0e2c..588ee3ef 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -26,10 +26,15 @@ type Model interface { Call(ctx context.Context, messageRequest types.CompletionRequest, status chan<- types.CompletionStatus) (*types.CompletionMessage, error) } +type RuntimeManager interface { + GetContext(ctx context.Context, tool types.Tool, cmd, env []string) (string, []string, error) +} + type Engine struct { - Model Model - Env []string - Progress chan<- types.CompletionStatus + Model Model + RuntimeManager RuntimeManager + Env []string + Progress chan<- types.CompletionStatus } type State struct { diff --git a/pkg/hash/sha256.go b/pkg/hash/sha256.go index be171281..fc7aa3f4 100644 --- a/pkg/hash/sha256.go +++ b/pkg/hash/sha256.go @@ -6,13 +6,25 @@ import ( "encoding/json" ) +func ID(parts ...string) string { + d := sha256.New() + for i, part := range parts { + if i > 0 { + d.Write([]byte{0x00}) + } + d.Write([]byte(part)) + } + hash := d.Sum(nil) + return hex.EncodeToString(hash[:]) +} + func Digest(obj any) string { data, err := json.Marshal(obj) if err != nil { panic(err) } - hash := sha256.Sum224(data) + hash := sha256.Sum256(data) return hex.EncodeToString(hash[:]) } @@ -32,6 +44,6 @@ func Encode(obj any) string { panic(err) } - hash := sha256.Sum224(data) + hash := sha256.Sum256(data) return hex.EncodeToString(hash[:]) } diff --git a/pkg/loader/github/github.go b/pkg/loader/github/github.go index 9c52f819..d36050ac 100644 --- a/pkg/loader/github/github.go +++ b/pkg/loader/github/github.go @@ -10,6 +10,7 @@ import ( "github.com/gptscript-ai/gptscript/pkg/loader" "github.com/gptscript-ai/gptscript/pkg/system" + "github.com/gptscript-ai/gptscript/pkg/types" ) const ( @@ -50,7 +51,7 @@ func getCommit(account, repo, ref string) (string, error) { return commit.SHA, nil } -func Load(urlName string) (string, *loader.Repo, bool, error) { +func Load(urlName string) (string, *types.Repo, bool, error) { if !strings.HasPrefix(urlName, GithubPrefix) { return "", nil, false, nil } @@ -61,8 +62,8 @@ func Load(urlName string) (string, *loader.Repo, bool, error) { } parts := strings.Split(url, "/") - // Must be at least 4 parts github.com/ACCOUNT/REPO/FILE - if len(parts) < 4 { + // Must be at least 3 parts github.com/ACCOUNT/REPO[/FILE] + if len(parts) < 3 { return "", nil, false, nil } @@ -81,8 +82,8 @@ func Load(urlName string) (string, *loader.Repo, bool, error) { } downloadURL := fmt.Sprintf(githubDownloadURL, account, repo, ref, path) - return downloadURL, &loader.Repo{ - VCS: "github", + return downloadURL, &types.Repo{ + VCS: "git", Root: fmt.Sprintf(githubRepoURL, account, repo), Path: filepath.Dir(path), Name: filepath.Base(path), diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go index 20edaca3..cfd45ef3 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -34,20 +34,7 @@ type source struct { // be a valid URI or URL, used primarily for display. Location string // Repo The VCS repo where this tool was found, used to clone and provide the local tool code content - Repo *Repo -} - -type Repo struct { - // VCS The VCS type, such as "github" - VCS string - // The URL where the VCS repo can be found - Root string - // The path in the repo of this source. This should refer to a directory and not the actual file - Path string - // The filename of the source in the repo, relative to Path - Name string - // The revision of this source - Revision string + Repo *types.Repo } func (s *source) String() string { @@ -151,6 +138,7 @@ func readTool(ctx context.Context, prg *types.Program, base *source, targetToolN for i, tool := range tools { tool.WorkingDir = base.Path tool.Source.Location = base.Location + tool.Source.Repo = base.Repo // Probably a better way to come up with an ID tool.ID = tool.Source.String() diff --git a/pkg/loader/url.go b/pkg/loader/url.go index 896d30ff..ce5e50ff 100644 --- a/pkg/loader/url.go +++ b/pkg/loader/url.go @@ -7,9 +7,11 @@ import ( url2 "net/url" "path/filepath" "strings" + + "github.com/gptscript-ai/gptscript/pkg/types" ) -type VCSLookup func(string) (string, *Repo, bool, error) +type VCSLookup func(string) (string, *types.Repo, bool, error) var vcsLookups []VCSLookup @@ -19,7 +21,7 @@ func AddVSC(lookup VCSLookup) { func loadURL(ctx context.Context, base *source, name string) (*source, bool, error) { var ( - repo *Repo + repo *types.Repo url = name ) @@ -37,7 +39,7 @@ func loadURL(ctx context.Context, base *source, name string) (*source, bool, err if repo == nil { for _, vcs := range vcsLookups { - newURL, newRepo, ok, err := vcs(url) + newURL, newRepo, ok, err := vcs(name) if err != nil { return nil, false, err } else if ok { diff --git a/pkg/mvl/log.go b/pkg/mvl/log.go index 72f155cf..7bee5a93 100644 --- a/pkg/mvl/log.go +++ b/pkg/mvl/log.go @@ -114,6 +114,10 @@ func (l *Logger) Tracef(msg string, args ...any) { l.log.WithFields(l.fields).Tracef(msg, args...) } +func (l *Logger) IsDebug() bool { + return l.log.IsLevelEnabled(logrus.DebugLevel) +} + func (l *Logger) Debugf(msg string, args ...any) { l.log.WithFields(l.fields).Debugf(msg, args...) } diff --git a/pkg/repos/download/extract.go b/pkg/repos/download/extract.go new file mode 100644 index 00000000..3ad6b053 --- /dev/null +++ b/pkg/repos/download/extract.go @@ -0,0 +1,99 @@ +package download + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "fmt" + "io" + "net/http" + "net/url" + "os" + "path/filepath" + "time" + + "github.com/mholt/archiver/v4" +) + +func Extract(ctx context.Context, downloadURL, digest, targetDir string) error { + if err := os.RemoveAll(targetDir); err != nil { + return nil + } + + if err := os.MkdirAll(targetDir, 0755); err != nil { + return fmt.Errorf("mkdir %s: %w", targetDir, err) + } + + resp, err := http.Get(downloadURL) + if err != nil { + return err + } + defer resp.Body.Close() + + digester := sha256.New() + input := io.TeeReader(resp.Body, digester) + + parsedURL, err := url.Parse(downloadURL) + if err != nil { + return err + } + + format, input, err := archiver.Identify(filepath.Base(parsedURL.Path), input) + if err != nil { + return err + } + + ex, ok := format.(archiver.Extractor) + if !ok { + return fmt.Errorf("failed to detect proper archive for extraction from %s got: %v", downloadURL, ex) + } + + err = ex.Extract(ctx, input, nil, func(_ context.Context, f archiver.File) error { + target := filepath.Join(targetDir, f.NameInArchive) + if err := os.MkdirAll(filepath.Dir(target), 0755); err != nil { + return err + } + if f.IsDir() { + return os.MkdirAll(target, f.Mode()) + } else if f.LinkTarget != "" { + return os.Symlink(f.LinkTarget, target) + } + targetFile, err := os.Create(target) + if err != nil { + return fmt.Errorf("create %s: %w", target, err) + } + arc, err := f.Open() + if err != nil { + return err + } + if _, err := io.Copy(targetFile, arc); err != nil { + return err + } + if err := arc.Close(); err != nil { + return err + } + if err := targetFile.Close(); err != nil { + return err + } + if err := os.Chmod(target, f.Mode()); err != nil { + return err + } + if err := os.Chtimes(target, time.Time{}, f.ModTime()); err != nil { + return err + } + + return nil + }) + if err != nil { + return err + } + + resultDigest := digester.Sum(nil) + resultDigestString := hex.EncodeToString(resultDigest[:]) + + if resultDigestString != digest { + return fmt.Errorf("downloaded %s and expected digest %s but got %s", downloadURL, digest, resultDigestString) + } + + return nil +} diff --git a/pkg/repos/get.go b/pkg/repos/get.go new file mode 100644 index 00000000..8de6ca1d --- /dev/null +++ b/pkg/repos/get.go @@ -0,0 +1,110 @@ +package repos + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "io/fs" + "os" + "path/filepath" + + "github.com/gptscript-ai/gptscript/pkg/repos/git" + "github.com/gptscript-ai/gptscript/pkg/types" +) + +type Runtime interface { + ID() string + Supports(cmd []string) bool + Setup(ctx context.Context, dataRoot, toolSource string, env []string) ([]string, error) +} + +type noopRuntime struct { +} + +func (n noopRuntime) ID() string { + return "none" +} + +func (n noopRuntime) Supports(_ []string) bool { + return false +} + +func (n noopRuntime) Setup(_ context.Context, _, _ string, _ []string) ([]string, error) { + return nil, nil +} + +type Manager struct { + storageDir string + gitDir string + runtimeDir string + runtimes []Runtime +} + +func New(cacheDir string, runtimes ...Runtime) *Manager { + root := filepath.Join(cacheDir, "repos") + return &Manager{ + storageDir: root, + gitDir: filepath.Join(root, "git"), + runtimeDir: filepath.Join(root, "runtimes"), + runtimes: runtimes, + } +} + +func (m *Manager) setup(ctx context.Context, runtime Runtime, tool types.Tool, env []string) (string, []string, error) { + target := filepath.Join(m.storageDir, tool.Source.Repo.Revision, runtime.ID()) + doneFile := target + ".done" + envData, err := os.ReadFile(doneFile) + if err == nil { + var savedEnv []string + if err := json.Unmarshal(envData, &savedEnv); err == nil { + return target, append(env, savedEnv...), nil + } + } else if !errors.Is(err, fs.ErrNotExist) { + return "", nil, err + } + + // Cleanup previous failed runs + _ = os.RemoveAll(doneFile + ".tmp") + _ = os.RemoveAll(doneFile) + _ = os.RemoveAll(target) + + if err := git.Checkout(ctx, m.gitDir, tool.Source.Repo.Root, tool.Source.Repo.Revision, target); err != nil { + return "", nil, err + } + + newEnv, err := runtime.Setup(ctx, m.runtimeDir, target, env) + if err != nil { + return "", nil, err + } + + out, err := os.Create(doneFile + ".tmp") + if err != nil { + return "", nil, err + } + defer out.Close() + + if err := json.NewEncoder(out).Encode(newEnv); err != nil { + return "", nil, err + } + + return target, append(env, newEnv...), os.Rename(doneFile+".tmp", doneFile) +} + +func (m *Manager) GetContext(ctx context.Context, tool types.Tool, cmd, env []string) (string, []string, error) { + if tool.Source.Repo == nil { + return tool.WorkingDir, env, nil + } + + if tool.Source.Repo.VCS != "git" { + return "", nil, fmt.Errorf("only git is supported, found VCS %s for %s", tool.Source.Repo.VCS, tool.ID) + } + + for _, runtime := range m.runtimes { + if runtime.Supports(cmd) { + return m.setup(ctx, runtime, tool, env) + } + } + + return m.setup(ctx, &noopRuntime{}, tool, env) +} diff --git a/pkg/repos/get_test.go b/pkg/repos/get_test.go new file mode 100644 index 00000000..4feab1a6 --- /dev/null +++ b/pkg/repos/get_test.go @@ -0,0 +1,39 @@ +package repos + +import ( + "context" + "fmt" + "os" + "testing" + + "github.com/adrg/xdg" + "github.com/gptscript-ai/gptscript/pkg/repos/runtimes/python" + "github.com/gptscript-ai/gptscript/pkg/types" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +var ( + testCacheHome = lo.Must(xdg.CacheFile("gptscript-test-cache/runtime")) +) + +func TestManager_GetContext(t *testing.T) { + m := New(testCacheHome, &python.Runtime{ + Version: "3.11", + }) + cwd, env, err := m.GetContext(context.Background(), types.Tool{ + Source: types.ToolSource{ + Repo: &types.Repo{ + VCS: "git", + Root: "https://github.com/gptscript-ai/image-generation.git", + Revision: "b9d9ed60c25da7c0e01d504a7219d1c6e460fe80", + }, + }, + }, []string{"/usr/bin/env", "python3.11"}, os.Environ()) + require.NoError(t, err) + assert.NotEqual(t, "", cwd) + assert.True(t, len(env) > 0) + fmt.Print(cwd) + fmt.Print(env) +} diff --git a/pkg/repos/git/cmd.go b/pkg/repos/git/cmd.go new file mode 100644 index 00000000..2f724a55 --- /dev/null +++ b/pkg/repos/git/cmd.go @@ -0,0 +1,29 @@ +package git + +import ( + "context" + "os/exec" + + "github.com/gptscript-ai/gptscript/pkg/debugcmd" +) + +func newGitCommand(ctx context.Context, args ...string) *exec.Cmd { + cmd := exec.CommandContext(ctx, "git", args...) + debugcmd.SetupDebug(cmd) + return cmd +} + +func cloneBare(ctx context.Context, repo, toDir string) error { + cmd := newGitCommand(ctx, "clone", "--bare", "--depth", "1", repo, toDir) + return cmd.Run() +} + +func gitWorktreeAdd(ctx context.Context, gitDir, commitDir, commit string) error { + cmd := newGitCommand(ctx, "--git-dir", gitDir, "worktree", "add", "-f", commitDir, commit) + return cmd.Run() +} + +func fetchCommit(ctx context.Context, gitDir, commit string) error { + cmd := newGitCommand(ctx, "--git-dir", gitDir, "fetch", "origin", commit) + return cmd.Run() +} diff --git a/pkg/repos/git/git.go b/pkg/repos/git/git.go new file mode 100644 index 00000000..bf0f1341 --- /dev/null +++ b/pkg/repos/git/git.go @@ -0,0 +1,56 @@ +package git + +import ( + "context" + "fmt" + "os" + "path/filepath" + + "github.com/gptscript-ai/gptscript/pkg/hash" +) + +func exists(dir string) (bool, error) { + if _, err := os.Stat(dir); os.IsNotExist(err) { + return false, nil + } else if err != nil { + return false, err + } + return true, nil +} + +func Checkout(ctx context.Context, base, repo, commit, toDir string) error { + if found, err := exists(toDir); err != nil { + return err + } else if found { + return fmt.Errorf("%s already exists, can not create repo", toDir) + } + + if err := os.MkdirAll(filepath.Dir(toDir), 0755); err != nil { + return err + } + + if err := Fetch(ctx, base, repo, commit); err != nil { + return err + } + + log.Infof("Checking out %s to %s", commit, toDir) + return gitWorktreeAdd(ctx, gitDir(base, repo), toDir, commit) +} + +func gitDir(base, repo string) string { + return filepath.Join(base, "repos", hash.Digest(repo)) +} + +func Fetch(ctx context.Context, base, repo, commit string) error { + gitDir := gitDir(base, repo) + if found, err := exists(gitDir); err != nil { + return err + } else if !found { + log.Infof("Cloning %s", repo) + if err := cloneBare(ctx, repo, gitDir); err != nil { + return err + } + } + log.Infof("Fetching %s at %s", commit, repo) + return fetchCommit(ctx, gitDir, commit) +} diff --git a/pkg/repos/git/git_test.go b/pkg/repos/git/git_test.go new file mode 100644 index 00000000..7fa03df5 --- /dev/null +++ b/pkg/repos/git/git_test.go @@ -0,0 +1,34 @@ +package git + +import ( + "context" + "os" + "path/filepath" + "testing" + + "github.com/adrg/xdg" + "github.com/samber/lo" + "github.com/stretchr/testify/require" +) + +var ( + testCacheHome = lo.Must(xdg.CacheFile("gptscript-test-cache/repo")) + testCommit = "f9d0ca6559d0b7c78da7f413fc4faf87ae9b8919" +) + +func TestFetch(t *testing.T) { + err := Fetch(context.Background(), testCacheHome, + "https://github.com/gptscript-ai/image-generation.git", + testCommit) + require.NoError(t, err) +} + +func TestCheckout(t *testing.T) { + commitDir := filepath.Join(testCacheHome, "commits", testCommit) + err := os.RemoveAll(commitDir) + require.NoError(t, err) + err = Checkout(context.Background(), testCacheHome, + "https://github.com/gptscript-ai/image-generation.git", + testCommit, commitDir) + require.NoError(t, err) +} diff --git a/pkg/repos/git/log.go b/pkg/repos/git/log.go new file mode 100644 index 00000000..37eefe04 --- /dev/null +++ b/pkg/repos/git/log.go @@ -0,0 +1,5 @@ +package git + +import "github.com/gptscript-ai/gptscript/pkg/mvl" + +var log = mvl.Package() diff --git a/pkg/repos/runtimes/default.go b/pkg/repos/runtimes/default.go new file mode 100644 index 00000000..da445bd2 --- /dev/null +++ b/pkg/repos/runtimes/default.go @@ -0,0 +1,24 @@ +package runtimes + +import ( + "github.com/gptscript-ai/gptscript/pkg/engine" + "github.com/gptscript-ai/gptscript/pkg/repos" + "github.com/gptscript-ai/gptscript/pkg/repos/runtimes/python" +) + +var Runtimes = []repos.Runtime{ + &python.Runtime{ + Version: "3.12", + Default: true, + }, + &python.Runtime{ + Version: "3.11", + }, + &python.Runtime{ + Version: "3.10", + }, +} + +func Default(cacheDir string) engine.RuntimeManager { + return repos.New(cacheDir, Runtimes...) +} diff --git a/pkg/repos/runtimes/env/env.go b/pkg/repos/runtimes/env/env.go new file mode 100644 index 00000000..339d2178 --- /dev/null +++ b/pkg/repos/runtimes/env/env.go @@ -0,0 +1,22 @@ +package env + +func execEquals(bin, check string) bool { + return bin == check || + bin == check+".exe" +} + +func Matches(cmd []string, bin string) bool { + switch len(cmd) { + case 0: + return false + case 1: + return execEquals(cmd[0], bin) + } + if cmd[0] == bin { + return true + } + if cmd[0] == "/usr/bin/env" || cmd[0] == "/bin/env" { + return execEquals(cmd[1], bin) + } + return false +} diff --git a/pkg/repos/runtimes/python/generate/generate.go b/pkg/repos/runtimes/python/generate/generate.go new file mode 100644 index 00000000..cc773daf --- /dev/null +++ b/pkg/repos/runtimes/python/generate/generate.go @@ -0,0 +1,200 @@ +package main + +import ( + "encoding/json" + "flag" + "fmt" + "io" + "log" + "net/http" + "os" + "strings" +) + +const ( + assetsURL = "https://api.github.com/repos/indygreg/python-build-standalone/releases/%d/assets?per_page=1000" + latestReleaseURL = "https://raw.githubusercontent.com/indygreg/python-build-standalone/latest-release/latest-release.json" +) + +var ( + versions = []string{ + "3.10", + "3.11", + "3.12", + } + osKeyMap = map[osKey]string{ + { + OS: "linux", + Arch: "amd64", + }: "x86_64_v2-unknown-linux-gnu", + { + OS: "linux", + Arch: "arm64", + }: "aarch64-unknown-linux-gnu", + { + OS: "windows", + Arch: "amd64", + }: "x86_64-pc-windows-msvc-static", + { + OS: "windows", + Arch: "arm64", + }: "aarch64-pc-windows-msvc-static", + { + OS: "darwin", + Arch: "amd64", + }: "x86_64-apple-darwin", + { + OS: "darwin", + Arch: "arm64", + }: "aarch64-apple-darwin", + } +) + +type osKey struct { + OS string + Arch string +} + +type Release struct { + OS string `json:"os,omitempty"` + Arch string `json:"arch,omitempty"` + Version string `json:"version,omitempty"` + URL string `json:"url,omitempty"` + Digest string `json:"digest,omitempty"` +} + +type latestRelease struct { + Version int `json:"version"` + Tag string `json:"tag"` + ReleaseURL string `json:"release_url"` + AssetURLPrefix string `json:"asset_url_prefix"` +} + +type release struct { + ID int `json:"id"` +} + +type asset struct { + URL string `json:"url"` + Name string `json:"name"` + BrowserDownloadURL string `json:"browser_download_url"` +} + +func main() { + var output string + flag.StringVar(&output, "output", "", "File to write to") + flag.Parse() + + if err := mainErr(output); err != nil { + log.Fatal(err) + } +} + +func toJSON(obj any, url string) error { + url = strings.TrimPrefix(url, "<") + + req, err := http.NewRequest(http.MethodGet, url, nil) + if err != nil { + return err + } + req.Header.Set("Accept", "application/json") + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + data, err := io.ReadAll(resp.Body) + if err != nil { + return err + } + + for _, link := range strings.Split(resp.Header.Get("link"), ", <") { + nextURL, rel, _ := strings.Cut(link, ">; ") + if rel == `rel="next"` { + var more json.RawMessage + if err := toJSON(&more, nextURL); err != nil { + return err + } + // concatenate two json arrays in a fabulously hacky but totally valid approach + data = append(data[:len(data)-1], []byte(",")...) + data = append(data, more[1:]...) + } + } + + return json.Unmarshal(data, obj) +} + +func getData(url string) (string, error) { + resp, err := http.Get(url) + if err != nil { + return "", err + } + defer resp.Body.Close() + + shaData, err := io.ReadAll(resp.Body) + if err != nil { + return "", err + } + return strings.TrimSpace(string(shaData)), nil +} + +func mainErr(output string) error { + var ( + current latestRelease + release release + assets []asset + releases []Release + ) + + if err := toJSON(¤t, latestReleaseURL); err != nil { + return err + } + + if err := toJSON(&release, current.ReleaseURL); err != nil { + return err + } + + if err := toJSON(&assets, fmt.Sprintf(assetsURL, release.ID)); err != nil { + return err + } + + for _, asset := range assets { + if !strings.HasSuffix(asset.Name, "tar.gz") { + continue + } + for _, version := range versions { + ver, suffix, _ := strings.Cut(asset.Name, "+"+current.Tag+"-") + prefix := fmt.Sprintf("cpython-%s.", version) + if !strings.HasPrefix(ver, prefix) { + continue + } + + for osKey, spec := range osKeyMap { + if suffix == spec+"-install_only.tar.gz" { + digest, err := getData(asset.BrowserDownloadURL + ".sha256") + if err != nil { + return err + } + releases = append(releases, Release{ + OS: osKey.OS, + Arch: osKey.Arch, + Version: version, + URL: asset.BrowserDownloadURL, + Digest: digest, + }) + } + } + } + } + + f, err := os.Create(output) + if err != nil { + return err + } + + enc := json.NewEncoder(f) + enc.SetIndent("", " ") + return enc.Encode(releases) +} diff --git a/pkg/repos/runtimes/python/log.go b/pkg/repos/runtimes/python/log.go new file mode 100644 index 00000000..9a006a72 --- /dev/null +++ b/pkg/repos/runtimes/python/log.go @@ -0,0 +1,5 @@ +package python + +import "github.com/gptscript-ai/gptscript/pkg/mvl" + +var log = mvl.Package() diff --git a/pkg/repos/runtimes/python/python.go b/pkg/repos/runtimes/python/python.go new file mode 100644 index 00000000..0e743830 --- /dev/null +++ b/pkg/repos/runtimes/python/python.go @@ -0,0 +1,166 @@ +package python + +import ( + "context" + // For embedded python.json + _ "embed" + "encoding/json" + "errors" + "fmt" + "io/fs" + "os" + "path/filepath" + "runtime" + "strings" + + "github.com/gptscript-ai/gptscript/pkg/debugcmd" + "github.com/gptscript-ai/gptscript/pkg/hash" + "github.com/gptscript-ai/gptscript/pkg/repos/download" + "github.com/gptscript-ai/gptscript/pkg/repos/runtimes/env" +) + +//go:embed python.json +var releasesData []byte + +const uvVersion = "uv==0.1.15" + +type Release struct { + OS string `json:"os,omitempty"` + Arch string `json:"arch,omitempty"` + Version string `json:"version,omitempty"` + URL string `json:"url,omitempty"` + Digest string `json:"digest,omitempty"` +} + +type Runtime struct { + // version something like "3.12" + Version string + // If true this is the version that will be used for python or python3 + Default bool +} + +func (r *Runtime) ID() string { + return "python" + r.Version +} + +func (r *Runtime) Supports(cmd []string) bool { + if env.Matches(cmd, r.ID()) { + return true + } + if !r.Default { + return false + } + return env.Matches(cmd, "python") || env.Matches(cmd, "python3") +} + +func (r *Runtime) installVenv(ctx context.Context, binDir, venvPath string) error { + cmd := debugcmd.New(ctx, filepath.Join(binDir, "uv"), "venv", "-p", + filepath.Join(binDir, "python3"), venvPath) + return cmd.Run() +} + +func (r *Runtime) Setup(ctx context.Context, dataRoot, toolSource string, env []string) ([]string, error) { + binPath, err := r.getRuntime(ctx, dataRoot) + if err != nil { + return nil, err + } + + venvPath := filepath.Join(dataRoot, "venv", hash.ID(binPath, toolSource)) + venvBinPath := filepath.Join(venvPath, "bin") + + // Cleanup failed runs + if err := os.RemoveAll(venvPath); err != nil { + return nil, err + } + + if err := r.installVenv(ctx, binPath, venvPath); err != nil { + return nil, err + } + + var newEnv []string + for _, path := range env { + v, ok := strings.CutPrefix(path, "PATH=") + if ok { + newEnv = append(newEnv, fmt.Sprintf("PATH=%s%s%s", + venvBinPath, string(os.PathListSeparator), v)) + } + } + newEnv = append(newEnv, "VIRTUAL_ENV="+venvPath) + + if err := r.runPip(ctx, toolSource, binPath, append(env, newEnv...)); err != nil { + return nil, err + } + + return newEnv, nil +} + +func readRelease() (result []Release) { + if err := json.Unmarshal(releasesData, &result); err != nil { + panic(err) + } + return +} + +func (r *Runtime) getReleaseAndDigest() (string, string, error) { + for _, release := range readRelease() { + if release.OS == runtime.GOOS && + release.Arch == runtime.GOARCH && + release.Version == r.Version { + return release.URL, release.Digest, nil + } + } + return "", "", fmt.Errorf("failed to find an python runtime for %s", r.Version) +} + +func (r *Runtime) runPip(ctx context.Context, toolSource, binDir string, env []string) error { + for _, req := range []string{"requirements-gptscript.txt", "requirements.txt"} { + reqFile := filepath.Join(toolSource, req) + if s, err := os.Stat(reqFile); err == nil && !s.IsDir() { + cmd := debugcmd.New(ctx, filepath.Join(binDir, "uv"), "pip", "install", "-r", reqFile) + cmd.Env = env + return cmd.Run() + } + } + + return nil +} + +func (r *Runtime) setupUV(ctx context.Context, tmp string) error { + cmd := debugcmd.New(ctx, filepath.Join(tmp, "python", "bin", "python3"), + filepath.Join(tmp, "python", "bin", "pip"), + "install", uvVersion) + return cmd.Run() +} + +func (r *Runtime) getRuntime(ctx context.Context, cwd string) (string, error) { + url, sha, err := r.getReleaseAndDigest() + if err != nil { + return "", err + } + + target := filepath.Join(cwd, "python", hash.ID(url, sha, uvVersion)) + binDir := filepath.Join(target, "python", "bin") + if _, err := os.Stat(target); err == nil { + return binDir, nil + } else if !errors.Is(err, fs.ErrNotExist) { + return "", err + } + + log.Infof("Downloading Python %s.x", r.Version) + tmp := target + ".download" + defer os.RemoveAll(tmp) + + if err := os.MkdirAll(tmp, 0755); err != nil { + return "", err + } + + if err := download.Extract(ctx, url, sha, tmp); err != nil { + return "", err + } + + if err := r.setupUV(ctx, tmp); err != nil { + return "", err + } + + return binDir, os.Rename(tmp, target) +} diff --git a/pkg/repos/runtimes/python/python.json b/pkg/repos/runtimes/python/python.json new file mode 100644 index 00000000..8d8d1ced --- /dev/null +++ b/pkg/repos/runtimes/python/python.json @@ -0,0 +1,107 @@ +[ + { + "os": "darwin", + "arch": "arm64", + "version": "3.10", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.10.13%2B20240107-aarch64-apple-darwin-install_only.tar.gz", + "digest": "4d19a0509c274f360a5c250d71a2af7263ebaf898ecdb71427f3532cbc6b2cf7" + }, + { + "os": "linux", + "arch": "arm64", + "version": "3.10", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.10.13%2B20240107-aarch64-unknown-linux-gnu-install_only.tar.gz", + "digest": "4793cab2b657d8656463ca423aae7cf9cdacf49059d9e4c01888f5650883e85e" + }, + { + "os": "darwin", + "arch": "amd64", + "version": "3.10", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.10.13%2B20240107-x86_64-apple-darwin-install_only.tar.gz", + "digest": "47da6831e269ad6af603f59bbd4767636c5749bd70a24363c9cf003c32c8ecfc" + }, + { + "os": "windows", + "arch": "amd64", + "version": "3.10", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.10.13%2B20240107-x86_64-pc-windows-msvc-static-install_only.tar.gz", + "digest": "8176713d446ff0a0b4b2bbf8f562398879cd1acbf493bbd6a381e2f5aa96070e" + }, + { + "os": "linux", + "arch": "amd64", + "version": "3.10", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.10.13%2B20240107-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "digest": "6f30beb2b610ef11a87ede7c33d319f87a7d3a5b4c0d81435a6cce825e5818ed" + }, + { + "os": "darwin", + "arch": "arm64", + "version": "3.11", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7%2B20240107-aarch64-apple-darwin-install_only.tar.gz", + "digest": "b042c966920cf8465385ca3522986b12d745151a72c060991088977ca36d3883" + }, + { + "os": "linux", + "arch": "arm64", + "version": "3.11", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7%2B20240107-aarch64-unknown-linux-gnu-install_only.tar.gz", + "digest": "b102eaf865eb715aa98a8a2ef19037b6cc3ae7dfd4a632802650f29de635aa13" + }, + { + "os": "darwin", + "arch": "amd64", + "version": "3.11", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7%2B20240107-x86_64-apple-darwin-install_only.tar.gz", + "digest": "a0e615eef1fafdc742da0008425a9030b7ea68a4ae4e73ac557ef27b112836d4" + }, + { + "os": "windows", + "arch": "amd64", + "version": "3.11", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7%2B20240107-x86_64-pc-windows-msvc-static-install_only.tar.gz", + "digest": "36a8584ef16277f84a7fea81fca7fb941a8b8fa1defee28100afb39e90385926" + }, + { + "os": "linux", + "arch": "amd64", + "version": "3.11", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.11.7%2B20240107-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "digest": "2cdd399100e647aa9d381e197e6a8c98e822ecb8fc1b6bda4b1eb554dbfb8177" + }, + { + "os": "darwin", + "arch": "arm64", + "version": "3.12", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.12.1%2B20240107-aarch64-apple-darwin-install_only.tar.gz", + "digest": "f93f8375ca6ac0a35d58ff007043cbd3a88d9609113f1cb59cf7c8d215f064af" + }, + { + "os": "linux", + "arch": "arm64", + "version": "3.12", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.12.1%2B20240107-aarch64-unknown-linux-gnu-install_only.tar.gz", + "digest": "236533ef20e665007a111c2f36efb59c87ae195ad7dca223b6dc03fb07064f0b" + }, + { + "os": "darwin", + "arch": "amd64", + "version": "3.12", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.12.1%2B20240107-x86_64-apple-darwin-install_only.tar.gz", + "digest": "eca96158c1568dedd9a0b3425375637a83764d1fa74446438293089a8bfac1f8" + }, + { + "os": "windows", + "arch": "amd64", + "version": "3.12", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.12.1%2B20240107-x86_64-pc-windows-msvc-static-install_only.tar.gz", + "digest": "7dde51352511697579d86c968881f431acff9e8b1eb3f42c54de27341fa5b7b2" + }, + { + "os": "linux", + "arch": "amd64", + "version": "3.12", + "url": "https://github.com/indygreg/python-build-standalone/releases/download/20240107/cpython-3.12.1%2B20240107-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "digest": "9dd6fc5a1326985896493d475e7eae0d07f6de0d932faef3c4b04bdd81b88c0c" + } +] diff --git a/pkg/repos/runtimes/python/python_test.go b/pkg/repos/runtimes/python/python_test.go new file mode 100644 index 00000000..ecfd4fdd --- /dev/null +++ b/pkg/repos/runtimes/python/python_test.go @@ -0,0 +1,27 @@ +package python + +import ( + "context" + "os" + "strings" + "testing" + + "github.com/adrg/xdg" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +var ( + testCacheHome = lo.Must(xdg.CacheFile("gptscript-test-cache/runtime")) +) + +func TestRuntime(t *testing.T) { + r := Runtime{ + Version: "3.12", + } + + s, err := r.Setup(context.Background(), testCacheHome, "testdata", os.Environ()) + require.NoError(t, err) + assert.True(t, strings.HasSuffix(s[0], "/bin"), "missing /bin: %s", s) +} diff --git a/pkg/repos/runtimes/python/testdata/requirements.txt b/pkg/repos/runtimes/python/testdata/requirements.txt new file mode 100644 index 00000000..f0dd0aec --- /dev/null +++ b/pkg/repos/runtimes/python/testdata/requirements.txt @@ -0,0 +1 @@ +openai \ No newline at end of file diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go index 6e637146..292b2903 100644 --- a/pkg/runner/runner.go +++ b/pkg/runner/runner.go @@ -24,12 +24,14 @@ type Monitor interface { } type Options struct { - MonitorFactory MonitorFactory `usage:"-"` + MonitorFactory MonitorFactory `usage:"-"` + RuntimeManager engine.RuntimeManager `usage:"-"` } func complete(opts ...Options) (result Options) { for _, opt := range opts { result.MonitorFactory = types.FirstSet(opt.MonitorFactory, result.MonitorFactory) + result.RuntimeManager = types.FirstSet(opt.RuntimeManager, result.RuntimeManager) } if result.MonitorFactory == nil { result.MonitorFactory = noopFactory{} @@ -38,16 +40,18 @@ func complete(opts ...Options) (result Options) { } type Runner struct { - c engine.Model - factory MonitorFactory + c engine.Model + factory MonitorFactory + runtimeManager engine.RuntimeManager } func New(client engine.Model, opts ...Options) (*Runner, error) { opt := complete(opts...) return &Runner{ - c: client, - factory: opt.MonitorFactory, + c: client, + factory: opt.MonitorFactory, + runtimeManager: opt.RuntimeManager, }, nil } @@ -93,9 +97,10 @@ func (r *Runner) call(callCtx engine.Context, monitor Monitor, env []string, inp defer progressClose() e := engine.Engine{ - Model: r.c, - Progress: progress, - Env: env, + Model: r.c, + RuntimeManager: r.runtimeManager, + Progress: progress, + Env: env, } monitor.Event(Event{ diff --git a/pkg/types/tool.go b/pkg/types/tool.go index a0f1143a..00d1ec2f 100644 --- a/pkg/types/tool.go +++ b/pkg/types/tool.go @@ -100,9 +100,23 @@ func (t Tool) String() string { return buf.String() } +type Repo struct { + // VCS The VCS type, such as "git" + VCS string + // The URL where the VCS repo can be found + Root string + // The path in the repo of this source. This should refer to a directory and not the actual file + Path string + // The filename of the source in the repo, relative to Path + Name string + // The revision of this source + Revision string +} + type ToolSource struct { Location string `json:"location,omitempty"` LineNo int `json:"lineNo,omitempty"` + Repo *Repo `json:"repo,omitempty"` } func (t ToolSource) String() string {