Merge branch 'master' of github.com:armadaproject/armada into f/chris…

…ma/better-validation
armadaproject · Feb 25, 2024 · 88c0844 · 88c0844
2 parents 7947892 + 921c19f
commit 88c0844
Show file tree

Hide file tree

Showing 23 changed files with 4,350 additions and 1,198 deletions.
diff --git a/client/DotNet/Armada.Client/ClientGenerated.cs b/client/DotNet/Armada.Client/ClientGenerated.cs
@@ -1786,6 +1786,18 @@ public enum ApiJobState
         [System.Runtime.Serialization.EnumMember(Value = @"UNKNOWN")]
         UNKNOWN = 5,
 
+        [System.Runtime.Serialization.EnumMember(Value = @"SUBMITTED")]
+        SUBMITTED = 6,
+
+        [System.Runtime.Serialization.EnumMember(Value = @"LEASED")]
+        LEASED = 7,
+
+        [System.Runtime.Serialization.EnumMember(Value = @"PREEMPTED")]
+        PREEMPTED = 8,
+
+        [System.Runtime.Serialization.EnumMember(Value = @"CANCELLED")]
+        CANCELLED = 9,
+
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.27.0 (Newtonsoft.Json v12.0.0.0)")]

diff --git a/client/DotNet/ArmadaProject.Io.Client/ArmadaProject.Io.Client.csproj b/client/DotNet/ArmadaProject.Io.Client/ArmadaProject.Io.Client.csproj
@@ -37,6 +37,7 @@
     />
     <Protobuf
       Include="../../../pkg/api/*.proto"
+      Exclude="../../../pkg/api/job.proto"
       AdditionalProtocArguments="--proto_path=../../../proto"
       ProtoRoot="../../../"
       GrpcServices="Client"

diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "armada_client"
-version = "0.2.8"
+version = "0.2.9"
 description = "Armada gRPC API python client"
 readme = "README.md"
 requires-python = ">=3.7"

diff --git a/client/python/tests/unit/test_gen.py b/client/python/tests/unit/test_gen.py
diff --git a/config/armada/config.yaml b/config/armada/config.yaml
@@ -134,6 +134,7 @@ postgres:
     sslmode: disable
 queryapi:
   enabled: false
+  maxQueryItems: 500
   postgres:
     connection:
       host: postgres

diff --git a/internal/armada/configuration/types.go b/internal/armada/configuration/types.go
@@ -310,6 +310,7 @@ type PostgresConfig struct {
 }
 
 type QueryApiConfig struct {
-	Enabled  bool
-	Postgres PostgresConfig
+	Enabled       bool
+	Postgres      PostgresConfig
+	MaxQueryItems int
 }
diff --git a/internal/armada/queryapi/database/models.go b/internal/armada/queryapi/database/models.go
diff --git a/internal/armada/queryapi/database/query.sql b/internal/armada/queryapi/database/query.sql
@@ -1,2 +1,12 @@
--- name: GetJobState :many
-SELECT state FROM job WHERE job_id = $1;
+-- name: GetJobStates :many
+SELECT job_id, state FROM job WHERE job_id = ANY(sqlc.arg(job_ids)::text[]);
+
+-- name: GetJobDetails :many
+SELECT job_id, queue, jobset, namespace, state, submitted, cancelled, cancel_reason, last_transition_time, latest_run_id, job_spec FROM job WHERE job_id = ANY(sqlc.arg(job_ids)::text[]);
+
+-- name: GetJobRunsByRunIds :many
+SELECT * FROM job_run WHERE run_id = ANY(sqlc.arg(run_ids)::text[]);
+
+-- name: GetJobRunsByJobIds :many
+SELECT * FROM job_run WHERE job_id = ANY(sqlc.arg(job_ids)::text[]) order by leased  desc;
+