Skip to content

[dev] refactor devserver into a combined service model #15518

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

Open
cjllanwarne wants to merge 4 commits into
base: main
Choose a base branch
from
+161 −197
Open

[dev] refactor devserver into a combined service model #15518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
149424e
refactor devserver into a combined service model
cjllanwarne May 29, 2026
0e68c03
remove redundant mock data generator
cjllanwarne May 29, 2026
a09f87a
fix trailing / behavior and remove unnecessary repeat rebuilds
cjllanwarne Jun 1, 2026
21fd6d6
fix / link
cjllanwarne Jun 2, 2026
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
79 changes: 24 additions & 55 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,47 +186,36 @@ hail-buildkit-image: ci/buildkit/Dockerfile
./docker-build.sh ci buildkit/Dockerfile $(IMAGE_NAME) --build-arg DOCKER_PREFIX=$(DOCKER_PREFIX)
echo $(IMAGE_NAME) > $@

services/ui/dist/ci/flaky_tests.js: $(shell git ls-files services/ui)
cd services/ui && npm ci && npm run build
services/ui/dist/.built: services/ui/node_modules/.package-lock.json $(shell git ls-files services/ui)
cd services/ui && npm run build
touch $@

ci/ci/static/compiled-js/flaky_tests.js: services/ui/dist/ci/flaky_tests.js
mkdir -p ci/ci/static/compiled-js
ci/ci/static/compiled-js/flaky_tests.js: services/ui/dist/.built
mkdir -p $(@D)
cp services/ui/dist/ci/flaky_tests.js $@

ci-image: ci/ci/static/compiled-js/flaky_tests.js

services/ui/dist/batch/job.js: $(shell git ls-files services/ui)
cd services/ui && npm ci && npm run build

batch/batch/front_end/static/compiled-js/job.js: services/ui/dist/batch/job.js
mkdir -p batch/batch/front_end/static/compiled-js
batch/batch/front_end/static/compiled-js/job.js: services/ui/dist/.built
mkdir -p $(@D)
cp services/ui/dist/batch/job.js $@

batch-image: batch/batch/front_end/static/compiled-js/job.js

services/ui/dist/batch_driver/index.js: $(shell git ls-files services/ui)
cd services/ui && npm ci && npm run build

batch/batch/driver/static/compiled-js/index.js: services/ui/dist/batch_driver/index.js
mkdir -p batch/batch/driver/static/compiled-js
batch/batch/driver/static/compiled-js/index.js: services/ui/dist/.built
mkdir -p $(@D)
cp services/ui/dist/batch_driver/index.js $@

batch-image: batch/batch/driver/static/compiled-js/index.js

services/ui/dist/monitoring/index.js: $(shell git ls-files services/ui)
cd services/ui && npm ci && npm run build

monitoring/monitoring/static/compiled-js/index.js: services/ui/dist/monitoring/index.js
mkdir -p monitoring/monitoring/static/compiled-js
monitoring/monitoring/static/compiled-js/index.js: services/ui/dist/.built
mkdir -p $(@D)
cp services/ui/dist/monitoring/index.js $@

monitoring-image: monitoring/monitoring/static/compiled-js/index.js

services/ui/dist/auth/index.js: $(shell git ls-files services/ui)
cd services/ui && npm ci && npm run build

auth/auth/static/compiled-js/index.js: services/ui/dist/auth/index.js
mkdir -p auth/auth/static/compiled-js
auth/auth/static/compiled-js/index.js: services/ui/dist/.built
mkdir -p $(@D)
cp services/ui/dist/auth/index.js $@

auth-image: auth/auth/static/compiled-js/index.js
Expand Down Expand Up @@ -294,33 +283,16 @@ endif
tailwind-compile-watch:
cd web_common && npx tailwindcss --watch -i input.css -o web_common/static/css/output.css

ifeq ($(SERVICE),ci)
run-dev-proxy: ci/ci/static/compiled-js/flaky_tests.js
tailwind-compile-watch: ci/ci/static/compiled-js/flaky_tests.js
DEVSERVER_TARGETS = tailwind-compile-watch run-dev-proxy ui-js-watch
else ifeq ($(SERVICE),batch)
run-dev-proxy: batch/batch/front_end/static/compiled-js/job.js
tailwind-compile-watch: batch/batch/front_end/static/compiled-js/job.js
DEVSERVER_TARGETS = tailwind-compile-watch run-dev-proxy ui-js-watch-batch
else ifeq ($(SERVICE),batch-driver)
run-dev-proxy: batch/batch/driver/static/compiled-js/index.js
tailwind-compile-watch: batch/batch/driver/static/compiled-js/index.js
DEVSERVER_TARGETS = tailwind-compile-watch run-dev-proxy ui-js-watch-batch-driver
else ifeq ($(SERVICE),monitoring)
run-dev-proxy: monitoring/monitoring/static/compiled-js/index.js
tailwind-compile-watch: monitoring/monitoring/static/compiled-js/index.js
DEVSERVER_TARGETS = tailwind-compile-watch run-dev-proxy ui-js-watch-monitoring
else ifeq ($(SERVICE),auth)
run-dev-proxy: auth/auth/static/compiled-js/index.js
tailwind-compile-watch: auth/auth/static/compiled-js/index.js
DEVSERVER_TARGETS = tailwind-compile-watch run-dev-proxy ui-js-watch-auth
else
DEVSERVER_TARGETS = tailwind-compile-watch run-dev-proxy
endif
run-dev-proxy: ci/ci/static/compiled-js/flaky_tests.js \
batch/batch/front_end/static/compiled-js/job.js \
batch/batch/driver/static/compiled-js/index.js \
monitoring/monitoring/static/compiled-js/index.js \
auth/auth/static/compiled-js/index.js
DEVSERVER_TARGETS = tailwind-compile-watch run-dev-proxy ui-js-watch ui-js-watch-batch ui-js-watch-batch-driver ui-js-watch-monitoring ui-js-watch-auth

.PHONY: run-dev-proxy
run-dev-proxy:
SERVICE=$(SERVICE) adev runserver --root . --static web_common/web_common/static devbin/dev_proxy.py
adev runserver --root . --static web_common/web_common/static devbin/dev_proxy.py

services/ui/node_modules/.package-lock.json: services/ui/package.json services/ui/package-lock.json
npm ci --prefix services/ui
Expand Down Expand Up @@ -352,12 +324,9 @@ check-devserver-deps:
echo 'fix: run "make install-dev-requirements" (and/or "source .venv/bin/activate" if using a venv)' >&2; \
exit 1; \
fi
@SERVICE=$(SERVICE) python3 -c "\
import importlib.metadata as m, sys, os; \
svc = os.environ.get('SERVICE', ''); \
pkg_alias = {'batch-driver': 'batch'}; \
svc_pkg = pkg_alias.get(svc, svc); \
pkgs = ['gear', 'web_common'] + ([svc_pkg] if svc_pkg else []); \
@python3 -c "\
import importlib.metadata as m, sys; \
pkgs = ['gear', 'web_common', 'batch', 'ci', 'monitoring', 'auth']; \
installed = {d.name for d in m.distributions()}; \
missing = [p for p in pkgs if p not in installed]; \
(print('error: missing packages: ' + ', '.join(missing), file=sys.stderr), \
Expand All @@ -366,7 +335,7 @@ missing = [p for p in pkgs if p not in installed]; \

.PHONY: devserver
devserver: check-devserver-deps
$(MAKE) -j 3 $(DEVSERVER_TARGETS)
$(MAKE) -j 7 $(DEVSERVER_TARGETS)

.PHONY: benchmark
benchmark: hail-dev-image
Expand Down
Loading
Loading