Core hardening (OCP/DIP): neutral Usage value object and slim tool contract - #23
Merged
Conversation
Add a neutral Usage value object; Response and EmbeddingResponse store it and accept Usage|array, with ArrayAccess preserving legacy key access. This fixes token counts returning 0 for OpenAI-family providers and Cohere. Remove toAnthropic() and toOpenAI() from ToolInterface; keep them deprecated on the concrete Tool. Agent now emits a neutral tool definition (name, description, parameters) and each provider formats it. Deprecate Response::fromAnthropic() and ToolCall::fromAnthropic(); provider response mapping now lives in the provider packages. No public method removed; fully backward compatible.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Backward-compatible OCP/DIP hardening of
papi-core. No public method is removed; the change is safe for existing consumers.Neutral
Usagevalue objectUsage(inputTokens, outputTokens, totalTokens, raw), implementingArrayAccessover the legacy keys so$response->usage['input_tokens']keeps working.ResponseandEmbeddingResponsestore aUsageand acceptUsage|array(array path deprecated).getInputTokens()etc.) now read the normalisedUsage, so they return correct counts for OpenAI-family providers and Cohere (previously0).Neutral tool flow
toAnthropic()/toOpenAI()fromToolInterface; kept them@deprecatedon the concreteTool.Agentnow emits a neutral tool definition (name,description,parameters); each provider formats it to its own wire shape.Provider-owned response mapping
Response::fromAnthropic()andToolCall::fromAnthropic()are@deprecated; Anthropic mapping now lives in the anthropic package.Response::fromOpenAI()stays as the shared OpenAI-compatible adapter.Compatibility
Fully backward compatible: deprecations are docblock-only (no runtime notices), and every previously public method still exists.
Tests
composer cigreen: 207 tests passed, lint and Psalm (level 4) clean.