ivoryos 1.0.0__py3-none-any.whl → 1.0.3__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.

Potentially problematic release.

This version of ivoryos might be problematic. Click here for more details.

Files changed (23) hide show
  1. ivoryos/routes/auth/auth.py +3 -3
  2. ivoryos/routes/control/control.py +89 -60
  3. ivoryos/routes/control/templates/control/controllers_home.html +7 -7
  4. ivoryos/routes/database/database.py +98 -39
  5. ivoryos/routes/database/templates/database/{experiment_database.html → scripts_database.html} +27 -18
  6. ivoryos/routes/database/templates/database/{workflow_run_database.html → workflow_database.html} +27 -5
  7. ivoryos/routes/design/design.py +215 -78
  8. ivoryos/routes/design/templates/design/experiment_run.html +62 -123
  9. ivoryos/static/js/socket_handler.js +13 -8
  10. ivoryos/utils/bo_campaign.py +87 -0
  11. ivoryos/utils/client_proxy.py +1 -1
  12. ivoryos/utils/db_models.py +27 -7
  13. ivoryos/utils/global_config.py +16 -7
  14. ivoryos/utils/script_runner.py +56 -40
  15. ivoryos/utils/task_runner.py +81 -0
  16. ivoryos/utils/utils.py +0 -68
  17. ivoryos/version.py +1 -1
  18. {ivoryos-1.0.0.dist-info → ivoryos-1.0.3.dist-info}/METADATA +3 -3
  19. {ivoryos-1.0.0.dist-info → ivoryos-1.0.3.dist-info}/RECORD +23 -21
  20. /ivoryos/routes/database/templates/database/{experiment_step_view.html → workflow_view.html} +0 -0
  21. {ivoryos-1.0.0.dist-info → ivoryos-1.0.3.dist-info}/LICENSE +0 -0
  22. {ivoryos-1.0.0.dist-info → ivoryos-1.0.3.dist-info}/WHEEL +0 -0
  23. {ivoryos-1.0.0.dist-info → ivoryos-1.0.3.dist-info}/top_level.txt +0 -0
ivoryos/routes/database/templates/database/{experiment_database.html → scripts_database.html} RENAMED
@@ -35,19 +35,19 @@
35
35
  </tr>
36
36
  </thead>
37
37
  <tbody>
38
- {% for workflow in workflows %}
38
+ {% for script in scripts %}
39
39
  <tr>
40
- <td><a href="{{ url_for('database.edit_workflow', workflow_name=workflow.name) }}">{{ workflow.name }}</a></td>
41
- <td>{{ workflow.deck }}</td>
42
- <td>{{ workflow.status }}</td>
43
- <td>{{ workflow.time_created }}</td>
44
- <td>{{ workflow.last_modified }}</td>
45
- <td>{{ workflow.author }}</td>
40
+ <td><a href="{{ url_for('database.edit_workflow', script_name=script.name) }}">{{ script.name }}</a></td>
41
+ <td>{{ script.deck }}</td>
42
+ <td>{{ script.status }}</td>
43
+ <td>{{ script.time_created }}</td>
44
+ <td>{{ script.last_modified }}</td>
45
+ <td>{{ script.author }}</td>
46
46
  {# <td>{{ workflow.registered }}</td>#}
47
47
  <td>
48
48
  {#not workflow.status == "finalized" or#}
49
- {% if session['user'] == 'admin' or session['user'] == workflow.author %}
50
- <a href="{{ url_for('database.delete_workflow', workflow_name=workflow.name) }}">delete</a>
49
+ {% if session['user'] == 'admin' or session['user'] == script.author %}
50
+ <a href="{{ url_for('database.delete_workflow', script_name=script.name) }}">delete</a>
51
51
  {% else %}
52
52
  <a class="disabled-link">delete</a>
53
53
  {% endif %}
@@ -57,18 +57,27 @@
57
57
  </tbody>
58
58
  </table>
59
59
 
60
- {# paging#}
60
+ {# paging#}
61
61
  <div class="pagination justify-content-center">
62
- <div class="page-item {{ 'disabled' if not workflows.has_prev else '' }}">
63
- <a class="page-link" href="{{ url_for('database.load_from_database', page=workflows.prev_num) }}">Previous</a>
62
+ <div class="page-item {{ 'disabled' if not scripts.has_prev else '' }}">
63
+ <a class="page-link" href="{{ url_for('database.load_from_database', page=scripts.prev_num) }}">Previous</a>
64
64
  </div>
65
- {% for num in workflows.iter_pages() %}
66
- <div class="page-item">
67
- <a class="page-link {{ 'active' if num == workflows.page else '' }}" href="{{ url_for('database.load_from_database', page=num) }}">{{ num }}</a>
68
- </div>
65
+
66
+ {% for num in scripts.iter_pages() %}
67
+ {% if num %}
68
+ <div class="page-item {{ 'active' if num == scripts.page else '' }}">
69
+ <a class="page-link" href="{{ url_for('database.load_from_database', page=num) }}">{{ num }}</a>
70
+ </div>
71
+ {% else %}
72
+ <div class="page-item disabled">
73
+ <span class="page-link">…</span>
74
+ </div>
75
+ {% endif %}
69
76
  {% endfor %}
70
- <div class="page-item {{ 'disabled' if not workflows.has_next else '' }}">
71
- <a class="page-link" href="{{ url_for('database.load_from_database', page=workflows.next_num) }}">Next</a>
77
+
78
+ <div class="page-item {{ 'disabled' if not scripts.has_next else '' }}">
79
+ <a class="page-link" href="{{ url_for('database.load_from_database', page=scripts.next_num) }}">Next</a>
72
80
  </div>
73
81
  </div>
82
+
74
83
  {% endblock %}
ivoryos/routes/database/templates/database/{workflow_run_database.html → workflow_database.html} RENAMED
@@ -2,11 +2,24 @@
2
2
 
3
3
  {% block title %}IvoryOS | Design Database{% endblock %}
4
4
  {% block body %}
5
+ <div class="div">
6
+ <form id="search" style="display: inline-block;float: right;" action="{{url_for('database.list_workflows',deck_name=deck_name)}}" method="GET">
7
+ <div class="input-group">
8
+ <div class="form-outline">
9
+ <input type="search" name="keyword" id="keyword" class="form-control" placeholder="Search workflows...">
10
+ </div>
11
+ <button type="submit" class="btn btn-primary">
12
+ <i class="bi bi-search"></i>
13
+ </button>
14
+ </div>
15
+ </form>
16
+ </div>
5
17
 
6
- <table class="table table-hover" id="workflowResultLibrary">
18
+ <table class="table table-hover" id="workflowResultLibrary">
7
19
  <thead>
8
20
  <tr>
9
21
  <th scope="col">Workflow name</th>
22
+ <th scope="col">Workflow ID</th>
10
23
  <th scope="col">Start time</th>
11
24
  <th scope="col">End time</th>
12
25
  <th scope="col">Data</th>
@@ -16,6 +29,7 @@
16
29
  {% for workflow in workflows %}
17
30
  <tr>
18
31
  <td><a href="{{ url_for('database.get_workflow_steps', workflow_id=workflow.id) }}">{{ workflow.name }}</a></td>
32
+ <td>{{ workflow.id }}</td>
19
33
  <td>{{ workflow.start_time.strftime("%Y-%m-%d %H:%M:%S") if workflow.start_time else '' }}</td>
20
34
  <td>{{ workflow.end_time.strftime("%Y-%m-%d %H:%M:%S") if workflow.end_time else '' }}</td>
21
35
 
@@ -36,16 +50,24 @@
36
50
  </tbody>
37
51
  </table>
38
52
 
39
- {# paging#}
53
+ {# paging#}
40
54
  <div class="pagination justify-content-center">
41
55
  <div class="page-item {{ 'disabled' if not workflows.has_prev else '' }}">
42
56
  <a class="page-link" href="{{ url_for('database.list_workflows', page=workflows.prev_num) }}">Previous</a>
43
57
  </div>
58
+
44
59
  {% for num in workflows.iter_pages() %}
45
- <div class="page-item">
46
- <a class="page-link {{ 'active' if num == workflows.page else '' }}" href="{{ url_for('database.list_workflows', page=num) }}">{{ num }}</a>
47
- </div>
60
+ {% if num %}
61
+ <div class="page-item {{ 'active' if num == workflows.page else '' }}">
62
+ <a class="page-link" href="{{ url_for('database.list_workflows', page=num) }}">{{ num }}</a>
63
+ </div>
64
+ {% else %}
65
+ <div class="page-item disabled">
66
+ <span class="page-link">…</span>
67
+ </div>
68
+ {% endif %}
48
69
  {% endfor %}
70
+
49
71
  <div class="page-item {{ 'disabled' if not workflows.has_next else '' }}">
50
72
  <a class="page-link" href="{{ url_for('database.list_workflows', page=workflows.next_num) }}">Next</a>
51
73
  </div>