|
37 | 37 | from typing_extensions import TypedDict |
38 | 38 |
|
39 | 39 | from ...items import TResponseInputItem |
40 | | -from ...memory.session import SessionABC |
| 40 | +from ...memory.session import SessionABC, session_method_accepts_wrapper |
41 | 41 | from ...memory.session_settings import SessionSettings, resolve_session_limit |
| 42 | +from ...run_context import RunContextWrapper |
42 | 43 |
|
43 | 44 |
|
44 | 45 | class EncryptedEnvelope(TypedDict): |
@@ -180,24 +181,52 @@ def _unwrap_valid_items( |
180 | 181 | valid_items.append(item) |
181 | 182 | return valid_items |
182 | 183 |
|
183 | | - async def get_items(self, limit: int | None = None) -> list[TResponseInputItem]: |
| 184 | + async def _get_underlying_items( |
| 185 | + self, limit: int | None, wrapper: RunContextWrapper[Any] | None |
| 186 | + ) -> list[TResponseInputItem]: |
| 187 | + # Forward the wrapper only when the underlying session opts in, so wrapping older |
| 188 | + # custom sessions keeps working unchanged. |
| 189 | + if wrapper is not None and session_method_accepts_wrapper( |
| 190 | + self.underlying_session.get_items |
| 191 | + ): |
| 192 | + return await self.underlying_session.get_items(limit, wrapper=wrapper) |
| 193 | + return await self.underlying_session.get_items(limit) |
| 194 | + |
| 195 | + async def get_items( |
| 196 | + self, |
| 197 | + limit: int | None = None, |
| 198 | + *, |
| 199 | + wrapper: RunContextWrapper[Any] | None = None, |
| 200 | + ) -> list[TResponseInputItem]: |
184 | 201 | effective_limit = resolve_session_limit(limit, self.session_settings) |
185 | 202 | if effective_limit is not None and effective_limit > 0: |
186 | 203 | window = effective_limit |
187 | 204 | while True: |
188 | | - encrypted_items = await self.underlying_session.get_items(window) |
| 205 | + encrypted_items = await self._get_underlying_items(window, wrapper) |
189 | 206 | valid_items = self._unwrap_valid_items(encrypted_items) |
190 | 207 | if len(valid_items) >= effective_limit: |
191 | 208 | return valid_items[-effective_limit:] |
192 | 209 | if len(encrypted_items) < window: |
193 | 210 | return valid_items |
194 | 211 | window *= 2 |
195 | 212 |
|
196 | | - encrypted_items = await self.underlying_session.get_items(limit) |
| 213 | + encrypted_items = await self._get_underlying_items(limit, wrapper) |
197 | 214 | return self._unwrap_valid_items(encrypted_items) |
198 | 215 |
|
199 | | - async def add_items(self, items: list[TResponseInputItem]) -> None: |
| 216 | + async def add_items( |
| 217 | + self, |
| 218 | + items: list[TResponseInputItem], |
| 219 | + *, |
| 220 | + wrapper: RunContextWrapper[Any] | None = None, |
| 221 | + ) -> None: |
200 | 222 | wrapped: list[EncryptedEnvelope] = [self._wrap(it) for it in items] |
| 223 | + if wrapper is not None and session_method_accepts_wrapper( |
| 224 | + self.underlying_session.add_items |
| 225 | + ): |
| 226 | + await self.underlying_session.add_items( |
| 227 | + cast(list[TResponseInputItem], wrapped), wrapper=wrapper |
| 228 | + ) |
| 229 | + return |
201 | 230 | await self.underlying_session.add_items(cast(list[TResponseInputItem], wrapped)) |
202 | 231 |
|
203 | 232 | async def pop_item(self) -> TResponseInputItem | None: |
|
0 commit comments