primitive 0.1.58__py3-none-any.whl → 0.1.60__py3-none-any.whl

primitive/jobs/actions.py

@@ -1,9 +1,18 @@
 from typing import List, Optional
-from gql import gql
 
+from gql import gql
 
 from primitive.utils.actions import BaseAction
+
 from ..utils.auth import guard
+from .graphql.mutations import job_run_update_mutation
+from .graphql.queries import (
+    github_app_token_for_job_run_query,
+    job_run_query,
+    job_run_status_query,
+    job_runs_query,
+    jobs_query,
+)
 
 
 class Jobs(BaseAction):
@@ -17,52 +26,7 @@ class Jobs(BaseAction):
         first: Optional[int] = 1,
         last: Optional[int] = None,
     ):
-        query = gql(
-            """ 
-            fragment PageInfoFragment on PageInfo {
-                hasNextPage
-                hasPreviousPage
-                startCursor
-                endCursor
-            }
-
-            fragment JobFragment on Job {
-                id
-                pk
-                slug
-                name
-                createdAt
-                updatedAt
-            }
-
-            query jobs(
-                $before: String
-                $after: String
-                $first: Int
-                $last: Int
-                $filters: JobFilters
-            ) {
-                jobs(
-                    before: $before
-                    after: $after
-                    first: $first
-                    last: $last
-                    filters: $filters
-                ) {
-                    totalCount
-                    pageInfo {
-                        ...PageInfoFragment
-                    }
-                    edges {
-                        cursor
-                        node {
-                            ...JobFragment
-                        }
-                    }
-                }
-            }
-            """
-        )
+        query = gql(jobs_query)
 
         filters = {}
         if organization_id:
@@ -101,73 +65,7 @@ class Jobs(BaseAction):
         first: Optional[int] = 1,
         last: Optional[int] = None,
     ):
-        query = gql(
-            """
-fragment PageInfoFragment on PageInfo {
-  hasNextPage
-  hasPreviousPage
-  startCursor
-  endCursor
-}
-
-fragment JobRunFragment on JobRun {
-  id
-  pk
-  createdAt
-  updatedAt
-  completedAt
-  startedAt
-  status
-  conclusion
-  job {
-    id
-    pk
-    slug
-    name
-    createdAt
-    updatedAt
-  }
-  jobSettings {
-    containerArgs
-    rootDirectory
-  }
-  gitCommit {
-    sha
-    branch
-    repoFullName
-  }
-}
-
-query jobRuns(
-  $before: String
-  $after: String
-  $first: Int
-  $last: Int
-  $filters: JobRunFilters
-  $order: JobRunOrder
-) {
-  jobRuns(
-    before: $before
-    after: $after
-    first: $first
-    last: $last
-    filters: $filters
-    order: $order
-  ) {
-    totalCount
-    pageInfo {
-      ...PageInfoFragment
-    }
-    edges {
-      cursor
-      node {
-        ...JobRunFragment
-      }
-    }
-  }
-}
-"""
-        )
+        query = gql(job_runs_query)
 
         filters = {}
         if organization_id:
@@ -194,50 +92,18 @@ query jobRuns(
             },
         }
 
-        result = self.primitive.session.execute(query, variable_values=variables)
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
         return result
 
     @guard
     def get_job_run(self, id: str):
-        query = gql(
-            """
-            fragment JobRunFragment on JobRun {
-                id
-                pk
-                createdAt
-                updatedAt
-                completedAt
-                startedAt
-                status
-                conclusion
-                job {
-                    id
-                    pk
-                    slug
-                    name
-                    createdAt
-                    updatedAt
-                }
-                gitCommit {
-                    sha
-                    branch
-                    repoFullName
-                }
-                jobSettings {
-                    containerArgs
-                    rootDirectory
-                }
-            }
-
-            query jobRun($id: GlobalID!) {
-                jobRun(id: $id) {
-                    ...JobRunFragment
-                }
-            }
-            """
-        )
+        query = gql(job_run_query)
         variables = {"id": id}
-        result = self.primitive.session.execute(query, variable_values=variables)
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
         return result
 
     @guard
@@ -248,19 +114,7 @@ query jobRuns(
         conclusion: str = None,
         file_ids: Optional[List[str]] = [],
     ):
-        mutation = gql(
-            """
-            mutation jobRunUpdate($input: JobRunUpdateInput!) {
-                jobRunUpdate(input: $input) {
-                    ... on JobRun {
-                        id
-                        status
-                        conclusion
-                    }
-                }
-            }
-        """
-        )
+        mutation = gql(job_run_update_mutation)
         input = {"id": id}
         if status:
             input["status"] = status
@@ -269,21 +123,19 @@ query jobRuns(
         if file_ids and len(file_ids) > 0:
             input["files"] = file_ids
         variables = {"input": input}
-        result = self.primitive.session.execute(mutation, variable_values=variables)
+        result = self.primitive.session.execute(
+            mutation, variable_values=variables, get_execution_result=True
+        )
         return result
 
     @guard
     def github_access_token_for_job_run(self, job_run_id: str):
-        query = gql(
-            """
-query ghAppTokenForJobRun($jobRunId: GlobalID!) {
-    ghAppTokenForJobRun(jobRunId: $jobRunId)
-}
-"""
-        )
+        query = gql(github_app_token_for_job_run_query)
         variables = {"jobRunId": job_run_id}
-        result = self.primitive.session.execute(query, variable_values=variables)
-        return result["ghAppTokenForJobRun"]
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
+        return result.data["ghAppTokenForJobRun"]
 
     def get_latest_job_run_for_job(
         self, job_slug: Optional[str] = None, job_id: Optional[str] = None
@@ -300,32 +152,11 @@ query ghAppTokenForJobRun($jobRunId: GlobalID!) {
         ]
         return job_run
 
-    def job_run_start(
-        self,
-        job_slug: str,
-        job_id: str,
-    ):
-        if not job_slug and not job_id:
-            raise ValueError("job_slug or job_id is required")
-
-        self.get_jobs(slug=job_slug)
-
     @guard
     def get_job_status(self, id: str):
-        query = gql(
-            """
-            fragment JobRunFragment on JobRun {
-                id
-                status
-            }
-
-            query jobRun($id: GlobalID!) {
-                jobRun(id: $id) {
-                    ...JobRunFragment
-                }
-            }
-            """
-        )
+        query = gql(job_run_status_query)
         variables = {"id": id}
-        result = self.primitive.session.execute(query, variable_values=variables)
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
         return result

primitive/jobs/graphql/fragments.py

@@ -0,0 +1,47 @@
+job_fragment = """
+fragment JobFragment on Job {
+    id
+    pk
+    slug
+    name
+    createdAt
+    updatedAt
+}
+"""
+
+job_run_fragment = """
+fragment JobRunFragment on JobRun {
+  id
+  pk
+  createdAt
+  updatedAt
+  completedAt
+  startedAt
+  status
+  conclusion
+  job {
+    id
+    pk
+    slug
+    name
+    createdAt
+    updatedAt
+  }
+  jobSettings {
+    containerArgs
+    rootDirectory
+  }
+  gitCommit {
+    sha
+    branch
+    repoFullName
+  }
+}
+"""
+
+job_run_status_fragment = """
+fragment JobRunStatusFragment on JobRun {
+    id
+    status
+}
+"""

primitive/jobs/graphql/mutations.py

@@ -0,0 +1,11 @@
+job_run_update_mutation = """
+mutation jobRunUpdate($input: JobRunUpdateInput!) {
+    jobRunUpdate(input: $input) {
+        ... on JobRun {
+            id
+            status
+            conclusion
+        }
+    }
+}
+"""

primitive/jobs/graphql/queries.py

@@ -0,0 +1,100 @@
+from primitive.graphql.utility_fragments import page_info_fragment
+
+from .fragments import job_fragment, job_run_fragment, job_run_status_fragment
+
+jobs_query = (
+    page_info_fragment
+    + job_fragment
+    + """
+query jobs(
+    $before: String
+    $after: String
+    $first: Int
+    $last: Int
+    $filters: JobFilters
+) {
+    jobs(
+        before: $before
+        after: $after
+        first: $first
+        last: $last
+        filters: $filters
+    ) {
+        totalCount
+        pageInfo {
+            ...PageInfoFragment
+        }
+        edges {
+            cursor
+            node {
+                ...JobFragment
+            }
+        }
+    }
+}
+"""
+)
+
+
+job_runs_query = (
+    page_info_fragment
+    + job_run_fragment
+    + """
+query jobRuns(
+  $before: String
+  $after: String
+  $first: Int
+  $last: Int
+  $filters: JobRunFilters
+  $order: JobRunOrder
+) {
+  jobRuns(
+    before: $before
+    after: $after
+    first: $first
+    last: $last
+    filters: $filters
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      ...PageInfoFragment
+    }
+    edges {
+      cursor
+      node {
+        ...JobRunFragment
+      }
+    }
+  }
+}
+"""
+)
+
+job_run_query = (
+    job_run_fragment
+    + """
+query jobRun($id: GlobalID!) {
+    jobRun(id: $id) {
+        ...JobRunFragment
+    }
+}
+"""
+)
+
+github_app_token_for_job_run_query = """
+query ghAppTokenForJobRun($jobRunId: GlobalID!) {
+    ghAppTokenForJobRun(jobRunId: $jobRunId)
+}
+"""
+
+job_run_status_query = (
+    job_run_status_fragment
+    + """
+query jobRun($id: GlobalID!) {
+    jobRun(id: $id) {
+        ...JobRunStatusFragment
+    }
+}
+"""
+)

primitive/organizations/actions.py

@@ -1,9 +1,11 @@
 from typing import Optional
-from gql import gql
 
+from gql import gql
 
 from primitive.utils.actions import BaseAction
+
 from ..utils.auth import guard
+from .graphql.queries import organizations_query
 
 
 class Organizations(BaseAction):
@@ -15,54 +17,7 @@ class Organizations(BaseAction):
         first: Optional[int] = 1,
         last: Optional[int] = None,
     ):
-        query = gql(
-            """ 
-            fragment PageInfoFragment on PageInfo {
-                hasNextPage
-                hasPreviousPage
-                startCursor
-                endCursor
-            }
-
-            fragment OrganizationFragment on Organization {
-                id
-                pk
-                slug
-                name
-                createdAt
-                updatedAt
-            }
-
-            query organizations(
-                $before: String
-                $after: String
-                $first: Int
-                $last: Int
-                $filters: OrganizationFilters
-                $order: OrganizationOrder
-            ) {
-                organizations(
-                    before: $before
-                    after: $after
-                    first: $first
-                    last: $last
-                    filters: $filters
-                    order: $order
-                ) {
-                    totalCount
-                    pageInfo {
-                        ...PageInfoFragment
-                    }
-                    edges {
-                        cursor
-                        node {
-                            ...OrganizationFragment
-                        }
-                    }
-                }
-            }
-            """
-        )
+        query = gql(organizations_query)
 
         filters = {}
         if organization_id:

primitive/organizations/graphql/fragments.py

@@ -0,0 +1,10 @@
+organization_fragment = """
+fragment OrganizationFragment on Organization {
+    id
+    pk
+    slug
+    name
+    createdAt
+    updatedAt
+}
+"""

primitive/organizations/graphql/queries.py

@@ -0,0 +1,38 @@
+from primitive.graphql.utility_fragments import page_info_fragment
+
+from .fragments import organization_fragment
+
+organizations_query = (
+    page_info_fragment
+    + organization_fragment
+    + """
+query organizations(
+    $before: String
+    $after: String
+    $first: Int
+    $last: Int
+    $filters: OrganizationFilters
+    $order: OrganizationOrder
+) {
+    organizations(
+        before: $before
+        after: $after
+        first: $first
+        last: $last
+        filters: $filters
+        order: $order
+    ) {
+        totalCount
+        pageInfo {
+            ...PageInfoFragment
+        }
+        edges {
+            cursor
+            node {
+                ...OrganizationFragment
+            }
+        }
+    }
+}
+"""
+)

primitive/projects/actions.py

@@ -1,8 +1,11 @@
+from typing import Optional
+
 from gql import gql
 
-from typing import Optional
 from primitive.utils.actions import BaseAction
+
 from ..utils.auth import guard
+from .graphql.queries import projects_query
 
 
 class Projects(BaseAction):
@@ -14,52 +17,7 @@ class Projects(BaseAction):
         first: Optional[int] = 1,
         last: Optional[int] = None,
     ):
-        query = gql(
-            """ 
-            fragment PageInfoFragment on PageInfo {
-                hasNextPage
-                hasPreviousPage
-                startCursor
-                endCursor
-            }
-
-            fragment ProjectFragment on Project {
-                id
-                pk
-                slug
-                name
-                createdAt
-                updatedAt
-            }
-
-            query projects(
-                $before: String
-                $after: String
-                $first: Int
-                $last: Int
-                $filters: ProjectFilters
-            ) {
-                projects(
-                    before: $before
-                    after: $after
-                    first: $first
-                    last: $last
-                    filters: $filters
-                ) {
-                    totalCount
-                    pageInfo {
-                        ...PageInfoFragment
-                    }
-                    edges {
-                        cursor
-                        node {
-                            ...ProjectFragment
-                        }
-                    }
-                }
-            }
-            """
-        )
+        query = gql(projects_query)
 
         filters = {}
         if organization_id:

primitive/projects/graphql/fragments.py

@@ -0,0 +1,10 @@
+project_fragment = """
+fragment ProjectFragment on Project {
+    id
+    pk
+    slug
+    name
+    createdAt
+    updatedAt
+}
+"""

primitive/projects/graphql/queries.py

@@ -0,0 +1,36 @@
+from primitive.graphql.utility_fragments import page_info_fragment
+
+from .fragments import project_fragment
+
+projects_query = (
+    page_info_fragment
+    + project_fragment
+    + """
+query projects(
+    $before: String
+    $after: String
+    $first: Int
+    $last: Int
+    $filters: ProjectFilters
+) {
+    projects(
+        before: $before
+        after: $after
+        first: $first
+        last: $last
+        filters: $filters
+    ) {
+        totalCount
+        pageInfo {
+            ...PageInfoFragment
+        }
+        edges {
+            cursor
+            node {
+                ...ProjectFragment
+            }
+        }
+    }
+}
+"""
+)