Commit 3b54c38
dori
feat:
feat: implement dynamic token limits with model-specific context management
This commit introduces a comprehensive token management system that replaces
hardcoded limits with dynamic, model-specific token limits while maintaining
backward compatibility.
## Key Features Added:
### Dynamic Token Limits (NEW)
- `src/mcp_as_a_judge/db/dynamic_token_limits.py`: New module providing
model-specific token limits with LiteLLM integration
- Initialization pattern: start with hardcoded defaults, upgrade from cache
or LiteLLM API if available, return whatever is available
- Caching system to avoid repeated API calls for model information
### Enhanced Token Calculation
- `src/mcp_as_a_judge/db/token_utils.py`: Upgraded to async functions with
accurate LiteLLM token counting and character-based fallback
- Unified model detection from LLM config or MCP sampling context
- Functions: `calculate_tokens_in_string`, `calculate_tokens_in_record`,
`filter_records_by_token_limit` (all now async)
### Two-Level Token Management
- **Database Level**: Storage limits enforced during save operations
- Record count limit (20 per session)
- Token count limit (dynamic based on model, fallback to 50K)
- LRU session cleanup (50 total sessions max)
- **Load Level**: LLM context limits enforced during retrieval
- Ensures history + current prompt fits within model's input limit
- FIFO removal of oldest records when limits exceeded
### Updated Service Layer
- `src/mcp_as_a_judge/db/conversation_history_service.py`: Added await for
async token filtering function
- `src/mcp_as_a_judge/db/providers/sqlite_provider.py`: Integrated dynamic
token limits in cleanup operations
### Test Infrastructure
- `tests/test_helpers/`: New test utilities package
- `tests/test_helpers/token_utils_helpers.py`: Helper functions for token
calculation testing and model cache management
- `tests/test_improved_token_counting.py`: Comprehensive async test suite
- Updated existing tests to support async token functions
## Implementation Details:
### Model Detection Strategy:
1. Try LLM configuration (fast, synchronous)
2. Try MCP sampling detection (async, requires context)
3. Fallback to None with hardcoded limits
### Token Limit Logic:
- **On Load**: Check total history + current prompt tokens against model max input
- **On Save**: Two-step cleanup (record count limit, then token limit)
- **FIFO Removal**: Always remove oldest records first to preserve recent context
### Backward Compatibility:
- All existing method signatures preserved with alias support
- Graceful fallback when model information unavailable
- No breaking changes to existing functionality
## Files Changed:
- Modified: 5 core files (service, provider, token utils, server)
- Added: 3 new files (dynamic limits, test helpers)
- Enhanced: 2 test files with async support
## Testing:
- All 160 tests pass (1 skipped for integration-only)
- Comprehensive coverage of token calculation, limits, and cleanup logic
- Edge cases and error handling verified
This implementation follows the user's preferred patterns:
- Configuration-based approach with rational fallbacks
- Clean separation of concerns between storage and LLM limits
- Efficient FIFO cleanup maintaining recent conversation context1 parent 24f9cc7 commit 3b54c38
File tree
10 files changed
+517
-70
lines changed- src/mcp_as_a_judge
- db
- providers
- tests
- test_helpers
10 files changed
+517
-70
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
17 | 19 | | |
18 | 20 | | |
19 | 21 | | |
| |||
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
40 | | - | |
| 42 | + | |
41 | 43 | | |
42 | 44 | | |
43 | 45 | | |
| |||
49 | 51 | | |
50 | 52 | | |
51 | 53 | | |
| 54 | + | |
52 | 55 | | |
53 | 56 | | |
54 | 57 | | |
| |||
63 | 66 | | |
64 | 67 | | |
65 | 68 | | |
66 | | - | |
67 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
68 | 72 | | |
69 | 73 | | |
70 | 74 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | 14 | | |
| 15 | + | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | | - | |
| 99 | + | |
100 | 100 | | |
101 | | - | |
102 | | - | |
103 | | - | |
| 101 | + | |
| 102 | + | |
104 | 103 | | |
105 | 104 | | |
106 | | - | |
107 | 105 | | |
108 | 106 | | |
109 | 107 | | |
| |||
140 | 138 | | |
141 | 139 | | |
142 | 140 | | |
143 | | - | |
| 141 | + | |
144 | 142 | | |
145 | 143 | | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
146 | 148 | | |
147 | 149 | | |
148 | | - | |
| 150 | + | |
149 | 151 | | |
150 | 152 | | |
151 | | - | |
| 153 | + | |
152 | 154 | | |
153 | | - | |
| 155 | + | |
154 | 156 | | |
155 | 157 | | |
156 | 158 | | |
157 | 159 | | |
158 | 160 | | |
159 | 161 | | |
160 | 162 | | |
161 | | - | |
| 163 | + | |
162 | 164 | | |
163 | 165 | | |
164 | 166 | | |
| |||
220 | 222 | | |
221 | 223 | | |
222 | 224 | | |
223 | | - | |
| 225 | + | |
224 | 226 | | |
225 | 227 | | |
226 | 228 | | |
| |||
244 | 246 | | |
245 | 247 | | |
246 | 248 | | |
247 | | - | |
| 249 | + | |
248 | 250 | | |
249 | | - | |
| 251 | + | |
250 | 252 | | |
251 | 253 | | |
252 | 254 | | |
| |||
0 commit comments