updates

.gitattributes

@@ -1 +1 @@
-archive/** linguist-vendored
+archive/* linguist-vendored

tooling/pipeline/CMakeLists.txt

@@ -137,8 +137,7 @@ set(HTTPLIB_REQUIRE_OPENSSL ON CACHE BOOL "Require OpenSSL for cpp-httplib" FORC
 FetchContent_MakeAvailable(cpp-httplib)
 
 # 5. Executable & Sources
-add_executable(${PROJECT_NAME}
+add_executable(${PROJECT_NAME})
-        includes/services/enrichment/mock_enrichment.h)
 
 # --- Entry point ---
 target_sources(${PROJECT_NAME} PRIVATE
@@ -195,9 +194,9 @@ endif()
 
 # --- services: wikipedia ---
 target_sources(${PROJECT_NAME} PRIVATE
-        src/services/enrichment/wikipedia/wikipedia_service.cc
+        src/services/wikipedia/wikipedia_service.cc
-        src/services/enrichment/wikipedia/fetch_extract.cc
+        src/services/wikipedia/fetch_extract.cc
-        src/services/enrichment/wikipedia/get_summary.cc
+        src/services/wikipedia/get_summary.cc
 )
 
 # --- services: sqlite ---

tooling/pipeline/includes/biergarten_data_generator.h

@@ -12,8 +12,8 @@
 
 #include "data_generation/data_generator.h"
 #include "data_model/generated_models.h"
-#include "services/database/export_service.h"
 #include "services/enrichment/enrichment_service.h"
+#include "services/database/export_service.h"
 
 /**
  * @brief Main data generator class for the Biergarten pipeline.
@@ -32,8 +32,7 @@ class BiergartenDataGenerator {
    */
   BiergartenDataGenerator(std::unique_ptr<IEnrichmentService> context_service,
                           std::unique_ptr<DataGenerator> generator,
-                          std::unique_ptr<IExportService> exporter,
+                          std::unique_ptr<IExportService> exporter);
-                          const ApplicationOptions& application_options);
 
   /**
    * @brief Run the data generation pipeline.
@@ -57,14 +56,12 @@ class BiergartenDataGenerator {
   /// @brief Storage backend for generated brewery records.
   std::unique_ptr<IExportService> exporter_;
 
-  const ApplicationOptions application_options_;
-
   /**
    * @brief Load locations from JSON and sample cities.
    *
    * @return Vector of sampled locations capped at 50 entries.
    */
-  std::vector<Location> QueryCitiesWithCountries();
+  static std::vector<Location> QueryCitiesWithCountries();
 
   /**
    * @brief Generate breweries for enriched cities.

tooling/pipeline/includes/data_model/models.h

@@ -83,9 +83,6 @@ struct SamplingOptions {
 
   /// @brief Random seed (-1 for random, otherwise non-negative).
   int seed = -1;
-
-  /// @brief Number of layers to offload to GPU.
-  int n_gpu_layers = 0;
 };
 
 /**
@@ -98,7 +95,8 @@ struct GeneratorOptions {
   /// @brief Use mocked generator instead of actual LLM inference.
   bool use_mocked = false;
 
-
+  /// @brief Number of layers to offload to GPU.
+  int n_gpu_layers = 0;
 
   /// @brief Specific sampling parameters for this generator.
   /// If nullopt, the application should use global defaults.
@@ -118,10 +116,6 @@ struct PipelineOptions {
 
   /// @brief Path for application logs.
   std::filesystem::path log_path;
-
-  /// @brief Number of locations to sample from the dataset
-  /// More locations -> more users/more breweries
-  uint32_t location_count;
 };
 
 /**

tooling/pipeline/includes/services/enrichment/mock_enrichment.h

@@ -1,17 +0,0 @@
-//
-// Created by aaronpo on 13/05/2026.
-//
-
-#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_MOCK_ENRICHMENT_H_
-#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_MOCK_ENRICHMENT_H_
-#include <string>
-
-#include "enrichment_service.h"
-
-class MockEnrichmentService final : public IEnrichmentService {
- public:
-  std::string GetLocationContext(const Location& /*loc*/) override {
-    return {};
-  }
-};
-#endif  // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_MOCK_ENRICHMENT_H_

tooling/pipeline/includes/services/enrichment/wikipedia_service.h

@@ -15,10 +15,10 @@
 #include "web_client/web_client.h"
 
 /// @brief Provides Wikipedia summary lookups backed by cached raw extracts.
-class WikipediaEnrichmentService final : public IEnrichmentService {
+class WikipediaService final : public IEnrichmentService {
  public:
   /// @brief Creates a new Wikipedia service with the provided web client.
-  explicit WikipediaEnrichmentService(std::unique_ptr<WebClient> client);
+  explicit WikipediaService(std::unique_ptr<WebClient> client);
 
   /// @brief Returns the Wikipedia-derived context for a location.
   [[nodiscard]] std::string GetLocationContext(const Location& loc) override;

tooling/pipeline/includes/web_client/http_web_client.h

@@ -42,7 +42,7 @@ public:
    * @param value Raw string to encode.
    * @return Percent-encoded string safe for use in a URL.
    */
-  std::string EncodeURL(const std::string& value) override;
+  std::string UrlEncode(const std::string& value) override;
 };
 
 

tooling/pipeline/includes/web_client/web_client.h

@@ -30,7 +30,7 @@ class WebClient {
    * @param value Raw string value.
    * @return Encoded value safe for URL usage.
    */
-  virtual std::string EncodeURL(const std::string& value) = 0;
+  virtual std::string UrlEncode(const std::string& value) = 0;
 };
 
 #endif  // BIERGARTEN_PIPELINE_INCLUDES_WEB_CLIENT_WEB_CLIENT_H_

tooling/pipeline/runpod/.dockerignore

@@ -1,9 +0,0 @@
-# Ignore model files!
-*.gguf
-*.bin
-models/
-weights/
-
-# Ignore local build folders
-build/
-.git/

tooling/pipeline/runpod/Dockerfile

@@ -1,72 +1,65 @@
-# --- Stage 1: Build Environment (The "Heavy" Stage) ---
+# Phase 1: Pull prebuilt binaries
-FROM nvidia/cuda:12.6.3-devel-ubuntu24.04 AS builder
+FROM ghcr.io/ggml-org/llama.cpp:full-cuda AS llama-bin
+
+# Phase 2: Building environment
+FROM nvidia/cuda:12.6.3-devel-ubuntu24.04
 
 ENV DEBIAN_FRONTEND=noninteractive \
-  CMAKE_GENERATOR=Ninja
+  CMAKE_GENERATOR=Ninja \
+  APP_ROOT=/workspace/app \
+  BUILD_DIR=/workspace/app/build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  build-essential ca-certificates curl git libboost-json-dev \
+  build-essential \
-  libboost-program-options-dev libssl-dev ninja-build pkg-config zlib1g-dev \
+  ca-certificates \
+  curl \
+  git \
+  libboost-json-dev \
+  libboost-program-options-dev \
+  libssl-dev \
+  ninja-build \
+  pkg-config \
+  zlib1g-dev \
   && rm -rf /var/lib/apt/lists/*
 
-# Install modern CMake
+# Install modern CMake via curl (Ubuntu 24.04 'apt' version can be laggy)
 RUN curl -L https://github.com/Kitware/CMake/releases/download/v3.31.0/cmake-3.31.0-linux-x86_64.sh -o cmake.sh && \
   sh cmake.sh --skip-license --prefix=/usr/local && rm cmake.sh
 
-# Get headers for C++ build
+# Copy backends to /usr/local/lib and register with ldconfig so the
-RUN curl -L https://github.com/ggml-org/llama.cpp/archive/refs/tags/b9012.tar.gz -o /tmp/llama-src.tar.gz && \
+# runtime linker can resolve libllama.so, libggml.so, libggml-base.so etc.
-  tar -xzf /tmp/llama-src.tar.gz -C /tmp && \
+COPY --from=llama-bin /app/lib*.so* /usr/local/lib/
-  cp -r /tmp/llama.cpp-b9012/include/* /usr/local/include/ && \
+RUN ldconfig
-  cp -r /tmp/llama.cpp-b9012/ggml/include/* /usr/local/include/
 
-# Pull llama.cpp binaries to use during build if needed
+# Headers for C++ Build
-COPY --from=ghcr.io/ggml-org/llama.cpp:full-cuda /app/lib*.so* /usr/local/lib/
+RUN git clone --depth 1 -b b9012 https://github.com/ggml-org/llama.cpp.git /tmp/llama-src && \
+  cp -r /tmp/llama-src/include/* /usr/local/include/ && \
+  cp -r /tmp/llama-src/ggml/include/* /usr/local/include/ && \
+  rm -rf /tmp/llama-src
 
-WORKDIR /app
+ENV LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
+
+WORKDIR /workspace/app
 COPY . .
 
 # Build the C++ pipeline
 RUN cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release && \
   cmake --build build -j$(nproc)
 
-# --- Stage 2: Runtime Environment (The "Slim" Stage) ---
+# Co-locate GGML backend plugins with the executable.
-FROM nvidia/cuda:12.6.3-runtime-ubuntu24.04 AS runtime
+# ggml_backend_load_all() searches the executable directory first when
-
+# GGML_BACKEND_DIR is not set. Copying the ggml-*.so plugin files here
-# Install only necessary runtime shared libraries
+# ensures the loader finds them without any environment variable.
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# libllama.so, libggml.so, and libggml-base.so are NOT copied here —
-  curl \
+# those are proper shared libraries resolved via ldconfig/LD_LIBRARY_PATH.
-  ca-certificates \
+RUN cp /usr/local/lib/libggml-cuda.so  /workspace/app/build/ 2>/dev/null || true && \
-  libboost-json1.83.0 \
+  cp /usr/local/lib/libggml-cpu*.so   /workspace/app/build/ 2>/dev/null || true && \
-  libboost-program-options1.83.0 \
+  cp /usr/local/lib/libggml-blas*.so  /workspace/app/build/ 2>/dev/null || true && \
-  libgomp1 \
+  cp /usr/local/lib/libggml-rpc*.so   /workspace/app/build/ 2>/dev/null || true
-  libssl3 \
-  zlib1g \
-  && rm -rf /var/lib/apt/lists/*
-
-ENV APP_ROOT=/app \
-  LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
-
-WORKDIR /app/build
-
-# Copy only the compiled binaries from the builder
-COPY --from=builder /app/build/biergarten-pipeline ./
-
-# Copy required config files
-COPY locations.json /app/build/
-COPY beer-styles.json /app/build/
-
-# Copy prompt templates
-COPY prompts /app/prompts
-
-# Copy only the necessary shared libraries from builder/llama-bin
-COPY --from=ghcr.io/ggml-org/llama.cpp:full-cuda /app/lib*.so* /usr/local/lib/
-
-# Co-locate plugins
-RUN cp /usr/local/lib/libggml-cuda.so . 2>/dev/null || true && \
-  cp /usr/local/lib/libggml-cpu*.so . 2>/dev/null || true
 
 # Setup Start Script
-COPY ./runpod/start.sh /usr/local/bin/biergarten-start
+COPY runpod/start.sh /usr/local/bin/biergarten-start
 RUN chmod +x /usr/local/bin/biergarten-start
 
+WORKDIR /workspace/app/build
 ENTRYPOINT ["/usr/local/bin/biergarten-start"]

tooling/pipeline/runpod/start.sh

@@ -1,58 +1,49 @@
 #!/bin/bash
 set -e
 
+# Configuration / Defaults
 MODEL_PATH="${BIERGARTEN_MODEL_PATH:-/workspace/models/google_gemma-4-E4B-it-Q6_K.gguf}"
 OUTPUT_DIR="${BIERGARTEN_OUTPUT_DIR:-/workspace/output}"
 LOG_PATH="${BIERGARTEN_LOG_PATH:-/workspace/logs/pipeline.log}"
-EXECUTABLE="/app/build/biergarten-pipeline"
+EXECUTABLE="/workspace/app/build/biergarten-pipeline"
-PROMPT_DIR="/app/prompts"
+PROMPT_DIR="/workspace/app/build/prompts"
 
 echo "--- Starting Biergarten Pipeline Environment Check ---"
 
-# Ensure directories exist
+# 1. Ensure volume mount directories exist
 mkdir -p "$OUTPUT_DIR"
 mkdir -p "$(dirname "$LOG_PATH")"
-mkdir -p "$(dirname "$MODEL_PATH")"
 
-# Download model if missing
+# 2. Check for model file
 if [ ! -f "$MODEL_PATH" ]; then
-    echo "Model not found. Downloading (this may take a while)..."
+    echo "ERROR: Model not found at $MODEL_PATH"
-
+    echo "Current /workspace/models contents:"
-    curl -L -C - \
+    ls -lh /workspace/models 2>/dev/null || echo "(directory does not exist)"
-      -o "$MODEL_PATH" \
-      "https://huggingface.co/bartowski/google_gemma-4-E4B-it-GGUF/resolve/main/google_gemma-4-E4B-it-Q6_K.gguf?download=true"
-
-    echo "Download complete."
-fi
-
-# Verify model exists
-if [ ! -f "$MODEL_PATH" ]; then
-    echo "ERROR: Model still not found after download attempt."
     exit 1
 fi
 
-# Default GPU layers
+# 3. Build the command arguments
-GL_LAYERS="${BIERGARTEN_GL_LAYERS:-40}"
-
-# Build args
 ARGS=(
     "--model"      "$MODEL_PATH"
     "--prompt-dir" "$PROMPT_DIR"
     "--output"     "$OUTPUT_DIR"
     "--log-path"   "$LOG_PATH"
-    "--n-gpu-layers" "$GL_LAYERS"
 )
 
-# Optional params
+# Optional hyperparameters
 [[ -n "$BIERGARTEN_TEMPERATURE" ]] && ARGS+=("--temperature"  "$BIERGARTEN_TEMPERATURE")
 [[ -n "$BIERGARTEN_TOP_P" ]]       && ARGS+=("--top-p"        "$BIERGARTEN_TOP_P")
 [[ -n "$BIERGARTEN_TOP_K" ]]       && ARGS+=("--top-k"        "$BIERGARTEN_TOP_K")
 [[ -n "$BIERGARTEN_N_CTX" ]]       && ARGS+=("--n-ctx"        "$BIERGARTEN_N_CTX")
 [[ -n "$BIERGARTEN_SEED" ]]        && ARGS+=("--seed"         "$BIERGARTEN_SEED")
+[[ -n "$BIERGARTEN_GL_LAYERS" ]]   && ARGS+=("--n-gpu-layers" "$BIERGARTEN_GL_LAYERS")
 
-# Extra args
+# Append any extra custom args
-[[ -n "$BIERGARTEN_EXTRA_ARGS" ]] && ARGS+=($BIERGARTEN_EXTRA_ARGS)
+if [[ -n "$BIERGARTEN_EXTRA_ARGS" ]]; then
+    ARGS+=($BIERGARTEN_EXTRA_ARGS)
+fi
 
 echo "--- Executing: $EXECUTABLE ${ARGS[*]} ---"
 
+# Execute the binary directly, replacing the shell process
 exec "$EXECUTABLE" "${ARGS[@]}"

tooling/pipeline/src/application_options/parse_arguments.cc

@@ -30,8 +30,6 @@ std::optional<ApplicationOptions> ParseArguments(const int argc, char** argv) {
         "Context window size in tokens");
     opt("seed", prog_opts::value<int>()->default_value(sampling_defaults.seed),
         "Sampler seed: -1 for random, otherwise non-negative integer");
-    opt("n-gpu-layers", prog_opts::value<int>()->default_value(0),
-        "Number of layers to offload to GPU");
   };
 
   // --mocked and --model are mutually exclusive; validation is enforced below
@@ -52,7 +50,8 @@ std::optional<ApplicationOptions> ParseArguments(const int argc, char** argv) {
     opt("prompt-dir", prog_opts::value<std::string>()->default_value(""),
         "Directory containing named prompt files (e.g. BREWERY_GENERATION.md)."
         " Required when not using --mocked.");
-    opt("location-count", prog_opts::value<uint32_t>()->default_value(10));
+    opt("n-gpu-layers", prog_opts::value<int>()->default_value(0),
+        "Number of layers to offload to GPU");
   };
 
   add_sampling_options();
@@ -85,8 +84,6 @@ std::optional<ApplicationOptions> ParseArguments(const int argc, char** argv) {
     options.pipeline.output_path = var_map["output"].as<std::string>();
     options.pipeline.log_path = var_map["log-path"].as<std::string>();
     options.pipeline.prompt_dir = var_map["prompt-dir"].as<std::string>();
-    options.pipeline.location_count =
-      var_map["location-count"].as<uint32_t>();
 
     const bool use_mocked = var_map["mocked"].as<bool>();
     const std::string model_path = var_map["model"].as<std::string>();
@@ -116,7 +113,7 @@ std::optional<ApplicationOptions> ParseArguments(const int argc, char** argv) {
 
     options.generator.use_mocked = use_mocked;
     options.generator.model_path = model_path;
-    // options.generator.n_gpu_layers = n_gpu_layers;
+    options.generator.n_gpu_layers = n_gpu_layers;
 
     // Only populate sampling config when the user explicitly overrides at
     // least one value. Leaving it as std::nullopt lets LlamaGenerator fall
@@ -125,7 +122,7 @@ std::optional<ApplicationOptions> ParseArguments(const int argc, char** argv) {
     const bool user_provided_sampling =
         !var_map["temperature"].defaulted() || !var_map["top-p"].defaulted() ||
         !var_map["top-k"].defaulted() || !var_map["n-ctx"].defaulted() ||
-        !var_map["seed"].defaulted() || !var_map["n_gpu_layers"].defaulted();
+        !var_map["seed"].defaulted();
 
     if (user_provided_sampling) {
       // Warn but do not fail — the run is still valid, the flags are just
@@ -139,7 +136,6 @@ std::optional<ApplicationOptions> ParseArguments(const int argc, char** argv) {
         sampling.top_k = var_map["top-k"].as<uint32_t>();
         sampling.n_ctx = var_map["n-ctx"].as<uint32_t>();
         sampling.seed = var_map["seed"].as<int>();
-        sampling.n_gpu_layers = var_map["n-gpu-layers"].as<int>();
 
         options.generator.sampling = sampling;
       }

tooling/pipeline/src/biergarten_data_generator/biergarten_data_generator.cc

@@ -10,9 +10,7 @@
 BiergartenDataGenerator::BiergartenDataGenerator(
     std::unique_ptr<IEnrichmentService> context_service,
     std::unique_ptr<DataGenerator> generator,
-    std::unique_ptr<IExportService> exporter,
+    std::unique_ptr<IExportService> exporter)
-    const ApplicationOptions &app_options)
     : context_service_(std::move(context_service)),
       generator_(std::move(generator)),
-      exporter_(std::move(exporter)),
+      exporter_(std::move(exporter)) {}
-      application_options_(app_options) {}

tooling/pipeline/src/biergarten_data_generator/query_cities_with_countries.cc

@@ -13,6 +13,8 @@
 #include "biergarten_data_generator.h"
 #include "json_handling/json_loader.h"
 
+static constexpr size_t kBreweryAmount = 50;
+
 std::vector<Location> BiergartenDataGenerator::QueryCitiesWithCountries() {
   spdlog::info("\n=== GEOGRAPHIC DATA OVERVIEW ===");
 
@@ -21,9 +23,7 @@ std::vector<Location> BiergartenDataGenerator::QueryCitiesWithCountries() {
   auto all_locations = JsonLoader::LoadLocations(locations_path);
   spdlog::info("  Locations available: {}", all_locations.size());
 
-  const size_t sample_count = std::min(
+  const size_t sample_count = std::min(kBreweryAmount, all_locations.size());
-      static_cast<size_t>(application_options_.pipeline.location_count),
-      all_locations.size());
 
   const auto sample_count_signed =
       static_cast<std::iter_difference_t<decltype(all_locations.cbegin())>>(

tooling/pipeline/src/biergarten_data_generator/run.cc

@@ -21,8 +21,8 @@ bool BiergartenDataGenerator::Run() {
     for (auto& city : cities) {
       try {
         std::string region_context = context_service_->GetLocationContext(city);
-        // spdlog::debug("[Pipeline] Context for '{}' ({}) gathered:\n{}",
+        spdlog::debug("[Pipeline] Context for '{}' ({}) gathered:\n{}",
-        //               city.city, city.iso3166_2, region_context);
+                      city.city, city.country, region_context);
 
         enriched.push_back(
             EnrichedCity{.location = std::move(city),

tooling/pipeline/src/data_generation/llama/llama_generator.cc

@@ -89,7 +89,7 @@ LlamaGenerator::LlamaGenerator(
   }
 
   n_ctx_ = sampling.n_ctx;
-  n_gpu_layers_ = sampling.n_gpu_layers;
+  n_gpu_layers_ = options.generator.n_gpu_layers;
 
   this->Load(model_path);
 }

tooling/pipeline/src/main.cc

@@ -8,9 +8,11 @@
 
 #include <boost/di.hpp>
 #include <boost/program_options.hpp>
+
 #include <exception>
 #include <memory>
 #include <optional>
+
 #include <string>
 
 #include "biergarten_data_generator.h"
@@ -19,13 +21,12 @@
 #include "data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h"
 #include "data_model/models.h"
 #include "llama_backend_state.h"
+#include "services/enrichment/enrichment_service.h"
 #include "services/database/export_service.h"
+#include "services/prompting/prompt_directory.h"
 #include "services/database/sqlite_export_service.h"
 #include "services/datetime/timer.h"
-#include "services/enrichment/enrichment_service.h"
-#include "services/enrichment/mock_enrichment.h"
 #include "services/enrichment/wikipedia_service.h"
-#include "services/prompting/prompt_directory.h"
 #include "web_client/http_web_client.h"
 
 namespace di = boost::di;
@@ -42,9 +43,7 @@ int main(const int argc, char** argv) {
     spdlog::set_level(spdlog::level::debug);
 #endif
 
-    const std::optional<ApplicationOptions> parsed_options =
+    const auto parsed_options = ParseArguments(argc, argv);
-        ParseArguments(argc, argv);
-
     if (!parsed_options.has_value()) {
       return 0;
     }
@@ -66,20 +65,12 @@ int main(const int argc, char** argv) {
     }
 
     const auto injector = di::make_injector(
-        di::bind<ApplicationOptions>().to(options),
-        di::bind<std::string>().to(model_path),
         di::bind<WebClient>().to<HttpWebClient>(),
+        di::bind<ApplicationOptions>().to(options),
+        di::bind<IEnrichmentService>().to<WikipediaService>(),
         di::bind<IExportService>().to<SqliteExportService>(),
         di::bind<IPromptFormatter>().to<Gemma4JinjaPromptFormatter>(),
-        di::bind<IEnrichmentService>().to(
+        di::bind<std::string>().to(model_path),
-            [options](const auto& inj) -> std::unique_ptr<IEnrichmentService> {
-              if (options.generator.use_mocked) {
-                return std::make_unique<MockEnrichmentService>();
-              }
-
-              return std::make_unique<WikipediaEnrichmentService>(
-                  inj.template create<std::unique_ptr<WebClient>>());
-            }),
         di::bind<DataGenerator>().to(
             [options, model_path, sampling, &prompt_directory](
             const auto& inj) -> std::unique_ptr<DataGenerator> {
@@ -98,11 +89,9 @@ int main(const int argc, char** argv) {
                   options, model_path,
                   inj.template create<std::unique_ptr<IPromptFormatter>>(),
                   std::move(prompt_directory));
-            })
+            }));
 
-    );
+    auto generator =
-
-    const auto generator =
         injector.create<std::unique_ptr<BiergartenDataGenerator>>();
 
     if (!generator->Run()) {

tooling/pipeline/src/services/enrichment/wikipedia/fetch_extract.cc

@@ -1,112 +0,0 @@
-/**
- * @file wikipedia/fetch_extract.cc
- */
-
-#include <spdlog/spdlog.h>
-
-#include <boost/json.hpp>
-#include <chrono>
-#include <format>
-#include <string>
-#include <string_view>
-#include <thread>
-
-#include "services/enrichment/wikipedia_service.h"
-
-using namespace boost;
-
-std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
-
-  const std::string cache_key(query);
-
-  // 1. Cache Lookup
-  if (const auto cache_it = this->extract_cache_.find(cache_key);
-      cache_it != this->extract_cache_.end()) {
-    spdlog::debug("Wikipedia: Cache hit for {}!", cache_key);
-    return cache_it->second;
-  }
-
-  const std::string encoded = this->client_->EncodeURL(cache_key);
-  const std::string url = std::format(
-      "https://en.wikipedia.org/w/"
-      "api.php?action=query&titles={}&prop=extracts&explaintext=1&format=json",
-      encoded);
-
-
-  const std::string body = this->client_->Get(url);
-  {
-    using namespace std::literals::chrono_literals;
-    std::this_thread::sleep_for(1s);
-  }
-
-  // 2. Parse JSON
-  system::error_code ec;
-  json::value doc = json::parse(body, ec);
-
-  if (ec) {
-    spdlog::warn("WikipediaService: JSON parse error for '{}': {}", query,
-                 ec.message());
-    return {};
-  }
-
-  // 3. Safe Extraction
-  const json::object* obj = doc.if_object();
-  if (obj == nullptr) {
-    spdlog::warn("WikipediaService: Expected root object for '{}'", query);
-    return {};
-  }
-
-  const json::value* query_ptr = obj->if_contains("query");
-  const json::value* pages_ptr =
-      ((query_ptr != nullptr) && query_ptr->is_object())
-          ? query_ptr->get_object().if_contains("pages")
-          : nullptr;
-
-  if ((pages_ptr == nullptr) || !pages_ptr->is_object()) {
-    spdlog::warn("WikipediaService: Missing query.pages for '{}'", query);
-    return {};
-  }
-
-  const json::object& pages = pages_ptr->get_object();
-
-  if (pages.empty()) {
-    spdlog::warn("WikipediaService: No pages returned for '{}'", query);
-    this->extract_cache_.emplace(cache_key, "");
-    return {};
-  }
-
-  // Wikipedia returns the page under a dynamic ID key; we just want the first
-  // one
-  const json::value& page_val = pages.begin()->value();
-
-  if (!page_val.is_object()) {
-    spdlog::warn("WikipediaService: Unexpected page format for '{}'", query);
-    return {};
-  }
-
-  const json::object& page = page_val.get_object();
-
-  // Handle 404/Missing status
-  if (page.contains("missing")) {
-    spdlog::warn("WikipediaService: Page '{}' does not exist", query);
-    this->extract_cache_.emplace(cache_key, "");
-    return {};
-  }
-
-  const json::value* extract_ptr = page.if_contains("extract");
-
-  if ((extract_ptr == nullptr) || !extract_ptr->is_string()) {
-    spdlog::warn("WikipediaService: No extract string found for '{}'", query);
-    this->extract_cache_.emplace(cache_key, "");
-    return {};
-  }
-
-  // 4. Success
-  std::string extract(extract_ptr->as_string());
-  spdlog::info("WikipediaService: Fetched {} chars for '{}'", extract.size(),
-                query);
-
-  this->extract_cache_.insert_or_assign(cache_key, extract);
-
-  return extract;
-}

tooling/pipeline/src/services/enrichment/wikipedia/get_summary.cc

@@ -1,58 +0,0 @@
-/**
- * @file wikipedia/get_summary.cc
- * @brief WikipediaService::GetLocationContext() implementation.
- */
-
-#include <spdlog/spdlog.h>
-
-#include <chrono>
-#include <format>
-#include <string>
-#include <thread>
-
-#include "services/enrichment/wikipedia_service.h"
-
-std::string WikipediaEnrichmentService::GetLocationContext(const Location& loc) {
-  using namespace std::literals::chrono_literals;
-  if (!this->client_) {
-    spdlog::warn("Client is nullptr.");
-    return {};
-  }
-
-  std::string result;
-
-  // std::string region_query(loc.city);
-  // if (!loc.country.empty()) {
-  //   region_query += loc.state_province,
-  //   region_query += ", ";
-  //   region_query += loc.country;
-  // }
-
-  constexpr std::string_view brewing_query = "brewing";
-  const std::string location_query =
-      std::format("{}, {}", loc.city, loc.iso3166_2);
-  const std::string beer_query = std::format("beer in {}", loc.country);
-
-  auto append_extract = [&result](const std::string& extract) -> void {
-    if (extract.empty()) {
-      return;
-    }
-    if (!result.empty()) {
-      result += "\n\n";
-    }
-    result += extract;
-  };
-
-  try {
-    append_extract(FetchExtract(brewing_query));
-    append_extract(FetchExtract(beer_query));
-    spdlog::info("Done fetching for {}. Sleeping for 10 seconds.",
-                 location_query);
-    std::this_thread::sleep_for(10s);
-
-  } catch (const std::runtime_error& e) {
-    spdlog::debug("WikipediaService lookup failed for '{}': {}", location_query,
-                  e.what());
-  }
-  return result;
-}

tooling/pipeline/src/services/wikipedia/fetch_extract.cc

@@ -0,0 +1,61 @@
+/**
+ * @file wikipedia/fetch_extract.cc
+ * @brief WikipediaService::FetchExtract() implementation.
+ */
+
+#include <spdlog/spdlog.h>
+
+#include <boost/json.hpp>
+#include <string>
+#include <string_view>
+
+#include "services/enrichment/wikipedia_service.h"
+
+std::string WikipediaService::FetchExtract(std::string_view query) {
+  const std::string cache_key(query);
+  const auto cache_it = this->extract_cache_.find(cache_key);
+  if (cache_it != this->extract_cache_.end()) {
+    return cache_it->second;
+  }
+
+  const std::string encoded = this->client_->UrlEncode(cache_key);
+  const std::string url =
+      "https://en.wikipedia.org/w/api.php?action=query&titles=" + encoded +
+      "&prop=extracts&explaintext=1&format=json";
+
+  const std::string body = this->client_->Get(url);
+
+  boost::system::error_code parse_error;
+  boost::json::value doc = boost::json::parse(body, parse_error);
+
+  if (!parse_error && doc.is_object()) {
+    try {
+      auto& pages = doc.at("query").at("pages").get_object();
+      if (!pages.empty()) {
+        auto& page = pages.begin()->value().get_object();
+        if (page.contains("extract") && page.at("extract").is_string()) {
+          const std::string_view extract_view = page.at("extract").as_string();
+          std::string extract(extract_view);
+
+          spdlog::debug("WikipediaService fetched {} chars for '{}'",
+                        extract.size(), query);
+
+          this->extract_cache_.emplace(cache_key, extract);
+          return extract;
+        }
+      }
+      this->extract_cache_.emplace(cache_key, std::string{});
+    } catch (const std::exception& e) {
+      spdlog::warn(
+          "WikipediaService: failed to parse response structure for '{}': "
+          "{}",
+          query, e.what());
+      return {};
+    }
+  } else if (parse_error) {
+    spdlog::warn("WikipediaService: JSON parse error for '{}': {}", query,
+                 parse_error.message());
+  }
+
+  return {};
+}

tooling/pipeline/src/services/wikipedia/get_summary.cc

@@ -0,0 +1,47 @@
+/**
+ * @file wikipedia/get_summary.cc
+ * @brief WikipediaService::GetLocationContext() implementation.
+ */
+
+#include <spdlog/spdlog.h>
+
+#include <string>
+
+#include "services/enrichment/wikipedia_service.h"
+
+std::string WikipediaService::GetLocationContext(const Location& loc) {
+  if (!client_) {
+    return {};
+  }
+
+  std::string result;
+
+  std::string region_query(loc.city);
+  if (!loc.country.empty()) {
+    region_query += ", ";
+    region_query += loc.country;
+  }
+
+  const std::string beer_query = "beer in " + loc.country;
+  const std::string city_beer_query = "beer in " + loc.city;
+
+  auto append_extract = [&result](const std::string& extract) -> void {
+    if (extract.empty()) {
+      return;
+    }
+    if (!result.empty()) {
+      result += "\n\n";
+    }
+    result += extract;
+  };
+
+  try {
+    append_extract(FetchExtract(region_query));
+    append_extract(FetchExtract(beer_query));
+    append_extract(FetchExtract(city_beer_query));
+  } catch (const std::runtime_error& e) {
+    spdlog::debug("WikipediaService lookup failed for '{}': {}", region_query,
+                  e.what());
+  }
+  return result;
+}

tooling/pipeline/src/services/wikipedia/wikipedia_service.cc

@@ -7,6 +7,5 @@
 
 #include <utility>
 
-WikipediaEnrichmentService::WikipediaEnrichmentService(
+WikipediaService::WikipediaService(std::unique_ptr<WebClient> client)
-    std::unique_ptr<WebClient> client)
     : client_(std::move(client)) {}

tooling/pipeline/src/web_client/http_web_client.cc

@@ -12,8 +12,6 @@
 #include <string>
 #include <utility>
 
-#include "spdlog/spdlog.h"
-
 namespace {
 constexpr time_t kConnectionTimeoutSeconds = 5;
 constexpr time_t kReadTimeoutSeconds = 10;
@@ -40,12 +38,8 @@ std::string HttpWebClient::Get(const std::string& url) {
   client.set_follow_location(true);
   client.set_connection_timeout(kConnectionTimeoutSeconds);
   client.set_read_timeout(kReadTimeoutSeconds);
-  client.set_default_headers({
-     {"Accept", "application/json"},
-     {"User-Agent", "biergarten-pipeline/1.0"}
- });
 
-  const httplib::Result result = client.Get(path);
+  const auto result = client.Get(path);
 
   if (!result) {
     throw std::runtime_error(
@@ -54,7 +48,6 @@ std::string HttpWebClient::Get(const std::string& url) {
   }
 
   if (result->status < kSuccessMin || result->status >= kSuccessMax) {
-    spdlog::error("[HttpWebClient] Request failed for URL: " + url);
     throw std::runtime_error(
         "[HttpWebClient] HTTP " + std::to_string(result->status) +
         " for URL: " + url);
@@ -63,6 +56,6 @@ std::string HttpWebClient::Get(const std::string& url) {
   return result->body;
 }
 
-std::string HttpWebClient::EncodeURL(const std::string& value) {
+std::string HttpWebClient::UrlEncode(const std::string& value) {
   return httplib::encode_uri_component(value);
 }