langfun 0.1.2.dev202504060803__py3-none-any.whl → 0.1.2.dev202504080804__py3-none-any.whl

langfun/core/llms/__init__.py

@@ -40,6 +40,7 @@ from langfun.core.llms.azure_openai import AzureOpenAI
 
 # Gemini models.
 from langfun.core.llms.google_genai import GenAI
+from langfun.core.llms.google_genai import Gemini25ProPreview_20250325
 from langfun.core.llms.google_genai import Gemini2Flash
 from langfun.core.llms.google_genai import Gemini2Flash_001
 from langfun.core.llms.google_genai import Gemini2FlashLitePreview_20250205
@@ -72,6 +73,7 @@ from langfun.core.llms.vertexai import VertexAIGemini15Flash8B_001
 from langfun.core.llms.vertexai import VertexAIGemini2ProExp_20250205
 from langfun.core.llms.vertexai import VertexAIGemini2FlashThinkingExp_20250121
 from langfun.core.llms.vertexai import VertexAIGeminiExp_20241206
+from langfun.core.llms.vertexai import VertexAIGemini25ProExp_20250325
 
 # For backward compatibility.
 GeminiPro1_5 = Gemini15Pro

langfun/core/llms/gemini.py

@@ -148,20 +148,61 @@ class GeminiModelInfo(lf.ModelInfo):
 
 
 SUPPORTED_MODELS = [
-
     #
     # Production models.
     #
-
+    # Gemini 2.5 Pro
+    GeminiModelInfo(
+        model_id='gemini-2.5-pro-preview-03-25',
+        in_service=True,
+        provider=pg.oneof(['Google GenAI']),
+        model_type='instruction-tuned',
+        description='Gemini 2.5 Pro.',
+        release_date=datetime.datetime(2025, 3, 25),
+        input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
+        context_length=lf.ModelInfo.ContextLength(
+            max_input_tokens=1_048_576,
+            max_output_tokens=65_536,
+        ),
+        pricing=GeminiModelInfo.Pricing(
+            cost_per_1m_cached_input_tokens=1.25,
+            cost_per_1m_input_tokens=1.25,
+            cost_per_1m_output_tokens=10.0,
+        ),
+        rate_limits=lf.ModelInfo.RateLimits(
+            max_requests_per_minute=20,
+            max_tokens_per_minute=1_000_000,
+        ),
+    ),
+    GeminiModelInfo(
+        model_id='gemini-2.5-pro-exp-03-25',
+        in_service=True,
+        provider=pg.oneof(['VertexAI']),
+        model_type='instruction-tuned',
+        description='Gemini 2.5 Pro.',
+        release_date=datetime.datetime(2025, 3, 25),
+        input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
+        context_length=lf.ModelInfo.ContextLength(
+            max_input_tokens=1_048_576,
+            max_output_tokens=65_536,
+        ),
+        pricing=GeminiModelInfo.Pricing(
+            cost_per_1m_cached_input_tokens=1.25,
+            cost_per_1m_input_tokens=1.25,
+            cost_per_1m_output_tokens=10.0,
+        ),
+        rate_limits=lf.ModelInfo.RateLimits(
+            max_requests_per_minute=20,
+            max_tokens_per_minute=1_000_000,
+        ),
+    ),
     # Gemini 2.0 Flash.
     GeminiModelInfo(
         model_id='gemini-2.0-flash',
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 2.0 Flash model.'
-        ),
+        description='Gemini 2.0 Flash model.',
         release_date=datetime.datetime(2025, 2, 5),
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
@@ -184,9 +225,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 2.0 Flash model (version 001).'
-        ),
+        description='Gemini 2.0 Flash model (version 001).',
         release_date=datetime.datetime(2025, 2, 5),
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
@@ -210,9 +249,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 2.0 Lite preview model.'
-        ),
+        description='Gemini 2.0 Lite preview model.',
         release_date=datetime.datetime(2025, 2, 5),
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
@@ -237,9 +274,7 @@ SUPPORTED_MODELS = [
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         in_service=True,
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Flash model (latest stable).'
-        ),
+        description='Gemini 1.5 Flash model (latest stable).',
         release_date=datetime.datetime(2024, 9, 30),
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
@@ -265,9 +300,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Flash model (version 001).'
-        ),
+        description='Gemini 1.5 Flash model (version 001).',
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
             max_input_tokens=1_048_576,
@@ -292,9 +325,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Flash model (version 002).'
-        ),
+        description='Gemini 1.5 Flash model (version 002).',
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
             max_input_tokens=1_048_576,
@@ -320,9 +351,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider='Google GenAI',
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Flash 8B model (latest stable).'
-        ),
+        description='Gemini 1.5 Flash 8B model (latest stable).',
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
             max_input_tokens=1_048_576,
@@ -347,9 +376,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider='Google GenAI',
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Flash 8B model (version 001).'
-        ),
+        description='Gemini 1.5 Flash 8B model (version 001).',
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
             max_input_tokens=1_048_576,
@@ -376,9 +403,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Pro model (latest stable).'
-        ),
+        description='Gemini 1.5 Pro model (latest stable).',
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
             max_input_tokens=2_097_152,
@@ -403,9 +428,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Pro model (version 001).'
-        ),
+        description='Gemini 1.5 Pro model (version 001).',
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
             max_input_tokens=2_097_152,
@@ -430,9 +453,7 @@ SUPPORTED_MODELS = [
         in_service=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 1.5 Pro model (version 002).'
-        ),
+        description='Gemini 1.5 Pro model (version 002).',
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
             max_input_tokens=2_097_152,
@@ -452,20 +473,16 @@ SUPPORTED_MODELS = [
             max_tokens_per_minute=4_000_000,
         ),
     ),
-
     #
     # Experimental models.
     #
-
     GeminiModelInfo(
         model_id='gemini-2.0-pro-exp-02-05',
         in_service=True,
         experimental=True,
         provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
-        description=(
-            'Gemini 2.0 Pro experimental model (02/05/2025).'
-        ),
+        description='Gemini 2.0 Pro experimental model (02/05/2025).',
         release_date=datetime.datetime(2025, 2, 5),
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
@@ -495,9 +512,7 @@ SUPPORTED_MODELS = [
         experimental=True,
         provider='Google GenAI',
         model_type='instruction-tuned',
-        description=(
-            'Gemini year 1 experimental model (12/06/2024)'
-        ),
+        description='Gemini year 1 experimental model (12/06/2024)',
         release_date=datetime.datetime(2025, 1, 21),
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,
         context_length=lf.ModelInfo.ContextLength(
@@ -511,9 +526,7 @@ SUPPORTED_MODELS = [
         experimental=True,
         provider='Google GenAI',
         model_type='instruction-tuned',
-        description=(
-            'Gemini experimental model on learning science principles.'
-        ),
+        description='Gemini experimental model on learning science principles.',
         url='https://ai.google.dev/gemini-api/docs/learnlm',
         release_date=datetime.datetime(2024, 11, 19),
         input_modalities=GeminiModelInfo.ALL_SUPPORTED_INPUT_TYPES,

langfun/core/llms/google_genai.py

@@ -108,6 +108,11 @@ class GeminiExp_20241206(GenAI):
 #
 
 
+class Gemini25ProPreview_20250325(GenAI):
+  """Gemini 2.5 Pro model launched on 03/25/2025."""
+  model = 'gemini-2.5-pro-preview-03-25'
+
+
 class Gemini2Flash(GenAI):
   """Gemini 2.0 Flash model (latest stable)."""
   model = 'gemini-2.0-flash'

langfun/core/llms/vertexai.py

@@ -166,6 +166,11 @@ class VertexAIGemini(VertexAI, gemini.Gemini):
 #
 
 
+class VertexAIGemini25ProExp_20250325(VertexAIGemini):  # pylint: disable=invalid-name
+  """Gemini 2.5 Pro model launched on 03/25/2025."""
+  model = 'gemini-2.5-pro-exp-03-25'
+
+
 class VertexAIGemini2Flash(VertexAIGemini):  # pylint: disable=invalid-name
   """Gemini Flash 2.0 model (latest stable)."""
   model = 'gemini-2.0-flash'

{langfun-0.1.2.dev202504060803.dist-info → langfun-0.1.2.dev202504080804.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfun
-Version: 0.1.2.dev202504060803
+Version: 0.1.2.dev202504080804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors

{langfun-0.1.2.dev202504060803.dist-info → langfun-0.1.2.dev202504080804.dist-info}/RECORD

@@ -81,7 +81,7 @@ langfun/core/eval/v2/reporting.py,sha256=yUIPCAMnp7InIzpv1DDWrcLO-75iiOUTpscj7sm
 langfun/core/eval/v2/reporting_test.py,sha256=hcPJJaMtPulqERvHYTpId83WXdqDKnnexmULtK7WKwk,5686
 langfun/core/eval/v2/runners.py,sha256=De4d5QQ-Tpw0nPDODQexDPy0ti-FEgzHBvfH78zqdtg,15945
 langfun/core/eval/v2/runners_test.py,sha256=A37fKK2MvAVTiShsg_laluJzJ9AuAQn52k7HPbfD0Ks,11666
-langfun/core/llms/__init__.py,sha256=F2nqEv9Cc-1QALrlPnIEp-TZiSVTi6U8WWb1YwDt1w0,8038
+langfun/core/llms/__init__.py,sha256=joLhl55EU2BURQGomT6HYYDdkm1hBmgt7SuUfpsyTkw,8180
 langfun/core/llms/anthropic.py,sha256=K8la8U7g26ibvk_Cy9U7Z8or-kaqQIpaEJ4An9FrXPQ,21690
 langfun/core/llms/anthropic_test.py,sha256=SSK7OTx3gMYE1NMAi_PqQqeNsCkZAcVJvl_OCEOhyzk,7145
 langfun/core/llms/azure_openai.py,sha256=-KkSLaR54MlsIqz_XIwv0TnsBnvNTAxnjA2Q2O2u5KM,2733
@@ -92,9 +92,9 @@ langfun/core/llms/deepseek.py,sha256=jvTxdXPr-vH6HNakn_Ootx1heDg8Fen2FUkUW36bpCs
 langfun/core/llms/deepseek_test.py,sha256=DvROWPlDuow5E1lfoSkhyGt_ELA19JoQoDsTnRgDtTg,1847
 langfun/core/llms/fake.py,sha256=xmgCkk9y0I4x0IT32SZ9_OT27aLadXH8PRiYNo5VTd4,3265
 langfun/core/llms/fake_test.py,sha256=2h13qkwEz_JR0mtUDPxdAhQo7MueXaFSwsD2DIRDW9g,7653
-langfun/core/llms/gemini.py,sha256=xBZEIPTKzWNscomrGhBVBxfEMuMSz48tl2FzCgtaWvU,21334
+langfun/core/llms/gemini.py,sha256=W2W1pqa4-XkrktGDosRV_jJjAukAvR9_jhwfEGN12VM,22641
 langfun/core/llms/gemini_test.py,sha256=WVdE1_X1cuicUEYd9YnIlV-dO_k_MMIHecBhWQtBNWE,5526
-langfun/core/llms/google_genai.py,sha256=mzUdWAShRzz2k_foUo0eIdNOyHs_xjEtbewqYyuD0k0,4768
+langfun/core/llms/google_genai.py,sha256=IANJlhTEvBNAgmK8Rsc_6xguQmwgE76GayESqae4NMk,4906
 langfun/core/llms/google_genai_test.py,sha256=NKNtpebArQ9ZR7Qsnhd2prFIpMjleojy6o6VMXkJ1zY,1502
 langfun/core/llms/groq.py,sha256=S9V10kFo3cgX89qPgt_umq-SpRnxEDLTt_hJmpERfbo,12066
 langfun/core/llms/groq_test.py,sha256=P4EgexCqsh4K2x11w0UL_vz-YYNaPdQU0WsDAdnTRQ8,2045
@@ -106,7 +106,7 @@ langfun/core/llms/openai_compatible_test.py,sha256=I5WWL3lRo-WXnSoUKLkIEjXfwjoiH
 langfun/core/llms/openai_test.py,sha256=gwuO6aoa296iM2welWV9ua4KF8gEVGsEPakgbtkWkFQ,2687
 langfun/core/llms/rest.py,sha256=ucMKHXlmg6pYSIMhQSktLmTSGMSIiqO8fp1r_GiEhaU,4333
 langfun/core/llms/rest_test.py,sha256=_zM7nV8DEVyoXNiQOnuwJ917mWjki0614H88rNmDboE,5020
-langfun/core/llms/vertexai.py,sha256=Cf_QeFybIF-dALxdtwy7-ElepSv1ryd6im5-NijwUGE,17646
+langfun/core/llms/vertexai.py,sha256=lzPkv9I71vw4wVWA8vCqWJS74VRi65Gkw_egVgidpXM,17825
 langfun/core/llms/vertexai_test.py,sha256=dOprP_uLNmXHYxMoX_hMPMsjKR-e_B5nKHjhlMCQoOQ,4252
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
@@ -156,8 +156,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=Ot__1P1M8oJfoTp-M9-PQ6HUXqZKyMwvZ5f7yQ3yfyM,2326
-langfun-0.1.2.dev202504060803.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202504060803.dist-info/METADATA,sha256=4-hkMRxJ8W5j4bAHBFL5wkqa0RuRpIET8DVeqgzbYtU,7692
-langfun-0.1.2.dev202504060803.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-langfun-0.1.2.dev202504060803.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202504060803.dist-info/RECORD,,
+langfun-0.1.2.dev202504080804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202504080804.dist-info/METADATA,sha256=Qq4joLhwX1FKwWkLzatcVGDNwYaGLLyyn113vyKNa1I,7692
+langfun-0.1.2.dev202504080804.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+langfun-0.1.2.dev202504080804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202504080804.dist-info/RECORD,,