mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
1f9c368622
Gemini's Schema validator requires every `enum` entry to be a string, even when the parent `type` is integer/number/boolean. Discord's `auto_archive_duration` parameter (`type: integer, enum: [60, 1440, 4320, 10080]`) tripped this on every request that shipped the full tool catalog to generativelanguage.googleapis.com, surfacing as `Gateway: Non-retryable client error: Gemini HTTP 400 (INVALID_ARGUMENT) Invalid value ... (TYPE_STRING), 60` and aborting the turn. Sanitize by dropping the `enum` key when the declared type is numeric or boolean and any entry is non-string. The `type` and `description` survive, so the model still knows the allowed values; the tool handler keeps its own runtime validation. Other providers (OpenAI, OpenRouter, Anthropic) are unaffected — the sanitizer only runs for native Gemini / cloudcode adapters. Reported by @selfhostedsoul on Discord with hermes debug share.
99 lines
3.3 KiB
Python
99 lines
3.3 KiB
Python
"""Helpers for translating OpenAI-style tool schemas to Gemini's schema subset."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any, Dict, List
|
|
|
|
# Gemini's ``FunctionDeclaration.parameters`` field accepts the ``Schema``
|
|
# object, which is only a subset of OpenAPI 3.0 / JSON Schema. Strip fields
|
|
# outside that subset before sending Hermes tool schemas to Google.
|
|
_GEMINI_SCHEMA_ALLOWED_KEYS = {
|
|
"type",
|
|
"format",
|
|
"title",
|
|
"description",
|
|
"nullable",
|
|
"enum",
|
|
"maxItems",
|
|
"minItems",
|
|
"properties",
|
|
"required",
|
|
"minProperties",
|
|
"maxProperties",
|
|
"minLength",
|
|
"maxLength",
|
|
"pattern",
|
|
"example",
|
|
"anyOf",
|
|
"propertyOrdering",
|
|
"default",
|
|
"items",
|
|
"minimum",
|
|
"maximum",
|
|
}
|
|
|
|
|
|
def sanitize_gemini_schema(schema: Any) -> Dict[str, Any]:
|
|
"""Return a Gemini-compatible copy of a tool parameter schema.
|
|
|
|
Hermes tool schemas are OpenAI-flavored JSON Schema and may contain keys
|
|
such as ``$schema`` or ``additionalProperties`` that Google's Gemini
|
|
``Schema`` object rejects. This helper preserves the documented Gemini
|
|
subset and recursively sanitizes nested ``properties`` / ``items`` /
|
|
``anyOf`` definitions.
|
|
"""
|
|
|
|
if not isinstance(schema, dict):
|
|
return {}
|
|
|
|
cleaned: Dict[str, Any] = {}
|
|
for key, value in schema.items():
|
|
if key not in _GEMINI_SCHEMA_ALLOWED_KEYS:
|
|
continue
|
|
if key == "properties":
|
|
if not isinstance(value, dict):
|
|
continue
|
|
props: Dict[str, Any] = {}
|
|
for prop_name, prop_schema in value.items():
|
|
if not isinstance(prop_name, str):
|
|
continue
|
|
props[prop_name] = sanitize_gemini_schema(prop_schema)
|
|
cleaned[key] = props
|
|
continue
|
|
if key == "items":
|
|
cleaned[key] = sanitize_gemini_schema(value)
|
|
continue
|
|
if key == "anyOf":
|
|
if not isinstance(value, list):
|
|
continue
|
|
cleaned[key] = [
|
|
sanitize_gemini_schema(item)
|
|
for item in value
|
|
if isinstance(item, dict)
|
|
]
|
|
continue
|
|
cleaned[key] = value
|
|
|
|
# Gemini's Schema validator requires every ``enum`` entry to be a string,
|
|
# even when the parent ``type`` is ``integer`` / ``number`` / ``boolean``.
|
|
# OpenAI / OpenRouter / Anthropic accept typed enums (e.g. Discord's
|
|
# ``auto_archive_duration: {type: integer, enum: [60, 1440, 4320, 10080]}``),
|
|
# so we only drop the ``enum`` when it would collide with Gemini's rule.
|
|
# Keeping ``type: integer`` plus the human-readable description gives the
|
|
# model enough guidance; the tool handler still validates the value.
|
|
enum_val = cleaned.get("enum")
|
|
type_val = cleaned.get("type")
|
|
if isinstance(enum_val, list) and type_val in {"integer", "number", "boolean"}:
|
|
if any(not isinstance(item, str) for item in enum_val):
|
|
cleaned.pop("enum", None)
|
|
|
|
return cleaned
|
|
|
|
|
|
def sanitize_gemini_tool_parameters(parameters: Any) -> Dict[str, Any]:
|
|
"""Normalize tool parameters to a valid Gemini object schema."""
|
|
|
|
cleaned = sanitize_gemini_schema(parameters)
|
|
if not cleaned:
|
|
return {"type": "object", "properties": {}}
|
|
return cleaned
|