style: update include guards and incl statements to follow google style guide

2026-07-16 17:47:22 +00:00 · 2026-06-28 13:07:14 -04:00
parent 98f97b8e2c
commit c0ffdb0ec7
28 changed files with 199 additions and 143 deletions
--- a/tooling/pipeline/includes/biergarten_pipeline.h
+++ b/tooling/pipeline/includes/biergarten_pipeline.h
@@ -0,0 +1,70 @@
+#ifndef BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_PIPELINE_H_
+#define BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_PIPELINE_H_
+
+/**
+ * @file biergarten_pipeline.h
+ * @brief Master umbrella header — includes every public header in the
+ * Biergarten pipeline.
+ */
+
+// --- orchestrator ---
+#include "biergarten_pipeline_orchestrator.h"
+
+// --- concurrency ---
+#include "concurrency/bounded_channel.h"
+
+// --- data_generation ---
+#include "data_generation/data_generator.h"
+#include "data_generation/json_grammars.h"
+#include "data_generation/llama_generator.h"
+#include "data_generation/llama_generator_helpers.h"
+#include "data_generation/mock_generator.h"
+#include "data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h"
+#include "data_generation/prompt_formatting/prompt_formatter.h"
+
+// --- data_model ---
+#include "data_model/generated_models.h"
+#include "data_model/models.h"
+#include "data_model/names_by_country.h"
+
+// --- json_handling ---
+#include "json_handling/json_loader.h"
+#include "json_handling/pretty_print.h"
+
+// --- llama backend ---
+#include "llama_backend_state.h"
+
+// --- services: curated_data ---
+#include "services/curated_data/curated_data_service.h"
+
+// --- services: database ---
+#include "services/database/export_service.h"
+#include "services/database/sqlite_connection_helpers.h"
+#include "services/database/sqlite_export_service.h"
+#include "services/database/sqlite_export_service_helpers.h"
+#include "services/database/sqlite_handle_types.h"
+#include "services/database/sqlite_statement_helpers.h"
+
+// --- services: datetime ---
+#include "services/datetime/date_time_provider.h"
+#include "services/datetime/timer.h"
+
+// --- services: enrichment ---
+#include "services/enrichment/enrichment_service.h"
+#include "services/enrichment/mock_enrichment.h"
+#include "services/enrichment/wikipedia_service.h"
+
+// --- services: logging ---
+#include "services/logging/log_dispatcher.h"
+#include "services/logging/log_entry.h"
+#include "services/logging/log_producer.h"
+#include "services/logging/logger.h"
+
+// --- services: prompting ---
+#include "services/prompting/prompt_directory.h"
+
+// --- web_client ---
+#include "web_client/http_web_client.h"
+#include "web_client/web_client.h"
+
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_PIPELINE_H_
--- a/tooling/pipeline/includes/biergarten_pipeline_orchestrator.h
+++ b/tooling/pipeline/includes/biergarten_pipeline_orchestrator.h
@@ -1,12 +1,9 @@
-#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_pipeline_orchestrator.h
 * @brief Orchestration for end-to-end brewery and user data generation.
- *
- * Coordinates location loading, enrichment, and generation phases to produce
- * a complete dataset, wiring dependencies selected at the composition root.
 */

 #include <memory>
@@ -103,10 +100,6 @@ class BiergartenPipelineOrchestrator {
   * @brief Generate users grounded in sampled names and personas for
   * enriched cities.
   *
-   * Loads personas.json / forenames-by-country.json /
-   * surnames-by-country.json itself, mirroring how QueryCitiesWithCountries()
-   * owns its own locations.json load.
-   *
   * @param cities Span of enriched city data.
   */
  void GenerateUsers(std::span<const EnrichedCity> cities);
@@ -120,4 +113,4 @@ class BiergartenPipelineOrchestrator {
  std::vector<UserRecord> generated_users_;
 };

-#endif  // BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_DATA_GENERATOR_H_
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_BIERGARTEN_PIPELINE_ORCHESTRATOR_H_
--- a/tooling/pipeline/includes/concurrency/bounded_channel.tcc
+++ b/tooling/pipeline/includes/concurrency/bounded_channel.tcc
@@ -1,4 +1,4 @@
-#include "bounded_channel.h"
+#include "concurrency/bounded_channel.h"

 template <typename T>
 void BoundedChannel<T>::Send(T item) {
--- a/tooling/pipeline/includes/data_generation/llama_generator.h
+++ b/tooling/pipeline/includes/data_generation/llama_generator.h
@@ -1,24 +1,23 @@
 #ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_LLAMA_GENERATOR_H_
 #define BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_LLAMA_GENERATOR_H_

-#include <filesystem>
-
 /**
 * @file data_generation/llama_generator.h
 * @brief llama.cpp-backed implementation of DataGenerator.
 */

 #include <cstdint>
+#include <filesystem>
 #include <memory>
 #include <random>
 #include <string>
 #include <string_view>

-#include "../services/prompting/prompt_directory.h"
 #include "data_generation/data_generator.h"
 #include "data_generation/prompt_formatting/prompt_formatter.h"
 #include "data_model/models.h"
 #include "services/logging/logger.h"
+#include "services/prompting/prompt_directory.h"

 struct llama_model;
 struct llama_context;
--- a/tooling/pipeline/includes/data_model/models.h
+++ b/tooling/pipeline/includes/data_model/models.h
@@ -7,7 +7,6 @@
 * inputs.
 */

-#include <boost/program_options.hpp>
 #include <cstdint>
 #include <filesystem>
 #include <memory>
@@ -16,6 +15,8 @@
 #include <string_view>
 #include <vector>

+#include <boost/program_options.hpp>
+
 class ILogger;

 namespace prog_opts = boost::program_options;
--- a/tooling/pipeline/includes/json_handling/pretty_print.h
+++ b/tooling/pipeline/includes/json_handling/pretty_print.h
@@ -9,10 +9,11 @@
 * readable output. Adapted from Boost JSON library examples.
 */

-#include <boost/json.hpp>
 #include <ostream>
 #include <string>

+#include <boost/json.hpp>
+
 /**
 * @brief Pretty-prints a JSON value to an output stream with indentation.
 *
@@ -106,4 +107,4 @@ inline void PrettyPrint(std::ostream& outstream,
  }
 }

-#endif
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_JSON_HANDLING_PRETTY_PRINT_H_
--- a/tooling/pipeline/includes/services/database/sqlite_connection_helpers.h
+++ b/tooling/pipeline/includes/services/database/sqlite_connection_helpers.h
@@ -6,13 +6,13 @@
 * @brief Declarations for connection-level SQLite helper functions.
 */

-#include <sqlite3.h>
-
 #include <filesystem>
 #include <string>
 #include <string_view>

-#include "sqlite_handle_types.h"
+#include <sqlite3.h>
+
+#include "services/database/sqlite_handle_types.h"

 namespace sqlite_export_service_internal {

--- a/tooling/pipeline/includes/services/database/sqlite_export_service.h
+++ b/tooling/pipeline/includes/services/database/sqlite_export_service.h
@@ -11,10 +11,10 @@
 #include <string>
 #include <unordered_map>

-#include "../datetime/date_time_provider.h"
 #include "data_model/models.h"
-#include "export_service.h"
-#include "sqlite_export_service_helpers.h"
+#include "services/database/export_service.h"
+#include "services/database/sqlite_export_service_helpers.h"
+#include "services/datetime/date_time_provider.h"

 /**
 * @brief Persists generated brewery records into a fresh SQLite database.
--- a/tooling/pipeline/includes/services/database/sqlite_export_service_helpers.h
+++ b/tooling/pipeline/includes/services/database/sqlite_export_service_helpers.h
@@ -3,8 +3,8 @@

 /* Umbrella header for backward compatibility. */

-#include "sqlite_connection_helpers.h"
-#include "sqlite_handle_types.h"
-#include "sqlite_statement_helpers.h"
+#include "services/database/sqlite_connection_helpers.h"
+#include "services/database/sqlite_handle_types.h"
+#include "services/database/sqlite_statement_helpers.h"

 #endif  // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_HELPERS_H_
--- a/tooling/pipeline/includes/services/database/sqlite_handle_types.h
+++ b/tooling/pipeline/includes/services/database/sqlite_handle_types.h
@@ -5,11 +5,11 @@
 * Shared handle and parameter type declarations used by SQLite helper units.
 */

-#include <sqlite3.h>
-
 #include <memory>
 #include <string_view>

+#include <sqlite3.h>
+
 namespace sqlite_export_service_internal {

 struct SqliteDatabaseDeleter {
--- a/tooling/pipeline/includes/services/database/sqlite_statement_helpers.h
+++ b/tooling/pipeline/includes/services/database/sqlite_statement_helpers.h
@@ -7,13 +7,13 @@
 * constants.
 */

-#include <sqlite3.h>
-
 #include <string>
 #include <string_view>
 #include <vector>

-#include "sqlite_handle_types.h"
+#include <sqlite3.h>
+
+#include "services/database/sqlite_handle_types.h"

 namespace sqlite_export_service_internal {

@@ -109,30 +109,36 @@ INSERT INTO users (

 // sqlite3_bind_*() parameter indices are 1-based, matching the "?"
 // placeholder order in the SQL above.
-inline constexpr int kLocationCityBindIndex = 1;
-inline constexpr int kLocationStateProvinceBindIndex = 2;
-inline constexpr int kLocationIso31662BindIndex = 3;
-inline constexpr int kLocationCountryBindIndex = 4;
-inline constexpr int kLocationIso31661BindIndex = 5;
-inline constexpr int kLocationLanguagesBindIndex = 6;
-inline constexpr int kLocationLatitudeBindIndex = 7;
-inline constexpr int kLocationLongitudeBindIndex = 8;
+enum eLocationBindIndex {
+  kLocationCityBindIndex = 1,
+  kLocationStateProvinceBindIndex,
+  kLocationIso31662BindIndex,
+  kLocationCountryBindIndex,
+  kLocationIso31661BindIndex,
+  kLocationLanguagesBindIndex,
+  kLocationLatitudeBindIndex,
+  kLocationLongitudeBindIndex,
+};

-inline constexpr int kBreweryLocationIdBindIndex = 1;
-inline constexpr int kBreweryEnglishNameBindIndex = 2;
-inline constexpr int kBreweryEnglishDescriptionBindIndex = 3;
-inline constexpr int kBreweryLocalNameBindIndex = 4;
-inline constexpr int kBreweryLocalDescriptionBindIndex = 5;
+enum BreweryBindIndex {
+  kBreweryLocationIdBindIndex = 1,
+  kBreweryEnglishNameBindIndex,
+  kBreweryEnglishDescriptionBindIndex,
+  kBreweryLocalNameBindIndex,
+  kBreweryLocalDescriptionBindIndex,
+};

-inline constexpr int kUserLocationIdBindIndex = 1;
-inline constexpr int kUserFirstNameBindIndex = 2;
-inline constexpr int kUserLastNameBindIndex = 3;
-inline constexpr int kUserGenderBindIndex = 4;
-inline constexpr int kUserUsernameBindIndex = 5;
-inline constexpr int kUserBioBindIndex = 6;
-inline constexpr int kUserActivityWeightBindIndex = 7;
-inline constexpr int kUserEmailBindIndex = 8;
-inline constexpr int kUserDateOfBirthBindIndex = 9;
+enum UserBindIndex {
+  kUserLocationIdBindIndex = 1,
+  kUserFirstNameBindIndex,
+  kUserLastNameBindIndex,
+  kUserGenderBindIndex,
+  kUserUsernameBindIndex,
+  kUserBioBindIndex,
+  kUserActivityWeightBindIndex,
+  kUserEmailBindIndex,
+  kUserDateOfBirthBindIndex,
+};

 SqliteStatementHandle PrepareStatement(const SqliteDatabaseHandle& db_handle,
                                       std::string_view sql,
--- a/tooling/pipeline/includes/services/enrichment/mock_enrichment.h
+++ b/tooling/pipeline/includes/services/enrichment/mock_enrichment.h
@@ -8,7 +8,7 @@

 #include <string>

-#include "enrichment_service.h"
+#include "services/enrichment/enrichment_service.h"

 /**
 * @brief Enrichment service that returns no context for any location.
--- a/tooling/pipeline/includes/services/enrichment/wikipedia_service.h
+++ b/tooling/pipeline/includes/services/enrichment/wikipedia_service.h
@@ -11,7 +11,7 @@
 #include <string_view>
 #include <unordered_map>

-#include "enrichment_service.h"
+#include "services/enrichment/enrichment_service.h"
 #include "services/logging/logger.h"
 #include "web_client/web_client.h"

--- a/tooling/pipeline/includes/services/logging/log_producer.h
+++ b/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>

@@ -50,4 +50,4 @@ class LogProducer final : public ILogger {
  BoundedChannel<LogEntry>& channel_;
 };

-#endif  // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_CHANNEL_LOGGER_H_
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_LOGGING_LOG_PRODUCER_H_
--- a/tooling/pipeline/includes/web_client/http_web_client.h
+++ b/tooling/pipeline/includes/web_client/http_web_client.h
@@ -52,4 +52,4 @@ class HttpWebClient final : public WebClient {
  std::shared_ptr<ILogger> logger_;
 };

-#endif
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_WEB_CLIENT_HTTP_WEB_CLIENT_H_