Skip to content

fix for trustcall bug #60

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix for trustcall bug #60

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: 29 additions & 6 deletions trustcall/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,29 @@ def filter_state(state: dict) -> ExtractionOutputs:
if removal_schema and tc["name"] == removal_schema.__name__:
sch = removal_schema
elif tc["name"] not in validator.schemas_by_name:
if existing_schema_policy in (False, "ignore"):
continue
sch = validator.schemas_by_name[tc["name"]]
# Check if this is a patched tool call from existing schemas
json_doc_id = updated_docs.get(tc["id"])
if json_doc_id and existing:
# This is a patched tool call, try to find the original schema
if isinstance(existing, dict) and str(json_doc_id) in existing:
# For dict-based existing schemas, the json_doc_id is the
# schema name
original_schema_name = str(json_doc_id)
if original_schema_name in validator.schemas_by_name:
sch = validator.schemas_by_name[original_schema_name]
else:
if existing_schema_policy in (False, "ignore"):
continue
sch = validator.schemas_by_name[tc["name"]]
else:
# For list-based existing schemas or unknown cases
if existing_schema_policy in (False, "ignore"):
continue
sch = validator.schemas_by_name[tc["name"]]
else:
if existing_schema_policy in (False, "ignore"):
continue
sch = validator.schemas_by_name[tc["name"]]
else:
sch = validator.schemas_by_name[tc["name"]]
try:
Expand Down Expand Up @@ -786,11 +806,14 @@ def _teardown(
)
except StopIteration:
logger.error(
f"Could not find existing schema in dict for {json_doc_id}"
)
f"Could not find existing schema in list for json_doc_id '{json_doc_id}'. " # noqa: E501
f"Available schema IDs: {[e[0] for e in existing if len(e) >= 1]}" # noqa: E501
)
if rt:
rt.error = (
f"Could not find existing schema for {json_doc_id}"
f"Could not find existing schema for json_doc_id '{json_doc_id}'. " # noqa: E501
f"Available schema IDs: {[e[0] for e in existing if len(e) >= 1]}. " # noqa: E501
f"Please ensure the json_doc_id matches one of the available schema IDs." # noqa: E501
)
continue
except (ValueError, IndexError, TypeError):
Expand Down