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.

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

First iteration of the new Katib UI #1427

Merged
merged 34 commits into from
Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
1c0bf27
Create a folder for the new-ui
kimwnasptd Feb 2, 2021
86c4377
Initial code for the frontend
kimwnasptd Feb 3, 2021
a79f401
backend: Expose the entire status of an experiment
kimwnasptd Feb 3, 2021
eed978d
backend: Return the KFP run uid
kimwnasptd Feb 3, 2021
3665e81
backend: sereve an Angular SPA
kimwnasptd Feb 23, 2021
927ca31
Dockerfile for the new Katib web app
kimwnasptd Feb 23, 2021
b74e1a6
Extend the dockerignore for the new UI
kimwnasptd Feb 3, 2021
07c0a65
Update the README with build commands
kimwnasptd Feb 3, 2021
fadabca
review: use port 8080 instead of 80 in backend
kimwnasptd Feb 17, 2021
71c0613
review: use lowercase fields when fetchin exps
kimwnasptd Feb 18, 2021
1069d25
review: Add seconds to the x-axis of Trial info
kimwnasptd Feb 23, 2021
3b52da2
review: Unify the npm run build commands
kimwnasptd Feb 23, 2021
f34dad7
review: Move TypeMeta values to a common place
kimwnasptd Feb 23, 2021
a466012
review: Remove section for max_old_space_size in README
kimwnasptd Feb 23, 2021
4e37bd7
review: add katib prefix to docs link
kimwnasptd Feb 23, 2021
83379a8
review: Correct link for new UI in README
kimwnasptd Feb 23, 2021
95cf72c
review: Remove unused 'format' npm script
kimwnasptd Feb 23, 2021
cae69f9
review: Ensure format checks work with Travis
kimwnasptd Feb 23, 2021
02c098f
review: Remove unused space
kimwnasptd Feb 23, 2021
57c5150
review: Use create_experiment route
kimwnasptd Feb 23, 2021
3b76c41
review: fix travis govet test
kimwnasptd Feb 23, 2021
df60957
review: Rename the Bayesian settings
kimwnasptd Feb 23, 2021
d79b307
review: Rename the ParametersSpec
kimwnasptd Feb 24, 2021
bd40e33
review: Remove setting TypeMeta and ObjectMeta
kimwnasptd Feb 24, 2021
97d81d6
review: Update README for build:watch
kimwnasptd Feb 24, 2021
976a268
review: Fix a typo
kimwnasptd Feb 24, 2021
90c2043
review: Remove unused css
kimwnasptd Feb 25, 2021
77535d9
review: Use types from k8s.models file
kimwnasptd Feb 25, 2021
dc75b93
Add kfp-run column if UID is present in trials
kimwnasptd Feb 26, 2021
0c9a8b7
Properly expose the NAS fields
kimwnasptd Feb 26, 2021
74261d4
review: Move MetricCollector enums to global enums file
kimwnasptd Feb 26, 2021
74b9734
review: Remove unused volume enum
kimwnasptd Mar 1, 2021
2b7bc69
review: Don't send empty settings
kimwnasptd Mar 1, 2021
b7451ff
review: Add parameters for TPE
kimwnasptd Mar 1, 2021
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
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ examples
manifests
pkg/ui/*/frontend/node_modules
pkg/ui/*/frontend/build
pkg/new-ui/*/frontend/node_modules
pkg/new-ui/*/frontend/build
55 changes: 55 additions & 0 deletions cmd/new-ui/v1beta1/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# --- Clone the kubeflow/kubeflow code ---
FROM ubuntu AS fetch-kubeflow-kubeflow

RUN apt-get update && apt-get install git -y

WORKDIR /kf
RUN git clone https://github.com/kubeflow/kubeflow.git && \
cd kubeflow && \
git checkout a349284

# --- Build the frontend kubeflow library ---
FROM node:12 AS frontend-kubeflow-lib

WORKDIR /src

ARG LIB=/kf/kubeflow/components/crud-web-apps/common/frontend/kubeflow-common-lib
COPY --from=fetch-kubeflow-kubeflow $LIB/package*.json ./
RUN npm ci

COPY --from=fetch-kubeflow-kubeflow $LIB/ ./
RUN npm run build

# --- Build the frontend ---
FROM node:12 AS frontend

WORKDIR /src
COPY ./pkg/new-ui/v1beta1/frontend/package*.json ./
RUN npm ci

COPY ./pkg/new-ui/v1beta1/frontend/ .
COPY --from=frontend-kubeflow-lib /src/dist/kubeflow/ ./node_modules/kubeflow/

RUN npm run build:prod

# --- Build the backend ---
FROM golang:alpine AS go-build

# The GOPATH in the image is /go.
ADD . /go/src/github.com/kubeflow/katib
WORKDIR /go/src/github.com/kubeflow/katib/cmd/new-ui
RUN if [ "$(uname -m)" = "ppc64le" ] || [ "$(uname -m)" = "aarch64" ]; then \
apk --update add gcc musl-dev && \
go build -o katib-ui ./v1beta1; \
else \
go build -o katib-ui ./v1beta1; \
fi

# --- compose the web app ---
FROM alpine:3.7
WORKDIR /app
COPY --from=go-build /go/src/github.com/kubeflow/katib/cmd/new-ui/katib-ui /app/
COPY --from=frontend /src/dist/static /app/build/static/

USER 1000
ENTRYPOINT ["./katib-ui"]
58 changes: 58 additions & 0 deletions cmd/new-ui/v1beta1/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package main

import (
"flag"
"fmt"
"log"
"net/http"

_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

common_v1beta1 "github.com/kubeflow/katib/pkg/common/v1beta1"
ui "github.com/kubeflow/katib/pkg/new-ui/v1beta1"
)

var (
port, host, buildDir, dbManagerAddr *string
)

func init() {
port = flag.String("port", "8080", "The port to listen to for incoming HTTP connections")
host = flag.String("host", "0.0.0.0", "The host to listen to for incoming HTTP connections")
buildDir = flag.String("build-dir", "/app/build", "The dir of frontend")
dbManagerAddr = flag.String("db-manager-address", common_v1beta1.GetDBManagerAddr(), "The address of Katib DB manager")
}

func main() {
flag.Parse()
kuh := ui.NewKatibUIHandler(*dbManagerAddr)

log.Printf("Serving the frontend dir %s", *buildDir)
frontend := http.FileServer(http.Dir(*buildDir))
http.HandleFunc("/katib/", kuh.ServeIndex(*buildDir))
http.Handle("/katib/static/", http.StripPrefix("/katib/", frontend))

http.HandleFunc("/katib/fetch_experiments/", kuh.FetchAllExperiments)

http.HandleFunc("/katib/create_experiment/", kuh.CreateExperiment)

http.HandleFunc("/katib/delete_experiment/", kuh.DeleteExperiment)

http.HandleFunc("/katib/fetch_experiment/", kuh.FetchExperiment)
http.HandleFunc("/katib/fetch_suggestion/", kuh.FetchSuggestion)

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/add_template/", kuh.AddTemplate)
http.HandleFunc("/katib/edit_template/", kuh.EditTemplate)
http.HandleFunc("/katib/delete_template/", kuh.DeleteTemplate)
http.HandleFunc("/katib/fetch_namespaces", kuh.FetchNamespaces)

log.Printf("Serving at %s:%s", *host, *port)
if err := http.ListenAndServe(fmt.Sprintf("%s:%s", *host, *port), nil); err != nil {
panic(err)
}
}
122 changes: 122 additions & 0 deletions pkg/new-ui/v1beta1/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# Katib User Interface

This is the source code for the Katib UI. Current version of Katib UI is v1beta1. On the official Kubeflow website [here](https://www.kubeflow.org/docs/components/katib/experiment/#running-the-experiment-from-the-katib-ui) you can find information how to use Katib UI.
We are using [Angular](https://angular.io/) framework to create frontend and Go as a backend.

We are using [Material UI](https://material.angular.io/) to design frontend. Try to use Material UI components to implement new Katib UI features.

## Folder structure

1. You can find `Dockerfile` and `main.go` - file to serve the UI under `cmd/new-ui/v1beta1`

1. You can find Go backend under `pkg/new-ui/v1beta1`

1. You can find Angular frontend under `pkg/new-ui/v1beta1/frontend`

## Requirements

To make changes to the UI you need to install:

- Tools, defined [here](https://github.com/kubeflow/katib/blob/master/docs/developer-guide.md#requirements).

- `node` (v12 or later) and `npm` (v6.13 or later). Recommended to install `node` and `npm` using [`nvm`](https://github.com/nvm-sh/nvm). After installing `nvm`, you can run `nvm install 12.18.1` to install `node` version 12.18.1 and run `nvm use 12.18.1` to use that version.

## Development

While development you have different ways to run Katib UI.
1. Build and serve only the frontend. The dev server will also be proxying requests to the backend
2. Build the frontend and serve it via the backend locally

### Serve only the frontend

You can run a webpack dev server that only exposes the frontend files, which can be useful for testing only the UI of the app. There's also a `proxy.conf.json` file which configures the dev server to send the backend requests to port `8000`.

In order to build the UI locally, and expose it with a webpack dev server you will need to:
1. Create a module from the [common library](https://github.com/kubeflow/kubeflow/tree/master/components/crud-web-apps/common/frontend/kubeflow-common-lib)
2. Install the node modules of the app and also link the common-library module



You can build the common library with:
```bash
cd /tmp && git clone https://github.com/kubeflow/kubeflow.git \
&& cd kubeflow \
&& git checkout a349284 \
&& cd components/crud-web-apps/common/frontend/kubeflow-common-lib

# build the common library module
npm i
npm run build

# link the module to your npm packages
# depending on where you npm stores the global packages you
# might need to use sudo
npm link dist/kubeflow
```

And then build and run the UI locally, on `localhost:4200`, with:
```bash
# If you've already cloned the repo then skip this step and just
# navigate to the pkg/new-ui/v1beta1/frontend dir
cd /tmp && git clone https://github.com/kubeflow/katib.git \
&& cd katib/pkg/new-ui/v1beta1/frontend

npm i
npm link kubeflow
npm run start
```

### Serve the UI from the backend

This is the recommended way to test the web app e2e. In order to build the UI and serve it via the backend, locally, you will need to:

1. Build the UI locally. You can follow the steps from the previous section, but instead of running `npm run start` you will need to run `npm run build:watch`. This will start a process that will be watching the source code and building the frontend artifacts under `frontend/dist/static` folder.
andreyvelich marked this conversation as resolved.
Show resolved Hide resolved
kimwnasptd marked this conversation as resolved.
Show resolved Hide resolved
1. Run `kubectl port-forward svc/katib-db-manager 6789 -n kubeflow` to expose `katib-db-manager` service for external access. You can use [different ways](https://kubernetes.io/docs/tasks/access-application-cluster/) to get external address for Kubernetes service. After exposing service, you should be able to receive information by running `wget <external-ip>:<service-port>`. In case of port-forwarding above, you have to run `wget localhost:6789`.

1. Go to `cmd/new-ui/v1beta1`.

1. Run `main.go` file with appropriate flags, where:

- `--build-dir` - directory with the frontend artifacts.
- `--port` - port to access Katib UI.
- `--db-manager-address` - Katib DB manager external IP and port address.

For example, if you use port-forwarding to expose `katib-db-manager`, run this command:

```
go run main.go --build-dir=../../../pkg/new-ui/v1beta1/frontend/dist --port=8080 --db-manager-address=localhost:6789
kimwnasptd marked this conversation as resolved.
Show resolved Hide resolved
```

After that, you can access the UI using this URL: `http://localhost:8080/katib/`.

## Production

To run Katib UI in Production, after all changes in frontend and backend, you need to create an image for the UI. Under `/katib` directory run this: `docker build . -f cmd/new-ui/v1beta1/Dockerfile -t <name of your image>` to build the image.

After that, you can modify UI [deployment](https://github.com/kubeflow/katib/blob/master/manifests/v1beta1/ui/deployment.yaml#L24) with your new image. Then, follow [these steps](https://www.kubeflow.org/docs/components/katib/hyperparameter/#accessing-the-katib-ui) to access Katib UI.

## Code style

To make frontend code consistent and easy to review we use [Prettier](https://prettier.io/). You can find Prettier config [here](https://github.com/kubeflow/katib/tree/master/pkg/new-ui/v1beta1/frontend/.prettierrc.yaml).
Check [here](https://prettier.io/docs/en/install.html), how to install Prettier CLI to check and format your code.

### IDE integration

For VSCode you can install plugin: "Prettier - Code formatter" and it picks Prettier config automatically.

You can edit [settings.json](https://code.visualstudio.com/docs/getstarted/settings#_settings-file-locations) file for VSCode to autoformat on save.

```json
"settings": {
"editor.formatOnSave": true
}
```

For others IDE see [this](https://prettier.io/docs/en/editors.html).

### Check and format code

Before submitting PR check and format your code. To check your code run `npm run format:check` under `/frontend` folder. To format your code run `npm run format:write` under `/frontend` folder.
If all files formatted you can submit the PR.

If you don't want to format some code, [here](https://prettier.io/docs/en/ignore.html) is an instruction how to disable Prettier.
Loading