server: deploy servo/intermittent-tracker#24 as staging

Author: delan

server/nixos/configuration.nix

@@ -216,7 +216,7 @@
       hash = "sha256-mROaUYqcOa+XePl4CzM/zM/mE21ejM2UhyQSYc8emc4=";
     };
 
-    intermittent-tracker = workingDir: {
+    intermittent-tracker-service = workingDir: script: {
       # Wait for networking
       wants = ["network-online.target"];
       after = ["network-online.target"];
@@ -225,16 +225,39 @@
       wantedBy = ["multi-user.target"];
 
       path = ["/run/current-system/sw"];
-      script = ''
-        . .venv/bin/activate
-        FLASK_DEBUG=1 python3 -m intermittent_tracker.flask_server
-      '';
+      inherit script;
 
       serviceConfig = {
         WorkingDirectory = workingDir;
         Restart = "on-failure";
       };
     };
+    # v1 service requires manual deployment of the app:
+    # $ git clone https://github.com/servo/intermittent-tracker.git <staging|prod>
+    # $ cd <staging|prod>
+    # $ uv venv
+    # $ . .venv/bin/activate
+    # $ uv pip install -r requirements.txt
+    # $ cp config.json.example config.json
+    intermittent-tracker-service-v1 = workingDir:
+      intermittent-tracker-service workingDir ''
+        . .venv/bin/activate
+        FLASK_DEBUG=1 python3 -m intermittent_tracker.flask_server
+      '';
+    intermittent-tracker-service-v2 = workingDir: app:
+      intermittent-tracker-service workingDir ''
+        FLASK_DEBUG=1 ${app}/bin/intermittent_tracker
+      '';
+
+    intermittent-tracker-staging = pkgs.callPackage ./python-app.nix {
+      src = pkgs.fetchFromGitHub {
+        owner = "servo";
+        repo = "intermittent-tracker";
+        rev = "42d55fdcce5e1d4e3aec70e4cfeb575d8569c8d3";
+        hash = "sha256-L8Sk1aL3Na0JFymFj07eCcFIUZ0uYLt1ED2DDKnZ4VU=";
+      };
+      packageName = "intermittent-tracker";
+    };
   in {
     # For benchmarking: disable CPU frequency boost, offline SMT siblings, etc.
     # Process affinity will be isolated externally via `isolcpus`.
@@ -255,14 +278,13 @@
       };
     };
 
-    # $ git clone https://github.com/servo/intermittent-tracker.git <staging|prod>
-    # $ cd <staging|prod>
-    # $ uv venv
-    # $ . .venv/bin/activate
-    # $ uv pip install -r requirements.txt
-    # $ cp config.json.example config.json
-    intermittent-tracker-staging = lib.mkIf hasIntermittentTracker (intermittent-tracker "/config/intermittent-tracker/staging");
-    intermittent-tracker-prod = lib.mkIf hasIntermittentTracker (intermittent-tracker "/config/intermittent-tracker/prod");
+    intermittent-tracker-staging = lib.mkIf hasIntermittentTracker
+      (intermittent-tracker-service-v2
+        "/config/intermittent-tracker/staging"
+        intermittent-tracker-staging);
+    intermittent-tracker-prod = lib.mkIf hasIntermittentTracker
+      (intermittent-tracker-service-v1
+        "/config/intermittent-tracker/prod");
 
     monitor = {
       # Wait for networking

server/nixos/python-app.nix

@@ -0,0 +1,62 @@
+# Based on the uv2nix docs:
+# <https://pyproject-nix.github.io/uv2nix/install.html#classic-nix>
+# <https://pyproject-nix.github.io/uv2nix/usage/getting-started.html>
+# <https://pyproject-nix.github.io/uv2nix/patterns/applications.html>
+{
+  src,
+  packageName,
+
+  # Provided by callPackage:
+  lib,
+  callPackage,
+  fetchFromGitHub,
+  python3,
+}: let
+  pyproject-nix = import (fetchFromGitHub {
+    owner = "pyproject-nix";
+    repo = "pyproject.nix";
+    rev = "02e9418fd4af638447dca4b17b1280da95527fc9";
+    hash = "sha256-amLaLNwKSZPShQHzfgmc/9o76dU8xzN0743dWgvYlr8=";
+  }) {
+    inherit lib;
+  };
+  uv2nix = import (fetchFromGitHub {
+    owner = "pyproject-nix";
+    repo = "uv2nix";
+    rev = "87de87c2486da49d22daef61fc98c490789a8e42";
+    hash = "sha256-L9/jSc4YHNfeTa/iKolWtzF4A00o21YnrZmoTHAoo2U=";
+  }) {
+    inherit pyproject-nix lib;
+  };
+  pyproject-build-systems = import (fetchFromGitHub {
+    owner = "pyproject-nix";
+    repo = "build-system-pkgs";
+    rev = "5b8e37fe0077db5c1df3a5ee90a651345f085d38";
+    hash = "sha256-6nzSZl28IwH2Vx8YSmd3t6TREHpDbKlDPK+dq1LKIZQ=";
+  }) {
+    inherit pyproject-nix uv2nix lib;
+  };
+  pythonBase = callPackage pyproject-nix.build.packages {
+    python = python3;
+  };
+  workspace = uv2nix.lib.workspace.loadWorkspace {
+    workspaceRoot = src;
+  };
+  overlay = workspace.mkPyprojectOverlay {
+    sourcePreference = "wheel";
+  };
+  pythonSet = pythonBase.overrideScope (
+    lib.composeManyExtensions [
+      # NOTE: just `.wheel`, not `.overlays.wheel`, since we aren’t using the flake
+      # <https://github.com/pyproject-nix/build-system-pkgs/blob/5b8e37fe0077db5c1df3a5ee90a651345f085d38/flake.nix#L34>
+      # <https://github.com/pyproject-nix/build-system-pkgs/blob/5b8e37fe0077db5c1df3a5ee90a651345f085d38/default.nix#L11>
+      pyproject-build-systems.wheel
+      overlay
+    ]
+  );
+  venv = pythonSet.mkVirtualEnv "venv" workspace.deps.default;
+  inherit (callPackage pyproject-nix.build.util {}) mkApplication;
+in mkApplication {
+  inherit venv;
+  package = pythonSet."${packageName}";
+}