Skip to content

@myanvoos: Extend web.py and add local hot reload #922

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ experiments (default value `./results`).

Then navigate to `http://localhost:<port>` to view the result in [a table](#result-table).

> Tip:
You can also pass `-wf` or `--watch-filesystem` to watch for changes in `results-dir` and automatically
update the results report. Refresh the page to see the updated report.

## Detailed workflows
Configure and use framework in the following steps:
Expand Down
103 changes: 89 additions & 14 deletions report/web.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
from typing import Any, Dict, List, Optional

import jinja2
from watchdog.events import FileSystemEventHandler
from watchdog.observers import Observer

from report.common import (AccumulatedResult, Benchmark, FileSystem, Project,
Results, Sample, Target)
Expand Down Expand Up @@ -247,6 +249,63 @@ def _write_benchmark_sample(self, benchmark: Benchmark, sample: Sample,
sample.id, e)


class ReportWatcher(FileSystemEventHandler):
"""Watches for file changes and regenerates reports."""

def __init__(self, args: argparse.Namespace):
super().__init__()
self.args = args
self.observer = Observer()
self.server_thread = None
self.server = None

if args.watch_filesystem:
logging.info('Watching filesystem for changes in %s', args.results_dir)
self.observer.schedule(self, args.results_dir, recursive=True)

if args.watch_template:
logging.info('DEV: Watching for changes in the report folder')
self.observer.schedule(self, "report", recursive=True)

if args.serve:
self.server_thread = threading.Thread(target=self._start_server)
self.server_thread.daemon = True
self.server_thread.start()
logging.info('Launching webserver at %s:%d', LOCAL_HOST, self.args.port)

def _start_server(self):
"""Helper method to start the server."""
handler = partial(SimpleHTTPRequestHandler, directory=self.args.output_dir)
self.server = ThreadingHTTPServer((LOCAL_HOST, self.args.port), handler)
self.server.daemon_threads = True
self.server.allow_reuse_address = True
self.server.serve_forever()

def start(self):
"""Start watching if either watch flag is enabled."""
if self.args.watch_filesystem or self.args.watch_template:
self.observer.start()

def stop(self):
"""Stop watching and clean up."""
self.observer.stop()
self.observer.join()

def on_modified(self, event):
"""Restart the server when the watcher detects a change"""
logging.info('%s has been modified. Regenerating report...', event.src_path)
generate_report(self.args)

if self.args.serve:
if self.server:
self.server.shutdown()
self.server.server_close()

self.server_thread = threading.Thread(target=self._start_server)
self.server_thread.daemon = True
self.server_thread.start()


def generate_report(args: argparse.Namespace) -> None:
"""Generates static web server files."""
logging.info('Generating web page files in %s', args.output_dir)
Expand Down Expand Up @@ -301,29 +360,45 @@ def _parse_arguments() -> argparse.Namespace:
help='Port to launch webserver on.',
type=int,
default=8012)
parser.add_argument('--interval-seconds',
'-i',
help='Interval in seconds to generate report.',
type=int,
default=90)
parser.add_argument('--watch-filesystem',
'-wf',
help='Watch filesystem for changes and generate report.',
action='store_true')
parser.add_argument(
'--watch-template',
'-wt',
help='Watch the report templates for changes and generate report. '
'For development purposes.',
action='store_true')

return parser.parse_args()


def main():
args = _parse_arguments()
logging.getLogger().setLevel(os.environ.get('LOGLEVEL', 'INFO').upper())

if not args.serve:
generate_report(args)
else:
logging.getLogger().setLevel(os.environ.get('LOGLEVEL', 'INFO').upper())
# Launch web server
thread = threading.Thread(target=launch_webserver, args=(args,))
thread.start()
generate_report(args)

watcher = ReportWatcher(args)
watcher.start()

# Generate results continuously while the process runs.
while True:
try:
should_continue = args.serve or args.watch_filesystem or args.watch_template

while should_continue:
generate_report(args)
try:
time.sleep(90)
except KeyboardInterrupt:
logging.info('Exiting.')
os._exit(0)
time.sleep(args.interval_seconds)

except KeyboardInterrupt:
watcher.stop()
logging.info('Exiting.')
os._exit(0)


if __name__ == '__main__':
Expand Down
1 change: 1 addition & 0 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ requests==2.32.3
rust-demangler==1.0
tiktoken==0.7.0
yapf==0.40.1
watchdog==6.0.0
Loading