feat: add /api/query/result endpoint, fetch Fugaku FOM in estimate code=qws system=MiyabiG

Author: yoshifuminakamura

programs/qws/estimate.sh

@@ -18,14 +18,14 @@ est_benchmark_system="$est_system"
 est_benchmark_fom="$est_fom"
 est_benchmark_nodes="$est_node_count"
 
-# --- Dummy estimation model (scale-mock) ---
-# Current system: Fugaku — FOM scaled by 10x
+# --- Current system: Fugaku — fetch real FOM from result_server ---
 est_current_system="Fugaku"
-est_current_fom=$(awk -v fom="$est_fom" 'BEGIN {printf "%.3f", fom * 10}')
+CURRENT_EXP=""  # Set specific Exp here if needed (e.g. "default")
+fetch_current_fom "$est_code" "$CURRENT_EXP"
 est_current_nodes="$est_node_count"
-est_current_method="scale-mock"
+est_current_method="measured"
 
-# Future system: FugakuNEXT — FOM scaled by 2x
+# Future system: FugakuNEXT — FOM scaled by 2x (dummy)
 est_future_system="FugakuNEXT"
 est_future_fom=$(awk -v fom="$est_fom" 'BEGIN {printf "%.3f", fom * 2}')
 est_future_nodes="$est_node_count"

programs/qws/list.csv

@@ -5,6 +5,6 @@ system,mode,queue_group,nodes,numproc_node,nthreads,elapse
 #FugakuCN,native,small,2,4,12,0:10:00
 #RC_GH200,native,dummy,1,1,12,0:10:00
 #RC_DGXS,native,dummy,1,1,20,0:10:00
-RC_GENOA,native,dummy,1,1,96,0:10:00
+#RC_GENOA,native,dummy,1,1,96,0:10:00
 MiyabiG,cross,debug-g,1,1,72,0:10:00
-MiyabiC,cross,debug-c,1,1,112,0:10:00
+#MiyabiC,cross,debug-c,1,1,112,0:10:00

result_server/routes/api.py

@@ -12,8 +12,9 @@
   POST /upload-tgz  → ingest_padata
 """
 
-from flask import Blueprint, request, abort, current_app
+from flask import Blueprint, request, abort, current_app, jsonify
 import os
+import json
 import uuid
 import shutil
 from datetime import datetime
@@ -147,6 +148,55 @@ def ingest_padata():
     }, 200
 
 
+# ==========================================
+# Query API: /api/query/*
+# ==========================================
+
+@api_bp.route("/api/query/result", methods=["GET"])
+def query_result():
+    """Search results by system, code, exp and return the latest match.
+
+    Query parameters:
+      system (required): e.g. Fugaku
+      code   (required): e.g. qws
+      exp    (optional): e.g. default
+
+    Returns the full JSON of the most recent matching result file.
+    """
+    require_api_key()
+
+    system = request.args.get("system")
+    code = request.args.get("code")
+    exp = request.args.get("exp")
+
+    if not system or not code:
+        abort(400, description="system and code are required")
+
+    received_dir = current_app.config["RECEIVED_DIR"]
+    json_files = sorted(
+        [f for f in os.listdir(received_dir) if f.endswith(".json")],
+        reverse=True,
+    )
+
+    for json_file in json_files:
+        try:
+            with open(os.path.join(received_dir, json_file), "r", encoding="utf-8") as f:
+                data = json.load(f)
+        except Exception:
+            continue
+
+        if data.get("system") != system:
+            continue
+        if data.get("code") != code:
+            continue
+        if exp is not None and data.get("Exp") != exp:
+            continue
+
+        return jsonify(data), 200
+
+    abort(404, description=f"No result found for system={system}, code={code}, exp={exp}")
+
+
 # ==========================================
 # 互換ルート (deprecated)
 # ==========================================

result_server/tests/test_api_routes.py

@@ -274,6 +274,63 @@ def test_estimated_route_accessible(self, app):
         assert any("/estimated/" in r for r in rules)
 
 
+# ============================================================
+# /api/query/result
+# ============================================================
+
+class TestQueryResult:
+    def _seed_result(self, received_dir, data, filename="result_20250101_000000_aaaa.json"):
+        path = os.path.join(received_dir, filename)
+        with open(path, "w") as f:
+            json.dump(data, f)
+
+    def test_query_returns_latest_match(self, client, tmp_dirs):
+        received, _ = tmp_dirs
+        old = {"system": "Fugaku", "code": "qws", "Exp": "default", "FOM": 1.0}
+        new = {"system": "Fugaku", "code": "qws", "Exp": "default", "FOM": 9.9}
+        self._seed_result(received, old, "result_20250101_000000_aaaa.json")
+        self._seed_result(received, new, "result_20250102_000000_bbbb.json")
+
+        resp = client.get(
+            "/api/query/result?system=Fugaku&code=qws",
+            headers={"X-API-Key": API_KEY},
+        )
+        assert resp.status_code == 200
+        assert resp.get_json()["FOM"] == 9.9
+
+    def test_query_with_exp_filter(self, client, tmp_dirs):
+        received, _ = tmp_dirs
+        d1 = {"system": "Fugaku", "code": "qws", "Exp": "A", "FOM": 1.0}
+        d2 = {"system": "Fugaku", "code": "qws", "Exp": "B", "FOM": 2.0}
+        self._seed_result(received, d1, "result_20250101_000000_aaaa.json")
+        self._seed_result(received, d2, "result_20250102_000000_bbbb.json")
+
+        resp = client.get(
+            "/api/query/result?system=Fugaku&code=qws&exp=A",
+            headers={"X-API-Key": API_KEY},
+        )
+        assert resp.status_code == 200
+        assert resp.get_json()["FOM"] == 1.0
+
+    def test_query_no_match_returns_404(self, client, tmp_dirs):
+        resp = client.get(
+            "/api/query/result?system=Fugaku&code=nonexistent",
+            headers={"X-API-Key": API_KEY},
+        )
+        assert resp.status_code == 404
+
+    def test_query_missing_params_returns_400(self, client):
+        resp = client.get(
+            "/api/query/result?system=Fugaku",
+            headers={"X-API-Key": API_KEY},
+        )
+        assert resp.status_code == 400
+
+    def test_query_missing_api_key_returns_401(self, client):
+        resp = client.get("/api/query/result?system=Fugaku&code=qws")
+        assert resp.status_code == 401
+
+
 # ============================================================
 # ヘルパー
 # ============================================================

scripts/estimate_common.sh

@@ -77,6 +77,51 @@ performance_ratio() {
     'BEGIN { if (fut == 0) printf "0"; else printf "%.3f", cur / fut }'
 }
 
+# ---------------------------------------------------------------------------
+# fetch_current_fom — Fetch Fugaku FOM from result_server API
+#
+# Arguments:
+#   $1  code (e.g. qws)
+#   $2  exp  (optional, e.g. default)
+#
+# Requires: RESULT_SERVER, RESULT_SERVER_KEY environment variables
+# Sets: est_current_fom (FOM value from Fugaku result)
+# Exits with 1 on failure.
+# ---------------------------------------------------------------------------
+fetch_current_fom() {
+  local code="$1"
+  local exp="${2:-}"
+
+  if [[ -z "${RESULT_SERVER:-}" ]]; then
+    echo "ERROR: RESULT_SERVER is not set" >&2
+    exit 1
+  fi
+  if [[ -z "${RESULT_SERVER_KEY:-}" ]]; then
+    echo "ERROR: RESULT_SERVER_KEY is not set" >&2
+    exit 1
+  fi
+
+  local url="${RESULT_SERVER}/api/query/result?system=Fugaku&code=${code}"
+  if [[ -n "$exp" ]]; then
+    url="${url}&exp=${exp}"
+  fi
+
+  local response
+  response=$(curl -sf -H "X-API-Key: ${RESULT_SERVER_KEY}" "$url")
+  if [[ $? -ne 0 || -z "$response" ]]; then
+    echo "ERROR: Failed to fetch Fugaku result for code=${code}, exp=${exp}" >&2
+    exit 1
+  fi
+
+  est_current_fom=$(echo "$response" | jq -r '.FOM')
+  if [[ -z "$est_current_fom" || "$est_current_fom" == "null" ]]; then
+    echo "ERROR: FOM not found in Fugaku result for code=${code}, exp=${exp}" >&2
+    exit 1
+  fi
+
+  echo "Fetched Fugaku FOM for ${code}: ${est_current_fom}"
+}
+
 # ---------------------------------------------------------------------------
 # print_json — Output an Estimate_JSON to stdout
 #