langfun 0.1.2.dev202502050804__py3-none-any.whl → 0.1.2.dev202502060804__py3-none-any.whl

langfun/core/__init__.py

@@ -121,8 +121,6 @@ from langfun.core import console
 # Utility for event logging.
 from langfun.core import logging
 
-# Import internal modules.
-
 # pylint: enable=g-import-not-at-top
 # pylint: enable=g-importing-member
 # pylint: enable=g-bad-import-order

langfun/core/llms/__init__.py

@@ -39,6 +39,9 @@ from langfun.core.llms.groq import Groq
 
 # Gemini models.
 from langfun.core.llms.google_genai import GenAI
+from langfun.core.llms.google_genai import Gemini2Flash
+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 GeminiFlash2_0ThinkingExp_20241219
 from langfun.core.llms.google_genai import GeminiFlash2_0Exp
 from langfun.core.llms.google_genai import GeminiExp_20241206
@@ -52,6 +55,9 @@ from langfun.core.llms.google_genai import GeminiFlash1_5_001
 from langfun.core.llms.google_genai import GeminiPro1
 
 from langfun.core.llms.vertexai import VertexAIGemini
+from langfun.core.llms.vertexai import VertexAIGemini2Flash
+from langfun.core.llms.vertexai import VertexAIGemini2ProExp_20250205
+from langfun.core.llms.vertexai import VertexAIGemini2FlashThinkingExp_20250121
 from langfun.core.llms.vertexai import VertexAIGeminiFlash2_0ThinkingExp_20241219
 from langfun.core.llms.vertexai import VertexAIGeminiFlash2_0Exp
 from langfun.core.llms.vertexai import VertexAIGeminiExp_20241206

langfun/core/llms/gemini.py

@@ -85,6 +85,70 @@ SUPPORTED_MODELS_AND_SETTINGS = {
     # NOTE: Please update google_genai.py, vertexai.py, __init__.py when
     # adding new models.
     # !!! PLEASE KEEP MODELS SORTED BY RELEASE DATE !!!
+    'gemini-2.0-flash-001': pg.Dict(
+        latest_update='2025-02-05',
+        experimental=True,
+        in_service=True,
+        supported_modalities=ALL_MODALITIES,
+        rpm_free=2000,
+        tpm_free=40_000_000,
+        rpm_paid=0,
+        tpm_paid=0,
+        cost_per_1m_input_tokens_up_to_128k=0,
+        cost_per_1m_output_tokens_up_to_128k=0,
+        cost_per_1m_cached_tokens_up_to_128k=0,
+        cost_per_1m_input_tokens_longer_than_128k=0,
+        cost_per_1m_output_tokens_longer_than_128k=0,
+        cost_per_1m_cached_tokens_longer_than_128k=0,
+    ),
+    'gemini-2.0-flash': pg.Dict(
+        latest_update='2025-02-05',
+        experimental=True,
+        in_service=True,
+        supported_modalities=ALL_MODALITIES,
+        rpm_free=2000,
+        tpm_free=40_000_000,
+        rpm_paid=0,
+        tpm_paid=0,
+        cost_per_1m_input_tokens_up_to_128k=0,
+        cost_per_1m_output_tokens_up_to_128k=0,
+        cost_per_1m_cached_tokens_up_to_128k=0,
+        cost_per_1m_input_tokens_longer_than_128k=0,
+        cost_per_1m_output_tokens_longer_than_128k=0,
+        cost_per_1m_cached_tokens_longer_than_128k=0,
+    ),
+    'gemini-2.0-pro-exp-02-05': pg.Dict(
+        latest_update='2025-02-05',
+        experimental=True,
+        in_service=True,
+        supported_modalities=ALL_MODALITIES,
+        rpm_free=1000,
+        tpm_free=40_000_000,
+        rpm_paid=0,
+        tpm_paid=0,
+        cost_per_1m_input_tokens_up_to_128k=0,
+        cost_per_1m_output_tokens_up_to_128k=0,
+        cost_per_1m_cached_tokens_up_to_128k=0,
+        cost_per_1m_input_tokens_longer_than_128k=0,
+        cost_per_1m_output_tokens_longer_than_128k=0,
+        cost_per_1m_cached_tokens_longer_than_128k=0,
+    ),
+    'gemini-2.0-flash-thinking-exp-01-21': pg.Dict(
+        latest_update='2024-01-21',
+        experimental=True,
+        in_service=True,
+        supported_modalities=ALL_MODALITIES,
+        rpm_free=10,
+        tpm_free=40_000_000,
+        rpm_paid=0,
+        tpm_paid=0,
+        cost_per_1m_input_tokens_up_to_128k=0,
+        cost_per_1m_output_tokens_up_to_128k=0,
+        cost_per_1m_cached_tokens_up_to_128k=0,
+        cost_per_1m_input_tokens_longer_than_128k=0,
+        cost_per_1m_output_tokens_longer_than_128k=0,
+        cost_per_1m_cached_tokens_longer_than_128k=0,
+    ),
     'gemini-2.0-flash-thinking-exp-1219': pg.Dict(
         latest_update='2024-12-19',
         experimental=True,

langfun/core/llms/google_genai.py

@@ -63,10 +63,32 @@ class GenAI(gemini.Gemini):
     )
 
 
+class Gemini2Flash(GenAI):  # pylint: disable=invalid-name
+  """Gemini Flash 2.0 model launched on 02/05/2025."""
+
+  api_version = 'v1beta'
+  model = 'gemini-2.0-flash'
+
+
+class Gemini2ProExp_20250205(GenAI):  # pylint: disable=invalid-name
+  """Gemini Flash 2.0 Pro model launched on 02/05/2025."""
+
+  api_version = 'v1beta'
+  model = 'gemini-2.0-pro-exp-02-05'
+
+
+class Gemini2FlashThinkingExp_20250121(GenAI):  # pylint: disable=invalid-name
+  """Gemini Flash 2.0 Thinking model launched on 01/21/2025."""
+
+  api_version = 'v1beta'
+  model = 'gemini-2.0-flash-thinking-exp-01-21'
+  timeout = None
+
+
 class GeminiFlash2_0ThinkingExp_20241219(GenAI):  # pylint: disable=invalid-name
   """Gemini Flash 2.0 Thinking model launched on 12/19/2024."""
 
-  api_version = 'v1alpha'
+  api_version = 'v1beta'
   model = 'gemini-2.0-flash-thinking-exp-1219'
   timeout = None
 

langfun/core/llms/rest.py

@@ -17,6 +17,7 @@ import functools
 from typing import Annotated, Any, Callable
 
 import langfun.core as lf
+# Placeholder for Google-internal internet access import.
 import requests
 
 
@@ -65,10 +66,15 @@ class REST(lf.LanguageModel):
   @functools.cached_property
   def _session(self) -> requests.Session:
     assert self._api_initialized
-    s = requests.Session()
+    s = self._create_session()
+    # Placeholder for Google-internal session adapter.
     s.headers.update(self.headers or {})
     return s
 
+  def _create_session(self) -> requests.Session:
+    """Creates a new session."""
+    return requests.Session()
+
   def _on_bound(self):
     super()._on_bound()
     self.__dict__.pop('_session', None)

langfun/core/llms/vertexai.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 """Vertex AI generative models."""
 
-import functools
 import os
 from typing import Annotated, Any, Literal
 
@@ -119,14 +118,10 @@ class VertexAI(rest.REST):
     """Returns a string to identify the model."""
     return f'VertexAI({self.model})'
 
-  @functools.cached_property
-  def _session(self):
-    assert self._api_initialized
+  def _create_session(self):
     assert self._credentials is not None
     assert auth_requests is not None
-    s = auth_requests.AuthorizedSession(self._credentials)
-    s.headers.update(self.headers or {})
-    return s
+    return auth_requests.AuthorizedSession(self._credentials)
 
 
 #
@@ -149,6 +144,31 @@ class VertexAIGemini(VertexAI, gemini.Gemini):
     )
 
 
+class VertexAIGemini2Flash(VertexAIGemini):  # pylint: disable=invalid-name
+  """Gemini Flash 2.0 model launched on 02/05/2025."""
+
+  api_version = 'v1beta'
+  model = 'gemini-2.0-flash-001'
+  location = 'us-central1'
+
+
+class VertexAIGemini2ProExp_20250205(VertexAIGemini):  # pylint: disable=invalid-name
+  """Gemini Flash 2.0 Pro model launched on 02/05/2025."""
+
+  api_version = 'v1beta'
+  model = 'gemini-2.0-pro-exp-02-05'
+  location = 'us-central1'
+
+
+class VertexAIGemini2FlashThinkingExp_20250121(VertexAIGemini):  # pylint: disable=invalid-name
+  """Gemini Flash 2.0 Thinking model launched on 01/21/2025."""
+
+  api_version = 'v1beta'
+  model = 'gemini-2.0-flash-thinking-exp-01-21'
+  timeout = None
+  location = 'us-central1'
+
+
 class VertexAIGeminiFlash2_0ThinkingExp_20241219(VertexAIGemini):  # pylint: disable=invalid-name
   """Vertex AI Gemini Flash 2.0 Thinking model launched on 12/19/2024."""
 

langfun/core/modalities/mime.py

@@ -17,8 +17,9 @@ import base64
 import functools
 from typing import Annotated, Any, Iterable, Type, Union
 import langfun.core as lf
+# Placeholder for Google-internal internet access import.
 import pyglove as pg
-import requests
+import requests   # pylint: disable=unused-import
 
 
 try:
@@ -177,10 +178,7 @@ class Mime(lf.Modality):
   def download(cls, uri: str) -> bytes | str:
     """Downloads the content of the given URI."""
     if uri.lower().startswith(('http:', 'https:', 'ftp:')):
-      return requests.get(
-          uri,
-          headers={'User-Agent': 'Mozilla/5.0'},
-      ).content
+      return requests.get(uri, headers={'User-Agent': 'Mozilla/5.0'}).content
     else:
       content = pg.io.readfile(uri, mode='rb')
       assert content is not None

{langfun-0.1.2.dev202502050804.dist-info → langfun-0.1.2.dev202502060804.dist-info}/METADATA

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

{langfun-0.1.2.dev202502050804.dist-info → langfun-0.1.2.dev202502060804.dist-info}/RECORD

@@ -1,5 +1,5 @@
 langfun/__init__.py,sha256=fhfPXpHN7GoGqixpFfqhQkYxFs_siP_LhbjZhd3lhio,2497
-langfun/core/__init__.py,sha256=Cy3BU8R9VHnJmbxiN9QXXBb1K09ZoESYIJGf_uwJrDs,4571
+langfun/core/__init__.py,sha256=HOV4RFypDBmQhXouUA2UEassOuYTol0und3EtSa3D5c,4543
 langfun/core/component.py,sha256=g1kQM0bryYYYWVDrSMnHfc74wIBbpfe5_B3s-UIP5GE,3028
 langfun/core/component_test.py,sha256=0CxTgjAud3aj8wBauFhG2FHDqrxCTl4OI4gzQTad-40,9254
 langfun/core/concurrent.py,sha256=zY-pXqlGqss_GI20tM1gXvyW8QepVPUuFNmutcIdhbI,32760
@@ -73,7 +73,7 @@ langfun/core/eval/v2/reporting.py,sha256=7rL9LLmGYnQ5HIjqRqsOMkUlBl4BmFPEL6Vlofq
 langfun/core/eval/v2/reporting_test.py,sha256=UmYSAQvD3AIXsSyWQ-WD2uLtEISYpmBeoKY5u5Qwc8E,5696
 langfun/core/eval/v2/runners.py,sha256=DKEmSlGXjOXKWFdBhTpLy7tMsBHZHd1Brl3hWIngsSQ,15931
 langfun/core/eval/v2/runners_test.py,sha256=A37fKK2MvAVTiShsg_laluJzJ9AuAQn52k7HPbfD0Ks,11666
-langfun/core/llms/__init__.py,sha256=PKkEVyGBSMc1CZOh8vVN-NCxBPDv3Sctt0fsN7NU1EU,7770
+langfun/core/llms/__init__.py,sha256=qoFPJhueF6tuZSfi5QyiXXDhFSqrHQxid1bjb9dJm3Y,8178
 langfun/core/llms/anthropic.py,sha256=z_DWDpR1VKNzv6wq-9CXLzWdqCDXRKuVFacJNpgBqAs,10826
 langfun/core/llms/anthropic_test.py,sha256=zZ2eSP8hhVv-RDSWxT7wX-NS5DfGfQmCjS9P0pusAHM,6556
 langfun/core/llms/compositional.py,sha256=csW_FLlgL-tpeyCOTVvfUQkMa_zCN5Y2I-YbSNuK27U,2872
@@ -82,9 +82,9 @@ langfun/core/llms/deepseek.py,sha256=9EbuNrngd5BwpsvsEfkW2XQdq3K23S3-jlI8RbMNZF4
 langfun/core/llms/deepseek_test.py,sha256=dS72i52bwMpCN4dJDvpJI59AnNChpwxS5eYYFrhGh90,1843
 langfun/core/llms/fake.py,sha256=gCHBYBLvBCsC78HI1hpoqXCS-p1FMTgY1P1qh_sGBPk,3070
 langfun/core/llms/fake_test.py,sha256=2h13qkwEz_JR0mtUDPxdAhQo7MueXaFSwsD2DIRDW9g,7653
-langfun/core/llms/gemini.py,sha256=itwTCmQHRjwSjt7_UzFfaat23gyRL-El4qmJrg-OGVA,17398
+langfun/core/llms/gemini.py,sha256=oYcpQ3I7-c1MeSC7mj9iKtAZTdbWKI9Fzp84drvR5QY,19703
 langfun/core/llms/gemini_test.py,sha256=2ERhYWCJwnfDTQbCaZHFuB1TdWJFrOBS7yyCBInIdQk,6129
-langfun/core/llms/google_genai.py,sha256=85Vmx5QmsziON03PRsFQINSu5NF6pAAuFFhUdDteWGc,3662
+langfun/core/llms/google_genai.py,sha256=WbVZAIDhh7mKy15LZMXOEniQ8Obd-hjiy2KviUCfmXQ,4261
 langfun/core/llms/google_genai_test.py,sha256=JZf_cbQ4GGGpwiQCLjFJn7V4jxBBqgZhIx91AzbGKVo,1250
 langfun/core/llms/groq.py,sha256=oGxyyCi5TtMVu2POdO8pXS7pK4Es56FtqjghZIGYopc,7579
 langfun/core/llms/groq_test.py,sha256=9aOD3nO4dEoH57B-5iOr5DQjG0vyv1jzFtAe7HfoiNg,1963
@@ -94,9 +94,9 @@ langfun/core/llms/openai.py,sha256=bIJae2UDO_uwoZGZRYP58GM4FdP4w9qjQhBIYJyGH34,1
 langfun/core/llms/openai_compatible.py,sha256=MF9JCc0uTPkIK95uvQTMIBXk4z_xKQMZqQHFaVmXwcA,5898
 langfun/core/llms/openai_compatible_test.py,sha256=0uFYhCiuHo2Wrlgj16-GRG6rW8P6EaHCUguL3jS0QJ8,16708
 langfun/core/llms/openai_test.py,sha256=m85YjGCvWvV5ZYagjC0FqI0FcqyCEVCbUUs8Wm3iUrc,2475
-langfun/core/llms/rest.py,sha256=mX6BJ7Nu3VMriurA493tgJKRlymBiZXimEKcHAPWLEE,3588
+langfun/core/llms/rest.py,sha256=2N-zg9wuB-XeQvISc-xWOBCfBVvjMc4p3LO_rD23z7c,3818
 langfun/core/llms/rest_test.py,sha256=zWGiI08f9gXsoQPJS9TlX1zD2uQLrJUB-1VpAJXRHfs,3475
-langfun/core/llms/vertexai.py,sha256=SVvLTqQZ6Ha8wZh3azkh4g3O838CpNkuP3XlgIrLMKo,15751
+langfun/core/llms/vertexai.py,sha256=zLiHHrm5gpE6DgC5k0cxugD2qui9MF8bhg-4aJDXB24,16364
 langfun/core/llms/vertexai_test.py,sha256=6eLQOyeL5iGZOIWb39sFcf1TgYD_6TBGYdMO4UIvhf4,3333
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
@@ -110,7 +110,7 @@ langfun/core/modalities/audio.py,sha256=qCrVCX690SG0ps-ZfOtNWvHn_CmdJsmxF7GySScW
 langfun/core/modalities/audio_test.py,sha256=yyGEBYqMXmNs_F2dEtj-PX8HE040vqh-YQppsvdxPw4,2025
 langfun/core/modalities/image.py,sha256=ovcX8NLBNv8WzxAdhQ-u4VQfHVBkWijRj_oiNwhE9lk,1768
 langfun/core/modalities/image_test.py,sha256=XMgtJXY75R5eo0CZ222D1QUy57_hESnttmCGWwDLt7k,3824
-langfun/core/modalities/mime.py,sha256=xZpnENHqwIUBLbT3s3izJvAPnw3XTtXe2v1y4mz9UkI,7856
+langfun/core/modalities/mime.py,sha256=T00qHntL3uewF_DBVA-sJiV9mPK6bLAuBsg0bWSYKUQ,7919
 langfun/core/modalities/mime_test.py,sha256=Lg21nKFi--a884gnI7tFS4cHnwByEEhWg4Ugsr-UCbw,5277
 langfun/core/modalities/ms_office.py,sha256=0PnM6W9SovVfJNd4XCpUfOcGBuvj4hlA1zqPjdsJNFM,3725
 langfun/core/modalities/ms_office_test.py,sha256=rrDBx51ELAqRaUX6Y6tgg0k3tEFHOlRMfUpeULD7mlo,87868
@@ -148,8 +148,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.dev202502050804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202502050804.dist-info/METADATA,sha256=e2enW-kwbwvIsfHXKAG4tfEpLYlyMyIkdyXxp2j0SXQ,8172
-langfun-0.1.2.dev202502050804.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-langfun-0.1.2.dev202502050804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202502050804.dist-info/RECORD,,
+langfun-0.1.2.dev202502060804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202502060804.dist-info/METADATA,sha256=tw5p6p7Pp2I6CbNWAJx1EcB-umB-X10YeiJnw8LS65o,8172
+langfun-0.1.2.dev202502060804.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+langfun-0.1.2.dev202502060804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202502060804.dist-info/RECORD,,