Skip to content

Commit 6df0f5d

Browse files
alexmojakialexmojaki
authored
Update deps (#1557)
1 parent ded46dd commit 6df0f5d

File tree

4 files changed

+1083
-595
lines changed

4 files changed

+1083
-595
lines changed

‎tests/conftest.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
# Emit both new and old semantic convention attribute names
2727
os.environ['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup'
2828

29-
# Ensure that LOGFIRE_TOKEN in the environment doesn't interfere
29+
# Ensure that these variables in the environment don't interfere
3030
os.environ['LOGFIRE_TOKEN'] = ''
31+
os.environ.pop('OPENAI_BASE_URL', None)
3132

3233
# https://github.com/openai/openai-python/issues/2644
3334
sys.modules['openai.resources.evals'] = unittest.mock.MagicMock()

‎tests/otel_integrations/test_openai_agents_mcp.py‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ def name(self):
124124
'request': {
125125
'method': 'tools/list',
126126
'params': {
127+
'task': None,
127128
'meta': {
128129
'progressToken': None,
129130
'traceparent': '00-00000000000000000000000000000002-0000000000000007-01',
@@ -260,6 +261,7 @@ def name(self):
260261
'request': {
261262
'method': 'tools/call',
262263
'params': {
264+
'task': None,
263265
'meta': {
264266
'progressToken': None,
265267
'traceparent': '00-00000000000000000000000000000002-0000000000000011-01',
@@ -290,7 +292,7 @@ def name(self):
290292
'attributes': {
291293
'request': {
292294
'method': 'tools/call',
293-
'params': {'meta': None, 'name': 'random_number', 'arguments': {}},
295+
'params': {'task': None, 'meta': None, 'name': 'random_number', 'arguments': {}},
294296
},
295297
'rpc.system': 'jsonrpc',
296298
'rpc.jsonrpc.version': '2.0',
@@ -333,6 +335,7 @@ def name(self):
333335
'request': {
334336
'method': 'tools/list',
335337
'params': {
338+
'task': None,
336339
'meta': {
337340
'progressToken': None,
338341
'traceparent': '00-00000000000000000000000000000002-0000000000000019-01',
@@ -507,11 +510,12 @@ def name(self):
507510
'request': {
508511
'method': 'ping',
509512
'params': {
513+
'task': None,
510514
'meta': {
511515
'progressToken': None,
512516
'traceparent': '00-00000000000000000000000000000003-000000000000001f-01',
513517
'foo': 'bar1',
514-
}
518+
},
515519
},
516520
'jsonrpc': '2.0',
517521
'id': 4,
@@ -532,7 +536,7 @@ def name(self):
532536
'code.filepath': 'test_openai_agents_mcp.py',
533537
'code.function': 'test_mcp',
534538
'code.lineno': 123,
535-
'request': "\"PingRequest(method='ping', params=RequestParams(meta={'foo': 'bar1'}))\"",
539+
'request': "\"PingRequest(method='ping', params=RequestParams(task=None, meta={'foo': 'bar1'}))\"",
536540
'rpc.system': 'jsonrpc',
537541
'rpc.jsonrpc.version': '2.0',
538542
'rpc.method': 'ping',
@@ -552,11 +556,12 @@ def name(self):
552556
'request': {
553557
'method': 'ping',
554558
'params': {
559+
'task': None,
555560
'meta': {
556561
'progressToken': None,
557562
'traceparent': '00-00000000000000000000000000000004-0000000000000023-01',
558563
'foo': 'bar2',
559-
}
564+
},
560565
},
561566
'jsonrpc': '2.0',
562567
'id': 5,
@@ -577,7 +582,10 @@ def name(self):
577582
'code.filepath': 'test_openai_agents_mcp.py',
578583
'code.function': 'test_mcp',
579584
'code.lineno': 123,
580-
'request': {'method': 'ping', 'params': {'meta': {'progressToken': None, 'foo': 'bar2'}}},
585+
'request': {
586+
'method': 'ping',
587+
'params': {'task': None, 'meta': {'progressToken': None, 'foo': 'bar2'}},
588+
},
581589
'rpc.system': 'jsonrpc',
582590
'rpc.jsonrpc.version': '2.0',
583591
'rpc.method': 'ping',

‎tests/otel_integrations/test_pydantic_ai_mcp.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ async def client_streams(self):
110110
'request': {
111111
'method': 'tools/list',
112112
'params': {
113+
'task': None,
113114
'meta': {
114115
'progressToken': None,
115116
'traceparent': '00-00000000000000000000000000000002-0000000000000005-01',
@@ -241,6 +242,7 @@ async def client_streams(self):
241242
'request': {
242243
'method': 'sampling/createMessage',
243244
'params': {
245+
'task': None,
244246
'meta': {
245247
'progressToken': None,
246248
'traceparent': '00-00000000000000000000000000000002-0000000000000017-01',
@@ -254,6 +256,7 @@ async def client_streams(self):
254256
'annotations': None,
255257
'meta': None,
256258
},
259+
'meta': None,
257260
}
258261
],
259262
'modelPreferences': None,
@@ -263,6 +266,8 @@ async def client_streams(self):
263266
'maxTokens': 16384,
264267
'stopSequences': None,
265268
'metadata': None,
269+
'tools': None,
270+
'toolChoice': None,
266271
},
267272
'jsonrpc': '2.0',
268273
'id': 0,
@@ -298,6 +303,7 @@ async def client_streams(self):
298303
'request': {
299304
'method': 'sampling/createMessage',
300305
'params': {
306+
'task': None,
301307
'meta': None,
302308
'messages': [
303309
{
@@ -308,6 +314,7 @@ async def client_streams(self):
308314
'annotations': None,
309315
'meta': None,
310316
},
317+
'meta': None,
311318
}
312319
],
313320
'modelPreferences': None,
@@ -317,6 +324,8 @@ async def client_streams(self):
317324
'maxTokens': 16384,
318325
'stopSequences': None,
319326
'metadata': None,
327+
'tools': None,
328+
'toolChoice': None,
320329
},
321330
},
322331
'rpc.system': 'jsonrpc',
@@ -423,6 +432,7 @@ async def client_streams(self):
423432
'request': {
424433
'method': 'tools/call',
425434
'params': {
435+
'task': None,
426436
'meta': {
427437
'progressToken': None,
428438
'traceparent': '00-00000000000000000000000000000002-000000000000000f-01',
@@ -470,7 +480,7 @@ async def client_streams(self):
470480
'attributes': {
471481
'request': {
472482
'method': 'tools/call',
473-
'params': {'meta': None, 'name': 'joker', 'arguments': {'theme': 'socks'}},
483+
'params': {'task': None, 'meta': None, 'name': 'joker', 'arguments': {'theme': 'socks'}},
474484
},
475485
'rpc.system': 'jsonrpc',
476486
'rpc.jsonrpc.version': '2.0',
@@ -540,6 +550,7 @@ async def client_streams(self):
540550
'request': {
541551
'method': 'tools/list',
542552
'params': {
553+
'task': None,
543554
'meta': {
544555
'progressToken': None,
545556
'traceparent': '00-00000000000000000000000000000002-000000000000001d-01',

0 commit comments

Comments
 (0)