Finish out initial implementation.

Author: olsonanl

AppService.spec

@@ -34,7 +34,8 @@ module AppService
 	task_parameters parameters;
     } Task;
 
-    typedef mapping<string stage, string status> task_status;
+    //    typedef mapping<string stage, string status> task_status;
+    typedef string task_status;
 
     funcdef enumerate_apps()
 	returns (list<App>);

awe

@@ -18,7 +18,7 @@ my $rest = REST::Client->new();
 $rest->addHeader("Authorization", "OAuth " . $token->token);
 my $url = "http://redwood:7080";
 
-my $cur = $col->find({ "info.user" => "olson" });
+my $cur = $col->find({ '$and' => [ { "info.user" => "olson" },  { state => { '$ne' => "deleted" }}  ] });
 
 while (my $j = $cur->next)
 {
@@ -30,7 +30,7 @@ while (my $j = $cur->next)
     my $state = $j->{state};
 
     next unless $user eq 'olson';
-    print join("\t", $id, $user, $proj, $state, $start), "\n";
+    print join("\t", $id, $user, $proj, $state, $start, $info->{priority}), "\n";
 
 #    $rest->DELETE("$url/job/$id");
 

lib/Bio/KBase/AppService/AppServiceImpl.pm

@@ -265,6 +265,7 @@ sub start_app
 					   user => $ctx->user_id,
 					   clientgroups => '',
 					   userattr => $userattr,
+					   priority => 2,
 					  );
 
     my $shock = Bio::KBase::AppService::Shock->new($self->{shock_server}, $ctx->token);
@@ -375,6 +376,17 @@ sub query_task_status
     my $ctx = $Bio::KBase::AppService::Service::CallContext;
     my($status);
     #BEGIN query_task_status
+
+    my $awe = Bio::KBase::AppService::Awe->new($self->{awe_server}, $ctx->token);
+
+    $status = {};
+
+    for my $task_id (@$tasks)
+    {
+	my ($res, $error) = $awe->job_state($task_id);
+	$status->{$task_id} = $res;
+    }
+
     #END query_task_status
     my @_bad_returns;
     (ref($status) eq 'HASH') or push(@_bad_returns, "Invalid type for return variable \"status\" (value was \"$status\")");
@@ -449,7 +461,35 @@ sub enumerate_tasks
     my($return);
     #BEGIN enumerate_tasks
 
-    
+    my $awe = Bio::KBase::AppService::Awe->new($self->{awe_server}, $ctx->token);
+
+    $return = [];
+
+    #
+    # TODO: paging of requests
+    #
+
+    my $q = "/job?query&info.user=" . $ctx->user_id . "&info.pipeline=AppService";
+    print STDERR "Query tasks: $q\n";
+    my ($res, $error) = $awe->GET($q);
+    if ($res)
+    {
+	for my $t (@{$res->{data}})
+	{
+	    my $u = $t->{info}->{userattr};
+	    my $r = {
+		id => $t->{id},
+		app => $u->{app_id},
+		workspace => $u->{workspace},
+		parameters => decode_json($u->{parameters}),
+	    };
+	    push(@$return, $r);
+	}
+    }
+    else
+    {
+	die "Query failed: $error\n";
+    }
 
     #END enumerate_tasks
     my @_bad_returns;

lib/Bio/KBase/AppService/Awe.pm

@@ -59,6 +59,30 @@ sub submit
     }
 }
 
+sub GET
+{
+    my($self, $query) = @_;
+    my $url = $self->server . "/$query";
+    my $res = $self->ua->get($url, $self->auth_header());
+
+    if ($res->is_success)
+    {
+	my $awe_res = $self->json->decode($res->content);
+	if ($awe_res->{status} eq 200)
+	{
+	    return $awe_res;
+	}
+	else
+	{
+	    return undef, $awe_res->{error};
+	}
+    }
+    else
+    {
+	return undef, $res->content;
+    }
+}
+
 sub job_state
 {
     my($self, $job_id) = @_;

scripts/appserv-enumerate-tasks.pl

@@ -0,0 +1,27 @@
+use Bio::KBase::AppService::Client;
+use Getopt::Long::Descriptive;
+use strict;
+use Data::Dumper;
+
+my($opt, $usage) = describe_options("%c %o",
+				    ["url|u=s", "Service URL"],
+				    ["help|h", "Show this help message"]);
+
+print($usage->text), exit if $opt->help;
+print($usage->text), exit 1 if (@ARGV != 0);
+
+my $client = Bio::KBase::AppService::Client->new($opt->url);
+
+my $tasks = $client->enumerate_tasks();
+
+my $mlab = 0;
+my $mid = 0;
+
+my $status = $client->query_task_status([ map { $_->{id} } @$tasks ]);
+
+for my $task (@$tasks)
+{
+
+    print join("\t", $task->{id}, $task->{app}, $task->{workspace}, $status->{$task->{id}}), "\n";
+}
+