cloudos-cli 2.76.3__tar.gz → 2.76.4__tar.gz
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.
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/PKG-INFO +1 -1
- cloudos_cli-2.76.4/cloudos_cli/_version.py +1 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/details.py +30 -15
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli.egg-info/PKG-INFO +1 -1
- cloudos_cli-2.76.3/cloudos_cli/_version.py +0 -1
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/LICENSE +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/README.md +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/__main__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/clos.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/configure/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/configure/configure.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/cost/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/cost/cost.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/datasets/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/datasets/datasets.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/import_wf/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/import_wf/import_wf.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/jobs/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/jobs/job.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/link/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/link/link.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/logging/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/logging/logger.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/procurement/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/procurement/images.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/queue/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/queue/queue.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/related_analyses/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/related_analyses/related_analyses.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/array_job.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/cloud.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/errors.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/last_wf.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/requests.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli/utils/resources.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli.egg-info/SOURCES.txt +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli.egg-info/dependency_links.txt +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli.egg-info/entry_points.txt +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli.egg-info/requires.txt +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/cloudos_cli.egg-info/top_level.txt +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/setup.cfg +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/setup.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/functions_for_pytest.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_cli_project_create.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_cost/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_cost/test_job_cost.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_error_messages.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_logging/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_logging/test_logger.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_related_analyses/__init__.py +0 -0
- {cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_related_analyses/test_related_analyses.py +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = '2.76.4'
|
|
@@ -203,20 +203,35 @@ def create_job_details(j_details_h, job_id, output_format, output_basename, para
|
|
|
203
203
|
owner = str(j_details_h.get("user", {}).get("name", "None") + " " + j_details_h.get("user", {}).get("surname", "None"))
|
|
204
204
|
pipeline = str(j_details_h.get("workflow", {}).get("name", "None"))
|
|
205
205
|
# calculate the run time
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
206
|
+
start_time_raw = j_details_h.get("startTime")
|
|
207
|
+
end_time_raw = j_details_h.get("endTime")
|
|
208
|
+
|
|
209
|
+
if start_time_raw and end_time_raw:
|
|
210
|
+
try:
|
|
211
|
+
start_dt = datetime.fromisoformat(str(start_time_raw).replace('Z', '+00:00'))
|
|
212
|
+
end_dt = datetime.fromisoformat(str(end_time_raw).replace('Z', '+00:00'))
|
|
213
|
+
duration = end_dt - start_dt
|
|
214
|
+
# Format duration as hours:minutes:seconds
|
|
215
|
+
total_seconds = int(duration.total_seconds())
|
|
216
|
+
hours = total_seconds // 3600
|
|
217
|
+
minutes = (total_seconds % 3600) // 60
|
|
218
|
+
seconds = total_seconds % 60
|
|
219
|
+
if hours > 0:
|
|
220
|
+
run_time = f"{hours}h {minutes}m {seconds}s"
|
|
221
|
+
elif minutes > 0:
|
|
222
|
+
run_time = f"{minutes}m {seconds}s"
|
|
223
|
+
else:
|
|
224
|
+
run_time = f"{seconds}s"
|
|
225
|
+
submit_time = str(start_dt.strftime('%Y-%m-%d %H:%M:%S'))
|
|
226
|
+
end_time = str(end_dt.strftime('%Y-%m-%d %H:%M:%S'))
|
|
227
|
+
except (ValueError, TypeError):
|
|
228
|
+
run_time = "N/A"
|
|
229
|
+
submit_time = "N/A"
|
|
230
|
+
end_time = "N/A"
|
|
218
231
|
else:
|
|
219
|
-
run_time =
|
|
232
|
+
run_time = "N/A"
|
|
233
|
+
submit_time = "N/A" if not start_time_raw else str(datetime.fromisoformat(str(start_time_raw).replace('Z', '+00:00')).strftime('%Y-%m-%d %H:%M:%S'))
|
|
234
|
+
end_time = "N/A" if not end_time_raw else str(datetime.fromisoformat(str(end_time_raw).replace('Z', '+00:00')).strftime('%Y-%m-%d %H:%M:%S'))
|
|
220
235
|
# determine cost
|
|
221
236
|
cost = j_details_h.get("computeCostSpent", None)
|
|
222
237
|
if cost is not None:
|
|
@@ -242,8 +257,8 @@ def create_job_details(j_details_h, job_id, output_format, output_basename, para
|
|
|
242
257
|
"Owner": owner,
|
|
243
258
|
"Pipeline": pipeline,
|
|
244
259
|
"ID": str(job_id),
|
|
245
|
-
"Submit time":
|
|
246
|
-
"End time":
|
|
260
|
+
"Submit time": submit_time,
|
|
261
|
+
"End time": end_time,
|
|
247
262
|
"Run time": str(run_time),
|
|
248
263
|
"Commit": str(revision),
|
|
249
264
|
"Cost": cost_display,
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = '2.76.3'
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cloudos_cli-2.76.3 → cloudos_cli-2.76.4}/tests/test_related_analyses/test_related_analyses.py
RENAMED
|
File without changes
|