lemans 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf8e2ef8780e6577e9810b782c4fd1fe37fbe5691589c3ef665c09068ef4121
-  data.tar.gz: c697394a89a3056df20a174e55f83ad2ab81038cff1662a2bb91da784184c9d6
+  metadata.gz: 6ce349f204cd0dc573a18932210dd5298941fe097f24576df1e318b29ce7152a
+  data.tar.gz: c9113c9bc9dbc4cf1f92d422b3ff929b20420e769828f55585f2a3eead34aa93
 SHA512:
-  metadata.gz: 223472ec514232b4ec45a5f735d5786a7932ccd929064cc2c92bc5ebe22a70470836a6054694598a2c761c8eeac21fc7d8dc608a8506d309f2f1bfa7ad0d53eb
-  data.tar.gz: 3d05d9d1a0c1cd3432cf87c76f2a0afa6ec4b05298be9d6dbc8519268fb7805c6535246550c394a764de56c674ef22dba0a6c103cec807614b43d3548684ca77
+  metadata.gz: 89ecd01b291a2d75475f346e8e780d87e104139e0ca34f48dde192325ec2ed593920e0e63f8b41a26b9e13144052e6bfe841831bc5d40a4432a0cd98d3fc39fc
+  data.tar.gz: 84b2bceb8d5b7c60b0e6513bb05b801d38081f8f59c55e96338a2a47d660c0521a31d224c365e0b694581f4e600552e4e9e390f3ccd6130d7fc61c8a9897cce2

data/exe/lemans-remote

@@ -24,8 +24,10 @@
 #   Then watch, fetch, and clean up:
 #
 #     exe/lemans-remote status [--history] [--running | --complete]
-#     exe/lemans-remote pull-runs [RUN_ID ...] [--all]
+#     exe/lemans-remote pull-runs [RUN_ID ...] [--all] [--dry-run]
 #     exe/lemans-remote clobber RUN_ID ... | --all
+#     exe/lemans-remote snapshots
+#     exe/lemans-remote deprovision [--name SNAPSHOT]
 #
 #   Credentials come from the host ENV: DAYTONA_API_KEY (or DAYTONA_TOKEN),
 #   OPENROUTER_API_KEY, LEMANS_PROVIDER_ORDER; forward extras with --env KEY.
@@ -48,7 +50,7 @@ require "timeout"
 require "tmpdir"
 require "openssl"
 
-module LemansRemote
+module LemansRemote # :nodoc: all
   LABEL = "lemans-remote"
   RUN_ID_LABEL = "lemans-remote/run-id"
   STATUS_LABEL = "lemans-remote/status"
@@ -112,7 +114,7 @@ module LemansRemote
       name
     end
 
-    def drop(target = name)
+    def drop(target = name) # rubocop:disable Naming/PredicateMethod
       existing = find(target)
       return false unless existing
 
@@ -349,7 +351,7 @@ module LemansRemote
     end
 
     def manifests(sandbox)
-      code = 'require "json"; puts Dir.glob("/vault/*/manifest.json")' \
+      code = 'require "json"; puts Dir.glob("/vault/*/manifest.json", File::FNM_DOTMATCH)' \
              ".filter_map { |f| JSON.parse(File.read(f)) rescue nil }.to_json"
       response = sandbox.process.exec(command: "ruby -e #{Shellwords.escape(code)}", timeout: 120)
       raise "could not read the vault manifests: #{response.result}" unless response.exit_code.zero?
@@ -358,6 +360,14 @@ module LemansRemote
       body.empty? ? [] : JSON.parse(body)
     end
 
+    def archive_size(sandbox, run_id)
+      remote = "/vault/#{run_id}/runs.tar.gz"
+      response = sandbox.process.exec(command: "du -h #{Shellwords.escape(remote)}", timeout: 60)
+      return nil unless response.exit_code.zero?
+
+      response.result.to_s.split.first
+    end
+
     def download_runs(sandbox, run_id, runs_dir)
       remote = "/vault/#{run_id}/runs.tar.gz"
       probe = sandbox.process.exec(command: "test -f #{Shellwords.escape(remote)}", timeout: 60)
@@ -385,7 +395,7 @@ module LemansRemote
     def mark_pulled(sandbox, run_id)
       code = 'require "json"; require "time"; ' \
              'path = File.join("/vault", ARGV[0], "manifest.json"); ' \
-             'data = JSON.parse(File.read(path)); ' \
+             "data = JSON.parse(File.read(path)); " \
              'data["pulled_at"] = Time.now.utc.iso8601; ' \
              "File.write(path, JSON.pretty_generate(data))"
       sandbox.process.exec(command: "ruby -e #{Shellwords.escape(code)} #{Shellwords.escape(run_id)}", timeout: 60)
@@ -538,7 +548,7 @@ module LemansRemote
     def run_metadata(sandbox)
       {
         "run_id" => @run_id,
-        "bench" => @bench.root.basename.to_s,
+        "bench" => @bench.root.expand_path.basename.to_s,
         "tasks" => @tasks,
         "models" => @models,
         "args" => @extra_args,
@@ -734,9 +744,7 @@ module LemansRemote
       raise Thor::Error, "lemans-remote: no such task(s): #{unknown.join(", ")}" if unknown.any?
 
       provisioner = build_provisioner
-      unless provisioner.provisioned?
-        raise Thor::Error, "lemans-remote: snapshot #{provisioner.name} not found — run `lemans-remote provision` first"
-      end
+      raise Thor::Error, "lemans-remote: snapshot #{provisioner.name} not found — run `lemans-remote provision` first" unless provisioner.provisioned?
 
       attempts = options[:attempts].to_i
       raise Thor::Error, "lemans-remote: --attempts must be at least 1" if attempts < 1
@@ -786,7 +794,7 @@ module LemansRemote
         if filtered
           say "no #{options[:running] ? "running" : "complete"} lemans-remote runs"
         else
-          say "no lemans-remote runs#{options[:history] ? "" : " — try --history for completed ones"}"
+          say "no lemans-remote runs#{" — try --history for completed ones" unless options[:history]}"
         end
         return
       end
@@ -801,6 +809,7 @@ module LemansRemote
     map "pull-runs" => :pull_runs
     desc "pull-runs [RUN_IDS...]", "Download archived runs from the vault into the local runs directory"
     option :all, type: :boolean, default: false, desc: "Pull every completed run, even ones already pulled"
+    option :dry_run, type: :boolean, default: false, desc: "Preview what would be downloaded without pulling anything"
     option :runs_dir, default: "runs", desc: "Local directory to sync the results into"
     def pull_runs(*run_ids)
       pulled = []
@@ -821,6 +830,16 @@ module LemansRemote
         say_status :pull, "nothing new to pull (use --all to re-pull)", :yellow if targets.empty?
 
         targets.each do |run_id|
+          if options[:dry_run]
+            size = vault.archive_size(sandbox, run_id)
+            if size
+              say_status :would_pull, "#{run_id} (#{size})", :cyan
+            else
+              say_status :missing, "#{run_id} has no runs.tar.gz (still running?)", :yellow
+            end
+            next
+          end
+
           results = vault.download_runs(sandbox, run_id, options[:runs_dir])
           if results
             vault.mark_pulled(sandbox, run_id)
@@ -846,9 +865,7 @@ module LemansRemote
 
       live = Fleet.live
       if options[:all]
-        unless live.empty?
-          raise Thor::Error, "lemans-remote: #{live.size} run(s) still live (#{live.map(&:run_id).join(", ")}) — wait for them to finish"
-        end
+        raise Thor::Error, "lemans-remote: #{live.size} run(s) still live (#{live.map(&:run_id).join(", ")}) — wait for them to finish" unless live.empty?
         return unless options[:force] || yes?("Delete the whole #{Vault::NAME} volume and every stopped run sandbox? [y/N]")
 
         Fleet.rows.each { safe_delete_sandbox(_1.sandbox) }
@@ -876,6 +893,28 @@ module LemansRemote
       raise Thor::Error, "lemans-remote: #{e.message}"
     end
 
+    desc "snapshots", "List lemans-remote orchestrator snapshots"
+    def snapshots
+      current = build_provisioner.name
+      rows = all_snapshots.select { _1.name.start_with?("#{LABEL}-") }.map do |snap|
+        shape = "#{snap.cpu.to_i}cpu/#{snap.mem.to_i}gb/#{snap.disk.to_i}gb"
+        [snap.name, snap.state, shape, snap.created_at.to_s[0, 19], snap.last_used_at.to_s[0, 19],
+         snap.name == current ? "current" : "-"]
+      end
+
+      if rows.empty?
+        say "no lemans-remote snapshots — run `lemans-remote provision` first"
+        return
+      end
+
+      rows.sort_by! { _1[3].to_s }
+      rows.reverse!
+      print_table([%w[snapshot state shape created last-used note]] + rows)
+      say "delete old ones with `lemans-remote deprovision --name SNAPSHOT`"
+    rescue Lemans::ConfigError, RuntimeError => e
+      raise Thor::Error, "lemans-remote: #{e.message}"
+    end
+
     desc "deprovision", "Delete the orchestrator snapshot"
     option :name, desc: "Delete a specific snapshot by name (default: the one for this shape and version)"
     def deprovision
@@ -895,14 +934,14 @@ module LemansRemote
       say Lemans::VERSION
     end
 
+    FANOUT_THREADS = 4
+
     private
 
     def build_provisioner
       Provisioner.new(cpus: options[:cpus].to_i, memory_gb: options[:memory].to_i, disk_gb: options[:disk].to_i)
     end
 
-    FANOUT_THREADS = 4
-
     def plan_batches(bench, tasks)
       return [tasks] if options[:sync] || options[:run_in_band]
 
@@ -957,7 +996,7 @@ module LemansRemote
     end
 
     def build_run_id(bench, tasks, models, attempt = nil)
-      parts = [bench.root.basename.to_s]
+      parts = [bench.root.expand_path.basename.to_s]
       parts << (tasks.size == 1 ? tasks.first : "#{tasks.size}tasks") if tasks.any?
       if models.any?
         short = models.first.split("/").last
@@ -971,13 +1010,24 @@ module LemansRemote
       parts.map { name_part(_1) }.reject(&:empty?).join("-")
     end
 
-    def name_part(value) = value.to_s.downcase.gsub(/[^a-z0-9._+]+/, "-").gsub(/\A-+|-+\z/, "")
+    def name_part(value) = value.to_s.downcase.gsub(/[^a-z0-9._+]+/, "-").gsub(/\A[-.]+|[-.]+\z/, "")
+
+    def all_snapshots
+      items = []
+      page = 1
+      loop do
+        result = LemansRemote.client.snapshot.list(page: page, limit: 200)
+        items.concat(result.items)
+        break if page >= result.total_pages.to_i
+
+        page += 1
+      end
+      items
+    end
 
     def with_vault(&block)
       provisioner = build_provisioner
-      unless provisioner.provisioned?
-        raise Thor::Error, "lemans-remote: snapshot #{provisioner.name} not found — run `lemans-remote provision` first"
-      end
+      raise Thor::Error, "lemans-remote: snapshot #{provisioner.name} not found — run `lemans-remote provision` first" unless provisioner.provisioned?
 
       vault = VaultClient.new(snapshot: provisioner.name)
       vault.with_helper { |sandbox| block.call(vault, sandbox) }

data/lib/lemans/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lemans
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lemans
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Svyatoslav Kryukov