3232from inspect import isawaitable , isclass
3333from typing import Any , Optional , cast
3434
35- from openai ._types import NotGiven
35+ from openai ._types import NotGiven , Omit
3636from packaging .version import Version
3737from pydantic import BaseModel
3838from pydantic_core import to_jsonable_python
@@ -207,7 +207,7 @@ class OpenAiDefinition:
207207
208208
209209def _is_not_given (value : Any ) -> bool :
210- return isinstance (value , NotGiven )
210+ return isinstance (value , ( NotGiven , Omit ) )
211211
212212
213213def _get_attr_or_item (value : Any , key : str , default : Any = None ) -> Any :
@@ -356,13 +356,13 @@ def _extract_responses_prompt(kwargs: Any) -> Any:
356356 for key in _RESPONSES_PROMPT_FIELDS :
357357 value = kwargs .get (key , None )
358358
359- if value is not None and not isinstance (value , NotGiven ):
359+ if value is not None and not _is_not_given (value ):
360360 prompt_fields [key ] = _serialize_openai_value (value )
361361
362- if isinstance (input_value , NotGiven ):
362+ if _is_not_given (input_value ):
363363 input_value = None
364364
365- if isinstance (instructions , NotGiven ):
365+ if _is_not_given (instructions ):
366366 instructions = None
367367
368368 if instructions is None :
@@ -395,14 +395,11 @@ def _extract_chat_prompt(kwargs: Any) -> Any:
395395 """Extracts the user input from prompts. Returns an array of messages or dict with messages and functions"""
396396 prompt = {}
397397
398- if kwargs .get ("functions" ) is not None :
399- prompt .update ({"functions" : kwargs ["functions" ]})
400-
401- if kwargs .get ("function_call" ) is not None :
402- prompt .update ({"function_call" : kwargs ["function_call" ]})
398+ for key in ("functions" , "function_call" , "tools" ):
399+ value = kwargs .get (key )
403400
404- if kwargs . get ( "tools" ) is not None :
405- prompt .update ({"tools" : kwargs [ "tools" ] })
401+ if value is not None and not _is_not_given ( value ) :
402+ prompt .update ({key : value })
406403
407404 if prompt :
408405 # uf user provided functions, we need to send these together with messages to langfuse
@@ -533,7 +530,7 @@ def _get_langfuse_data_from_kwargs(resource: OpenAiDefinition, kwargs: Any) -> A
533530 metadata = kwargs .get ("metadata" , {})
534531 if (
535532 metadata is not None
536- and not isinstance (metadata , NotGiven )
533+ and not _is_not_given (metadata )
537534 and not isinstance (metadata , dict )
538535 ):
539536 if isinstance (metadata , BaseModel ):
@@ -556,63 +553,61 @@ def _get_langfuse_data_from_kwargs(resource: OpenAiDefinition, kwargs: Any) -> A
556553
557554 parsed_temperature = (
558555 kwargs .get ("temperature" , 1 )
559- if not isinstance (kwargs .get ("temperature" , 1 ), NotGiven )
556+ if not _is_not_given (kwargs .get ("temperature" , 1 ))
560557 else 1
561558 )
562559
563560 parsed_max_tokens = (
564561 kwargs .get ("max_tokens" , float ("inf" ))
565- if not isinstance (kwargs .get ("max_tokens" , float ("inf" )), NotGiven )
562+ if not _is_not_given (kwargs .get ("max_tokens" , float ("inf" )))
566563 else float ("inf" )
567564 )
568565
569566 parsed_max_completion_tokens = (
570567 kwargs .get ("max_completion_tokens" , None )
571- if not isinstance (kwargs .get ("max_completion_tokens" , float ("inf" )), NotGiven )
568+ if not _is_not_given (kwargs .get ("max_completion_tokens" , float ("inf" )))
572569 else None
573570 )
574571
575572 parsed_top_p = (
576- kwargs .get ("top_p" , 1 )
577- if not isinstance (kwargs .get ("top_p" , 1 ), NotGiven )
578- else 1
573+ kwargs .get ("top_p" , 1 ) if not _is_not_given (kwargs .get ("top_p" , 1 )) else 1
579574 )
580575
581576 parsed_frequency_penalty = (
582577 kwargs .get ("frequency_penalty" , 0 )
583- if not isinstance (kwargs .get ("frequency_penalty" , 0 ), NotGiven )
578+ if not _is_not_given (kwargs .get ("frequency_penalty" , 0 ))
584579 else 0
585580 )
586581
587582 parsed_presence_penalty = (
588583 kwargs .get ("presence_penalty" , 0 )
589- if not isinstance (kwargs .get ("presence_penalty" , 0 ), NotGiven )
584+ if not _is_not_given (kwargs .get ("presence_penalty" , 0 ))
590585 else 0
591586 )
592587
593588 parsed_seed = (
594589 kwargs .get ("seed" , None )
595- if not isinstance (kwargs .get ("seed" , None ), NotGiven )
590+ if not _is_not_given (kwargs .get ("seed" , None ))
596591 else None
597592 )
598593
599- parsed_n = kwargs .get ("n" , 1 ) if not isinstance (kwargs .get ("n" , 1 ), NotGiven ) else 1
594+ parsed_n = kwargs .get ("n" , 1 ) if not _is_not_given (kwargs .get ("n" , 1 )) else 1
600595
601596 parsed_service_tier = (
602597 kwargs .get ("service_tier" , None )
603- if not isinstance (kwargs .get ("service_tier" , None ), NotGiven )
598+ if not _is_not_given (kwargs .get ("service_tier" , None ))
604599 else None
605600 )
606601
607602 if resource .type == "embedding" :
608603 parsed_dimensions = (
609604 kwargs .get ("dimensions" , None )
610- if not isinstance (kwargs .get ("dimensions" , None ), NotGiven )
605+ if not _is_not_given (kwargs .get ("dimensions" , None ))
611606 else None
612607 )
613608 parsed_encoding_format = (
614609 kwargs .get ("encoding_format" , "float" )
615- if not isinstance (kwargs .get ("encoding_format" , "float" ), NotGiven )
610+ if not _is_not_given (kwargs .get ("encoding_format" , "float" ))
616611 else "float"
617612 )
618613
@@ -1195,7 +1190,7 @@ def _get_raw_response_mode(kwargs: Any) -> Optional[str]:
11951190 """
11961191 extra_headers = kwargs .get ("extra_headers" , None )
11971192
1198- if extra_headers is None or isinstance (extra_headers , NotGiven ):
1193+ if extra_headers is None or _is_not_given (extra_headers ):
11991194 return None
12001195
12011196 try :
0 commit comments