langfun 0.1.2.dev202506200804__tar.gz → 0.1.2.dev202506210804__tar.gz

{langfun-0.1.2.dev202506200804 → langfun-0.1.2.dev202506210804}/PKG-INFO

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

{langfun-0.1.2.dev202506200804 → langfun-0.1.2.dev202506210804}/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-0.1.2.dev202506200804 → langfun-0.1.2.dev202506210804}/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-0.1.2.dev202506200804 → langfun-0.1.2.dev202506210804}/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-0.1.2.dev202506200804 → langfun-0.1.2.dev202506210804}/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.dev202506200804 → langfun-0.1.2.dev202506210804}/langfun.egg-info/PKG-INFO

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