Skip to content

Commit

Permalink
Merge branch 'main' of github.com:cloudmesh/cloudmesh-cc
Browse files Browse the repository at this point in the history
  • Loading branch information
@laszewsk
laszewsk committed Dec 15, 2023
2 parents 4963894 + 574ab6f commit 5b72da4
Show file tree
Hide file tree
Showing 47 changed files with 390 additions and 1,079 deletions.
2 changes: 2 additions & 0 deletions .bumpversion.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ tag = False

[bumpversion:file:VERSION]

[bumpversion:file:openapi.yaml]

[bumpversion:file:./cloudmesh/cc/__version__.py]

[bumpversion:file:./cloudmesh/cc/__init__.py]
Expand Down
21 changes: 21 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@ Jacques Fleischer

$^*$ Corresponding author

## Citation

* <https://arxiv.org/pdf/2210.16941>
* <https://github.com/cyberaide/paper-cloudmesh-cc/raw/main/vonLaszewski-cloudmesh-cc.pdf>

```
@misc{las-2022-hybrid-cc,
title = {Hybrid Reusable Computational Analytics Workflow
Management with Cloudmesh},
author = {Gregor von Laszewski and J. P. Fleischer and
Geoffrey C. Fox},
year = 2022,
eprint = {2210.16941},
archivePrefix ={arXiv},
primaryClass = {cs.DC},
url = {https://arxiv.org/pdf/2210.16941},
urlOPT =
{https://github.com/cyberaide/paper-cloudmesh-cc/raw/main/vonLaszewski-cloudmesh-cc.pdf}
}
```


## Background

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.0
4.4.0
2 changes: 1 addition & 1 deletion cloudmesh/cc/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""Cloudmesh cc package."""
__version__ = "4.4.0"
__version__ = "4.4.0"
4 changes: 2 additions & 2 deletions cloudmesh/cc/service/service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,8 +899,8 @@ def list_workflows(output: str = None):
# 4.2 they are uncompressed just as if they were to do an individual upload.
# name is optional because the name is determined on what is provided
@app.post("/workflow", include_in_schema=include_portal_tag_in_schema)
@app.post("/workflow/{workflow_name}",
tags=['workflow'])
# @app.post("/workflow/{workflow_name}",
# tags=['workflow'])
@app.post("/workflow/upload", include_in_schema=include_portal_tag_in_schema)
def upload_workflow(directory: str = Query(None,
description='path to workflow dir '
Expand Down
5 changes: 3 additions & 2 deletions cloudmesh/cc/service/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
<link rel="icon" href="{{ url_for('static', path='/images/favicon.png') }}" sizes="128x128" />

<!-- Bootstrap CSS CDN -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>

<!-- Custom CSS -->
<link href="{{ url_for('static', path='/css/style3.css') }}" rel="stylesheet">
<link href="{{ url_for('static', path='/css/mystyle.css') }}" rel="stylesheet">
Expand Down
33 changes: 25 additions & 8 deletions cloudmesh/cc/service/templates/include/sidebar.html
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
<!-- Sidebar -->
<style>
.sidebar-header {
display: flex;
align-items: center;
flex-direction: column;
padding: 10px;
text-align: center;
}

.sidebar-header .navbar-brand {
margin-right: 10px;
}

.cloudmesh {
display: block;
margin-top: 10px;
}
</style>

<nav id="sidebar">
<div class="collapse show" id="navbarcool">

<div class="sidebar-header">
<a class="navbar-brand" href="#">
<img src="https://cloudmesh.github.io/cloudmesh-manual/_static/logo3.png" height="50" alt="Cloudmesh Logo"
loading="lazy" />
<br>
<b><small>Cloudmesh</small></b>
</a>

<img src="https://cloudmesh.github.io/cloudmesh-manual/_static/logo3.png" height="50" alt="Cloudmesh Logo" loading="lazy" />
</a>
Compute Cluster&nbsp;
</div>

<!-- Rest of the sidebar content -->


<ul class="list-unstyled components">
<li>
<a href="/"><i class="fa fa-home" aria-hidden="true"></i> &nbsp; Home</a>
Expand Down
186 changes: 104 additions & 82 deletions cloudmesh/cc/service/templates/watcher.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,20 @@
],
});
});
</script>

<style>
.navbar-nav {
display: flex;
align-items: center;
margin-bottom: 12px;
}

.nav-item.heading {
margin-right: 10px;
}
</style>

</script>
<script>
var source = new EventSource("http://127.0.0.1:8000/workflow-graph/{{ name }}");
source.onmessage = function(event) {
Expand Down Expand Up @@ -52,109 +63,120 @@
<!-- Page Content -->
<div id="content">
<h1>{{ name|safe }}</h1>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">

<button class="btn btn-dark d-inline-block d-lg-none ml-auto"
type="button"
data-toggle="collapse"
data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent"
aria-expanded="false"
aria-label="Toggle navigation">
<i class="fas fa-align-justify"></i>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="nav navbar-nav ml-auto">
<li><b class="btn badge-light"> Jobs</i> </b>
</li>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
<button class="btn btn-dark d-inline-block d-lg-none ml-auto"
type="button"
data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent"
aria-expanded="false"
aria-label="Toggle navigation">
<i class="fas fa-align-justify"></i>
</button>

<div class="collapse navbar-collapse flex-column ms-auto justify-content-start" id="navbarSupportedContent">
<ul class="nav navbar-nav me-auto">
<li class="nav-item heading">
<b class="text-black"> Jobs </b>

</li>
&nbsp;
<li>

<button type="button" class="btn badge-danger btn-sm">
<small> <i class="fa fa-close" aria-hidden="true"></i> &nbsp; Failed</small> <span class="badge badge-light"><div id="failednumber"></div></span>
</button>
</li>
<li class="nav-item">
<button type="button" class="btn bg-danger btn-sm">
<small class="text-white"> <i class="fa fa-close" aria-hidden="true"></i> &nbsp; Failed</small>
<span class="badge bg-light text-dark"><div id="failednumber"></div></span>
</button>
</li>
&nbsp;
<li>
<button type="button" class="btn badge-success btn-sm">
<small> <i class="fa fa-check" aria-hidden="true"></i> &nbsp; Done</small> <span class="badge badge-light"><div id="donenumber"></div></span>
</button>
</li>
<li class="nav-item">
<button type="button" class="btn bg-success btn-sm">
<small class="text-white"> <i class="fa fa-check" aria-hidden="true"></i> &nbsp; Done</small>
<span class="badge bg-light text-dark"><div id="donenumber"></div></span>
</button>
</li>
&nbsp;
<li>
<button type="button" class="btn badge-info btn-sm">
<small><i class="fa fa-cog" aria-hidden="true"></i> &nbsp; Running</small> <span class="badge badge-light"><div id="runningnumber"></div></span>
</button>
</li>
<li class="nav-item">
<button type="button" class="btn bg-info btn-sm">
<small class="text-black"><i class="fa fa-cog" aria-hidden="true"></i> &nbsp; Running</small>
<span class="badge bg-light text-dark"><div id="runningnumber"></div></span>
</button>
</li>
&nbsp;

<li>
<button type="button" class="btn badge-warning btn-sm">
<small><i class="fa fa-external-link" aria-hidden="true"></i> &nbsp; Submitted</small> <span class="badge badge-light"><div id="submittednumber"></div></span>
</button>
</li>
<li class="nav-item">
<button type="button" class="btn bg-warning btn-sm">
<small class="text-black"><i class="fa fa-external-link" aria-hidden="true"></i> &nbsp; Submitted</small>
<span class="badge bg-light text-dark"><div id="submittednumber"></div></span>
</button>
</li>
&nbsp;

<li>
<button type="button" class="btn badge-light btn-sm">
<small><i class="fa fa-square" aria-hidden="true"></i> &nbsp; Ready</small> <span class="badge badge-light"><div id="readynumber"></div></span>
</button>
</li>
<li class="nav-item">
<button type="button" class="btn bg-light btn-sm border border-dark">
<small class="text-black"><i class="fa fa-square" aria-hidden="true"></i> &nbsp; Ready</small>
<span class="badge bg-light text-dark"><div id="readynumber"></div></span>
</button>
</li>
&nbsp;
<li>
<button type="button" class="btn badge-secondary btn-sm">
<small> <i class="fa fa-plus-square" aria-hidden="true"></i> &nbsp; Add</small>
</button>
</li>
<li class="nav-item">
<button type="button" class="btn bg-secondary btn-sm">
<small class="text-white"> <i class="fa fa-plus-square" aria-hidden="true"></i> &nbsp; Add</small>
</button>
</li>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

<li>
<b class="btn badge-light btn-sm"> Workflow </b>
</li>
<li>
<button type="button" class="btn badge-secondary btn-sm">
<a href="/workflow/{{ name }}?output=table&initialized=True">

<small><i class="fa fa-table" aria-hidden="true"></i> Table</small></a>

</button>
</ul>

<ul class="nav navbar-nav me-auto">
<li class="nav-item heading">
<b class="text-black"> Workflow </b>
</li>
<li class="nav-item">
<button type="button" class="btn bg-secondary btn-sm">
<a href="/workflow/{{ name }}?output=table&initialized=True">
<small class="text-white"><i class="fa fa-table" aria-hidden="true"></i> &nbsp; Table</small>
</a>
</button>
</li>
&nbsp;
<li>
<button type="button" class="btn badge-success btn-sm">
<a href="/workflow/run/{{ name }}?redirect=graph"><small><i class="fa fa-rocket" aria-hidden="true"></i> &nbsp; Run</small></a>
</button>
</li>
<li class="nav-item">
<button type="button" class="btn bg-success btn-sm">
<a href="/workflow/run/{{ name }}?redirect=graph">
<small class="text-white"><i class="fa fa-rocket" aria-hidden="true"></i> &nbsp; Run</small>
</a>
</button>
</li>
&nbsp;

<li>
<button type="button" class="btn badge-danger btn-sm">
<small><i class="fa fa-ban" aria-hidden="true"></i> &nbsp; Stop</small>
</button>
<li class="nav-item">
<button type="button" class="btn bg-danger btn-sm">
<small class="text-white"><i class="fa fa-ban" aria-hidden="true"></i> &nbsp; Stop</small>
</button>
</li>
&nbsp;

<!-- reset does stop, then empties out runtime -->
<!-- dir, copies original workflow into runtime -->
<!-- dir, and report back that its done. -->
<!-- popup yes/no choice in bootstrap -->
<li>
<button type="button" class="btn badge-warning btn-sm">
<a href="/reset/{{ name }}?redirect=graph"><small><i class="fa fa-recycle" aria-hidden="true"></i> &nbsp; Reset</small></a>
</button>
<!-- popup yes/no choice in bootstrap needed ... -->
<li class="nav-item">
<button type="button" class="btn bg-warning btn-sm">
<a href="/reset/{{ name }}?redirect=graph">
<small><i class="fa fa-recycle" aria-hidden="true"></i> &nbsp; Reset</small>
</a>
</button>
</li>
&nbsp;

<li>
<button type="button" class="btn badge-danger btn-sm">
<a href="/delete/{{ name }}"><small><i class="fa fa-trash" aria-hidden="true"></i> &nbsp; Delete</small></a>
</button>
<li class="nav-item">
<button type="button" class="btn bg-danger btn-sm">
<a href="/delete/{{ name }}">
<small class="text-white"><i class="fa fa-trash" aria-hidden="true"></i> &nbsp; Delete</small>
</a>
</button>
</li>
&nbsp;

<li>
<button type="button" class="btn badge-info btn-sm">
<li class="nav-item">
<button type="button" class="btn bg-info btn-sm">
<a href="/edit/{{ name_of_workflow }}"><small><i class="fa fa-pen-to-square" aria-hidden="true"></i> &nbsp; Edit</small></a>
</button>
</li>
Expand Down
Loading

0 comments on commit 5b72da4

Please sign in to comment.