langfun 0.0.2.dev20240212__py3-none-any.whl → 0.0.2.dev20240214__py3-none-any.whl

langfun/core/eval/base_test.py

@@ -481,7 +481,7 @@ class SuiteTest(unittest.TestCase):
                     schema_fn='answer_schema()',
                 ),
                 cache_stats=dict(
-                    use_cache=True, num_queries=4, num_hits=0, num_updates=4
+                    use_cache=True, num_queries=4, num_hits=1, num_updates=3
                 ),
                 metrics=dict(total=2, failures=2, failure_rate=1.0),
             ),

langfun/core/llms/__init__.py

@@ -32,21 +32,20 @@ from langfun.core.llms.gemini import GeminiProVision
 from langfun.core.llms.openai import OpenAI
 
 from langfun.core.llms.openai import Gpt4Turbo
+from langfun.core.llms.openai import Gpt4Turbo_0125
 from langfun.core.llms.openai import Gpt4TurboVision
 from langfun.core.llms.openai import Gpt4
 from langfun.core.llms.openai import Gpt4_0613
-from langfun.core.llms.openai import Gpt4_0314
 from langfun.core.llms.openai import Gpt4_32K
 from langfun.core.llms.openai import Gpt4_32K_0613
-from langfun.core.llms.openai import Gpt4_32K_0314
 
 from langfun.core.llms.openai import Gpt35Turbo
+from langfun.core.llms.openai import Gpt35Turbo_0125
 from langfun.core.llms.openai import Gpt35Turbo_1106
 from langfun.core.llms.openai import Gpt35Turbo_0613
-from langfun.core.llms.openai import Gpt35Turbo_0301
 from langfun.core.llms.openai import Gpt35Turbo16K
 from langfun.core.llms.openai import Gpt35Turbo16K_0613
-from langfun.core.llms.openai import Gpt35Turbo16K_0301
+
 
 from langfun.core.llms.openai import Gpt35
 

langfun/core/llms/openai.py

@@ -302,40 +302,40 @@ class Gpt4(OpenAI):
 
 class Gpt4Turbo(Gpt4):
   """GPT-4 Turbo with 128K context window size. Knowledge up to 4-2023."""
-  model = 'gpt-4-1106-preview'
+  model = 'gpt-4-turbo-preview'
 
 
-class Gpt4TurboVision(Gpt4):
+class Gpt4TurboVision(Gpt4Turbo):
   """GPT-4 Turbo with vision."""
   model = 'gpt-4-vision-preview'
   multimodal = True
 
 
-class Gpt4_0613(Gpt4):    # pylint:disable=invalid-name
-  """GPT-4 0613."""
-  model = 'gpt-4-0613'
+class Gpt4Turbo_0125(Gpt4Turbo):   # pylint:disable=invalid-name
+  """GPT-4 Turbo with 128K context window size. Knowledge up to 4-2023."""
+  model = 'gpt-4-0125-preview'
 
 
-class Gpt4_0314(Gpt4):   # pylint:disable=invalid-name
-  """GPT-4 0314."""
-  model = 'gpt-4-0314'
+class Gpt4Turbo_1106(Gpt4Turbo):   # pylint:disable=invalid-name
+  """GPT-4 Turbo @20231106. 128K context window. Knowledge up to 4-2023."""
+  model = 'gpt-4-1106-preview'
+
+
+class Gpt4_0613(Gpt4):    # pylint:disable=invalid-name
+  """GPT-4 @20230613. 8K context window. Knowledge up to 9-2021."""
+  model = 'gpt-4-0613'
 
 
 class Gpt4_32K(Gpt4):       # pylint:disable=invalid-name
-  """GPT-4 with 32K context window size."""
+  """Latest GPT-4 with 32K context window."""
   model = 'gpt-4-32k'
 
 
 class Gpt4_32K_0613(Gpt4_32K):    # pylint:disable=invalid-name
-  """GPT-4 32K 0613."""
+  """GPT-4 @20230613. 32K context window. Knowledge up to 9-2021."""
   model = 'gpt-4-32k-0613'
 
 
-class Gpt4_32K_0314(Gpt4_32K):   # pylint:disable=invalid-name
-  """GPT-4 32K 0314."""
-  model = 'gpt-4-32k-0314'
-
-
 class Gpt35(OpenAI):
   """GPT-3.5. 4K max tokens, trained up on data up to Sep, 2021."""
   model = 'text-davinci-003'
@@ -346,8 +346,13 @@ class Gpt35Turbo(Gpt35):
   model = 'gpt-3.5-turbo'
 
 
+class Gpt35Turbo_0125(Gpt35Turbo):   # pylint:disable=invalid-name
+  """GPT-3.5 Turbo @20240125. 16K context window. Knowledge up to 09/2021."""
+  model = 'gpt-3.5-turbo-0125'
+
+
 class Gpt35Turbo_1106(Gpt35Turbo):   # pylint:disable=invalid-name
-  """Gpt3.5 Turbo snapshot at 2023/11/06, with with 16K context window size."""
+  """Gpt3.5 Turbo @20231106. 16K context window. Knowledge up to 09/2021."""
   model = 'gpt-3.5-turbo-1106'
 
 
@@ -356,11 +361,6 @@ class Gpt35Turbo_0613(Gpt35Turbo):   # pylint:disable=invalid-name
   model = 'gpt-3.5-turbo-0613'
 
 
-class Gpt35Turbo_0301(Gpt35Turbo):   # pylint:disable=invalid-name
-  """Gpt3.5 Turbo snapshot at 2023/03/01, with 4K context window size."""
-  model = 'gpt-3.5-turbo-0301'
-
-
 class Gpt35Turbo16K(Gpt35Turbo):
   """Latest GPT-3.5 model with 16K context window size."""
   model = 'gpt-3.5-turbo-16k'
@@ -371,11 +371,6 @@ class Gpt35Turbo16K_0613(Gpt35Turbo):   # pylint:disable=invalid-name
   model = 'gpt-3.5-turbo-16k-0613'
 
 
-class Gpt35Turbo16K_0301(Gpt35Turbo):   # pylint:disable=invalid-name
-  """Gtp 3.5 Turbo 16K 0301."""
-  model = 'gpt-3.5-turbo-16k-0301'
-
-
 class Gpt3(OpenAI):
   """Most capable GPT-3 model (Davinci) 2K context window size.
 

langfun/core/structured/parsing.py

@@ -78,6 +78,7 @@ def parse(
     user_prompt: str | None = None,
     lm: lf.LanguageModel | None = None,
     examples: list[mapping.MappingExample] | None = None,
+    include_context: bool = False,
     autofix: int = 0,
     autofix_lm: lf.LanguageModel | None = None,
     protocol: schema_lib.SchemaProtocol = 'python',
@@ -131,6 +132,8 @@ def parse(
       `lf.context` context manager will be used.
     examples: An optional list of fewshot examples for helping parsing. If None,
       the default one-shot example will be added.
+    include_context: If True, include the request sent to LLM for obtaining the
+      response to pares. Otherwise include only the response.
     autofix: Number of attempts to auto fix the generated code. If 0, autofix is
       disabled. Auto-fix is not supported for 'json' protocol.
     autofix_lm: The language model to use for autofix. If not specified, the
@@ -153,7 +156,7 @@ def parse(
   message = lf.AIMessage.from_value(message)
   if message.source is None and user_prompt is not None:
     message.source = lf.UserMessage(user_prompt, tags=['lm-input'])
-  context = getattr(message.lm_input, 'text', None)
+  context = getattr(message.lm_input, 'text', None) if include_context else None
 
   if examples is None:
     examples = DEFAULT_PARSE_EXAMPLES
@@ -184,6 +187,7 @@ def call(
     lm: lf.LanguageModel | None = None,
     parsing_lm: lf.LanguageModel | None = None,
     parsing_examples: list[mapping.MappingExample] | None = None,
+    parsing_include_context: bool = False,
     autofix: int = 0,
     autofix_lm: lf.LanguageModel | None = None,
     response_postprocess: Callable[[str], str] | None = None,
@@ -225,6 +229,8 @@ def call(
       for prompting the LM will be used.
     parsing_examples: Examples for parsing the output. If None,
       `lf.structured.DEFAULT_PARSE_EXAMPLES` will be used.
+    parsing_include_context: If True, include the request sent to LLM for
+      obtaining the response to pares. Otherwise include only the response.
     autofix: Number of attempts to auto fix the generated code. If 0, autofix is
       disabled. Auto-fix is not supported for 'json' protocol.
     autofix_lm: The language model to use for autofix. If not specified, the
@@ -258,6 +264,7 @@ def call(
       schema,
       examples=parsing_examples,
       lm=parsing_lm or lm,
+      include_context=parsing_include_context,
       autofix=autofix,
       autofix_lm=autofix_lm or lm,
       protocol=protocol,

{langfun-0.0.2.dev20240212.dist-info → langfun-0.0.2.dev20240214.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.0.2.dev20240212
+Version: 0.0.2.dev20240214
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors

{langfun-0.0.2.dev20240212.dist-info → langfun-0.0.2.dev20240214.dist-info}/RECORD

@@ -41,19 +41,19 @@ langfun/core/coding/python/permissions.py,sha256=1QWGHvzL8MM0Ok_auQ9tURqZHtdOfJa
 langfun/core/coding/python/permissions_test.py,sha256=w5EDb8QxpxgJyZkojyzVWQvDfg366zn99-g__6TbPQ0,2699
 langfun/core/eval/__init__.py,sha256=iDA2OcJ3kR6ixZizXIY3N9LsjkaVrfTbSClTiSP8ekY,1291
 langfun/core/eval/base.py,sha256=tT_85jpLMCbXufKf64BMslid9FB1TNhe3AIkIpLULhA,53782
-langfun/core/eval/base_test.py,sha256=cep-f0pj2o7Gd5KNQV-IP0blJ-dzhlcvnt4tSbqXun4,21177
+langfun/core/eval/base_test.py,sha256=3AG-PN6yv0DMcHvpPas2nv2bJoY9JdAYSYwiPUnnolo,21177
 langfun/core/eval/matching.py,sha256=g2yuBb4FeOlAlB10hqdWvaIg4QVQlJbiViRDcD2Y8go,9567
 langfun/core/eval/matching_test.py,sha256=IfuMF_dEmy4VzK6tIldRzD2Nqlml7SSh4u-baFNcZrw,4912
 langfun/core/eval/scoring.py,sha256=mshqbV_WM0zcp15TSR32ACMBDymlsbf6YH06PPx1Tw0,6139
 langfun/core/eval/scoring_test.py,sha256=_L_B40VZkyI2_PJce-jVKYC4llrO4jGUR5j86Gu6AT0,4046
-langfun/core/llms/__init__.py,sha256=sSqKE9CvyjncLcM6PkjKwpgfFRWkMNIz5yuVNzOUkdE,2447
+langfun/core/llms/__init__.py,sha256=zTTSz46M52wqJtgxg2lGvTgrTB1wl9xMaQvOxfi00bs,2346
 langfun/core/llms/fake.py,sha256=JH790_WDtlohL0leJMqd1F6a1YuM9XV3rgxHBsoILRg,2309
 langfun/core/llms/fake_test.py,sha256=nP3420LKGwTJJG1YH3y5XgH6yKmbFmmbonBwvMu-ZYA,3368
 langfun/core/llms/gemini.py,sha256=p3d4Cl2uET-os1n_V3YNE6-6cYrZjndj7lxZIk2E8_4,5688
 langfun/core/llms/gemini_test.py,sha256=ybNNCn3JW3hYpMe0wT5ILGDrMPaYYU8PN2kSookM0jk,5433
 langfun/core/llms/llama_cpp.py,sha256=EIjJa1-Tg4_VaIxVR88oDWSWc_axc1r2KwSPpl4PSp0,2549
 langfun/core/llms/llama_cpp_test.py,sha256=ZxC6defGd_HX9SFRU9U4cJiQnBKundbOrchbXuC1Z2M,1683
-langfun/core/llms/openai.py,sha256=ufhRf-fV-AFq_-pn5sKrcr_xIU7V0VnhjK3JfBG8sF8,11617
+langfun/core/llms/openai.py,sha256=ufFz1Q2bHVukyAck0dZ5MYZ8IKcVkYzDjQn3YXugLCQ,11711
 langfun/core/llms/openai_test.py,sha256=yfw7A-4Zo9u1cIkAMk39evE-tO7z6isNYTXiSnJXDQw,7599
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=cFfYvOIUae842pncqCAsRvqXCk2AnAsRYVx0mcIoAeY,3338
@@ -72,7 +72,7 @@ langfun/core/structured/description.py,sha256=vDiW1g2VbvG8ucNjV7Pp3VYCeAnLcp6vLQ
 langfun/core/structured/description_test.py,sha256=UtZGjSFUaQ6130t1E5tcL7ODu0xIefkapb53TbnqsK8,7362
 langfun/core/structured/mapping.py,sha256=lGkjhmvVdhBGgJmc5KbfT2xQjC1MuU4OCcCfsAYJjaQ,10192
 langfun/core/structured/mapping_test.py,sha256=07DDCGbwytQHSMm7fCi5-Ly-JNgdV4ubHZq0wthX4A4,3338
-langfun/core/structured/parsing.py,sha256=V3i8-AuBI4zdpsi_f6H-mbQ3h0HPgCle2OnDQolWJnA,10244
+langfun/core/structured/parsing.py,sha256=XWo1UdG1A_c0v4OgQ1C_6nK0264_UAVrmJfFz4jHbRE,10690
 langfun/core/structured/parsing_test.py,sha256=2_Uf3LYNRON1-5ysEr75xiG_cAxR3ZiixSfvUQu6mOQ,20846
 langfun/core/structured/prompting.py,sha256=P8in3qHXCuwjfzLpplS5woQSHV5aheXgm2mFiqVQD4g,6384
 langfun/core/structured/prompting_test.py,sha256=5lPsxUzyHEjOh0D5V5GEYjFFJZvUrebLV1aCCJS4H3Y,18971
@@ -87,8 +87,8 @@ langfun/core/templates/demonstration.py,sha256=vCrgYubdZM5Umqcgp8NUVGXgr4P_c-fik
 langfun/core/templates/demonstration_test.py,sha256=SafcDQ0WgI7pw05EmPI2S4v1t3ABKzup8jReCljHeK4,2162
 langfun/core/templates/selfplay.py,sha256=yhgrJbiYwq47TgzThmHrDQTF4nDrTI09CWGhuQPNv-s,2273
 langfun/core/templates/selfplay_test.py,sha256=IB5rWbjK_9CTkqEo1BclQPzFAKcIiusJckH8J19HFgI,2096
-langfun-0.0.2.dev20240212.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.0.2.dev20240212.dist-info/METADATA,sha256=Zmh563QIlYEut5qSAqnJIY3cdNJwN4Ug0i5N184OdX8,3368
-langfun-0.0.2.dev20240212.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-langfun-0.0.2.dev20240212.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.0.2.dev20240212.dist-info/RECORD,,
+langfun-0.0.2.dev20240214.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.0.2.dev20240214.dist-info/METADATA,sha256=uxTKGG1k253gR9c6VOHJULhL357YLkWxtXpVV6HAoyw,3368
+langfun-0.0.2.dev20240214.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+langfun-0.0.2.dev20240214.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.0.2.dev20240214.dist-info/RECORD,,