From 26635ace84e8d270e228b08c96cc8bfdd2345565 Mon Sep 17 00:00:00 2001 From: Aaron Po Date: Sun, 3 May 2026 21:44:37 -0400 Subject: [PATCH] Organize and consolidate header files (#220) --- .../includes/biergarten_data_generator.h | 8 +-- .../includes/data_generation/data_generator.h | 4 +- .../data_generation/llama_generator.h | 4 +- .../data_generation/llama_generator_helpers.h | 2 +- .../gemma4_jinja_prompt_formatter.h | 5 +- .../prompt_formatting/prompt_formatter.h | 5 +- .../includes/data_model/brewery_location.h | 22 ------- .../includes/data_model/brewery_result.h | 28 -------- .../includes/data_model/enriched_city.h | 21 ------ .../includes/data_model/generated_brewery.h | 20 ------ .../includes/data_model/generated_models.h | 66 +++++++++++++++++++ .../includes/data_model/generation_models.h | 13 ---- .../pipeline/includes/data_model/location.h | 41 ------------ .../{application_options.h => models.h} | 65 ++++++++++++++++-- .../includes/data_model/pipeline_models.h | 12 ---- .../includes/data_model/user_result.h | 22 ------- .../includes/json_handling/json_loader.h | 2 +- .../services/{ => database}/export_service.h | 8 +-- .../sqlite_connection_helpers.h | 8 +-- .../{ => database}/sqlite_export_service.h | 14 ++-- .../database/sqlite_export_service_helpers.h | 10 +++ .../{ => database}/sqlite_handle_types.h | 6 +- .../{ => database}/sqlite_statement_helpers.h | 8 +-- .../{ => datetime}/date_time_provider.h | 6 +- .../includes/services/{ => datetime}/timer.h | 6 +- .../{ => enrichment}/enrichment_service.h | 8 +-- .../{ => enrichment}/wikipedia_service.h | 8 +-- .../{ => prompting}/prompt_directory.h | 6 +- .../services/sqlite_export_service_helpers.h | 10 --- .../includes/web_client/http_web_client.h | 4 +- .../application_options/parse_arguments.cc | 2 +- .../data_generation/llama/llama_generator.cc | 2 +- tooling/pipeline/src/main.cc | 17 +++-- .../pipeline/src/services/prompt_directory.cc | 2 +- .../pipeline/src/services/sqlite/finalize.cc | 6 +- .../helpers/sqlite_connection_helpers.cc | 2 +- .../helpers/sqlite_statement_helpers.cc | 4 +- .../src/services/sqlite/initialize.cc | 4 +- .../src/services/sqlite/process_record.cc | 4 +- .../services/sqlite/sqlite_export_service.cc | 2 +- .../src/services/wikipedia/fetch_extract.cc | 2 +- .../src/services/wikipedia/get_summary.cc | 2 +- .../services/wikipedia/wikipedia_service.cc | 2 +- 43 files changed, 218 insertions(+), 275 deletions(-) delete mode 100644 tooling/pipeline/includes/data_model/brewery_location.h delete mode 100644 tooling/pipeline/includes/data_model/brewery_result.h delete mode 100644 tooling/pipeline/includes/data_model/enriched_city.h delete mode 100644 tooling/pipeline/includes/data_model/generated_brewery.h create mode 100644 tooling/pipeline/includes/data_model/generated_models.h delete mode 100644 tooling/pipeline/includes/data_model/generation_models.h delete mode 100644 tooling/pipeline/includes/data_model/location.h rename tooling/pipeline/includes/data_model/{application_options.h => models.h} (50%) delete mode 100644 tooling/pipeline/includes/data_model/pipeline_models.h delete mode 100644 tooling/pipeline/includes/data_model/user_result.h rename tooling/pipeline/includes/services/{ => database}/export_service.h (78%) rename tooling/pipeline/includes/services/{ => database}/sqlite_connection_helpers.h (68%) rename tooling/pipeline/includes/services/{ => database}/sqlite_export_service.h (81%) create mode 100644 tooling/pipeline/includes/services/database/sqlite_export_service_helpers.h rename tooling/pipeline/includes/services/{ => database}/sqlite_handle_types.h (74%) rename tooling/pipeline/includes/services/{ => database}/sqlite_statement_helpers.h (91%) rename tooling/pipeline/includes/services/{ => datetime}/date_time_provider.h (88%) rename tooling/pipeline/includes/services/{ => datetime}/timer.h (79%) rename tooling/pipeline/includes/services/{ => enrichment}/enrichment_service.h (69%) rename tooling/pipeline/includes/services/{ => enrichment}/wikipedia_service.h (76%) rename tooling/pipeline/includes/services/{ => prompting}/prompt_directory.h (90%) delete mode 100644 tooling/pipeline/includes/services/sqlite_export_service_helpers.h diff --git a/tooling/pipeline/includes/biergarten_data_generator.h b/tooling/pipeline/includes/biergarten_data_generator.h index c4bd709..1396213 100644 --- a/tooling/pipeline/includes/biergarten_data_generator.h +++ b/tooling/pipeline/includes/biergarten_data_generator.h @@ -11,11 +11,9 @@ #include #include "data_generation/data_generator.h" -#include "data_model/enriched_city.h" -#include "data_model/generated_brewery.h" -#include "data_model/location.h" -#include "services/enrichment_service.h" -#include "services/export_service.h" +#include "data_model/generated_models.h" +#include "services/enrichment/enrichment_service.h" +#include "services/database/export_service.h" /** * @brief Main data generator class for the Biergarten pipeline. diff --git a/tooling/pipeline/includes/data_generation/data_generator.h b/tooling/pipeline/includes/data_generation/data_generator.h index 5f0c87a..d7541b5 100644 --- a/tooling/pipeline/includes/data_generation/data_generator.h +++ b/tooling/pipeline/includes/data_generation/data_generator.h @@ -8,9 +8,7 @@ #include -#include "data_model/brewery_result.h" -#include "data_model/location.h" -#include "data_model/user_result.h" +#include "data_model/generated_models.h" /** * @brief Interface for data generator implementations. diff --git a/tooling/pipeline/includes/data_generation/llama_generator.h b/tooling/pipeline/includes/data_generation/llama_generator.h index 7479337..c3c4447 100644 --- a/tooling/pipeline/includes/data_generation/llama_generator.h +++ b/tooling/pipeline/includes/data_generation/llama_generator.h @@ -16,8 +16,8 @@ #include "data_generation/data_generator.h" #include "data_generation/prompt_formatting/prompt_formatter.h" -#include "data_model/application_options.h" -#include "services/prompt_directory.h" +#include "data_model/models.h" +#include "../services/prompting/prompt_directory.h" struct llama_model; struct llama_context; diff --git a/tooling/pipeline/includes/data_generation/llama_generator_helpers.h b/tooling/pipeline/includes/data_generation/llama_generator_helpers.h index 2b2a32c..e109568 100644 --- a/tooling/pipeline/includes/data_generation/llama_generator_helpers.h +++ b/tooling/pipeline/includes/data_generation/llama_generator_helpers.h @@ -12,7 +12,7 @@ #include #include -#include "data_model/brewery_result.h" +#include "data_model/generated_models.h" struct llama_vocab; using llama_token = int32_t; diff --git a/tooling/pipeline/includes/data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h b/tooling/pipeline/includes/data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h index cf08bbc..c96180b 100644 --- a/tooling/pipeline/includes/data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h +++ b/tooling/pipeline/includes/data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h @@ -1,4 +1,5 @@ -#pragma once +#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_ #include #include @@ -13,3 +14,5 @@ class Gemma4JinjaPromptFormatter final : public IPromptFormatter { [[nodiscard]] std::string Format(std::string_view system_prompt, std::string_view user_prompt) const override; }; + +#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_GEMMA4_JINJA_PROMPT_FORMATTER_H_ diff --git a/tooling/pipeline/includes/data_generation/prompt_formatting/prompt_formatter.h b/tooling/pipeline/includes/data_generation/prompt_formatting/prompt_formatter.h index df1ffff..ffcfad1 100644 --- a/tooling/pipeline/includes/data_generation/prompt_formatting/prompt_formatter.h +++ b/tooling/pipeline/includes/data_generation/prompt_formatting/prompt_formatter.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_PROMPT_FORMATTER_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_PROMPT_FORMATTER_H_ #include #include @@ -15,3 +16,5 @@ class IPromptFormatter { [[nodiscard]] virtual std::string Format( std::string_view system_prompt, std::string_view user_prompt) const = 0; }; + +#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_PROMPT_FORMATTING_PROMPT_FORMATTER_H_ diff --git a/tooling/pipeline/includes/data_model/brewery_location.h b/tooling/pipeline/includes/data_model/brewery_location.h deleted file mode 100644 index bb0622e..0000000 --- a/tooling/pipeline/includes/data_model/brewery_location.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_BREWERY_LOCATION_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_BREWERY_LOCATION_H_ - -/** - * @file data_model/brewery_location.h - * @brief Non-owning brewery location input. - */ - -#include - -/** - * @brief Non-owning brewery location input. - */ -struct BreweryLocation { - /// @brief City name. - std::string_view city_name; - - /// @brief Country name. - std::string_view country_name; -}; - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_BREWERY_LOCATION_H_ diff --git a/tooling/pipeline/includes/data_model/brewery_result.h b/tooling/pipeline/includes/data_model/brewery_result.h deleted file mode 100644 index 5114d1e..0000000 --- a/tooling/pipeline/includes/data_model/brewery_result.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_BREWERY_RESULT_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_BREWERY_RESULT_H_ - -/** - * @file data_model/brewery_result.h - * @brief Generated brewery payload. - */ - -#include - -/** - * @brief Generated brewery payload. - */ -struct BreweryResult { - /// @brief Brewery display name in English. - std::string name_en; - - /// @brief Brewery description text in English. - std::string description_en; - - /// @brief Brewery display name in the local language. - std::string name_local; - - /// @brief Brewery description text in the local language. - std::string description_local; -}; - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_BREWERY_RESULT_H_ diff --git a/tooling/pipeline/includes/data_model/enriched_city.h b/tooling/pipeline/includes/data_model/enriched_city.h deleted file mode 100644 index b033e15..0000000 --- a/tooling/pipeline/includes/data_model/enriched_city.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_ENRICHED_CITY_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_ENRICHED_CITY_H_ - -/** - * @file data_model/enriched_city.h - * @brief Enriched city data with Wikipedia context. - */ - -#include - -#include "data_model/location.h" - -/** - * @brief Enriched city data with Wikipedia context. - */ -struct EnrichedCity { - Location location; - std::string region_context{}; -}; - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_ENRICHED_CITY_H_ diff --git a/tooling/pipeline/includes/data_model/generated_brewery.h b/tooling/pipeline/includes/data_model/generated_brewery.h deleted file mode 100644 index 0a8b0c8..0000000 --- a/tooling/pipeline/includes/data_model/generated_brewery.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATED_BREWERY_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATED_BREWERY_H_ - -/** - * @file data_model/generated_brewery.h - * @brief Helper struct to store generated brewery data. - */ - -#include "data_model/brewery_result.h" -#include "data_model/location.h" - -/** - * @brief Helper struct to store generated brewery data. - */ -struct GeneratedBrewery { - Location location; - BreweryResult brewery; -}; - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATED_BREWERY_H_ diff --git a/tooling/pipeline/includes/data_model/generated_models.h b/tooling/pipeline/includes/data_model/generated_models.h new file mode 100644 index 0000000..40ec100 --- /dev/null +++ b/tooling/pipeline/includes/data_model/generated_models.h @@ -0,0 +1,66 @@ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATED_MODELS_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATED_MODELS_H_ + +/** + * @file data_model/generated_models.h + * @brief Generated output models from the pipeline: brewery/user results, enriched data, + * and complete generation results. + */ + +#include + +#include "data_model/models.h" + +// ============================================================================ +// Generation Output Models +// ============================================================================ + +/** + * @brief Generated brewery payload. + */ +struct BreweryResult { + /// @brief Brewery display name in English. + std::string name_en; + + /// @brief Brewery description text in English. + std::string description_en; + + /// @brief Brewery display name in the local language. + std::string name_local; + + /// @brief Brewery description text in the local language. + std::string description_local; +}; + +/** + * @brief Generated user profile payload. + */ +struct UserResult { + /// @brief Username handle. + std::string username{}; + + /// @brief Short user biography. + std::string bio{}; +}; + +// ============================================================================ +// Pipeline Data Models +// ============================================================================ + +/** + * @brief Enriched city data with Wikipedia context. + */ +struct EnrichedCity { + Location location; + std::string region_context{}; +}; + +/** + * @brief Helper struct to store generated brewery data. + */ +struct GeneratedBrewery { + Location location; + BreweryResult brewery; +}; + +#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATED_MODELS_H_ diff --git a/tooling/pipeline/includes/data_model/generation_models.h b/tooling/pipeline/includes/data_model/generation_models.h deleted file mode 100644 index 3897f93..0000000 --- a/tooling/pipeline/includes/data_model/generation_models.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATION_MODELS_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATION_MODELS_H_ - -/** - * @file data_model/generation_models.h - * @brief Convenience include for shared generation payload models. - */ - -#include "data_model/brewery_location.h" -#include "data_model/brewery_result.h" -#include "data_model/user_result.h" - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_GENERATION_MODELS_H_ diff --git a/tooling/pipeline/includes/data_model/location.h b/tooling/pipeline/includes/data_model/location.h deleted file mode 100644 index b23fdae..0000000 --- a/tooling/pipeline/includes/data_model/location.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_LOCATION_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_LOCATION_H_ - -/** - * @file data_model/location.h - * @brief Location data model used throughout generation pipeline. - */ - -#include -#include - -/** - * @brief Canonical location record for city-level generation. - */ -struct Location { - /// @brief City name. - std::string city{}; - - /// @brief State or province name. - std::string state_province{}; - - /// @brief ISO 3166-2 subdivision code. - std::string iso3166_2{}; - - /// @brief Country name. - std::string country{}; - - /// @brief ISO 3166-1 country code. - std::string iso3166_1{}; - - /// @brief Local language codes in priority order. - std::vector local_languages{}; - - /// @brief Latitude in decimal degrees. - double latitude{}; - - /// @brief Longitude in decimal degrees. - double longitude{}; -}; - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_LOCATION_H_ diff --git a/tooling/pipeline/includes/data_model/application_options.h b/tooling/pipeline/includes/data_model/models.h similarity index 50% rename from tooling/pipeline/includes/data_model/application_options.h rename to tooling/pipeline/includes/data_model/models.h index 7cbab47..0b97f52 100644 --- a/tooling/pipeline/includes/data_model/application_options.h +++ b/tooling/pipeline/includes/data_model/models.h @@ -1,9 +1,9 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_APPLICATION_OPTIONS_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_APPLICATION_OPTIONS_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_MODELS_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_MODELS_H_ /** - * @file data_model/application_options.h - * @brief Program options for the Biergarten pipeline application. + * @file data_model/models.h + * @brief Core data models: locations, application configuration, and generation inputs. */ #include @@ -11,9 +11,59 @@ #include #include #include +#include +#include namespace prog_opts = boost::program_options; +// ============================================================================ +// Location Models +// ============================================================================ + +/** + * @brief Canonical location record for city-level generation. + */ +struct Location { + /// @brief City name. + std::string city{}; + + /// @brief State or province name. + std::string state_province{}; + + /// @brief ISO 3166-2 subdivision code. + std::string iso3166_2{}; + + /// @brief Country name. + std::string country{}; + + /// @brief ISO 3166-1 country code. + std::string iso3166_1{}; + + /// @brief Local language codes in priority order. + std::vector local_languages{}; + + /// @brief Latitude in decimal degrees. + double latitude{}; + + /// @brief Longitude in decimal degrees. + double longitude{}; +}; + +/** + * @brief Non-owning brewery location input. + */ +struct BreweryLocation { + /// @brief City name. + std::string_view city_name; + + /// @brief Country name. + std::string_view country_name; +}; + +// ============================================================================ +// Configuration Models +// ============================================================================ + /** * @brief LLM sampling parameters. */ @@ -72,5 +122,10 @@ struct ApplicationOptions { PipelineOptions pipeline; }; +// ============================================================================ +// Function Declarations +// ============================================================================ + std::optional ParseArguments(const int argc, char** argv); -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_APPLICATION_OPTIONS_H_ + +#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_MODELS_H_ diff --git a/tooling/pipeline/includes/data_model/pipeline_models.h b/tooling/pipeline/includes/data_model/pipeline_models.h deleted file mode 100644 index 373db7a..0000000 --- a/tooling/pipeline/includes/data_model/pipeline_models.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_PIPELINE_MODELS_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_PIPELINE_MODELS_H_ - -/** - * @file data_model/pipeline_models.h - * @brief Convenience include for pipeline-specific data models. - */ - -#include "data_model/enriched_city.h" -#include "data_model/generated_brewery.h" - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_PIPELINE_MODELS_H_ diff --git a/tooling/pipeline/includes/data_model/user_result.h b/tooling/pipeline/includes/data_model/user_result.h deleted file mode 100644 index db72e66..0000000 --- a/tooling/pipeline/includes/data_model/user_result.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_USER_RESULT_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_USER_RESULT_H_ - -/** - * @file data_model/user_result.h - * @brief Generated user profile payload. - */ - -#include - -/** - * @brief Generated user profile payload. - */ -struct UserResult { - /// @brief Username handle. - std::string username{}; - - /// @brief Short user biography. - std::string bio{}; -}; - -#endif // BIERGARTEN_PIPELINE_INCLUDES_DATA_MODEL_USER_RESULT_H_ diff --git a/tooling/pipeline/includes/json_handling/json_loader.h b/tooling/pipeline/includes/json_handling/json_loader.h index d94db4f..6cf288f 100644 --- a/tooling/pipeline/includes/json_handling/json_loader.h +++ b/tooling/pipeline/includes/json_handling/json_loader.h @@ -9,7 +9,7 @@ #include #include -#include "data_model/location.h" +#include "data_model/models.h" /// @brief Loads curated world locations from a JSON file into memory. class JsonLoader { diff --git a/tooling/pipeline/includes/services/export_service.h b/tooling/pipeline/includes/services/database/export_service.h similarity index 78% rename from tooling/pipeline/includes/services/export_service.h rename to tooling/pipeline/includes/services/database/export_service.h index 3b5d6c6..eb61fed 100644 --- a/tooling/pipeline/includes/services/export_service.h +++ b/tooling/pipeline/includes/services/database/export_service.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_EXPORT_SERVICE_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_EXPORT_SERVICE_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_EXPORT_SERVICE_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_EXPORT_SERVICE_H_ /** * @file services/export_service.h @@ -8,7 +8,7 @@ #include -#include "data_model/generated_brewery.h" +#include "data_model/generated_models.h" /** * @brief Interface for services that persist generated brewery records. @@ -39,4 +39,4 @@ class IExportService { virtual void Finalize() = 0; }; -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_EXPORT_SERVICE_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_EXPORT_SERVICE_H_ diff --git a/tooling/pipeline/includes/services/sqlite_connection_helpers.h b/tooling/pipeline/includes/services/database/sqlite_connection_helpers.h similarity index 68% rename from tooling/pipeline/includes/services/sqlite_connection_helpers.h rename to tooling/pipeline/includes/services/database/sqlite_connection_helpers.h index b8dd370..1bb4832 100644 --- a/tooling/pipeline/includes/services/sqlite_connection_helpers.h +++ b/tooling/pipeline/includes/services/database/sqlite_connection_helpers.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_CONNECTION_HELPERS_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_CONNECTION_HELPERS_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_CONNECTION_HELPERS_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_CONNECTION_HELPERS_H_ /** * @file services/sqlite_connection_helpers.h @@ -12,7 +12,7 @@ #include #include -#include "services/sqlite_handle_types.h" +#include "sqlite_handle_types.h" namespace sqlite_export_service_internal { @@ -27,4 +27,4 @@ void RollbackTransactionNoThrow(const SqliteDatabaseHandle& db_handle) noexcept; } // namespace sqlite_export_service_internal -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_CONNECTION_HELPERS_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_CONNECTION_HELPERS_H_ diff --git a/tooling/pipeline/includes/services/sqlite_export_service.h b/tooling/pipeline/includes/services/database/sqlite_export_service.h similarity index 81% rename from tooling/pipeline/includes/services/sqlite_export_service.h rename to tooling/pipeline/includes/services/database/sqlite_export_service.h index ebae1ec..02cf6f6 100644 --- a/tooling/pipeline/includes/services/sqlite_export_service.h +++ b/tooling/pipeline/includes/services/database/sqlite_export_service.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_EXPORT_SERVICE_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_EXPORT_SERVICE_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_H_ /** * @file services/sqlite_export_service.h @@ -11,10 +11,10 @@ #include #include -#include "data_model/application_options.h" -#include "services/date_time_provider.h" -#include "services/export_service.h" -#include "services/sqlite_export_service_helpers.h" +#include "data_model/models.h" +#include "../datetime/date_time_provider.h" +#include "export_service.h" +#include "sqlite_export_service_helpers.h" /** * @brief Persists generated brewery records into a fresh SQLite database. @@ -57,4 +57,4 @@ class SqliteExportService final : public IExportService { std::unordered_map location_cache_; }; -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_EXPORT_SERVICE_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_H_ diff --git a/tooling/pipeline/includes/services/database/sqlite_export_service_helpers.h b/tooling/pipeline/includes/services/database/sqlite_export_service_helpers.h new file mode 100644 index 0000000..838d40e --- /dev/null +++ b/tooling/pipeline/includes/services/database/sqlite_export_service_helpers.h @@ -0,0 +1,10 @@ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_HELPERS_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_HELPERS_H_ + +/* Umbrella header for backward compatibility. */ + +#include "sqlite_connection_helpers.h" +#include "sqlite_handle_types.h" +#include "sqlite_statement_helpers.h" + +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_EXPORT_SERVICE_HELPERS_H_ diff --git a/tooling/pipeline/includes/services/sqlite_handle_types.h b/tooling/pipeline/includes/services/database/sqlite_handle_types.h similarity index 74% rename from tooling/pipeline/includes/services/sqlite_handle_types.h rename to tooling/pipeline/includes/services/database/sqlite_handle_types.h index 92da0ef..dcc533b 100644 --- a/tooling/pipeline/includes/services/sqlite_handle_types.h +++ b/tooling/pipeline/includes/services/database/sqlite_handle_types.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_HANDLE_TYPES_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_HANDLE_TYPES_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_HANDLE_TYPES_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_HANDLE_TYPES_H_ /** * Shared handle and parameter type declarations used by SQLite helper units. @@ -33,4 +33,4 @@ struct BindParam { } // namespace sqlite_export_service_internal -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_HANDLE_TYPES_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_HANDLE_TYPES_H_ diff --git a/tooling/pipeline/includes/services/sqlite_statement_helpers.h b/tooling/pipeline/includes/services/database/sqlite_statement_helpers.h similarity index 91% rename from tooling/pipeline/includes/services/sqlite_statement_helpers.h rename to tooling/pipeline/includes/services/database/sqlite_statement_helpers.h index 35cf829..2f0d174 100644 --- a/tooling/pipeline/includes/services/sqlite_statement_helpers.h +++ b/tooling/pipeline/includes/services/database/sqlite_statement_helpers.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_STATEMENT_HELPERS_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_STATEMENT_HELPERS_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_STATEMENT_HELPERS_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_STATEMENT_HELPERS_H_ /** * @file services/sqlite_statement_helpers.h @@ -13,7 +13,7 @@ #include #include -#include "services/sqlite_handle_types.h" +#include "sqlite_handle_types.h" namespace sqlite_export_service_internal { @@ -113,4 +113,4 @@ std::string SerializeVector(const std::vector& str_vec); } // namespace sqlite_export_service_internal -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_STATEMENT_HELPERS_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATABASE_SQLITE_STATEMENT_HELPERS_H_ diff --git a/tooling/pipeline/includes/services/date_time_provider.h b/tooling/pipeline/includes/services/datetime/date_time_provider.h similarity index 88% rename from tooling/pipeline/includes/services/date_time_provider.h rename to tooling/pipeline/includes/services/datetime/date_time_provider.h index d535614..1c00dd1 100644 --- a/tooling/pipeline/includes/services/date_time_provider.h +++ b/tooling/pipeline/includes/services/datetime/date_time_provider.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATE_TIME_PROVIDER_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATE_TIME_PROVIDER_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATETIME_DATE_TIME_PROVIDER_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATETIME_DATE_TIME_PROVIDER_H_ /** * @file services/date_time_provider.h @@ -63,4 +63,4 @@ class SystemDateTimeProvider final : public IDateTimeProvider { } }; -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATE_TIME_PROVIDER_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATETIME_DATE_TIME_PROVIDER_H_ diff --git a/tooling/pipeline/includes/services/timer.h b/tooling/pipeline/includes/services/datetime/timer.h similarity index 79% rename from tooling/pipeline/includes/services/timer.h rename to tooling/pipeline/includes/services/datetime/timer.h index 5542721..2fa0806 100644 --- a/tooling/pipeline/includes/services/timer.h +++ b/tooling/pipeline/includes/services/datetime/timer.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_TIMER_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_TIMER_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATETIME_TIMER_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATETIME_TIMER_H_ #include @@ -32,4 +32,4 @@ class Timer { } }; -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_TIMER_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_DATETIME_TIMER_H_ diff --git a/tooling/pipeline/includes/services/enrichment_service.h b/tooling/pipeline/includes/services/enrichment/enrichment_service.h similarity index 69% rename from tooling/pipeline/includes/services/enrichment_service.h rename to tooling/pipeline/includes/services/enrichment/enrichment_service.h index 3ff1929..32d02d6 100644 --- a/tooling/pipeline/includes/services/enrichment_service.h +++ b/tooling/pipeline/includes/services/enrichment/enrichment_service.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_SERVICE_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_SERVICE_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_ENRICHMENT_SERVICE_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_ENRICHMENT_SERVICE_H_ /** * @file services/enrichment_service.h @@ -8,7 +8,7 @@ #include -#include "data_model/location.h" +#include "data_model/models.h" /** * @brief Interface for services that can enrich a location with context. @@ -27,4 +27,4 @@ class IEnrichmentService { virtual std::string GetLocationContext(const Location& loc) = 0; }; -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_SERVICE_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_ENRICHMENT_SERVICE_H_ diff --git a/tooling/pipeline/includes/services/wikipedia_service.h b/tooling/pipeline/includes/services/enrichment/wikipedia_service.h similarity index 76% rename from tooling/pipeline/includes/services/wikipedia_service.h rename to tooling/pipeline/includes/services/enrichment/wikipedia_service.h index 8f9f461..696cf24 100644 --- a/tooling/pipeline/includes/services/wikipedia_service.h +++ b/tooling/pipeline/includes/services/enrichment/wikipedia_service.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_WIKIPEDIA_SERVICE_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_WIKIPEDIA_SERVICE_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_WIKIPEDIA_SERVICE_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_WIKIPEDIA_SERVICE_H_ /** * @file services/wikipedia_service.h @@ -11,7 +11,7 @@ #include #include -#include "services/enrichment_service.h" +#include "enrichment_service.h" #include "web_client/web_client.h" /// @brief Provides Wikipedia summary lookups backed by cached raw extracts. @@ -30,4 +30,4 @@ class WikipediaService final : public IEnrichmentService { std::unordered_map extract_cache_; }; -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_WIKIPEDIA_SERVICE_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_ENRICHMENT_WIKIPEDIA_SERVICE_H_ diff --git a/tooling/pipeline/includes/services/prompt_directory.h b/tooling/pipeline/includes/services/prompting/prompt_directory.h similarity index 90% rename from tooling/pipeline/includes/services/prompt_directory.h rename to tooling/pipeline/includes/services/prompting/prompt_directory.h index 53410ad..8b2d4c6 100644 --- a/tooling/pipeline/includes/services/prompt_directory.h +++ b/tooling/pipeline/includes/services/prompting/prompt_directory.h @@ -1,5 +1,5 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_PROMPT_DIRECTORY_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_PROMPT_DIRECTORY_H_ +#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_PROMPTING_PROMPT_DIRECTORY_H_ +#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_PROMPTING_PROMPT_DIRECTORY_H_ /** * @file services/prompt_directory.h @@ -73,4 +73,4 @@ class PromptDirectory final : public IPromptDirectory { std::unordered_map cache_; }; -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_PROMPT_DIRECTORY_H_ +#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_PROMPTING_PROMPT_DIRECTORY_H_ diff --git a/tooling/pipeline/includes/services/sqlite_export_service_helpers.h b/tooling/pipeline/includes/services/sqlite_export_service_helpers.h deleted file mode 100644 index e18766a..0000000 --- a/tooling/pipeline/includes/services/sqlite_export_service_helpers.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_EXPORT_SERVICE_HELPERS_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_EXPORT_SERVICE_HELPERS_H_ - -/* Umbrella header for backward compatibility. */ - -#include "services/sqlite_connection_helpers.h" -#include "services/sqlite_handle_types.h" -#include "services/sqlite_statement_helpers.h" - -#endif // BIERGARTEN_PIPELINE_INCLUDES_SERVICES_SQLITE_EXPORT_SERVICE_HELPERS_H_ diff --git a/tooling/pipeline/includes/web_client/http_web_client.h b/tooling/pipeline/includes/web_client/http_web_client.h index 38bedca..778d5d3 100644 --- a/tooling/pipeline/includes/web_client/http_web_client.h +++ b/tooling/pipeline/includes/web_client/http_web_client.h @@ -3,8 +3,8 @@ * @brief cpp-httplib implementation of the WebClient interface. */ -#ifndef BIERGARTEN_PIPELINE_INCLUDES_HTTP_WEB_CLIENT_CURL_WEB_CLIENT_H_ -#define BIERGARTEN_PIPELINE_INCLUDES_HTTP_WEB_CLIENT_CURL_WEB_CLIENT_H_ +#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" diff --git a/tooling/pipeline/src/application_options/parse_arguments.cc b/tooling/pipeline/src/application_options/parse_arguments.cc index 019cb32..64c31c3 100644 --- a/tooling/pipeline/src/application_options/parse_arguments.cc +++ b/tooling/pipeline/src/application_options/parse_arguments.cc @@ -4,7 +4,7 @@ #include #include -#include "data_model/application_options.h" +#include "data_model/models.h" std::optional ParseArguments(const int argc, char** argv) { prog_opts::options_description desc("Pipeline Options"); diff --git a/tooling/pipeline/src/data_generation/llama/llama_generator.cc b/tooling/pipeline/src/data_generation/llama/llama_generator.cc index 2a12dc8..646c9bb 100644 --- a/tooling/pipeline/src/data_generation/llama/llama_generator.cc +++ b/tooling/pipeline/src/data_generation/llama/llama_generator.cc @@ -11,7 +11,7 @@ #include #include -#include "data_model/application_options.h" +#include "data_model/models.h" #include "llama.h" static constexpr uint32_t kMaxContextSize = 32768U; diff --git a/tooling/pipeline/src/main.cc b/tooling/pipeline/src/main.cc index 924d5b5..3b2a3ce 100644 --- a/tooling/pipeline/src/main.cc +++ b/tooling/pipeline/src/main.cc @@ -19,15 +19,14 @@ #include "data_generation/llama_generator.h" #include "data_generation/mock_generator.h" #include "data_generation/prompt_formatting/gemma4_jinja_prompt_formatter.h" -#include "data_model/application_options.h" +#include "data_model/models.h" #include "llama_backend_state.h" -#include "services/enrichment_service.h" -#include "services/export_service.h" -#include "services/prompt_directory.h" -#include "services/sqlite_export_service.h" -#include "services/timer.h" -#include "services/wikipedia_service.h" -#include "web_client/curl_web_client.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/wikipedia_service.h" #include "web_client/http_web_client.h" namespace di = boost::di; @@ -106,4 +105,4 @@ int main(const int argc, char** argv) { spdlog::critical("Unhandled fatal error in main: {}", exception.what()); return 1; } -} \ No newline at end of file +} diff --git a/tooling/pipeline/src/services/prompt_directory.cc b/tooling/pipeline/src/services/prompt_directory.cc index ab908b2..7583f2e 100644 --- a/tooling/pipeline/src/services/prompt_directory.cc +++ b/tooling/pipeline/src/services/prompt_directory.cc @@ -4,7 +4,7 @@ * construction and loads named prompt files on demand with in-process caching. */ -#include "services/prompt_directory.h" +#include "services/prompting/prompt_directory.h" #include diff --git a/tooling/pipeline/src/services/sqlite/finalize.cc b/tooling/pipeline/src/services/sqlite/finalize.cc index b2ef035..e891b31 100644 --- a/tooling/pipeline/src/services/sqlite/finalize.cc +++ b/tooling/pipeline/src/services/sqlite/finalize.cc @@ -5,8 +5,8 @@ #include -#include "services/sqlite_export_service.h" -#include "services/sqlite_export_service_helpers.h" +#include "services/database/sqlite_export_service.h" +#include "services/database/sqlite_export_service_helpers.h" void SqliteExportService::Finalize() { if (db_handle_ == nullptr) { @@ -28,4 +28,4 @@ void SqliteExportService::Finalize() { RollbackAndCloseNoThrow(); throw; } -} \ No newline at end of file +} diff --git a/tooling/pipeline/src/services/sqlite/helpers/sqlite_connection_helpers.cc b/tooling/pipeline/src/services/sqlite/helpers/sqlite_connection_helpers.cc index b5fec26..c527aa3 100644 --- a/tooling/pipeline/src/services/sqlite/helpers/sqlite_connection_helpers.cc +++ b/tooling/pipeline/src/services/sqlite/helpers/sqlite_connection_helpers.cc @@ -1,4 +1,4 @@ -#include "services/sqlite_connection_helpers.h" +#include "services/database/sqlite_connection_helpers.h" #include diff --git a/tooling/pipeline/src/services/sqlite/helpers/sqlite_statement_helpers.cc b/tooling/pipeline/src/services/sqlite/helpers/sqlite_statement_helpers.cc index 9da278f..15ef25e 100644 --- a/tooling/pipeline/src/services/sqlite/helpers/sqlite_statement_helpers.cc +++ b/tooling/pipeline/src/services/sqlite/helpers/sqlite_statement_helpers.cc @@ -1,4 +1,4 @@ -#include "services/sqlite_statement_helpers.h" +#include "services/database/sqlite_statement_helpers.h" #include #include @@ -6,7 +6,7 @@ #include #include -#include "services/sqlite_connection_helpers.h" +#include "services/database/sqlite_connection_helpers.h" namespace sqlite_export_service_internal { diff --git a/tooling/pipeline/src/services/sqlite/initialize.cc b/tooling/pipeline/src/services/sqlite/initialize.cc index bbe6515..fb66bc9 100644 --- a/tooling/pipeline/src/services/sqlite/initialize.cc +++ b/tooling/pipeline/src/services/sqlite/initialize.cc @@ -8,8 +8,8 @@ #include #include -#include "services/sqlite_export_service.h" -#include "services/sqlite_export_service_helpers.h" +#include "services/database/sqlite_export_service.h" +#include "services/database/sqlite_export_service_helpers.h" std::filesystem::path SqliteExportService::BuildDatabasePath() const { std::filesystem::path base_filename("biergarten_seed_" + run_timestamp_utc_ + diff --git a/tooling/pipeline/src/services/sqlite/process_record.cc b/tooling/pipeline/src/services/sqlite/process_record.cc index be3af22..a46ff82 100644 --- a/tooling/pipeline/src/services/sqlite/process_record.cc +++ b/tooling/pipeline/src/services/sqlite/process_record.cc @@ -8,8 +8,8 @@ #include #include -#include "services/sqlite_export_service.h" -#include "services/sqlite_export_service_helpers.h" +#include "services/database/sqlite_export_service.h" +#include "services/database/sqlite_export_service_helpers.h" constexpr int kLocationPrecision = 17; diff --git a/tooling/pipeline/src/services/sqlite/sqlite_export_service.cc b/tooling/pipeline/src/services/sqlite/sqlite_export_service.cc index 4bf66a3..73d11eb 100644 --- a/tooling/pipeline/src/services/sqlite/sqlite_export_service.cc +++ b/tooling/pipeline/src/services/sqlite/sqlite_export_service.cc @@ -3,7 +3,7 @@ * @brief SqliteExportService constructor and destructor implementation. */ -#include "services/sqlite_export_service.h" +#include "services/database/sqlite_export_service.h" #include diff --git a/tooling/pipeline/src/services/wikipedia/fetch_extract.cc b/tooling/pipeline/src/services/wikipedia/fetch_extract.cc index 75090cc..748ed36 100644 --- a/tooling/pipeline/src/services/wikipedia/fetch_extract.cc +++ b/tooling/pipeline/src/services/wikipedia/fetch_extract.cc @@ -9,7 +9,7 @@ #include #include -#include "services/wikipedia_service.h" +#include "services/enrichment/wikipedia_service.h" std::string WikipediaService::FetchExtract(std::string_view query) { const std::string cache_key(query); diff --git a/tooling/pipeline/src/services/wikipedia/get_summary.cc b/tooling/pipeline/src/services/wikipedia/get_summary.cc index 21c266c..16fc7b6 100644 --- a/tooling/pipeline/src/services/wikipedia/get_summary.cc +++ b/tooling/pipeline/src/services/wikipedia/get_summary.cc @@ -7,7 +7,7 @@ #include -#include "services/wikipedia_service.h" +#include "services/enrichment/wikipedia_service.h" std::string WikipediaService::GetLocationContext(const Location& loc) { if (!client_) { diff --git a/tooling/pipeline/src/services/wikipedia/wikipedia_service.cc b/tooling/pipeline/src/services/wikipedia/wikipedia_service.cc index 6314d50..4142a5c 100644 --- a/tooling/pipeline/src/services/wikipedia/wikipedia_service.cc +++ b/tooling/pipeline/src/services/wikipedia/wikipedia_service.cc @@ -3,7 +3,7 @@ * @brief WikipediaService constructor implementation. */ -#include "services/wikipedia_service.h" +#include "services/enrichment/wikipedia_service.h" #include