Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Katib UI for v1alpha2 #486

Merged
merged 23 commits into from
May 17, 2019
Merged

Katib UI for v1alpha2 #486

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
49d33e8
Init commit
andreyvelich May 2, 2019
4aec4f2
Half of backend edit
andreyvelich May 3, 2019
accf5af
Merge remote-tracking branch 'upstream/master' into v1alpha2-new-ui
andreyvelich May 3, 2019
ab8fb6c
Backend for v1alpha2 UI is done
andreyvelich May 4, 2019
d18c7bb
Fix gopkg.toml
andreyvelich May 4, 2019
d19605b
fix gopkg lock
andreyvelich May 4, 2019
767bebb
Almost submit HP job by params done
andreyvelich May 9, 2019
a88dfeb
Modify gitignore
andreyvelich May 9, 2019
f9515e9
Add by parameters for HP and NAS done
andreyvelich May 9, 2019
6704667
HP and NAS jobs functionality done
andreyvelich May 10, 2019
541041f
Template is done
andreyvelich May 13, 2019
e5c2107
Merge remote-tracking branch 'upstream/master' into v1alpha2-new-ui
andreyvelich May 13, 2019
07fd11b
Add new filters in job list
andreyvelich May 13, 2019
ac240e6
Fix newlines
andreyvelich May 13, 2019
cc55147
Review changes
andreyvelich May 14, 2019
a52cb2d
dep ensure
andreyvelich May 14, 2019
4f5233a
Merge remote-tracking branch 'upstream/master' into v1alpha2-new-ui
andreyvelich May 15, 2019
7e1f138
Fix gopkg
andreyvelich May 16, 2019
3da6fab
Add tests for katib-ui
andreyvelich May 16, 2019
419f42b
Delete pkg
andreyvelich May 16, 2019
8ceb31b
Add pkg
andreyvelich May 16, 2019
37deb23
Fetch upstream
andreyvelich May 17, 2019
aa2eae7
Fix backend
andreyvelich May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,7 @@ required = [
[[constraint]]
name = "github.com/kubeflow/pytorch-operator"
version = "0.5.0-rc.1"

[[constraint]]
name = "github.com/awalterschulze/gographviz"
branch = "master"
12 changes: 8 additions & 4 deletions cmd/ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ FROM golang:alpine AS build-env
# The GOPATH in the image is /go.
ADD . /go/src/github.com/kubeflow/katib
WORKDIR /go/src/github.com/kubeflow/katib/cmd/ui
RUN go build -o katib-ui
RUN go build -o katib-ui ./v1alpha1
RUN go build -o katib-ui.v1alpha2 ./v1alpha2

FROM alpine:3.7
WORKDIR /app
# v1alpha1 source code
COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/ui/katib-ui /app/
COPY cmd/ui/static /app/static
COPY cmd/ui/template /app/template
ENTRYPOINT ["./katib-ui"]
COPY cmd/ui/v1alpha1/static /app/static
COPY cmd/ui/v1alpha1/template /app/template
# v1alpha2 source code
COPY --from=build-env /go/src/github.com/kubeflow/katib/cmd/ui/katib-ui.v1alpha2 /app/
COPY --from=build-env /go/src/github.com/kubeflow/katib/pkg/ui/v1alpha2/frontend/build/ /app/build
5 changes: 3 additions & 2 deletions cmd/ui/main.go → cmd/ui/v1alpha1/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package main

import (
"github.com/kubeflow/katib/pkg/ui"
"github.com/pressly/chi"
"net/http"

"github.com/kubeflow/katib/pkg/ui/v1alpha1"
"github.com/pressly/chi"
)

func main() {
Expand Down
0 cmd/ui/static/css/bootstrap.css → cmd/ui/v1alpha1/static/css/bootstrap.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/c3.min.css → cmd/ui/v1alpha1/static/css/c3.min.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/codemirror.css → cmd/ui/v1alpha1/static/css/codemirror.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/dropmenu.css → cmd/ui/v1alpha1/static/css/dropmenu.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/editmodal.css → cmd/ui/v1alpha1/static/css/editmodal.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/linegraph.css → cmd/ui/v1alpha1/static/css/linegraph.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/loader.css → cmd/ui/v1alpha1/static/css/loader.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/parallelcood.css → cmd/ui/v1alpha1/static/css/parallelcood.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/css/profile.css → cmd/ui/v1alpha1/static/css/profile.css
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/img/favicon.ico → cmd/ui/v1alpha1/static/img/favicon.ico
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/img/klogo.svg → cmd/ui/v1alpha1/static/img/klogo.svg
View file
Open in desktop
File renamed without changes
0 cmd/ui/static/js/autorefresh.js → cmd/ui/v1alpha1/static/js/autorefresh.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/js/bootstrap.js → cmd/ui/v1alpha1/static/js/bootstrap.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/js/c3.min.js → cmd/ui/v1alpha1/static/js/c3.min.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/js/codemirror.js → cmd/ui/v1alpha1/static/js/codemirror.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/static/js/yaml.js → cmd/ui/v1alpha1/static/js/yaml.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/index.html → cmd/ui/v1alpha1/template/index.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/layout.html → cmd/ui/v1alpha1/template/layout.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/linegraph.js → cmd/ui/v1alpha1/template/linegraph.js
View file
Open in desktop
File renamed without changes.
0 ...ui/template/metricscollectortemplate.html → ...a1/template/metricscollectortemplate.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/metricscollectortemplate.js → ...pha1/template/metricscollectortemplate.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/navbar.html → cmd/ui/v1alpha1/template/navbar.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/parallelcood.js → cmd/ui/v1alpha1/template/parallelcood.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/study.html → cmd/ui/v1alpha1/template/study.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/studyjobgen.html → cmd/ui/v1alpha1/template/studyjobgen.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/studyjobgen.js → cmd/ui/v1alpha1/template/studyjobgen.js
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/trial.html → cmd/ui/v1alpha1/template/trial.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/worker.html → cmd/ui/v1alpha1/template/worker.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/workertemplate.html → cmd/ui/v1alpha1/template/workertemplate.html
View file
Open in desktop
File renamed without changes.
0 cmd/ui/template/workertemplate.js → cmd/ui/v1alpha1/template/workertemplate.js
View file
Open in desktop
File renamed without changes.
37 changes: 37 additions & 0 deletions cmd/ui/v1alpha2/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package main

import (
"net/http"

ui "github.com/kubeflow/katib/pkg/ui/v1alpha2"
)

var (
port = "80"
)

func main() {
kuh := ui.NewKatibUIHandler()

frontend := http.FileServer(http.Dir("/app/build/"))
http.Handle("/katib/", http.StripPrefix("/katib/", frontend))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is only one deployment for UI, in a single container, both http server and logic to call Katib-manager to operate experiment/trial/metrics.. and converting the results are running, right?
I had thought there would be two deployments (frontend and backend).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be one deployment with frontend and backend.
All JS for frontend will be store in build folder here: https://github.com/andreyvelich/katib/tree/v1alpha2-new-ui/pkg/ui/v1alpha2/frontend/build/static.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the container works too heavy.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it will be fine, no reason to divide frontend and backend sides.
All frontend builds in a 3 JS files by React.


http.HandleFunc("/katib/fetch_hp_jobs/", kuh.FetchHPJobs)
http.HandleFunc("/katib/fetch_nas_jobs/", kuh.FetchNASJobs)
http.HandleFunc("/katib/submit_yaml/", kuh.SubmitYamlJob)
http.HandleFunc("/katib/submit_hp_job/", kuh.SubmitHPJob)
http.HandleFunc("/katib/submit_nas_job/", kuh.SubmitNASJob)

//TODO: Add it in Katib client
http.HandleFunc("/katib/delete_job/", kuh.DeleteJob)

http.HandleFunc("/katib/fetch_hp_job_info/", kuh.FetchHPJobInfo)
http.HandleFunc("/katib/fetch_hp_job_trial_info/", kuh.FetchHPJobTrialInfo)
http.HandleFunc("/katib/fetch_nas_job_info/", kuh.FetchNASJobInfo)

http.HandleFunc("/katib/fetch_trial_templates/", kuh.FetchTrialTemplates)
http.HandleFunc("/katib/fetch_collector_templates/", kuh.FetchMetricsCollectorTemplates)
http.HandleFunc("/katib/update_template/", kuh.AddEditDeleteTemplate)

http.ListenAndServe(":"+port, nil)
}
4 changes: 2 additions & 2 deletions pkg/ui/ui.go → pkg/ui/v1alpha1/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

common "github.com/kubeflow/katib/pkg/common/v1alpha1"
studyjobv1alpha1 "github.com/kubeflow/katib/pkg/api/operators/apis/studyjob/v1alpha1"
"github.com/kubeflow/katib/pkg/api/v1alpha1"
api "github.com/kubeflow/katib/pkg/api/v1alpha1"
"github.com/kubeflow/katib/pkg/manager/v1alpha1/studyjobclient"

"github.com/pressly/chi"
Expand Down Expand Up @@ -375,7 +375,7 @@ func (k *KatibUIHandler) MetricsCollectorTemplate(w http.ResponseWriter, r *http
MetricsCollectorTemplate map[string]string
}
mtv := MetricsCollectorTemplateView{
IDList: &IDList{},
IDList: &IDList{},
MetricsCollectorTemplate: mt,
}
if err != nil {
Expand Down
Loading