Browse Source

Merge pull request 'fix-issue' (#3112) from fix-2902 into V20221102

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/3112
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>
pull/3127/head
chenshihai 2 years ago
parent
commit
464b6655a5
15 changed files with 119 additions and 39 deletions
  1. +2
    -2
      options/locale/locale_en-US.ini
  2. +11
    -0
      templates/admin/cloudbrain/list.tmpl
  3. +9
    -2
      templates/custom/max_log.tmpl
  4. +7
    -4
      templates/repo/cloudbrain/benchmark/show.tmpl
  5. +7
    -4
      templates/repo/cloudbrain/inference/show.tmpl
  6. +7
    -4
      templates/repo/cloudbrain/trainjob/show.tmpl
  7. +12
    -0
      templates/repo/debugjob/index.tmpl
  8. +4
    -1
      templates/repo/grampus/trainjob/show.tmpl
  9. +7
    -4
      templates/repo/modelarts/inferencejob/show.tmpl
  10. +4
    -1
      templates/repo/modelarts/trainjob/show.tmpl
  11. +5
    -2
      templates/repo/modelarts/trainjob/version_new.tmpl
  12. +6
    -3
      templates/repo/modelsafety/show.tmpl
  13. +13
    -1
      templates/user/dashboard/cloudbrains.tmpl
  14. +24
    -4
      web_src/js/features/cloudbrainShow.js
  15. +1
    -7
      web_src/js/features/cloudrbanin.js

+ 2
- 2
options/locale/locale_en-US.ini View File

@@ -1217,8 +1217,8 @@ cloudbrain.benchmark.evaluate_train=Train Script
cloudbrain.benchmark.evaluate_test=Test Script cloudbrain.benchmark.evaluate_test=Test Script
cloudbrain.benchmark.types={"type":[{"id":1,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=detection","first":"Target detection","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=reid","first":"Target re-identification","second":[{"id":1,"value":"Vehicle re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"Image-based person re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]},{"id":3,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=tracking","first":"Multi-target tracking","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"lix07","repo_name":"MOT_benchmark_script"}]}]} cloudbrain.benchmark.types={"type":[{"id":1,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=detection","first":"Target detection","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=reid","first":"Target re-identification","second":[{"id":1,"value":"Vehicle re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"Image-based person re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]},{"id":3,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=tracking","first":"Multi-target tracking","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"lix07","repo_name":"MOT_benchmark_script"}]}]}
cloudbrain.morethanonejob=You already have a running or waiting task, create it after that task is over. cloudbrain.morethanonejob=You already have a running or waiting task, create it after that task is over.
cloudbrain.morethanonejob1=You have created a <span style="color:rgba(242, 113, 28, 1);"> similar task </span> that is waiting or running, please wait for the task to finish before creating it.
cloudbrain.morethanonejob2=You can view all your Cloud Brain tasks in <a href="/cloudbrains" target="_blank"> Personal Center > Cloud Brain Tasks </a>.
cloudbrain.morethanonejob1=You have created a <span style="color:rgba(242, 113, 28, 1);"> equivalent task </span> that is waiting or running, please wait for the task to finish before creating it.
cloudbrain.morethanonejob2=You can view all your Cloud Brain tasks in <a href="/cloudbrains" target="_blank"> Home > Cloudbrain Task </a>.


modelarts.infer_job_model = Model modelarts.infer_job_model = Model
modelarts.infer_job_model_file = Model File modelarts.infer_job_model_file = Model File


+ 11
- 0
templates/admin/cloudbrain/list.tmpl View File

@@ -497,6 +497,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ui modal debug-again-alert">
<div class="ui message" style="background-color: rgba(242, 113, 28, 0.05);border: 1px solid rgba(242, 113, 28, 1);border-radius: 5px;">
<div style="display: flex;align-items: center;">
<i class="ri-information-line" style="font-size: 35px;color: rgba(242, 113, 28, 1);;"></i>
<div style="text-align: left;margin-left: 1rem;">
<div style="font-weight: 600;line-height: 2;">{{.i18n.Tr "repo.cloudbrain.morethanonejob1" | Safe }}</div>
<div style="color:#939393">{{.i18n.Tr "repo.cloudbrain.morethanonejob2" | Safe}}</div>
</div>
</div>
</div>
</div>
</div> </div>
<script> <script>
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {


+ 9
- 2
templates/custom/max_log.tmpl View File

@@ -2,14 +2,21 @@
<div class="ui modal max-full-log{{.VersionName}} container" style="height: 90%;margin: 3rem auto;"> <div class="ui modal max-full-log{{.VersionName}} container" style="height: 90%;margin: 3rem auto;">
<div class="file-info" style="padding: 2rem;justify-content: space-between;"> <div class="file-info" style="padding: 2rem;justify-content: space-between;">
<div id="log-file-title" style="font-size: 16px;font-weight:600"></div> <div id="log-file-title" style="font-size: 16px;font-weight:600"></div>
<div>
<div class="file-info">
<a class="file-info" id="{{.VersionName}}-log-down" href="">
<i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;" class="log-file-down"></span>
</a>
<div class="file-info close-log-dialog" data-version="{{.VersionName}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"> <div class="file-info close-log-dialog" data-version="{{.VersionName}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<i class="ri-fullscreen-exit-fill" style="font-size: 16px;"></i> <i class="ri-fullscreen-exit-fill" style="font-size: 16px;"></i>
<span id="log-file-exit" style="margin-left: 0.3rem;font-size: 12px;"></span> <span id="log-file-exit" style="margin-left: 0.3rem;font-size: 12px;"></span>
</div> </div>
</div> </div>
</div> </div>
<div style="margin: 0 2rem;border: 1px solid #e8e8e8;height: 88%;position: relative;">
<div style="margin: 0 2.5rem;border: 1px solid #e8e8e8;height: 88%;position: relative;">
<span> <span>
<a style="position: absolute; right: -32px;cursor: pointer;" <a style="position: absolute; right: -32px;cursor: pointer;"
class="log_top-max" data-version="{{.VersionName}}" data-max="-max"><i class="icon-to-top"></i></a> class="log_top-max" data-version="{{.VersionName}}" data-max="-max"><i class="icon-to-top"></i></a>


+ 7
- 4
templates/repo/cloudbrain/benchmark/show.tmpl View File

@@ -531,19 +531,22 @@
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
<i class="ri-aspect-ratio-line"></i> <i class="ri-aspect-ratio-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
</div> </div>
</div> </div>
<div <div
style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;"> style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
<span> <span>
<a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a> class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
</span> </span>
<span class="log-info-{{.VersionName}}"> <span class="log-info-{{.VersionName}}">
<a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
class="log_bottom" data-version="{{.VersionName}}"><i class="log_bottom" data-version="{{.VersionName}}"><i
class="icon-to-bottom"></i></a> class="icon-to-bottom"></i></a>
</span> </span>


+ 7
- 4
templates/repo/cloudbrain/inference/show.tmpl View File

@@ -542,7 +542,10 @@
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
<i class="ri-aspect-ratio-line"></i> <i class="ri-aspect-ratio-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
</div> </div>
@@ -550,11 +553,11 @@
<div <div
style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;"> style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
<span> <span>
<a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a> class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
</span> </span>
<span class="log-info-{{.VersionName}}"> <span class="log-info-{{.VersionName}}">
<a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
class="log_bottom" data-version="{{.VersionName}}"><i class="log_bottom" data-version="{{.VersionName}}"><i
class="icon-to-bottom"></i></a> class="icon-to-bottom"></i></a>
</span> </span>
@@ -570,7 +573,7 @@
<input type="hidden" name="end_line-max" value> <input type="hidden" name="end_line-max" value>
<input type="hidden" name="start_line-max" value> <input type="hidden" name="start_line-max" value>
<input type="hidden" name="start_line-max-copy" value> <input type="hidden" name="start_line-max-copy" value>
<input type="hidden" name="start_line" value> <input type="hidden" name="start_line" value>
<input type="hidden" name="start_line" value>
<input type="hidden" name="init_log" value> <input type="hidden" name="init_log" value>
<pre id="log_file{{.VersionName}}"></pre> <pre id="log_file{{.VersionName}}"></pre>
</div> </div>


+ 7
- 4
templates/repo/cloudbrain/trainjob/show.tmpl View File

@@ -531,18 +531,21 @@
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
<i class="ri-aspect-ratio-line"></i> <i class="ri-aspect-ratio-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
</div> </div>
</div> </div>
<div style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;"> <div style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
<span> <span>
<a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a> class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
</span> </span>
<span class="log-info-{{.VersionName}}"> <span class="log-info-{{.VersionName}}">
<a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
class="log_bottom" data-version="{{.VersionName}}"><i class="log_bottom" data-version="{{.VersionName}}"><i
class="icon-to-bottom"></i></a> class="icon-to-bottom"></i></a>
</span> </span>
@@ -558,7 +561,7 @@
<input type="hidden" name="end_line-max" value> <input type="hidden" name="end_line-max" value>
<input type="hidden" name="start_line-max" value> <input type="hidden" name="start_line-max" value>
<input type="hidden" name="start_line-max-copy" value> <input type="hidden" name="start_line-max-copy" value>
<input type="hidden" name="start_line" value> <input type="hidden" name="start_line" value>
<input type="hidden" name="start_line" value>
<input type="hidden" name="init_log" value> <input type="hidden" name="init_log" value>
<pre id="log_file{{.VersionName}}"></pre> <pre id="log_file{{.VersionName}}"></pre>
</div> </div>


+ 12
- 0
templates/repo/debugjob/index.tmpl View File

@@ -419,6 +419,18 @@
</div> </div>
</div> </div>
</div> </div>

<div class="ui modal debug-again-alert">
<div class="ui message" style="background-color: rgba(242, 113, 28, 0.05);border: 1px solid rgba(242, 113, 28, 1);border-radius: 5px;">
<div style="display: flex;align-items: center;">
<i class="ri-information-line" style="font-size: 35px;color: rgba(242, 113, 28, 1);;"></i>
<div style="text-align: left;margin-left: 1rem;">
<div style="font-weight: 600;line-height: 2;">{{.i18n.Tr "repo.cloudbrain.morethanonejob1" | Safe }}</div>
<div style="color:#939393">{{.i18n.Tr "repo.cloudbrain.morethanonejob2" | Safe}}</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}} {{template "base/footer" .}}
<script> <script>
// 调试和评分新开窗口 // 调试和评分新开窗口


+ 4
- 1
templates/repo/grampus/trainjob/show.tmpl View File

@@ -527,7 +527,10 @@
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-log-type="c2Net" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/grampus/train-job/{{.JobID}}/download_log"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
<i class="ri-aspect-ratio-line"></i> <i class="ri-aspect-ratio-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
</div> </div>


+ 7
- 4
templates/repo/modelarts/inferencejob/show.tmpl View File

@@ -467,18 +467,21 @@ td, th {
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/download_log_file?version_name={{.VersionName}}"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
<i class="ri-aspect-ratio-line"></i> <i class="ri-aspect-ratio-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
</div> </div>
</div> </div>
<div style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;"> <div style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
<span> <span>
<a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a> class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
</span> </span>
<span class="log-info-{{.VersionName}}"> <span class="log-info-{{.VersionName}}">
<a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
class="log_bottom" data-version="{{.VersionName}}"><i class="log_bottom" data-version="{{.VersionName}}"><i
class="icon-to-bottom"></i></a> class="icon-to-bottom"></i></a>
</span> </span>
@@ -493,7 +496,7 @@ td, th {
<input type="hidden" name="end_line-max" value> <input type="hidden" name="end_line-max" value>
<input type="hidden" name="start_line-max" value> <input type="hidden" name="start_line-max" value>
<input type="hidden" name="start_line-max-copy" value> <input type="hidden" name="start_line-max-copy" value>
<input type="hidden" name="start_line" value> <input type="hidden" name="start_line" value>
<input type="hidden" name="start_line" value>
<input type="hidden" name="init_log" value> <input type="hidden" name="init_log" value>
<pre id="log_file{{.VersionName}}"></pre> <pre id="log_file{{.VersionName}}"></pre>
</div> </div>


+ 4
- 1
templates/repo/modelarts/trainjob/show.tmpl View File

@@ -555,7 +555,10 @@
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/download_log_file?version_name={{.VersionName}}"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
<i class="ri-aspect-ratio-line"></i> <i class="ri-aspect-ratio-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
</div> </div>


+ 5
- 2
templates/repo/modelarts/trainjob/version_new.tmpl View File

@@ -56,7 +56,10 @@
{{template "repo/header" .}} {{template "repo/header" .}}
<div class="ui container"> <div class="ui container">
<div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.attachment}}" data-dataset-name="{{.dataset_name}}"></div> <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.attachment}}" data-dataset-name="{{.dataset_name}}"></div>
{{template "base/alert" .}}
{{if eq .NotStopTaskCount 0}}
{{template "base/alert" .}}
{{end}}
{{template "custom/alert_cb" .}}
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{.i18n.Tr "repo.modelarts.train_job.new"}} {{.i18n.Tr "repo.modelarts.train_job.new"}}
</h4> </h4>
@@ -260,7 +263,7 @@
</div> </div>


<div class="inline unite min_title field"> <div class="inline unite min_title field">
<button class="ui create_train_job green button">
<button class="ui create_train_job green button {{if eq .NotStopTaskCount 1}}disabled{{end}}">
{{.i18n.Tr "repo.cloudbrain.new"}} {{.i18n.Tr "repo.cloudbrain.new"}}
</button> </button>
<a class="ui button cancel" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a> <a class="ui button cancel" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>


+ 6
- 3
templates/repo/modelsafety/show.tmpl View File

@@ -474,7 +474,10 @@
<i class="ri-download-cloud-2-line"></i> <i class="ri-download-cloud-2-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
</a> </a>
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
<div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"
data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain"
data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
<i class="ri-aspect-ratio-line"></i> <i class="ri-aspect-ratio-line"></i>
<span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span> <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
</div> </div>
@@ -482,11 +485,11 @@
<div <div
style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;"> style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
<span> <span>
<a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
class="log_top" data-version=""><i class="icon-to-top"></i></a> class="log_top" data-version=""><i class="icon-to-top"></i></a>
</span> </span>
<span class="log-info-"> <span class="log-info-">
<a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
<a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
class="log_bottom" data-version=""><i class="log_bottom" data-version=""><i
class="icon-to-bottom"></i></a> class="icon-to-bottom"></i></a>
</span> </span>


+ 13
- 1
templates/user/dashboard/cloudbrains.tmpl View File

@@ -1,7 +1,7 @@
{{template "base/head" .}} {{template "base/head" .}}
<!-- 提示框 --> <!-- 提示框 -->
<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
<div class="alert"></div> <div class="alert"></div>
<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
<div class="explore users"> <div class="explore users">
<div class="cloudbrain_debug" style="display: none;" data-debug="{{$.i18n.Tr "repo.debug"}}" <div class="cloudbrain_debug" style="display: none;" data-debug="{{$.i18n.Tr "repo.debug"}}"
data-debug-again="{{$.i18n.Tr "repo.debug_again"}}" data-debug-task="{{$.i18n.Tr "cloudbrain.DEBUG"}}" data-debug-again="{{$.i18n.Tr "repo.debug_again"}}" data-debug-task="{{$.i18n.Tr "cloudbrain.DEBUG"}}"
@@ -445,6 +445,18 @@
</div> </div>
</div> </div>
</div> </div>

<div class="ui modal debug-again-alert">
<div class="ui message" style="background-color: rgba(242, 113, 28, 0.05);border: 1px solid rgba(242, 113, 28, 1);border-radius: 5px;">
<div style="display: flex;align-items: center;">
<i class="ri-information-line" style="font-size: 35px;color: rgba(242, 113, 28, 1);;"></i>
<div style="text-align: left;margin-left: 1rem;">
<div style="font-weight: 600;line-height: 2;">{{.i18n.Tr "repo.cloudbrain.morethanonejob1" | Safe }}</div>
<div style="color:#939393">{{.i18n.Tr "repo.cloudbrain.morethanonejob2" | Safe}}</div>
</div>
</div>
</div>
</div>
</div> </div>


<script> <script>


+ 24
- 4
web_src/js/features/cloudbrainShow.js View File

@@ -41,7 +41,6 @@ export default async function initCloudrainSow() {
if (data.Lines == 0) { if (data.Lines == 0) {
if (max) { if (max) {
$("body").toast({ $("body").toast({
class: "info",
message: `您已翻阅至日志底部,请稍后再试!`, message: `您已翻阅至日志底部,请稍后再试!`,
}); });
} else { } else {
@@ -88,7 +87,6 @@ export default async function initCloudrainSow() {
if (data.Lines == 0) { if (data.Lines == 0) {
if (max) { if (max) {
$("body").toast({ $("body").toast({
class: "info",
message: `您已翻阅至日志顶部,请稍后再试!`, message: `您已翻阅至日志顶部,请稍后再试!`,
}); });
} else { } else {
@@ -167,7 +165,6 @@ export default async function initCloudrainSow() {
if (data.Lines == 0) { if (data.Lines == 0) {
if (max) { if (max) {
$("body").toast({ $("body").toast({
class: "info",
message: `您已翻阅至日志顶部,请稍后再试!`, message: `您已翻阅至日志顶部,请稍后再试!`,
}); });
} else { } else {
@@ -212,10 +209,16 @@ export default async function initCloudrainSow() {
$(`#${version_name}-log-down`) $(`#${version_name}-log-down`)
.removeClass("ti-download-file") .removeClass("ti-download-file")
.addClass("disabled"); .addClass("disabled");
$(`.max-full-log${version_name} #${version_name}-log-down`)
.removeClass("ti-download-file")
.addClass("disabled");
} else { } else {
$(`#${version_name}-log-down`) $(`#${version_name}-log-down`)
.addClass("ti-download-file") .addClass("ti-download-file")
.removeClass("disabled"); .removeClass("disabled");
$(`.max-full-log${version_name} #${version_name}-log-down`)
.addClass("ti-download-file")
.removeClass("disabled");
} }
$(`#log${version_name} input[name=end_line${max}]`).val(data.EndLine); //如果变动就改变所对应的值 $(`#log${version_name} input[name=end_line${max}]`).val(data.EndLine); //如果变动就改变所对应的值
if ($(this)[0].hasAttribute("data-tab")) { if ($(this)[0].hasAttribute("data-tab")) {
@@ -241,7 +244,6 @@ export default async function initCloudrainSow() {
if (data.Lines == 0) { if (data.Lines == 0) {
if (max) { if (max) {
$("body").toast({ $("body").toast({
class: "info",
message: `您已翻阅至日志底部,请稍后再试!`, message: `您已翻阅至日志底部,请稍后再试!`,
}); });
} else { } else {
@@ -318,6 +320,24 @@ export default async function initCloudrainSow() {
$(".file-info #log-file-exit").text( $(".file-info #log-file-exit").text(
$(".full-log-dialog").data("exit") $(".full-log-dialog").data("exit")
); );
$(".file-info .log-file-down").text(
$(".full-log-dialog").data("log-down")
);
$(".file-info .log-file-down").text(
$(".full-log-dialog").data("log-down")
);
$(`.max-full-log${version_name} #${version_name}-log-down`).attr(
"href",
$(".full-log-dialog").data("href")
);
$(`.max-full-log${version_name} .log_top-max`).attr(
"title",
$(".full-log-dialog").data("scroll-top")
);
$(`.max-full-log${version_name} .log_bottom-max`).attr(
"title",
$(".full-log-dialog").data("scroll-bottom")
);
}, },
onVisible: function () { onVisible: function () {
$(`#log-max${version_name}`).append( $(`#log-max${version_name}`).append(


+ 1
- 7
web_src/js/features/cloudrbanin.js View File

@@ -431,13 +431,7 @@ export default async function initCloudrain() {
.css("margin", "0 1rem"); .css("margin", "0 1rem");
} }
} else { } else {
$(".alert")
.html(res.error_msg)
.removeClass("alert-success")
.addClass("alert-danger")
.show()
.delay(2000)
.fadeOut();
$(".ui.modal.debug-again-alert").modal("show");
} }
}, },
error: function (res) { error: function (res) {


Loading…
Cancel
Save