langfun 0.0.2.dev20240513__py3-none-any.whl → 0.0.2.dev20240516__py3-none-any.whl

langfun/core/llms/__init__.py

@@ -35,25 +35,39 @@ from langfun.core.llms.google_genai import Palm2_IT
 # OpenAI models.
 from langfun.core.llms.openai import OpenAI
 
+from langfun.core.llms.openai import Gpt4o
+from langfun.core.llms.openai import Gpt4o_20240513
+
 from langfun.core.llms.openai import Gpt4Turbo
 from langfun.core.llms.openai import Gpt4Turbo_20240409
 from langfun.core.llms.openai import Gpt4TurboPreview
-from langfun.core.llms.openai import Gpt4TurboPreview_0125
-from langfun.core.llms.openai import Gpt4TurboPreview_1106
+from langfun.core.llms.openai import Gpt4TurboPreview_20240125
+from langfun.core.llms.openai import Gpt4TurboPreview_20231106
 from langfun.core.llms.openai import Gpt4VisionPreview
-from langfun.core.llms.openai import Gpt4VisionPreview_1106
+from langfun.core.llms.openai import Gpt4VisionPreview_20231106
 from langfun.core.llms.openai import Gpt4
-from langfun.core.llms.openai import Gpt4_0613
+from langfun.core.llms.openai import Gpt4_20230613
+
 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_20230613
 
 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_20240125
+from langfun.core.llms.openai import Gpt35Turbo_20231106
+from langfun.core.llms.openai import Gpt35Turbo_20230613
 from langfun.core.llms.openai import Gpt35Turbo16K
-from langfun.core.llms.openai import Gpt35Turbo16K_0613
-
+from langfun.core.llms.openai import Gpt35Turbo16K_20230613
+
+# For backward compatibility.
+Gpt4TurboPreview_0125 = Gpt4TurboPreview_20240125
+Gpt4TurboPreview_1106 = Gpt4TurboPreview_20231106
+Gpt4VisionPreview_1106 = Gpt4VisionPreview_20231106
+Gpt4_0613 = Gpt4_20230613
+Gpt4_32K_0613 = Gpt4_32K_20230613
+Gpt35Turbo_0125 = Gpt35Turbo_20240125
+Gpt35Turbo_1106 = Gpt35Turbo_20231106
+Gpt35Turbo_0613 = Gpt35Turbo_20230613
+Gpt35Turbo16K_0613 = Gpt35Turbo16K_20230613
 
 from langfun.core.llms.openai import Gpt35
 

langfun/core/llms/openai.py

@@ -33,15 +33,18 @@ _DEFAULT_RPM = 3000
 SUPPORTED_MODELS_AND_SETTINGS = {
     # Models from https://platform.openai.com/docs/models
     # RPM is from https://platform.openai.com/docs/guides/rate-limits
+    # GPT-4o models
+    'gpt-4o': pg.Dict(rpm=10000, tpm=5000000),
+    'gpt-4o-2024-05-13': pg.Dict(rpm=10000, tpm=5000000),
     # GPT-4-Turbo models
-    'gpt-4-turbo': pg.Dict(rpm=10000, tpm=1500000),
-    'gpt-4-turbo-2024-04-09': pg.Dict(rpm=10000, tpm=1500000),
-    'gpt-4-turbo-preview': pg.Dict(rpm=10000, tpm=1500000),
-    'gpt-4-0125-preview': pg.Dict(rpm=10000, tpm=1500000),
-    'gpt-4-1106-preview': pg.Dict(rpm=10000, tpm=1500000),
-    'gpt-4-vision-preview': pg.Dict(rpm=10000, tpm=1500000),
+    'gpt-4-turbo': pg.Dict(rpm=10000, tpm=2000000),
+    'gpt-4-turbo-2024-04-09': pg.Dict(rpm=10000, tpm=2000000),
+    'gpt-4-turbo-preview': pg.Dict(rpm=10000, tpm=2000000),
+    'gpt-4-0125-preview': pg.Dict(rpm=10000, tpm=2000000),
+    'gpt-4-1106-preview': pg.Dict(rpm=10000, tpm=2000000),
+    'gpt-4-vision-preview': pg.Dict(rpm=10000, tpm=2000000),
     'gpt-4-1106-vision-preview': pg.Dict(
-        rpm=10000, tpm=1500000
+        rpm=10000, tpm=2000000
     ),
     # GPT-4 models
     'gpt-4': pg.Dict(rpm=10000, tpm=300000),
@@ -309,12 +312,12 @@ class Gpt4TurboPreview(Gpt4):
   model = 'gpt-4-turbo-preview'
 
 
-class Gpt4TurboPreview_0125(Gpt4TurboPreview):  # pylint: disable=invalid-name
+class Gpt4TurboPreview_20240125(Gpt4TurboPreview):  # pylint: disable=invalid-name
   """GPT-4 Turbo Preview with 128k context window. Knowledge up to Dec. 2023."""
   model = 'gpt-4-0125-preview'
 
 
-class Gpt4TurboPreview_1106(Gpt4TurboPreview):  # pylint: disable=invalid-name
+class Gpt4TurboPreview_20231106(Gpt4TurboPreview):  # pylint: disable=invalid-name
   """GPT-4 Turbo Preview with 128k context window. Knowledge up to Apr. 2023."""
   model = 'gpt-4-1106-preview'
 
@@ -325,12 +328,12 @@ class Gpt4VisionPreview(Gpt4):
   multimodal = True
 
 
-class Gpt4VisionPreview_1106(Gpt4):  # pylint: disable=invalid-name
+class Gpt4VisionPreview_20231106(Gpt4):  # pylint: disable=invalid-name
   """GPT-4 Turbo vision preview. 128k context window. Knowledge to Apr. 2023."""
   model = 'gpt-4-1106-vision-preview'
 
 
-class Gpt4_0613(Gpt4):    # pylint:disable=invalid-name
+class Gpt4_20230613(Gpt4):    # pylint:disable=invalid-name
   """GPT-4 @20230613. 8K context window. Knowledge up to 9-2021."""
   model = 'gpt-4-0613'
 
@@ -340,11 +343,23 @@ class Gpt4_32K(Gpt4):       # pylint:disable=invalid-name
   model = 'gpt-4-32k'
 
 
-class Gpt4_32K_0613(Gpt4_32K):    # pylint:disable=invalid-name
+class Gpt4_32K_20230613(Gpt4_32K):    # pylint:disable=invalid-name
   """GPT-4 @20230613. 32K context window. Knowledge up to 9-2021."""
   model = 'gpt-4-32k-0613'
 
 
+class Gpt4o(OpenAI):
+  """GPT-4o."""
+  model = 'gpt-4o'
+  multimodal = True
+
+
+class Gpt4o_20240513(OpenAI):     # pylint:disable=invalid-name
+  """GPT-4o."""
+  model = 'gpt-4o-2024-05-13'
+  multimodal = True
+
+
 class Gpt35(OpenAI):
   """GPT-3.5. 4K max tokens, trained up on data up to Sep, 2021."""
   model = 'text-davinci-003'
@@ -355,17 +370,17 @@ class Gpt35Turbo(Gpt35):
   model = 'gpt-3.5-turbo'
 
 
-class Gpt35Turbo_0125(Gpt35Turbo):   # pylint:disable=invalid-name
+class Gpt35Turbo_20240125(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
+class Gpt35Turbo_20231106(Gpt35Turbo):   # pylint:disable=invalid-name
   """Gpt3.5 Turbo @20231106. 16K context window. Knowledge up to 09/2021."""
   model = 'gpt-3.5-turbo-1106'
 
 
-class Gpt35Turbo_0613(Gpt35Turbo):   # pylint:disable=invalid-name
+class Gpt35Turbo_20230613(Gpt35Turbo):   # pylint:disable=invalid-name
   """Gpt3.5 Turbo snapshot at 2023/06/13, with 4K context window size."""
   model = 'gpt-3.5-turbo-0613'
 
@@ -375,7 +390,7 @@ class Gpt35Turbo16K(Gpt35Turbo):
   model = 'gpt-3.5-turbo-16k'
 
 
-class Gpt35Turbo16K_0613(Gpt35Turbo):   # pylint:disable=invalid-name
+class Gpt35Turbo16K_20230613(Gpt35Turbo):   # pylint:disable=invalid-name
   """Gtp 3.5 Turbo 16K 0613."""
   model = 'gpt-3.5-turbo-16k-0613'
 

langfun/core/llms/vertexai.py

@@ -99,7 +99,7 @@ class VertexAI(lf.LanguageModel):
 
     credentials = self.credentials
     # Placeholder for Google-internal credentials.
-    from google.cloud.aiplatform import vertexai  # pylint: disable=g-import-not-at-top
+    import vertexai
     vertexai.init(project=project, location=location, credentials=credentials)
     return True
 
@@ -125,7 +125,7 @@ class VertexAI(lf.LanguageModel):
       self, options: lf.LMSamplingOptions
   ) -> Any:  # generative_models.GenerationConfig
     """Creates generation config from langfun sampling options."""
-    from google.cloud.aiplatform.vertexai.preview import generative_models  # pylint: disable=g-import-not-at-top
+    from vertexai import generative_models
     return generative_models.GenerationConfig(
         temperature=options.temperature,
         top_p=options.top_p,
@@ -138,7 +138,7 @@ class VertexAI(lf.LanguageModel):
       self, prompt: lf.Message
   ) -> list[str | Any]:
     """Gets generation input from langfun message."""
-    from google.cloud.aiplatform.vertexai.preview import generative_models  # pylint: disable=g-import-not-at-top
+    from vertexai import generative_models
     chunks = []
     for lf_chunk in prompt.chunk():
       if isinstance(lf_chunk, str):
@@ -239,7 +239,7 @@ class _ModelHub:
     """Gets a generative model by model id."""
     model = self._generative_model_cache.get(model_id, None)
     if model is None:
-      from google.cloud.aiplatform.vertexai.preview import generative_models  # pylint: disable=g-import-not-at-top
+      from vertexai import generative_models
       model = generative_models.GenerativeModel(model_id)
       self._generative_model_cache[model_id] = model
     return model
@@ -250,7 +250,7 @@ class _ModelHub:
     """Gets a text generation model by model id."""
     model = self._text_generation_model_cache.get(model_id, None)
     if model is None:
-      from google.cloud.aiplatform.vertexai import language_models  # pylint: disable=g-import-not-at-top
+      from vertexai import language_models
       model = language_models.TextGenerationModel.from_pretrained(model_id)
       self._text_generation_model_cache[model_id] = model
     return model

langfun/core/llms/vertexai_test.py

@@ -17,7 +17,7 @@ import os
 import unittest
 from unittest import mock
 
-from google.cloud.aiplatform.vertexai.preview import generative_models
+from vertexai import generative_models
 import langfun.core as lf
 from langfun.core import modalities as lf_modalities
 from langfun.core.llms import vertexai
@@ -39,7 +39,6 @@ example_image = (
 def mock_generate_content(content, generation_config, **kwargs):
   del kwargs
   c = pg.Dict(generation_config.to_dict())
-  print('zzz', c)
   return generative_models.GenerationResponse.from_dict({
       'candidates': [
           {
@@ -111,7 +110,7 @@ class VertexAITest(unittest.TestCase):
 
   def test_model_hub(self):
     with mock.patch(
-        'google.cloud.aiplatform.vertexai.preview.generative_models.'
+        'vertexai.generative_models.'
         'GenerativeModel.__init__'
     ) as mock_model_init:
       mock_model_init.side_effect = lambda *args, **kwargs: None
@@ -125,7 +124,7 @@ class VertexAITest(unittest.TestCase):
       )
 
     with mock.patch(
-        'google.cloud.aiplatform.vertexai.language_models.'
+        'vertexai.language_models.'
         'TextGenerationModel.from_pretrained'
     ) as mock_model_init:
 
@@ -163,13 +162,13 @@ class VertexAITest(unittest.TestCase):
 
   def test_call_generative_model(self):
     with mock.patch(
-        'google.cloud.aiplatform.vertexai.preview.generative_models.'
+        'vertexai.generative_models.'
         'GenerativeModel.__init__'
     ) as mock_model_init:
       mock_model_init.side_effect = lambda *args, **kwargs: None
 
       with mock.patch(
-          'google.cloud.aiplatform.vertexai.preview.generative_models.'
+          'vertexai.generative_models.'
           'GenerativeModel.generate_content'
       ) as mock_generate:
         mock_generate.side_effect = mock_generate_content
@@ -192,7 +191,7 @@ class VertexAITest(unittest.TestCase):
 
   def test_call_text_generation_model(self):
     with mock.patch(
-        'google.cloud.aiplatform.vertexai.language_models.'
+        'vertexai.language_models.'
         'TextGenerationModel.from_pretrained'
     ) as mock_model_init:
 

{langfun-0.0.2.dev20240513.dist-info → langfun-0.0.2.dev20240516.dist-info}/METADATA

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

{langfun-0.0.2.dev20240513.dist-info → langfun-0.0.2.dev20240516.dist-info}/RECORD

@@ -48,7 +48,7 @@ langfun/core/eval/patching.py,sha256=R0s2eAd1m97exQt06dmUL0V_MBG0W2Hxg7fhNB7cXW0
 langfun/core/eval/patching_test.py,sha256=8kCd54Egjju22FMgtJuxEsrXkW8ifs-UUBHtrCG1L6w,4775
 langfun/core/eval/scoring.py,sha256=1J7IATo-8FXUR0SBqk9icztHiM0lWkBFcWUo-vUURgQ,6376
 langfun/core/eval/scoring_test.py,sha256=O8olHbrUEg60gMxwOkWzKBJZpZoUlmVnBANX5Se2SXM,4546
-langfun/core/llms/__init__.py,sha256=C-NrcgFqf3_EP_dN8oADdckQ-rfPKZhsjeSf86kJpLk,3642
+langfun/core/llms/__init__.py,sha256=h_kam-0fjWISAQ90KZ_ydBhwADVCzrhLPXmAki3GfU0,4175
 langfun/core/llms/anthropic.py,sha256=7W9YdPN3SlAFhAIQlihMkrpo7tTY_4NvD0KIlCrqcsk,8505
 langfun/core/llms/anthropic_test.py,sha256=TMM30myyEhwF99Le4RvJEXOn8RYl0q1FRkt9Q9nl1jk,5540
 langfun/core/llms/fake.py,sha256=_smsN_CsYbeWrtjpegEPwdAPV9mwaIuH_4oZGeXQwQI,2896
@@ -59,10 +59,10 @@ langfun/core/llms/groq.py,sha256=NaGItVL_pkOpqPpI4bPGU27xLFRoaeizZ49v2s-4ERs,784
 langfun/core/llms/groq_test.py,sha256=M6GtlrsOvDun_j-sR8cPh4W_moHWZNSTiThu3kuwbbc,5281
 langfun/core/llms/llama_cpp.py,sha256=Y_KkMUf3Xfac49koMUtUslKl3h-HWp3-ntq7Jaa3bdo,2385
 langfun/core/llms/llama_cpp_test.py,sha256=ZxC6defGd_HX9SFRU9U4cJiQnBKundbOrchbXuC1Z2M,1683
-langfun/core/llms/openai.py,sha256=u2lqYcKFjFxLfWYD0KLT3YThqcoo66rWs3n0bcuSYBs,13286
+langfun/core/llms/openai.py,sha256=IN46gIqfY6aEEfxCPNmyH1hrep3oWBhJDwVFilfqNkM,13657
 langfun/core/llms/openai_test.py,sha256=asSA1sVy_7hnXioD_2HTxtSDpVTKBUO_EjZuyHpwbn0,14854
-langfun/core/llms/vertexai.py,sha256=O2Lp-F4KJzvQSCjPV--sa6nMS9-GsLj2eiqA-1qGhWQ,9661
-langfun/core/llms/vertexai_test.py,sha256=LBk4luL_N13ZejZebBzQ3tkfjxFhk7uBS4JjEpojJAo,7836
+langfun/core/llms/vertexai.py,sha256=DBH7WzrTL5oIyKWoZTuIR8B_gtgRi7hlS9GteSY0r4E,9317
+langfun/core/llms/vertexai_test.py,sha256=1u813e2esr8HVbOpLTOhIgzaX-GqCRTBouJ1doRn80Q,7642
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=cFfYvOIUae842pncqCAsRvqXCk2AnAsRYVx0mcIoAeY,3338
 langfun/core/llms/cache/in_memory.py,sha256=YfFyJEhLs73cUiB0ZfhMxYpdE8Iuxxw-dvMFwGHTSHw,4742
@@ -105,8 +105,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=DYVrkk7uNKCqJGEHH31HssU2BPuMItU1vJLzfcXIlYg,2156
-langfun-0.0.2.dev20240513.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.0.2.dev20240513.dist-info/METADATA,sha256=rjYqB2Epk9KuZYcGS-MbSrGnRFo4VDaHwafhCFGnah0,3452
-langfun-0.0.2.dev20240513.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-langfun-0.0.2.dev20240513.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.0.2.dev20240513.dist-info/RECORD,,
+langfun-0.0.2.dev20240516.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.0.2.dev20240516.dist-info/METADATA,sha256=48E9vW6pjNNjnhd1Zx5CTDkzo621qgKOfkhf_-qVVLc,3452
+langfun-0.0.2.dev20240516.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+langfun-0.0.2.dev20240516.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.0.2.dev20240516.dist-info/RECORD,,