primitive 0.2.42__py3-none-any.whl → 0.2.44__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- primitive/__about__.py +1 -1
- primitive/agent/actions.py +11 -7
- primitive/hardware/graphql/fragments.py +1 -0
- primitive/monitor/actions.py +4 -1
- primitive/reservations/actions.py +1 -2
- {primitive-0.2.42.dist-info → primitive-0.2.44.dist-info}/METADATA +1 -1
- {primitive-0.2.42.dist-info → primitive-0.2.44.dist-info}/RECORD +10 -10
- {primitive-0.2.42.dist-info → primitive-0.2.44.dist-info}/WHEEL +0 -0
- {primitive-0.2.42.dist-info → primitive-0.2.44.dist-info}/entry_points.txt +0 -0
- {primitive-0.2.42.dist-info → primitive-0.2.44.dist-info}/licenses/LICENSE.txt +0 -0
primitive/__about__.py
CHANGED
primitive/agent/actions.py
CHANGED
@@ -92,20 +92,24 @@ class Agent(BaseAction):
|
|
92
92
|
logger.info(
|
93
93
|
f"Setting JobRun {job_run_data.get('job').get('name')} to request_in_progress"
|
94
94
|
)
|
95
|
-
# we are setting to request_in_progress here which puts a started_at time on the JobRun in the API's database
|
96
|
-
# any time spent pulling Git repositories, setting up, etc, counts as compute time
|
97
|
-
job_run_result = self.primitive.jobs.job_run_update(
|
98
|
-
id=job_run_id, status="request_in_progress"
|
99
|
-
)
|
100
95
|
|
101
|
-
|
96
|
+
job_run_status = job_run_data.get("jobRun", {}).get("status", None)
|
97
|
+
|
98
|
+
while job_run_status != "in_progress":
|
99
|
+
if job_run_status == "pending":
|
100
|
+
# we are setting to request_in_progress here which puts a started_at time on the JobRun in the API's database
|
101
|
+
# any time spent pulling Git repositories, setting up, etc, counts as compute time
|
102
|
+
self.primitive.jobs.job_run_update(
|
103
|
+
id=job_run_id, status="request_in_progress"
|
104
|
+
)
|
102
105
|
logger.info(
|
103
|
-
f"Waiting for JobRun {job_run_data.get('name')} to be in_progress"
|
106
|
+
f"Waiting for JobRun {job_run_data.get('name')} to be in_progress. Current status: {job_run_status}"
|
104
107
|
)
|
105
108
|
sleep(1)
|
106
109
|
job_run_result = self.primitive.jobs.get_job_run(id=job_run_id)
|
107
110
|
if job_run_result.data is not None:
|
108
111
|
job_run_data = job_run_result.data.get("jobRun", {})
|
112
|
+
job_run_status = job_run_data.get("status", None)
|
109
113
|
|
110
114
|
runner = Runner(
|
111
115
|
primitive=self.primitive,
|
primitive/monitor/actions.py
CHANGED
@@ -115,6 +115,9 @@ class Monitor(BaseAction):
|
|
115
115
|
and (active_reservation_id is not None)
|
116
116
|
and (previous_reservation_id == active_reservation_id)
|
117
117
|
):
|
118
|
+
logger.info(
|
119
|
+
f"Reason: {active_reservation_data.get('reason', '')}"
|
120
|
+
)
|
118
121
|
self.primitive.provisioning.add_reservation_authorized_keys(
|
119
122
|
reservation_id=active_reservation_id
|
120
123
|
)
|
@@ -127,7 +130,7 @@ class Monitor(BaseAction):
|
|
127
130
|
reservation_id=active_reservation_id
|
128
131
|
)
|
129
132
|
)
|
130
|
-
job_run_id = job_run_data.get("id")
|
133
|
+
job_run_id = job_run_data.get("id", None)
|
131
134
|
|
132
135
|
# Golden state for normal reservation
|
133
136
|
if not job_run_id and active_reservation_id:
|
@@ -189,14 +189,13 @@ class Reservations(BaseAction):
|
|
189
189
|
)
|
190
190
|
|
191
191
|
while job_runs_for_reservation is None or job_runs_for_reservation.data is None:
|
192
|
-
logger.error("Error fetching job runs.")
|
193
192
|
sleep_amount = 5
|
194
193
|
logger.info(f"Error fetching job runs... [sleeping {sleep_amount} seconds]")
|
195
194
|
sleep(sleep_amount)
|
196
195
|
continue
|
197
196
|
|
198
197
|
if not job_runs_for_reservation.data["jobRuns"]["edges"]:
|
199
|
-
logger.
|
198
|
+
logger.info("No job runs found for the given reservation ID.")
|
200
199
|
return {}
|
201
200
|
|
202
201
|
return job_runs_for_reservation.data["jobRuns"]["edges"][0]["node"]
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: primitive
|
3
|
-
Version: 0.2.
|
3
|
+
Version: 0.2.44
|
4
4
|
Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
|
5
5
|
Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
|
6
6
|
Project-URL: Source, https://github.com//primitivecorp/primitive-cli
|
@@ -1,9 +1,9 @@
|
|
1
|
-
primitive/__about__.py,sha256=
|
1
|
+
primitive/__about__.py,sha256=nD4T6DRAwZX7Osoimqtf1Jwu6KoJDMk9mdI6wuoA4NY,130
|
2
2
|
primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
|
3
3
|
primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
|
4
4
|
primitive/client.py,sha256=RMF46F89oK82gfZH6Bf0WZrhXPUu01pbieSO_Vcuoc4,3624
|
5
5
|
primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
6
|
-
primitive/agent/actions.py,sha256=
|
6
|
+
primitive/agent/actions.py,sha256=IolgvWtdBleahMKbe787UQP_qaarhKZDtQygoz-6wnQ,6625
|
7
7
|
primitive/agent/commands.py,sha256=o847pK7v7EWQGG67tky6a33qtwoutX6LZrP2FIS_NOk,388
|
8
8
|
primitive/agent/runner.py,sha256=wkI7ANC9ob99Fy5UWJAj__Ah7f7gwMgrBJ_LgpWZf4A,15638
|
9
9
|
primitive/agent/uploader.py,sha256=ZzrzsajNBogwEC7mT6Ejy0h2Jd9axMYGzt9pbCvVMlk,3171
|
@@ -44,7 +44,7 @@ primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4
|
|
44
44
|
primitive/hardware/commands.py,sha256=NMliVHBZDl4UAvhmNEjrvN9KWPuqn87-d7eVb0ZqEYA,3752
|
45
45
|
primitive/hardware/ui.py,sha256=12rucuZ2s-w5R4bKyxON5dEbrdDnVf5sbj3K_nbdo44,2473
|
46
46
|
primitive/hardware/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
47
|
-
primitive/hardware/graphql/fragments.py,sha256=
|
47
|
+
primitive/hardware/graphql/fragments.py,sha256=H315uv-ujOsZEbQR5tmstbRU_9OCa5SErZMwIckSiLc,383
|
48
48
|
primitive/hardware/graphql/mutations.py,sha256=_4Hkbfik9Ron4T-meulu6T-9FR_BZjyPNwn745MPksU,1484
|
49
49
|
primitive/hardware/graphql/queries.py,sha256=I86uLuOSjHSph11Y5MVCYko5Js7hoiEZ-cEoPTc4J-k,1392
|
50
50
|
primitive/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -54,7 +54,7 @@ primitive/jobs/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
|
|
54
54
|
primitive/jobs/graphql/fragments.py,sha256=Ldhsc-NFHZGY8_1FjO2uZIdOL5UUGZjsldHea_GLJ_g,667
|
55
55
|
primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J8JJZuw,219
|
56
56
|
primitive/jobs/graphql/queries.py,sha256=ZxNmm-WovytbggNuKRnwa0kc26T34_0yhqkoqx-2uj0,1736
|
57
|
-
primitive/monitor/actions.py,sha256=
|
57
|
+
primitive/monitor/actions.py,sha256=80adDYkXi8i1C6WCV1N75tFAMhEbRw2NBMobWoFwpbg,9447
|
58
58
|
primitive/monitor/commands.py,sha256=VDlEL_Qpm_ysHxug7VpI0cVAZ0ny6AS91Y58D7F1zkU,409
|
59
59
|
primitive/organizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
60
60
|
primitive/organizations/actions.py,sha256=kVHOhG1oS2sI5p8uldSo5L-RUZsnG36eaulVuKLyZ-M,1863
|
@@ -75,7 +75,7 @@ primitive/provisioning/actions.py,sha256=IYZYAbtomtZtlkqDaBxx4e7PFKGkRNqek_tABH6
|
|
75
75
|
primitive/provisioning/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
76
76
|
primitive/provisioning/graphql/queries.py,sha256=cBtuKa6shoatYZfKSnQoPJP6B8g8y3QhFqJ_pkvMcG0,134
|
77
77
|
primitive/reservations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
78
|
-
primitive/reservations/actions.py,sha256=
|
78
|
+
primitive/reservations/actions.py,sha256=vxJ62oriy3Km1d_tiFGMbSclkMJf66eaUgVuhjGmuyA,7021
|
79
79
|
primitive/reservations/commands.py,sha256=LFRoV59QGgWIjBdrGjJdffHugg8TLe0Fwlcyu_JaTkk,2369
|
80
80
|
primitive/reservations/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
81
81
|
primitive/reservations/graphql/fragments.py,sha256=h3edd0Es38SNldhHiRU3hAJNYwrUIJMWxiP8av3BfrI,431
|
@@ -95,8 +95,8 @@ primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,37
|
|
95
95
|
primitive/utils/psutil.py,sha256=xa7ef435UL37jyjmUPbEqCO2ayQMpCs0HCrxVEvLcuM,763
|
96
96
|
primitive/utils/shell.py,sha256=Z4zxmOaSyGCrS0D6I436iQci-ewHLt4UxVg1CD9Serc,2171
|
97
97
|
primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
|
98
|
-
primitive-0.2.
|
99
|
-
primitive-0.2.
|
100
|
-
primitive-0.2.
|
101
|
-
primitive-0.2.
|
102
|
-
primitive-0.2.
|
98
|
+
primitive-0.2.44.dist-info/METADATA,sha256=tXtSib6WFcP3S1r4WDcB45W60OS_2YHzUWVKJg_33ck,3535
|
99
|
+
primitive-0.2.44.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
100
|
+
primitive-0.2.44.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
|
101
|
+
primitive-0.2.44.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
|
102
|
+
primitive-0.2.44.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|