Skip to content

Avoid structural tag cache key serialization #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ubospica wants to merge 1 commit into from
Closed

Avoid structural tag cache key serialization #785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions cpp/structural_tag.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1758,7 +1758,7 @@ class StructuralTagGrammarConverter {
* \return The rule id of the added rule. If the visit fails, the error is returned.
* \note This method uses serialization to deduplicate identical formats.
*/
Result<int, ISTError> Visit(const Format& format);
Result<int, ISTError> Visit(const Format& format, bool deduplicate = true);
Result<int, ISTError> VisitSub(const ConstStringFormat& format);
Result<int, ISTError> VisitSub(const JSONSchemaFormat& format);
Result<int, ISTError> VisitSub(const AnyTextFormat& format);
Expand Down Expand Up @@ -1804,7 +1804,7 @@ bool StructuralTagGrammarConverter::IsPrefix(
Result<Grammar, ISTError> StructuralTagGrammarConverter::Convert(const StructuralTag& structural_tag
) {
StructuralTagGrammarConverter converter;
auto result = converter.Visit(structural_tag.format);
auto result = converter.Visit(structural_tag.format, false);
if (result.IsErr()) {
return ResultErr(std::move(result).UnwrapErr());
}
Expand All @@ -1821,19 +1821,34 @@ Grammar StructuralTagGrammarConverter::AddRootRuleAndGetGrammar(int ref_rule_id)
return grammar_builder_.Get(root_rule_id);
}

Result<int, ISTError> StructuralTagGrammarConverter::Visit(const Format& format) {
std::string fingerprint = FormatToJSONValue(format).serialize();
Result<int, ISTError> StructuralTagGrammarConverter::Visit(const Format& format, bool deduplicate) {
std::string fingerprint;
if (deduplicate) {
if (const auto* json_schema = std::get_if<JSONSchemaFormat>(&format)) {
fingerprint.reserve(
json_schema->json_schema.size() + json_schema->style.size() + sizeof(int) + 16
);
fingerprint.append(JSONSchemaFormat::type);
fingerprint.push_back('\0');
fingerprint.append(json_schema->json_schema);
fingerprint.push_back('\0');
fingerprint.append(json_schema->style);
fingerprint.push_back('\0');
fingerprint.push_back(json_schema->any_order ? '\1' : '\0');
fingerprint.append(std::to_string(json_schema->max_whitespace_cnt.value_or(-1)));
} else {
fingerprint = FormatToJSONValue(format).serialize();
}

// Check if we've already processed an identical format
auto it = serialization_to_rule_id_.find(fingerprint);
if (it != serialization_to_rule_id_.end()) {
return ResultOk(it->second);
auto it = serialization_to_rule_id_.find(fingerprint);
if (it != serialization_to_rule_id_.end()) {
return ResultOk(it->second);
}
}

// Process the format and cache the result
auto result =
std::visit([&](auto&& arg) -> Result<int, ISTError> { return VisitSub(arg); }, format);
if (result.IsOk()) {
if (result.IsOk() && deduplicate) {
int rule_id = std::move(result).Unwrap();
serialization_to_rule_id_[fingerprint] = rule_id;
return ResultOk(rule_id);
Expand Down
Loading