ood_core 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1ad113f64d7ee39779802e7386bf753a2323969302963c58456b51a05f132b5
-  data.tar.gz: 472bcdea0fbd7096171a8338507e0e9c6554d6a4ceea3fb12f46a4a59f48cf7e
+  metadata.gz: a2dab30b28f29c33b19e8cce3b5464805c09ba374336ac68fa27da684826fca6
+  data.tar.gz: f94e04cb03fa816f4fa54f72e43acdfac2e5a3ee301bd0de59624ed4367669f7
 SHA512:
-  metadata.gz: 6436bdfb152bd592627f6fb710d44fc08e10d240a398199081ffd0ba1e3fd3a6f4fbaf8fb56adb88656bb58557eb6630702baea2e07ab1e5072f9180e02da967
-  data.tar.gz: 12eb878a31d953d7fb4c8bb6a0e67febf42b5c04aa397aa9fb17329d9aae33601e2d7358c3799ede4be5ef8af84fc9cb8d44e022847a4d42f3162788e5db828d
+  metadata.gz: 627ea1414e51fe18601977b50ad1b6472e58904a4ec6571620bc4a7dfa382c952e6aee65e04243352e4ed7ef842365a559134c2155d27c47a77fda819385afe0
+  data.tar.gz: 535c8466bf1e18192b850ab6c0c116c7b36173923c918c9bccc23d4e751acc9178c7f16a189efa518e103ec57be2b72e6d68d8ab2d11ec55a5874a525fac0ac5

data/lib/ood_core/job/adapters/coder/batch.rb

@@ -1,6 +1,5 @@
 require "ood_core/refinements/hash_extensions"
 require "json"
-  
 
 # Utility class for the Coder adapter to interact with the Coders API.
 class OodCore::Job::Adapters::Coder::Batch
@@ -10,8 +9,8 @@ class OodCore::Job::Adapters::Coder::Batch
     @host = config[:host]
     @token = config[:token]
     @service_user = config[:service_user]
-    @credential_deletion_max_attempts = config[:credential_deletion_max_attempts] || 5
-    @credential_deletion_timeout_interval = config[:credential_deletion_timeout_interval] || 10
+    @deletion_max_attempts = config[:deletion_max_attempts] || 5
+    @deletion_timeout_interval_seconds = config[:deletion_timeout_interval] || 10
     @credentials = credentials 
   end
 
@@ -38,63 +37,115 @@ class OodCore::Job::Adapters::Coder::Batch
     }
   end
 
+  def generate_coder_workspace_name(submitted_name)
+    "#{username}-#{submitted_name}-#{rand(2_821_109_907_456).to_s(36)}"
+  end 
   def submit(script)
-    org_id = script.native[:org_id]
     project_id = script.native[:project_id]
-    coder_parameters = script.native[:coder_parameters]
+    app_credentials = @credentials.generate_credentials(project_id)
+    workspace_name = generate_coder_workspace_name(script.native[:workspace_name])
+   
+    create_coder_workspace(
+      script.native[:org_id],
+      project_id,
+      script.native[:template_version_id],
+      script.native[:coder_parameters],
+      app_credentials,
+      workspace_name)
+
+    @credentials.save_credentials(workspace_name, app_credentials)
+    workspace_name
+  end
+
+  def create_coder_workspace(org_id, project_id, template_version_id, coder_parameters, app_credentials, name)
     endpoint = "#{@host}/api/v2/organizations/#{org_id}/members/#{@service_user}/workspaces"
-    app_credentials = @credentials.generate_credentials(project_id, username)
     headers = get_headers(@token)
-    workspace_name = "#{username}-#{script.native[:workspace_name]}-#{rand(2_821_109_907_456).to_s(36)}"
     body = {
-      template_version_id: script.native[:template_version_id],
-      name: workspace_name,
+      template_version_id: template_version_id,
+      name: name,
       rich_parameter_values: get_rich_parameters(coder_parameters, project_id, app_credentials),
     }
+    api_call('post', endpoint, headers, body)
+  end
 
-    resp = api_call('post', endpoint, headers, body)
-    @credentials.save_credentials(resp["id"], username, app_credentials)
-    resp["id"]
 
-  end
+  def delete_coder_workspace(id)
+    build_id = get_workspace_info(id)["id"]
 
-  def delete(id)
-    endpoint = "#{@host}/api/v2/workspaces/#{id}/builds"
+    endpoint = "#{@host}/api/v2/workspaces/#{build_id}/builds"
     headers = get_headers(@token)
     body = {
       'orphan' => false,
       'transition' => 'delete'
     }
     api_call('post', endpoint, headers, body)
+  end
   
-    credentials = @credentials.load_credentials(id, username)
-  
+  def delete(id)
+    delete_coder_workspace(id)
+
+    credentials = @credentials.load_credentials(id)
+    puts "credentials loaded #{credentials["id"]}" 
     wait_for_workspace_deletion(id) do |attempt|
-      puts "#{Time.now.inspect} Deleting workspace (attempt #{attempt + 1}/#{5})"
+      puts "#{Time.now.inspect} Deleting workspace (attempt #{attempt}/#{5})"
     end
-  
-    @credentials.destroy_credentials(credentials, workspace_json(id).dig("latest_build", "status"), id, username)
+    workspace_info = get_workspace_info(id)
+    @credentials.destroy_credentials(credentials, workspace_status(workspace_info), id)
   end
   
   def wait_for_workspace_deletion(id)
-    max_attempts = @credential_deletion_max_attempts
-    timeout_interval = @credential_deletion_timeout_interval
+    max_attempts = @deletion_max_attempts
+    timeout_interval = @deletion_timeout_interval_seconds
   
     max_attempts.times do |attempt|
-      break unless workspace_json(id) && workspace_json(id).dig("latest_build", "status") == "deleting"
+      workspace_info = get_workspace_info(id)
+      break unless workspace_info && workspace_status(workspace_info) == "deleting"
       yield(attempt + 1)
       sleep(timeout_interval)
     end
   end
-
-  def workspace_json(id)
-    endpoint = "#{@host}/api/v2/workspaces/#{id}?include_deleted=true"
+  def workspace_status(workspace_info)
+    workspace_info.dig("latest_build", "status")
+  end
+  def parse_error_logs(logs_array)    
+    logs_array
+    .reject { |n| n["output"].to_s.empty?}
+    .map { |n| n["output"].scan(/"message":\s*"([^"]+)"/)[0] }
+    .reject {|n| n.nil?}
+  end
+  
+  def get_workspace_info(id)
+    endpoint = "#{@host}/api/v2/users/#{@service_user}/workspace/#{id}?include_deleted=true"
     headers = get_headers(@token)
     api_call('get', endpoint, headers)
   end
 
+  def read_coder_output(latest_build)
+    coder_output_metadata = latest_build.dig("resources")
+    &.find { |resource| resource["name"] == "coder_output" }
+    &.dig("metadata")
+    coder_output_metadata&.map { |meta| [meta["key"].to_sym, meta["value"]] }&.to_h || {}
+  end 
+
   def info(id)
-    workspace_info_from_json(workspace_json(id))
+    workspace_info = get_workspace_info(id)
+    latest_build = workspace_info.dig("latest_build")
+    coder_status = workspace_status(workspace_info) || latest_build.dig("job", "status")
+    ood_status = coder_state_to_ood_status(coder_status)
+    coder_output_hash = read_coder_output(latest_build)
+    build_logs = get_build_logs(latest_build.dig("id"))
+    error_logs = parse_error_logs(build_logs)
+    OodCore::Job::Adapters::Coder::CoderJobInfo.new(**{
+      id: workspace_info["id"],
+      job_name: workspace_info["workspace_name"],
+      status: OodCore::Job::Status.new(state: ood_status),
+      job_owner: workspace_info["workspace_owner_name"],
+      submission_time: workspace_info["created_at"],
+      dispatch_time: workspace_info.dig("updated_at"),
+      wallclock_time: wallclock_time(workspace_info, ood_status),
+      ood_connection_info: { host: coder_output_hash[:floating_ip], port: 80, error_logs: error_logs},
+      native: coder_output_hash
+  })
   end
 
   def coder_state_to_ood_status(coder_state)
@@ -114,22 +165,10 @@ class OodCore::Job::Adapters::Coder::Batch
     end
   end
 
-  def build_coder_job_info(json_data, status)
-    coder_output_metadata = json_data["latest_build"]["resources"]
-    &.find { |resource| resource["name"] == "coder_output" }
-    &.dig("metadata")
-    coder_output_hash = coder_output_metadata&.map { |meta| [meta["key"].to_sym, meta["value"]] }&.to_h || {}
-    OodCore::Job::Adapters::Coder::CoderJobInfo.new(**{
-      id: json_data["id"],
-      job_name: json_data["workspace_name"],
-      status: OodCore::Job::Status.new(state: status),
-      job_owner: json_data["workspace_owner_name"],
-      submission_time: json_data["created_at"],
-      dispatch_time: json_data.dig("updated_at"),
-      wallclock_time: wallclock_time(json_data, status),
-      ood_connection_info: { host: coder_output_hash[:floating_ip], port: 80 },
-      native: coder_output_hash
-  })
+  def get_build_logs(build_id)
+    endpoint = "#{@host}/api/v2/workspacebuilds/#{build_id}/logs"
+    headers = get_headers(@token)
+    api_call('get', endpoint, headers)
   end
 
   def wallclock_time(json_data, status)
@@ -153,12 +192,6 @@ class OodCore::Job::Adapters::Coder::Batch
     et
   end
 
-  def workspace_info_from_json(json_data)
-    state = json_data.dig("latest_build", "status") || json_data.dig("latest_build", "job", "status")
-    status = coder_state_to_ood_status(state)
-    build_coder_job_info(json_data, status)
-  end
-
   def api_call(method, endpoint, headers, body = nil)
     uri = URI(endpoint)
     case method.downcase

data/lib/ood_core/job/adapters/coder/openstack_credentials.rb

@@ -1,22 +1,28 @@
 require "fog/openstack"
 require "json"
 require "ood_core/job/adapters/coder/credentials"
+require "tempfile"
+require 'excon'
 
 class OpenStackCredentials < CredentialsInterface
-  def initialize(auth_url)
+  def initialize(auth_url, dir)
     @auth_url = auth_url
+    @dir = dir
   end
 
-  def load_credentials(id, username)
-    file_path = "/home/#{username}/#{id}_credentials.json"
-    JSON.parse(File.read(file_path))
+  def load_credentials(id)
+    JSON.parse(File.read(file_path(id)))
   rescue Errno::ENOENT => e
     puts "Error loading credentials: #{e}"
     nil
   end
 
-  def generate_credentials(project_id, username)
-    token_json = JSON.parse(File.read("/home/#{username}/token.json"))
+  def file_path(id)
+    return "#{@dir}/#{username}-#{id}-os-credentials.json"
+  end
+
+  def generate_credentials(project_id)
+    token_json = JSON.parse(File.read("#{@dir}/#{username}-os-token.json"))
     access_token = token_json["id"]
     user_id = token_json["user_id"]
     connection = Fog::OpenStack::Identity.new({
@@ -74,13 +80,17 @@ class OpenStackCredentials < CredentialsInterface
 
   end
 
-  def save_credentials(id, username, app_credentials)
-    file_path = "/home/#{username}/#{id}_credentials.json"
-    File.write(file_path, JSON.generate(app_credentials))
+  def save_credentials(id, app_credentials)
+    Tempfile.open(["temp", ".json"], "/tmp") do |temp_file|
+      temp_file.write(JSON.generate(app_credentials))
+      temp_file.chmod(0600)
+      temp_file.close
+      FileUtils.mv(temp_file.path, file_path(id))
+    end
   end
 
 
-  def destroy_credentials(os_app_credentials, deletion_status, id, username)
+  def destroy_credentials(os_app_credentials, deletion_status, id)
     return if os_app_credentials.nil?
     
   
@@ -88,17 +98,19 @@ class OpenStackCredentials < CredentialsInterface
     credentials_to_destroy = find_os_application_credentials(connection, os_app_credentials)
   
     if deletion_status != "deleted"
-      File.delete("/home/#{username}/#{id}_credentials.json")
+      File.delete(file_path(id))
       puts "Workspace deletion timed out, credentials with id #{os_app_credentials['id']} of user #{os_app_credentials['user_id']} were not destroyed"
       return
     end
 
     begin
+      puts "Destroying application credentials with id #{os_app_credentials['id']} and session #{id}}"
       credentials_to_destroy.destroy
-    rescue Excon::Error::Forbidden => e
+    rescue Excon::Error => e
       puts "Error destroying application credentials with id #{os_app_credentials['id']} #{e}"
       raise JobAdapterError, e.message
     end
+    File.delete(file_path(id))
   end
 
 
@@ -116,4 +128,8 @@ class OpenStackCredentials < CredentialsInterface
   def find_os_application_credentials(connection, os_app_credentials)
     connection.application_credentials.find_by_id(os_app_credentials['id'], os_app_credentials['user_id'])
   end
+  def username
+    @username ||= Etc.getlogin
+  end
 end
+

data/lib/ood_core/job/adapters/coder.rb

@@ -1,9 +1,9 @@
 require "ood_core/refinements/hash_extensions"
 require "ood_core/refinements/array_extensions"
 require 'net/http'
-require 'json'
 require 'etc'
 
+
 module OodCore
   module Job
     class Factory
@@ -14,7 +14,7 @@ module OodCore
       def self.build_coder(config)
         config = config.to_h.symbolize_keys
         if config[:auth]["cloud"] == "openstack"
-          credentials = OpenStackCredentials.new(config[:auth]["url"]) 
+          credentials = OpenStackCredentials.new(config[:auth]["url"], config[:auth]["credentials_dir"]) 
         else
           raise ArgumentError, "Unsupported credentials for cloud type: #{config[:auth]['cloud']}"
         end
@@ -79,7 +79,7 @@ module OodCore
         #   adapters can get by without populating the entire Info object
         # @return [Array<Info>] information describing submitted jobs
         def info_all(attrs: nil)
-          raise NotImplementedError, 'subclass did not define #info_all'
+          []
         end
     
         # Whether the adapter supports job arrays

data/lib/ood_core/job/adapters/slurm.rb

@@ -881,8 +881,8 @@ module OodCore
 
         # safely parse date time string, return nil when there are errors.
         def parse_time(date_time)
-          Time.parse(date_time)
-        rescue ArgumentError
+          Time.parse(date_time.to_s)
+        rescue StandardError
           nil
         end
 

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.31.0"
+  VERSION = "0.31.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.31.1
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-16 00:00:00.000000000 Z
+date: 2026-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support