-
Notifications
You must be signed in to change notification settings - Fork 0
fix: resolve circular imports, bump litellm, fix release tag format #286
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| """Budget-layer error hierarchy. | ||
|
|
||
| Defines budget-specific exceptions in a leaf module with no intra-project | ||
| imports, preventing circular dependency chains when these exceptions are | ||
| needed by both the budget enforcer and the engine layer. | ||
| """ | ||
|
|
||
|
|
||
| class BudgetExhaustedError(Exception): | ||
| """Budget exhaustion signal. | ||
|
|
||
| Used in two contexts: | ||
|
|
||
| 1. Raised directly by :meth:`BudgetEnforcer.check_can_execute` | ||
| when pre-flight budget checks fail (e.g., monthly hard stop, | ||
| daily limit, or provider quota exceeded). | ||
| 2. Caught by the engine layer (``AgentEngine.run``) and used to | ||
| build an ``AgentRunResult`` with | ||
| ``TerminationReason.BUDGET_EXHAUSTED``. | ||
| """ | ||
|
|
||
|
|
||
| class DailyLimitExceededError(BudgetExhaustedError): | ||
| """Per-agent daily spending limit exceeded.""" | ||
|
|
||
|
|
||
| class QuotaExhaustedError(BudgetExhaustedError): | ||
| """Raised when provider quota is exhausted. | ||
|
|
||
| Raised for all degradation strategies. Degradation routing | ||
| (FALLBACK/QUEUE) is not yet implemented. | ||
| """ |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| """Resilience configuration models (retry + rate limiting). | ||
|
|
||
| Defined in ``core/`` to avoid circular imports between ``config.schema`` | ||
| and ``providers.resilience``. Both modules import from here. | ||
| """ | ||
|
|
||
| from typing import Self | ||
|
|
||
| from pydantic import BaseModel, ConfigDict, Field, model_validator | ||
|
|
||
| from ai_company.observability import get_logger | ||
| from ai_company.observability.events.config import CONFIG_VALIDATION_FAILED | ||
|
|
||
| logger = get_logger(__name__) | ||
|
|
||
|
|
||
| class RetryConfig(BaseModel): | ||
| """Configuration for automatic retry of transient provider errors. | ||
|
|
||
| Attributes: | ||
| max_retries: Maximum number of retry attempts (0 disables retries). | ||
| base_delay: Initial delay in seconds before the first retry. | ||
| max_delay: Upper bound on computed delay in seconds. | ||
| exponential_base: Multiplier for exponential backoff. | ||
| jitter: Whether to add random jitter to delay. | ||
| """ | ||
|
|
||
| model_config = ConfigDict(frozen=True, allow_inf_nan=False) | ||
|
|
||
| max_retries: int = Field( | ||
| default=3, | ||
| ge=0, | ||
| le=10, | ||
| description="Maximum number of retry attempts (0 disables retries)", | ||
| ) | ||
| base_delay: float = Field( | ||
| default=1.0, | ||
| gt=0.0, | ||
| description="Initial delay in seconds before the first retry", | ||
| ) | ||
| max_delay: float = Field( | ||
| default=60.0, | ||
| gt=0.0, | ||
| description="Upper bound on computed delay in seconds", | ||
| ) | ||
| exponential_base: float = Field( | ||
| default=2.0, | ||
| gt=1.0, | ||
| description="Multiplier for exponential backoff", | ||
| ) | ||
| jitter: bool = Field( | ||
| default=True, | ||
| description="Whether to add random jitter to delay", | ||
| ) | ||
|
|
||
| @model_validator(mode="after") | ||
| def _validate_delay_ordering(self) -> Self: | ||
| """Ensure base_delay does not exceed max_delay.""" | ||
| if self.base_delay > self.max_delay: | ||
| msg = ( | ||
| f"base_delay ({self.base_delay}) must be" | ||
| f" <= max_delay ({self.max_delay})" | ||
| ) | ||
| logger.warning( | ||
| CONFIG_VALIDATION_FAILED, | ||
| model="RetryConfig", | ||
| field="base_delay/max_delay", | ||
| base_delay=self.base_delay, | ||
| max_delay=self.max_delay, | ||
| reason=msg, | ||
| ) | ||
| raise ValueError(msg) | ||
| return self | ||
|
|
||
|
|
||
| class RateLimiterConfig(BaseModel): | ||
| """Configuration for client-side rate limiting. | ||
|
|
||
| Attributes: | ||
| max_requests_per_minute: Maximum requests per minute | ||
| (0 means unlimited). | ||
| max_concurrent: Maximum concurrent in-flight requests | ||
| (0 means unlimited). | ||
| """ | ||
|
|
||
| model_config = ConfigDict(frozen=True, allow_inf_nan=False) | ||
|
|
||
| max_requests_per_minute: int = Field( | ||
| default=0, | ||
| ge=0, | ||
| description="Maximum requests per minute (0 = unlimited)", | ||
| ) | ||
| max_concurrent: int = Field( | ||
| default=0, | ||
| ge=0, | ||
| description="Maximum concurrent in-flight requests (0 = unlimited)", | ||
| ) |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing the old budget-error aliases is another patch-level API break.
These new exports are fine as the canonical budget namespace, but the PR summary also removes the previous
ai_company.engine/ai_company.engine.errorsre-exports. Existing consumers importing these exceptions from the old paths will start failing immediately on afix:release. Keep deprecated aliases for one release, or ship this as an explicit breaking change.Also applies to: 108-145
🤖 Prompt for AI Agents