langfun 0.1.2.dev202506190804__py3-none-any.whl → 0.1.2.dev202506210804__py3-none-any.whl

langfun/core/llms/__init__.py

@@ -40,6 +40,8 @@ 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 Gemini25Pro
+from langfun.core.llms.google_genai import Gemini25Flash
 from langfun.core.llms.google_genai import Gemini25ProPreview_20250605
 from langfun.core.llms.google_genai import Gemini25FlashPreview_20250520
 from langfun.core.llms.google_genai import Gemini25ProPreview_20250506
@@ -56,7 +58,6 @@ from langfun.core.llms.google_genai import Gemini15Flash_002
 from langfun.core.llms.google_genai import Gemini15Flash_001
 from langfun.core.llms.google_genai import Gemini15Flash8B
 from langfun.core.llms.google_genai import Gemini15Flash8B_001
-
 from langfun.core.llms.google_genai import Gemini2ProExp_20250205
 from langfun.core.llms.google_genai import Gemini2FlashThinkingExp_20250121
 from langfun.core.llms.google_genai import GeminiExp_20241206
@@ -83,6 +84,8 @@ from langfun.core.llms.vertexai import VertexAIGemini25FlashPreview_20250417
 from langfun.core.llms.vertexai import VertexAIGemini25ProPreview_20250506
 from langfun.core.llms.vertexai import VertexAIGemini25FlashPreview_20250520
 from langfun.core.llms.vertexai import VertexAIGemini25ProPreview_20250605
+from langfun.core.llms.vertexai import VertexAIGemini25Pro
+from langfun.core.llms.vertexai import VertexAIGemini25Flash
 
 # For backward compatibility.
 GeminiPro1_5 = Gemini15Pro

langfun/core/llms/gemini.py

@@ -151,6 +151,52 @@ SUPPORTED_MODELS = [
     #
     # Production models.
     #
+    # Gemini 2.5 Flash
+    GeminiModelInfo(
+        model_id='gemini-2.5-flash',
+        in_service=True,
+        provider=pg.oneof(['Google GenAI', 'VertexAI']),
+        model_type='instruction-tuned',
+        description='Gemini 2.5 Flash GA.',
+        release_date=datetime.datetime(2025, 6, 17),
+        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=0.3,
+            cost_per_1m_input_tokens=0.3,
+            cost_per_1m_output_tokens=2.5,
+        ),
+        rate_limits=lf.ModelInfo.RateLimits(
+            max_requests_per_minute=2000,
+            max_tokens_per_minute=4_000_000,
+        ),
+    ),
+    # Gemini 2.5 Pro
+    GeminiModelInfo(
+        model_id='gemini-2.5-pro',
+        in_service=True,
+        provider=pg.oneof(['Google GenAI', 'VertexAI']),
+        model_type='instruction-tuned',
+        description='Gemini 2.5 Pro GA.',
+        release_date=datetime.datetime(2025, 6, 17),
+        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=2000,
+            max_tokens_per_minute=4_000_000,
+        )
+    ),
     # Gemini 2.5 Pro 0605
     GeminiModelInfo(
         model_id='gemini-2.5-pro-preview-06-05',
@@ -718,7 +764,7 @@ class Gemini(rest.REST):
       )
     if options.max_thinking_tokens is not None:
       config['thinkingConfig'] = {
-          'includeThoughts': True,
+          'includeThoughts': options.max_thinking_tokens > 0,
           'thinkingBudget': options.max_thinking_tokens,
       }
 

langfun/core/llms/google_genai.py

@@ -86,6 +86,18 @@ class GenAI(gemini.Gemini):
 #
 
 
+class Gemini25Pro(GenAI):
+  """Gemini 2.5 Pro GA model."""
+
+  model = 'gemini-2.5-pro'
+
+
+class Gemini25Flash(GenAI):
+  """Gemini 2.5 Flash GA model."""
+
+  model = 'gemini-2.5-flash'
+
+
 class Gemini2ProExp_20250205(GenAI):
   """Gemini 2.0 Pro experimental model launched on 02/05/2025."""
   model = 'gemini-2.0-pro-exp-02-05'

langfun/core/llms/vertexai.py

@@ -177,6 +177,20 @@ class VertexAIGemini(VertexAI, gemini.Gemini):
 #
 # Production models.
 #
+class VertexAIGemini25Pro(VertexAIGemini):  # pylint: disable=invalid-name
+  """Gemini 2.5 Pro GA model launched on 06/17/2025."""
+
+  model = 'gemini-2.5-pro'
+  location = 'global'
+
+
+class VertexAIGemini25Flash(VertexAIGemini):  # pylint: disable=invalid-name
+  """Gemini 2.5 Flash GA model launched on 06/17/2025."""
+
+  model = 'gemini-2.5-flash'
+  location = 'global'
+
+
 class VertexAIGemini25ProPreview_20250605(VertexAIGemini):  # pylint: disable=invalid-name
   """Gemini 2.5 Pro model launched on 06/05/2025."""
   model = 'gemini-2.5-pro-preview-06-05'

{langfun-0.1.2.dev202506190804.dist-info → langfun-0.1.2.dev202506210804.dist-info}/METADATA

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

{langfun-0.1.2.dev202506190804.dist-info → langfun-0.1.2.dev202506210804.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=iqbH4jMtnNMhfuv1eHaxJmk1Vvsrz-sAJJFP8U44-tA,16758
 langfun/core/eval/v2/runners_test.py,sha256=DO3xV0sBNB6n65j41xx2i7gqUCJcPF37DFZLEjrmISg,11987
-langfun/core/llms/__init__.py,sha256=3Lw6yyUej2Y5GigIQRhIW1cij-vCxm09TbVkdcdDUHQ,9290
+langfun/core/llms/__init__.py,sha256=CtxUdXohQ8AQk1DqBT6MBy2zdAoPSggNo00SYrj9-AY,9521
 langfun/core/llms/anthropic.py,sha256=YcQ2VG8iOfXtry_tTpAukmiwXa2hK_9LkpkmXk41Nm0,26226
 langfun/core/llms/anthropic_test.py,sha256=qA9vByp_cwwXNlXzcwHpPWFnO9lfFo8NKfDi5nBNqgI,9052
 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=qVcmPnJVAdNPAXnqL-slgBlLnNMRgR3v7ZIRW8yEy_I,27350
+langfun/core/llms/gemini.py,sha256=umrEJGnZb_U4CCbFHicaoVsBuEdZGg7QGNkr-mSJidw,29061
 langfun/core/llms/gemini_test.py,sha256=y1s0W65SrdepbZxzgIeoTB2MI7sXnfBDf1NsGn57LbM,7617
-langfun/core/llms/google_genai.py,sha256=q5Mudw3i9vVbhn7BRbLyHhr5Tnmb9dX1slNxWuZpKl8,5470
+langfun/core/llms/google_genai.py,sha256=NO9SX9X3AYp-sNvjt8e90Hjy_ZB4O9l-Y4HhR5X6Zus,5654
 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=KwOMA7tsmOxFBjezltkBDSU77AvOQ
 langfun/core/llms/openai_test.py,sha256=gwuO6aoa296iM2welWV9ua4KF8gEVGsEPakgbtkWkFQ,2687
 langfun/core/llms/rest.py,sha256=mY9n0sMAtf0RsvTBgbYHDxGzGD9WLIkocALEHXAL5r4,4583
 langfun/core/llms/rest_test.py,sha256=_zM7nV8DEVyoXNiQOnuwJ917mWjki0614H88rNmDboE,5020
-langfun/core/llms/vertexai.py,sha256=NDcd_xr8JcnjRlSItCUyHh6em7wMOaMXbbwpCM0TZGY,19545
+langfun/core/llms/vertexai.py,sha256=G-4Hofs5e1-XNrRP0SMGGML9yIHGy_TLTUEV3tLFP3g,19917
 langfun/core/llms/vertexai_test.py,sha256=_e-acnNBAf9C3WO6i1b2J_mhRzdDdYQTorD9hIVZKOg,5034
 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.dev202506190804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202506190804.dist-info/METADATA,sha256=HzCzwEMBEUG3SnJtQ3z5iYJlztEgF18qg8VZA7Q9poc,8178
-langfun-0.1.2.dev202506190804.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-langfun-0.1.2.dev202506190804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202506190804.dist-info/RECORD,,
+langfun-0.1.2.dev202506210804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202506210804.dist-info/METADATA,sha256=i25ROs-8AoUyciIlqt5Bt2i8XGKXht3okvRFTzG_vZ4,8178
+langfun-0.1.2.dev202506210804.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+langfun-0.1.2.dev202506210804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202506210804.dist-info/RECORD,,