logging updates

docs/pipeline/diagrams/current/class.puml

@@ -26,7 +26,6 @@ skinparam note {
 title The Biergarten Data Pipeline - Class Diagram
 
 class BiergartenDataGenerator {
-  - logger_ : std::shared_ptr<ILogger>
   - context_service_ : std::unique_ptr<IEnrichmentService>
   - generator_ : std::unique_ptr<DataGenerator>
   - exporter_ : std::unique_ptr<IExportService>
@@ -37,46 +36,6 @@ class BiergartenDataGenerator {
   - LogResults() : void
 }
 
-class LogLevel <<enumeration>> {
-  Debug
-  Info
-  Warn
-  Error
-}
-
-class PipelinePhase <<enumeration>> {
-  Startup
-  UserGeneration
-  BreweryAndBeerGeneration
-  CheckinGeneration
-  RatingGeneration
-  FollowGeneration
-  Teardown
-}
-
-struct LogEntry {
-  + timestamp : std::chrono::system_clock::time_point
-  + level : LogLevel
-  + phase : PipelinePhase
-  + message : std::string
-  + worker : std::optional<std::string>
-}
-
-interface ILogger <<interface>> {
-  + Log(entry : const LogEntry&) : void
-}
-
-class LogProducer {
-  - channel_ : BoundedChannel<LogEntry>&
-  + Log(entry : const LogEntry&) : void
-}
-
-class LogDispatcher {
-  - channel_ : BoundedChannel<LogEntry>&
-  + Run() : void
-  - ToSpdlogLevel(level) : spdlog::level::level_enum
-}
-
 interface IEnrichmentService <<interface>> {
   + GetLocationContext(loc : const Location&) : std::string
 }
@@ -164,17 +123,10 @@ class SystemDateTimeProvider {
 }
 
 ' Structural Relationships / Dependency Injection
-BiergartenDataGenerator *-- ILogger : owns
 BiergartenDataGenerator *-- IEnrichmentService : owns
 BiergartenDataGenerator *-- DataGenerator : owns
 BiergartenDataGenerator *-- IExportService : owns
 
-LogEntry *-- LogLevel
-LogEntry *-- PipelinePhase
-ILogger <|.. LogProducer : implements
-LogProducer ..> LogEntry : emits
-LogDispatcher ..> LogEntry : consumes
-
 IEnrichmentService <|.. WikipediaService : implements
 WikipediaService *-- WebClient : owns
 

docs/pipeline/diagrams/planned/class.puml

@@ -275,29 +275,32 @@ package "Infrastructure: Logging" {
     + level : LogLevel
     + phase : PipelinePhase
     + message : std::string
+    + city : std::optional<std::string>
+    + entity_id : std::optional<std::string>
     + worker : std::optional<std::string>
   }
 
-  interface ILogger <<interface>> {
-    + Log(entry : const LogEntry&) : void
+  interface Logger <<interface>> {
+    + Log(level, phase, message,\n  city, entity_id, worker) : void
   }
 
-  class LogProducer {
-    - channel_ : BoundedChannel<LogEntry>&
-    + Log(entry : const LogEntry&) : void
+  class PipelineLogger {
+    - log_ch_ : BoundedChannel<LogEntry>&
+    + Log(level, phase, message,\n  city, entity_id, worker) : void
   }
 
-  class LogDispatcher {
-    - channel_ : BoundedChannel<LogEntry>&
+  class LogWorker {
+    - log_ch_ : BoundedChannel<LogEntry>&
     + Run() : void
+    - FormatTimestamp(tp) : std::string
     - ToSpdlogLevel(level) : spdlog::level::level_enum
+    - ToString(phase) : std::string
   }
 
   LogEntry       *--  LogLevel
   LogEntry       *--  PipelinePhase
-  ILogger        <|.. LogProducer
-  LogProducer    ..>  LogEntry       : emits
-  LogDispatcher  ..>  LogEntry       : consumes
+  PipelineLogger ..>  LogEntry       : emits
+  LogWorker      ..>  LogEntry       : consumes
 }
 
 package "Infrastructure: Pipeline Channel" {

tooling/pipeline/includes/biergarten_pipeline_orchestrator.h

@@ -1,8 +1,8 @@
-#ifndef BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_DATA_GENERATOR_H_
-#define BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_DATA_GENERATOR_H_
+#ifndef BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_PIPELINE_ORCHESTRATOR_H_
+#define BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_PIPELINE_ORCHESTRATOR_H_
 
 /**
- * @file biergarten_data_generator.h
+ * @file biergarten_pipeline_orchestrator.h
  * @brief Orchestration for end-to-end brewery data generation pipeline.
  *
  * Intent: Coordinates location loading, enrichment, and generation phases
@@ -28,7 +28,7 @@
  */
 class BiergartenPipelineOrchestrator {
  public:
-/**
+  /**
    * @brief Constructs the orchestrator with injected pipeline dependencies.
    *
    * @param context_service Provides regional context for locations.
@@ -93,4 +93,5 @@ class BiergartenPipelineOrchestrator {
   /// @brief Stores generated brewery data.
   std::vector<GeneratedBrewery> generated_breweries_;
 };
-#endif  // BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_DATA_GENERATOR_H_
+
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_PIPELINE_ORCHESTRATOR_H_

tooling/pipeline/includes/concurrency/bounded_channel.h

@@ -8,7 +8,7 @@
 #include <queue>
 
 /**
- * @file bounded_channel.h
+ * @file concurrency/bounded_channel.h
  * @brief Thread-safe, bounded multi-producer/multi-consumer synchronous channel.
  *
  * Intent: Enables asynchronous inter-thread communication with backpressure.

tooling/pipeline/includes/data_generation/llama_generator.h

@@ -38,7 +38,8 @@ class LlamaGenerator final : public DataGenerator {
    * @param prompt_directory Directory service for loading named prompt files.
    */
   LlamaGenerator(const ApplicationOptions& options,
-                 const std::string& model_path, std::shared_ptr<ILogger> logger,
+                 const std::string& model_path,
+                 std::shared_ptr<ILogger> logger,
                  std::unique_ptr<IPromptFormatter> prompt_formatter,
                  std::unique_ptr<IPromptDirectory> prompt_directory);
 

tooling/pipeline/includes/data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h

@@ -1,6 +1,11 @@
 #ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_GEMMA4_JINJA_PROMPT_FORMATTER_H_
 #define BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_GEMMA4_JINJA_PROMPT_FORMATTER_H_
 
+/**
+ * @file data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h
+ * @brief Prompt formatter for Google Gemma 4 model using Jinja2 template syntax.
+ */
+
 #include <string>
 #include <string_view>
 

tooling/pipeline/includes/data_generation/prompt_formatting/prompt_formatter.h

@@ -1,6 +1,11 @@
 #ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_PROMPT_FORMATTER_H_
 #define BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_PROMPT_FORMATTER_H_
 
+/**
+ * @file data_generation/prompt_formatting/prompt_formatter.h
+ * @brief Abstract interface for formatting system and user prompts.
+ */
+
 #include <string>
 #include <string_view>
 

tooling/pipeline/includes/services/database/export_service.h

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_EXPORT_SERVICE_H_
 
 /**
- * @file services/export_service.h
+ * @file services/database/export_service.h
  * @brief Abstraction for persisting generated brewery data.
  */
 

tooling/pipeline/includes/services/database/sqlite_connection_helpers.h

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_CONNECTION_HELPERS_H_
 
 /**
- * @file services/sqlite_connection_helpers.h
+ * @file services/database/sqlite_connection_helpers.h
  * @brief Declarations for connection-level SQLite helper functions.
  */
 

tooling/pipeline/includes/services/database/sqlite_export_service.h

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_H_
 
 /**
- * @file services/sqlite_export_service.h
+ * @file services/database/sqlite_export_service.h
  * @brief SQLite-backed export service for generated brewery data.
  */
 

tooling/pipeline/includes/services/database/sqlite_statement_helpers.h

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_STATEMENT_HELPERS_H_
 
 /**
- * @file services/sqlite_statement_helpers.h
+ * @file services/database/sqlite_statement_helpers.h
  * @brief Declarations for statement-level SQLite helper functions and
  * constants.
  */

tooling/pipeline/includes/services/datetime/date_time_provider.h

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATETIME_DATE_TIME_PROVIDER_H_
 
 /**
- * @file services/date_time_provider.h
+ * @file services/datetime/date_time_provider.h
  * @brief Abstraction for UTC timestamp generation.
  */
 

tooling/pipeline/includes/services/datetime/timer.h

@@ -4,7 +4,7 @@
 #include <chrono>
 
 /**
- * @file services/timer.h
+ * @file services/datetime/timer.h
  * @brief Simple timer utility for measuring elapsed time.
  */
 class Timer {

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

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_ENRICHMENT_SERVICE_H_
 
 /**
- * @file services/enrichment_service.h
+ * @file services/enrichment/enrichment_service.h
  * @brief Abstraction for resolving contextual enrichment for a location.
  */
 

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

@@ -1,15 +1,29 @@
-//
-// 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_
+
+/**
+ * @file services/enrichment/mock_enrichment.h
+ * @brief Mock implementation of enrichment service for testing.
+ */
+
 #include <string>
 
 #include "enrichment_service.h"
 
+/**
+ * @brief Mock implementation of enrichment service for testing and prototyping.
+ *
+ * Returns empty context without performing actual web queries or enrichment.
+ * Useful for unit tests and development scenarios.
+ */
 class MockEnrichmentService final : public IEnrichmentService {
  public:
+  /**
+   * @brief Returns empty location context.
+   *
+   * @param loc Unused location parameter.
+   * @return Empty string (no enrichment performed).
+   */
   std::string GetLocationContext(const Location& /*loc*/) override {
     return {};
   }

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

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_WIKIPEDIA_SERVICE_H_
 
 /**
- * @file services/wikipedia_service.h
+ * @file services/enrichment/wikipedia_service.h
  * @brief Wikipedia summary retrieval service with in-memory caching.
  */
 

tooling/pipeline/includes/services/logging/log_entry.h

@@ -1,3 +1,6 @@
+#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_ENTRY_H_
+#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_ENTRY_H_
+
 /**
  * @file services/logging/log_entry.h
  * @brief Structured log record shared by the pipeline logging infra.
@@ -6,14 +9,10 @@
  * logging producer and dispatcher through BoundedChannel<LogEntry>.
  */
 
-#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_ENTRY_H_
-#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_ENTRY_H_
 
 #include <chrono>
-#include <source_location>
-#include <string>
 #include <thread>
-#include <vector>
+#include <string>
 
 /**
  * @enum LogLevel
@@ -55,12 +54,6 @@ struct LogEntry {
   std::chrono::system_clock::time_point timestamp =
       std::chrono::system_clock::now();
 
-  /// @brief Source location where the log call was made.
-  std::source_location origin = std::source_location::current();
-
-  /// @brief Thread responsible for emitting the log.
-  std::thread::id thread_id = std::this_thread::get_id();
-
 
   /// @brief Severity level of this entry.
   LogLevel level;

tooling/pipeline/includes/services/logging/log_producer.h

@@ -6,8 +6,8 @@
  * a bounded channel for later processing by the dispatcher.
  */
 
-#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_CHANNEL_LOGGER_H_
-#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_CHANNEL_LOGGER_H_
+#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_PRODUCER_H_
+#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_PRODUCER_H_
 
 #include <string_view>
 
@@ -43,10 +43,10 @@ class LogProducer final : public ILogger {
    *
    * Blocks while the channel applies backpressure.
    */
-  void Log(LogEntry log_entry) override;
+  void Log(LogEntry const& entry) override;
 
  private:
   BoundedChannel<LogEntry>& channel_;
 };
 
-#endif  // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_CHANNEL_LOGGER_H_
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_PRODUCER_H_

tooling/pipeline/includes/services/logging/logger.h

@@ -1,3 +1,6 @@
+#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOGGER_H_
+#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOGGER_H_
+
 /**
  * @file services/logging/logger.h
  * @brief Abstract logging interface used by pipeline components.
@@ -6,12 +9,10 @@
  * transport, buffering, and formatting implementation.
  */
 
-#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOGGER_H_
-#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOGGER_H_
 
-#include <source_location>
+#include <optional>
 #include <string>
-#include <utility>
+#include <string_view>
 
 #include "services/logging/log_entry.h"
 
@@ -34,9 +35,10 @@ class ILogger {
   /**
    * @brief Submit a log message to the logging subsystem.
    *
-   * @param log_entry Structured log entry data.
+   * @param entry Structured log record containing message and metadata.
+   *
    */
-  virtual void Log(LogEntry log_entry) = 0;
+  virtual void Log(const LogEntry& entry) = 0;
 };
 
 #endif  // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOGGER_H_

tooling/pipeline/includes/services/prompting/prompt_directory.h

@@ -2,7 +2,7 @@
 #define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_PROMPTING_PROMPT_DIRECTORY_H_
 
 /**
- * @file services/prompt_directory.h
+ * @file services/prompting/prompt_directory.h
  * @brief Interface and filesystem-backed implementation for named prompt
  * loading.
  *

tooling/pipeline/includes/web_client/http_web_client.h

@@ -1,19 +1,18 @@
 /**
-* @file web_client/http_web_client.h
-* @brief cpp-httplib implementation of the WebClient interface.
-*/
+ * @file web_client/http_web_client.h
+ * @brief cpp-httplib implementation of the WebClient interface.
+ */
 
 #ifndef BIERGARTEN_PIPELINE_INCLUDES_WEB_CLIENT_HTTP_WEB_CLIENT_H_
 #define BIERGARTEN_PIPELINE_INCLUDES_WEB_CLIENT_HTTP_WEB_CLIENT_H_
 
-
-#include "web_client/web_client.h"
-#include "services/logging/logger.h"
-
 #include <memory>
 #include <string>
 #include <utility>
 
+#include "services/logging/logger.h"
+#include "web_client/web_client.h"
+
 /**
  * @brief WebClient implementation backed by cpp-httplib.
  *
@@ -26,9 +25,18 @@
  * bound to a single origin at construction time.
  */
 class HttpWebClient final : public WebClient {
-public:
+ public:
+  /**
+   * @brief Construct an HTTP web client with a logger.
+   *
+   * @param logger Logger instance for diagnostics.
+   */
   explicit HttpWebClient(std::shared_ptr<ILogger> logger)
       : logger_(std::move(logger)) {}
+
+  /**
+   * @brief Destructor.
+   */
   ~HttpWebClient() override = default;
 
   /**
@@ -52,5 +60,4 @@ public:
   std::shared_ptr<ILogger> logger_;
 };
 
-
-#endif
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_WEB_CLIENT_HTTP_WEB_CLIENT_H_

tooling/pipeline/src/application_options/parse_arguments.cc

@@ -1,5 +1,4 @@
 #include <chrono>
-#include <format>
 #include <iostream>
 #include <optional>
 #include <sstream>
@@ -77,6 +76,8 @@ std::optional<ApplicationOptions> ParseArguments(
       logger->Log({.level = LogLevel::Info,
                    .phase = PipelinePhase::Startup,
                    .message = usage});
+    } else {
+      std::cout << title << std::endl << usage << std::endl;
     }
     return std::nullopt;
   }
@@ -93,6 +94,8 @@ std::optional<ApplicationOptions> ParseArguments(
         logger->Log({.level = LogLevel::Info,
                      .phase = PipelinePhase::Startup,
                      .message = help_stream.str()});
+      } else {
+        std::cout << help_stream.str() << std::endl;
       }
       return std::nullopt;
     }
@@ -199,6 +202,8 @@ std::optional<ApplicationOptions> ParseArguments(
       logger->Log({.level = LogLevel::Error,
                    .phase = PipelinePhase::Startup,
                    .message = msg});
+    } else {
+      std::cerr << msg << std::endl;
     }
     return std::nullopt;
   } catch (...) {
@@ -208,6 +213,8 @@ std::optional<ApplicationOptions> ParseArguments(
       logger->Log({.level = LogLevel::Error,
                    .phase = PipelinePhase::Startup,
                    .message = msg});
+    } else {
+      std::cerr << msg << std::endl;
     }
     return std::nullopt;
   }

tooling/pipeline/src/biergarten_pipeline_orchestrator/generate_breweries.cc

@@ -4,7 +4,6 @@
  */
 
 #include <chrono>
-#include <format>
 
 #include "biergarten_pipeline_orchestrator.h"
 #include "services/logging/logger.h"
@@ -37,32 +36,34 @@ void BiergartenPipelineOrchestrator::GenerateBreweries(
             {.level = LogLevel::Warn,
              .phase = PipelinePhase::BreweryAndBeerGeneration,
              .message =
-                 std::format("[Pipeline] Generated brewery for '{}' ({}) but SQLite export failed: {}",
-                 location.city, location.country, export_exception.what())});
+                 std::string("[Pipeline] Generated brewery for '") +
+                 location.city + "' (" + location.country +
+                 ") but SQLite export failed: " + export_exception.what()});
       }
     } catch (const std::exception& e) {
       ++skipped_count;
 
       logger_->Log({.level = LogLevel::Warn,
                     .phase = PipelinePhase::BreweryAndBeerGeneration,
-                    .message = std::format("[Pipeline] Skipping city '{}' ({}): brewery generation failed: {}",
-                               location.city, location.country, e.what())});
+                    .message = std::string("[Pipeline] Skipping city '") +
+                               location.city + " (" + location.country +
+                               "): brewery generation failed: " + e.what()});
     }
   }
 
   if (skipped_count > 0) {
     logger_->Log({.level = LogLevel::Warn,
                   .phase = PipelinePhase::BreweryAndBeerGeneration,
-                  .message = std::format(
-                      "[Pipeline] Skipped {} city/cities due to generation errors",
-                      skipped_count)});
+                  .message = std::string("[Pipeline] Skipped ") +
+                             std::to_string(skipped_count) +
+                             " city/cities due to generation errors"});
   }
 
   if (export_failed_count > 0) {
     logger_->Log({.level = LogLevel::Warn,
                   .phase = PipelinePhase::Teardown,
-                  .message = std::format(
-                      "[Pipeline] Failed to export {} generated brewery/breweries to SQLite",
-                      export_failed_count)});
+                  .message = std::string("[Pipeline] Failed to export ") +
+                             std::to_string(export_failed_count) +
+                             " generated brewery/breweries to SQLite"});
   }
 }

tooling/pipeline/src/biergarten_pipeline_orchestrator/run.cc

@@ -4,7 +4,6 @@
  */
 
 #include <chrono>
-#include <format>
 #include <utility>
 
 #include "biergarten_pipeline_orchestrator.h"
@@ -34,18 +33,18 @@ bool BiergartenPipelineOrchestrator::Run() {
         logger_->Log(
             {.level = LogLevel::Warn,
              .phase = PipelinePhase::UserGeneration,
-             .message = std::format(
-                 "[Pipeline] Skipping city '{}' ({}): context lookup failed: {}",
-                 city.city, city.country, exception.what())});
+             .message = std::string("[Pipeline] Skipping city '") + city.city +
+                        " (" + city.country +
+                        "): context lookup failed: " + exception.what()});
       }
     }
 
     if (skipped_count > 0) {
       logger_->Log({.level = LogLevel::Warn,
                     .phase = PipelinePhase::UserGeneration,
-                    .message = std::format(
-                        "[Pipeline] Skipped {} city/cities due to context lookup errors",
-                        skipped_count)});
+                    .message = std::string("[Pipeline] Skipped ") +
+                               std::to_string(skipped_count) +
+                               " city/cities due to context lookup errors"});
     }
 
     this->GenerateBreweries(enriched);
@@ -57,7 +56,7 @@ bool BiergartenPipelineOrchestrator::Run() {
         {.level = LogLevel::Error,
          .phase = PipelinePhase::Teardown,
          .message =
-             std::format("Pipeline execution failed with error: {}", e.what())});
+             std::string("Pipeline execution failed with error: ") + e.what()});
     return false;
   }
 }

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

@@ -103,8 +103,8 @@ BreweryResult LlamaGenerator::GenerateBrewery(
       logger_->Log(
           {.level = LogLevel::Debug,
            .phase = PipelinePhase::BreweryAndBeerGeneration,
-           .message = std::format("LlamaGenerator: raw output (attempt {}): {}",
-                      attempt + 1, raw)});
+           .message = std::string("LlamaGenerator: raw output (attempt ") +
+                      std::to_string(attempt + 1) + "): " + raw});
     }
 
     // Validate output: parse JSON and check required fields
@@ -120,8 +120,9 @@ BreweryResult LlamaGenerator::GenerateBrewery(
         logger_->Log(
             {.level = LogLevel::Info,
              .phase = PipelinePhase::BreweryAndBeerGeneration,
-             .message = std::format("LlamaGenerator: successfully generated brewery data on attempt {}",
-                        attempt + 1)});
+             .message = std::string("LlamaGenerator: successfully generated "
+                                    "brewery data on attempt ") +
+                        std::to_string(attempt + 1)});
       }
 
       return brewery;
@@ -135,8 +136,8 @@ BreweryResult LlamaGenerator::GenerateBrewery(
           {.level = LogLevel::Warn,
            .phase = PipelinePhase::BreweryAndBeerGeneration,
            .message =
-               std::format("LlamaGenerator: malformed brewery JSON (attempt {}): {}",
-               attempt + 1, *validation_error)});
+               std::string("LlamaGenerator: malformed brewery JSON (attempt ") +
+               std::to_string(attempt + 1) + "): " + *validation_error});
     }
 
     // Update prompt with error details to guide LLM toward correct output.
@@ -158,9 +159,10 @@ BreweryResult LlamaGenerator::GenerateBrewery(
     logger_->Log(
         {.level = LogLevel::Error,
          .phase = PipelinePhase::BreweryAndBeerGeneration,
-       .message = std::format(
-         "LlamaGenerator: malformed brewery response after {} attempts: {}",
-         max_attempts, last_error.empty() ? raw : last_error)});
+         .message =
+             std::string("LlamaGenerator: malformed brewery response after ") +
+             std::to_string(max_attempts) +
+             " attempts: " + (last_error.empty() ? raw : last_error)});
   }
   throw std::runtime_error("LlamaGenerator: malformed brewery response");
 }

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

@@ -5,7 +5,6 @@
  */
 
 
-#include <format>
 #include <string>
 
 #include "data_generation/llama_generator.h"
@@ -20,5 +19,5 @@
 // 4. Return locale-aware username and biography
 UserResult LlamaGenerator::GenerateUser(const std::string& locale) {
   return {.username = "test_user",
-          .bio = std::format("This is a test user profile from {}.", locale)};
+          .bio = "This is a test user profile from " + locale + "."};
 }

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

@@ -53,45 +53,46 @@ LlamaGenerator::LlamaGenerator(
         "LlamaGenerator: prompt directory dependency must not be null");
   }
 
-  const auto sampling = options.generator.sampling.value_or(SamplingOptions{});
+  const auto [temperature, top_p, top_k, n_ctx, seed, n_gpu_layers] =
+      options.generator.sampling.value_or(SamplingOptions{});
 
-  if (sampling.temperature < 0.0F) {
+  if (temperature < 0.0F) {
     throw std::runtime_error(
         "LlamaGenerator: sampling temperature must be >= 0");
   }
 
-  if (sampling.top_p <= 0.0F || sampling.top_p > 1.0F) {
+  if (top_p <= 0.0F || top_p > 1.0F) {
     throw std::runtime_error(
         "LlamaGenerator: sampling top-p must be in (0, 1]");
   }
 
-  if (sampling.top_k == 0U) {
+  if (top_k == 0U) {
     throw std::runtime_error("LlamaGenerator: sampling top-k must be > 0");
   }
 
-  if (sampling.seed < -1) {
+  if (seed < -1) {
     throw std::runtime_error(
         "LlamaGenerator: seed must be >= 0, or -1 for random");
   }
 
-  if (sampling.n_ctx == 0 || sampling.n_ctx > kMaxContextSize) {
+  if (n_ctx == 0 || n_ctx > kMaxContextSize) {
     throw std::runtime_error(
         "LlamaGenerator: context size must be in range [1, 32768]");
   }
 
-  sampling_temperature_ = sampling.temperature;
-  sampling_top_p_ = sampling.top_p;
-  sampling_top_k_ = sampling.top_k;
+  sampling_temperature_ = temperature;
+  sampling_top_p_ = top_p;
+  sampling_top_k_ = top_k;
 
-  if (sampling.seed == -1) {
+  if (seed == -1) {
     std::random_device random_device;
     rng_.seed(random_device());
   } else {
-    rng_.seed(static_cast<uint32_t>(sampling.seed));
+    rng_.seed(static_cast<uint32_t>(seed));
   }
 
-  n_ctx_ = sampling.n_ctx;
-  n_gpu_layers_ = sampling.n_gpu_layers;
+  n_ctx_ = n_ctx;
+  n_gpu_layers_ = n_gpu_layers;
 
   this->Load(model_path);
 }

tooling/pipeline/src/json_handling/json_loader.cc

@@ -6,7 +6,6 @@
 
 #include "json_handling/json_loader.h"
 
-#include <format>
 #include "services/logging/logger.h"
 #include <iostream>
 
@@ -21,8 +20,8 @@ static std::string ReadRequiredString(const boost::json::object& object,
                                       const char* key) {
   const boost::json::value* value = object.if_contains(key);
   if (value == nullptr || !value->is_string()) {
-    throw std::runtime_error(
-        std::format("Missing or invalid string field: {}", key));
+    throw std::runtime_error(std::string("Missing or invalid string field: ") +
+                             key);
   }
   const std::string_view text = value->as_string();
   return std::string(text);
@@ -32,8 +31,8 @@ static double ReadRequiredNumber(const boost::json::object& object,
                                  const char* key) {
   const boost::json::value* value = object.if_contains(key);
   if (value == nullptr || !value->is_number()) {
-    throw std::runtime_error(
-        std::format("Missing or invalid numeric field: {}", key));
+    throw std::runtime_error(std::string("Missing or invalid numeric field: ") +
+                             key);
   }
   return value->to_number<double>();
 }
@@ -43,7 +42,7 @@ static std::vector<std::string> ReadRequiredStringArray(
   const boost::json::value* value = object.if_contains(key);
   if (value == nullptr || !value->is_array()) {
     throw std::runtime_error(
-      std::format("Missing or invalid string array field: {}", key));
+        std::string("Missing or invalid string array field: ") + key);
   }
 
   const auto& array = value->as_array();
@@ -52,7 +51,7 @@ static std::vector<std::string> ReadRequiredStringArray(
   for (const auto& item : array) {
     if (!item.is_string()) {
       throw std::runtime_error(
-          std::format("Missing or invalid string array field: {}", key));
+          std::string("Missing or invalid string array field: ") + key);
     }
     items.emplace_back(item.as_string());
   }

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

@@ -22,7 +22,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
     if (logger_) {
       logger_->Log({.level = LogLevel::Debug,
                     .phase = PipelinePhase::UserGeneration,
-                    .message = std::format("Wikipedia: Cache hit for {}!", cache_key)});
+                    .message = std::string("Wikipedia: Cache hit for ") +
+                               cache_key + "!"});
     }
     return cache_it->second;
   }
@@ -48,8 +49,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
       logger_->Log(
           {.level = LogLevel::Warn,
            .phase = PipelinePhase::UserGeneration,
-           .message = std::format("WikipediaService: JSON parse error for '{}': {}",
-                      std::string(query), ec.message())});
+           .message = std::string("WikipediaService: JSON parse error for '") +
+                      std::string(query) + "': " + ec.message()});
     }
     return {};
   }
@@ -62,8 +63,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
           {.level = LogLevel::Warn,
            .phase = PipelinePhase::UserGeneration,
            .message =
-               std::format("WikipediaService: Expected root object for '{}'",
-               std::string(query))});
+               std::string("WikipediaService: Expected root object for '") +
+               std::string(query) + "'"});
     }
     return {};
   }
@@ -80,8 +81,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
           {.level = LogLevel::Warn,
            .phase = PipelinePhase::UserGeneration,
            .message =
-               std::format("WikipediaService: Missing query.pages for '{}'",
-               std::string(query))});
+               std::string("WikipediaService: Missing query.pages for '") +
+               std::string(query) + "'"});
     }
     return {};
   }
@@ -93,8 +94,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
       logger_->Log(
           {.level = LogLevel::Warn,
            .phase = PipelinePhase::UserGeneration,
-           .message = std::format("WikipediaService: No pages returned for '{}'",
-                      std::string(query))});
+           .message = std::string("WikipediaService: No pages returned for '") +
+                      std::string(query) + "'"});
     }
     this->extract_cache_.emplace(cache_key, "");
     return {};
@@ -110,8 +111,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
           {.level = LogLevel::Warn,
            .phase = PipelinePhase::UserGeneration,
            .message =
-               std::format("WikipediaService: Unexpected page format for '{}'",
-               std::string(query))});
+               std::string("WikipediaService: Unexpected page format for '") +
+               std::string(query) + "'"});
     }
     return {};
   }
@@ -123,8 +124,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
     if (logger_) {
       logger_->Log({.level = LogLevel::Warn,
                     .phase = PipelinePhase::UserGeneration,
-                    .message = std::format("WikipediaService: Page '{}' does not exist",
-                               std::string(query))});
+                    .message = std::string("WikipediaService: Page '") +
+                               std::string(query) + "' does not exist"});
     }
     this->extract_cache_.emplace(cache_key, "");
     return {};
@@ -138,8 +139,8 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
           {.level = LogLevel::Warn,
            .phase = PipelinePhase::UserGeneration,
            .message =
-               std::format("WikipediaService: No extract string found for '{}'",
-               std::string(query))});
+               std::string("WikipediaService: No extract string found for '") +
+               std::string(query) + "'"});
     }
     this->extract_cache_.emplace(cache_key, "");
     return {};
@@ -150,8 +151,9 @@ std::string WikipediaEnrichmentService::FetchExtract(std::string_view query) {
   if (logger_) {
     logger_->Log({.level = LogLevel::Info,
                   .phase = PipelinePhase::UserGeneration,
-                  .message = std::format("WikipediaService: Fetched {} chars for '{}'",
-                             extract.size(), std::string(query))});
+                  .message = std::string("WikipediaService: Fetched ") +
+                             std::to_string(extract.size()) + " chars for '" +
+                             std::string(query) + "'"});
   }
 
   this->extract_cache_.insert_or_assign(cache_key, extract);

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

@@ -52,8 +52,8 @@ std::string WikipediaEnrichmentService::GetLocationContext(
     if (logger_) {
       logger_->Log({.level = LogLevel::Info,
                     .phase = PipelinePhase::UserGeneration,
-                    .message = std::format("Done fetching for {}. Sleeping for 10 seconds.",
-                               location_query)});
+                    .message = std::string("Done fetching for ") +
+                               location_query + ". Sleeping for 10 seconds."});
     }
     std::this_thread::sleep_for(10s);
 
@@ -62,8 +62,8 @@ std::string WikipediaEnrichmentService::GetLocationContext(
       logger_->Log(
           {.level = LogLevel::Debug,
            .phase = PipelinePhase::UserGeneration,
-           .message = std::format("WikipediaService lookup failed for '{}': {}",
-                      location_query, e.what())});
+           .message = std::string("WikipediaService lookup failed for '") +
+                      location_query + "': " + e.what()});
     }
   }
   return result;

tooling/pipeline/src/services/logging/log_producer.cc

@@ -16,4 +16,4 @@
 LogProducer::LogProducer(BoundedChannel<LogEntry>& channel)
     : channel_(channel) {}
 
-void LogProducer::Log(LogEntry entry) { channel_.Send(std::move(entry)); }
+void LogProducer::Log(const LogEntry& entry) { channel_.Send(entry); }

tooling/pipeline/src/services/prompt_directory.cc

@@ -8,7 +8,6 @@
 
 #include <chrono>
 #include <filesystem>
-#include <format>
 #include <fstream>
 #include <stdexcept>
 #include <string>
@@ -45,8 +44,8 @@ PromptDirectory::PromptDirectory(const std::filesystem::path& prompt_dir,
   std::filesystem::directory_iterator probe(prompt_dir_, ec);
   if (ec) {
     throw std::runtime_error(
-        std::format("PromptDirectory: prompt directory is not readable: {} ({})",
-        prompt_dir_.string(), ec.message()));
+        "PromptDirectory: prompt directory is not readable: " +
+        prompt_dir_.string() + " (" + ec.message() + ")");
   }
 
   if (logger_) {
@@ -70,13 +69,13 @@ std::string PromptDirectory::Load(std::string_view key) {
 
   // Scenario 3: resolve <prompt_dir>/<key>.md and require it to exist.
   const std::filesystem::path file_path =
-      prompt_dir_ / std::filesystem::path(std::format("{}.md", key_str));
+      prompt_dir_ / std::filesystem::path(key_str + ".md");
 
   std::ifstream file(file_path);
   if (!file.is_open()) {
     throw std::runtime_error(
-        std::format("PromptDirectory: prompt file not found for key '{}': {}",
-        key_str, file_path.string()));
+        "PromptDirectory: prompt file not found for key '" + key_str +
+        "': " + file_path.string());
   }
 
   std::string content((std::istreambuf_iterator<char>(file)),
@@ -84,15 +83,16 @@ std::string PromptDirectory::Load(std::string_view key) {
   file.close();
 
   if (content.empty()) {
-    throw std::runtime_error(std::format("PromptDirectory: prompt file for key '{}' is empty: {}",
-                             key_str, file_path.string()));
+    throw std::runtime_error("PromptDirectory: prompt file for key '" +
+                             key_str + "' is empty: " + file_path.string());
   }
 
   if (logger_) {
     logger_->Log({.level = LogLevel::Info,
                   .phase = PipelinePhase::Startup,
-                  .message = std::format("[PromptDirectory] Loaded prompt '{}' from '{}' ({} chars)",
-                             key_str, file_path.string(), content.size())});
+                  .message = std::string("[PromptDirectory] Loaded prompt '") +
+                             key_str + "' from '" + file_path.string() + "' (" +
+                             std::to_string(content.size()) + " chars)"});
   }
 
   cache_.emplace(key_str, content);

tooling/pipeline/src/services/sqlite/helpers/sqlite_connection_helpers.cc

@@ -1,6 +1,5 @@
 #include "services/database/sqlite_connection_helpers.h"
 
-#include <format>
 #include <stdexcept>
 
 namespace sqlite_export_service_internal {
@@ -21,7 +20,7 @@ void SqliteStatementDeleter::operator()(
 void ThrowSqliteError(sqlite3* db_handle, std::string_view action) {
   const std::string message =
       db_handle != nullptr ? sqlite3_errmsg(db_handle) : "unknown SQLite error";
-  throw std::runtime_error(std::format("{}: {}", action, message));
+  throw std::runtime_error(std::string(action) + ": " + message);
 }
 
 SqliteDatabaseHandle OpenDatabase(const std::filesystem::path& path) {
@@ -51,7 +50,7 @@ void ExecSql(const SqliteDatabaseHandle& db_handle, std::string_view sql,
                                     ? error_message
                                     : sqlite3_errmsg(db_handle.get());
     sqlite3_free(error_message);
-    throw std::runtime_error(std::format("{}: {}", action, message));
+    throw std::runtime_error(std::string(action) + ": " + message);
   }
 }
 

tooling/pipeline/src/services/sqlite/initialize.cc

@@ -4,7 +4,6 @@
  */
 
 #include <filesystem>
-#include <format>
 #include <memory>
 #include <stdexcept>
 #include <string>
@@ -19,8 +18,8 @@ std::filesystem::path SqliteExportService::BuildDatabasePath() const {
 
   for (int suffix = 1; std::filesystem::exists(candidate); ++suffix) {
     candidate = output_path_ /
-                std::filesystem::path(std::format("biergarten_seed_{}-{}.sqlite",
-                                      run_timestamp_utc_, suffix));
+                std::filesystem::path("biergarten_seed_" + run_timestamp_utc_ +
+                                      "-" + std::to_string(suffix) + ".sqlite");
   }
 
   return candidate;

tooling/pipeline/src/web_client/http_web_client.cc

@@ -8,7 +8,6 @@
 #include <httplib.h>
 
 #include <chrono>
-#include <format>
 #include <regex>
 #include <stdexcept>
 #include <string>
@@ -48,9 +47,8 @@ std::string HttpWebClient::Get(const std::string& url) {
   const httplib::Result result = client.Get(path);
 
   if (!result) {
-    throw std::runtime_error(std::format(
-        "[HttpWebClient] Request failed for URL: {} — {}", url,
-        httplib::to_string(result.error())));
+    throw std::runtime_error("[HttpWebClient] Request failed for URL: " + url +
+                             " — " + httplib::to_string(result.error()));
   }
 
   if (result->status < kSuccessMin || result->status >= kSuccessMax) {
@@ -59,10 +57,11 @@ std::string HttpWebClient::Get(const std::string& url) {
           {.level = LogLevel::Error,
            .phase = PipelinePhase::UserGeneration,
            .message =
-           std::format("[HttpWebClient] Request failed for URL: {}", url)});
+               std::string("[HttpWebClient] Request failed for URL: ") + url});
     }
-    throw std::runtime_error(std::format("[HttpWebClient] HTTP {} for URL: {}",
-                       result->status, url));
+    throw std::runtime_error("[HttpWebClient] HTTP " +
+                             std::to_string(result->status) +
+                             " for URL: " + url);
   }
 
   return result->body;