use enriched city in generation functions

tooling/pipeline/includes/data_generation/data_generator.h

@@ -20,12 +20,10 @@ class DataGenerator {
   /**
    * @brief Generates brewery data for a location.
    *
-   * @param location Location data
+   * @param city Enriched city the brewery is associated with.
-   * @param region_context Additional regional context text.
    * @return Brewery generation result.
    */
-  virtual BreweryResult GenerateBrewery(const Location& location,
+  virtual BreweryResult GenerateBrewery(const EnrichedCity& city) = 0;
-                                        const std::string& region_context) = 0;
 
   /**
    * @brief Generates a user profile grounded in a sampled name and persona.

tooling/pipeline/includes/data_generation/llama_generator.h

@@ -55,8 +55,7 @@ class LlamaGenerator final : public DataGenerator {
    * @param region_context Additional regional context.
    * @return Generated brewery result.
    */
-  BreweryResult GenerateBrewery(const Location& location,
+  BreweryResult GenerateBrewery(const EnrichedCity&) override;
-                                const std::string& region_context) override;
 
   /**
    * @brief Generates a user profile grounded in a sampled name and persona.

tooling/pipeline/includes/data_generation/mock_generator.h

@@ -20,20 +20,15 @@ class MockGenerator final : public DataGenerator {
   /**
    * @brief Generates deterministic brewery data for a location.
    *
-   * @param location City and country names.
+   * @param enriched_city
-   * @param region_context Unused for mock generation.
    * @return Generated brewery result.
    */
-  BreweryResult GenerateBrewery(const Location& location,
-                                const std::string& region_context) override;
 
+  BreweryResult GenerateBrewery(const EnrichedCity& enriched_city) override;
   /**
    * @brief Generates deterministic user data grounded in a sampled name and
    * persona.
-   *
+
-   * @param city Enriched city the user is associated with.
-   * @param persona Persona archetype.
-   * @param name Sampled first/last name, copied directly into the result.
    * @return Generated user result.
    */
   UserResult GenerateUser(const EnrichedCity& city, const UserPersona& persona,

tooling/pipeline/src/biergarten_pipeline_orchestrator/generate_breweries.cc

@@ -22,12 +22,15 @@ void BiergartenPipelineOrchestrator::GenerateBreweries(
 
   const auto generate_record =
       [this, &skipped_count](
-          const Location& location,
+          const EnrichedCity& enriched_city) -> std::optional<BreweryRecord> {
-          const std::string& region_context) -> std::optional<BreweryRecord> {
     try {
-      const BreweryResult brewery =
+      const BreweryResult brewery = generator_->GenerateBrewery(enriched_city);
-          generator_->GenerateBrewery(location, region_context);
+      const std::string postal_code =
-      return BreweryRecord{.location = location, .brewery = brewery};
+          postal_code_service_->GeneratePostalCode(enriched_city.location);
+      return BreweryRecord{
+          .address = BreweryAddress{.city = enriched_city.location,
+                                    .postal_code = postal_code},
+          .brewery = brewery};
     } catch (const std::exception& e) {
       ++skipped_count;
 
@@ -36,7 +39,8 @@ void BiergartenPipelineOrchestrator::GenerateBreweries(
            .phase = PipelinePhase::BreweryAndBeerGeneration,
            .message = std::format("[Pipeline] Skipping city '{}' ({}): brewery "
                                   "generation failed: {}",
-                                  location.city, location.country, e.what())});
+                                  enriched_city.location.city,
+                                  enriched_city.location.country, e.what())});
       return std::nullopt;
     }
   };
@@ -57,9 +61,8 @@ void BiergartenPipelineOrchestrator::GenerateBreweries(
     }
   };
 
-  for (const auto& [location, region_context] : cities) {
+  for (const EnrichedCity& enriched_city : cities) {
-    const std::optional<BreweryRecord> record =
+    const std::optional<BreweryRecord> record = generate_record(enriched_city);
-        generate_record(location, region_context);
     if (!record.has_value()) {
       continue;
     }

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

@@ -36,7 +36,9 @@ static std::string FormatLocalLanguageCodes(
 static constexpr int kBreweryInitialMaxTokens = 2800;
 
 BreweryResult LlamaGenerator::GenerateBrewery(
-    const Location& location, const std::string& region_context) {
+    const EnrichedCity& enriched_city) {
+  const City& location = enriched_city.location;
+  const std::string& region_context = enriched_city.region_context;
   /**
    * Preprocess and truncate region context to manageable size
    */

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

@@ -11,7 +11,8 @@
 #include "data_generation/mock_generator.h"
 
 BreweryResult MockGenerator::GenerateBrewery(
-    const Location& location, const std::string& /*region_context*/) {
+    const EnrichedCity& enriched_city) {
+  const City& location = enriched_city.location;
   const size_t hash = DeterministicHash(location);
 
   const std::string_view adjective =