cleanup

pipeline/includes/data_generation/llama_generator_helpers.h

@@ -7,14 +7,14 @@
  */
 
 #include <cstddef>
+#include <cstdint>
 #include <optional>
 #include <string>
 #include <string_view>
-#include <utility>
 
 struct llama_model;
 struct llama_vocab;
-typedef int llama_token;
+typedef int32_t llama_token;
 
 /**
  * @brief Normalizes and truncates regional context.
@@ -23,18 +23,8 @@ typedef int llama_token;
  * @param max_chars Maximum output length.
  * @return Processed region context.
  */
-std::string PrepareRegionContextPublic(std::string_view region_context,
-                                       std::size_t max_chars = 2000);
-
-/**
- * @brief Parses a response expected to contain two logical lines.
- *
- * @param raw Raw model output.
- * @param error_message Error message thrown on parse failure.
- * @return Pair containing first and second parsed fields.
- */
-std::pair<std::string, std::string> ParseTwoLineResponsePublic(
-    const std::string& raw, const std::string& error_message);
+std::string PrepareRegionContext(std::string_view region_context,
+                                 size_t max_chars = 2000);
 
 /**
  * @brief Applies model chat template to system and user prompts.
@@ -44,9 +34,9 @@ std::pair<std::string, std::string> ParseTwoLineResponsePublic(
  * @param user_prompt User prompt text.
  * @return Model-formatted prompt.
  */
-std::string ToChatPromptPublic(const llama_model* model,
-                               const std::string& system_prompt,
-                               const std::string& user_prompt);
+std::string ToChatPrompt(const llama_model* model,
+                         const std::string& system_prompt,
+                         const std::string& user_prompt);
 
 /**
  * @brief Decodes a sampled token and appends it to output text.
@@ -55,8 +45,8 @@ std::string ToChatPromptPublic(const llama_model* model,
  * @param token Sampled token id.
  * @param output Output text buffer.
  */
-void AppendTokenPiecePublic(const llama_vocab* vocab, llama_token token,
-                            std::string& output);
+void AppendTokenPiece(const llama_vocab* vocab, llama_token token,
+                      std::string& output);
 
 /**
  * @brief Validates and parses brewery JSON output.
@@ -66,9 +56,9 @@ void AppendTokenPiecePublic(const llama_vocab* vocab, llama_token token,
  * @param description_out Parsed brewery description.
  * @return Validation error message if invalid, or std::nullopt on success.
  */
-std::optional<std::string> ValidateBreweryJsonPublic(
-    const std::string& raw, std::string& name_out,
-    std::string& description_out);
+std::optional<std::string> ValidateBreweryJson(const std::string& raw,
+                                               std::string& name_out,
+                                               std::string& description_out);
 
 /**
  * @brief Extracts the last balanced JSON object from text.
@@ -76,6 +66,6 @@ std::optional<std::string> ValidateBreweryJsonPublic(
  * @param text Input text.
  * @return Extracted JSON object or an empty string if none exists.
  */
-std::string ExtractLastJsonObjectPublic(const std::string& text);
+std::string ExtractLastJsonObject(const std::string& text);
 
-#endif  // BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_LLAMA_GENERATOR_HELPERS_H_
+#endif  // BIERGARTEN_PIPELINE_INCLUDES_DATA_GENERATION_LLAMA_GENERATOR_HELPERS_H_