langfun 0.0.2.dev20240626__tar.gz → 0.0.2.dev20240701__tar.gz

{langfun-0.0.2.dev20240626 → langfun-0.0.2.dev20240701}/PKG-INFO

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

{langfun-0.0.2.dev20240626 → langfun-0.0.2.dev20240701}/langfun/core/language_model.py

@@ -84,20 +84,23 @@ class LMSamplingUsage(pg.Object):
   prompt_tokens: int
   completion_tokens: int
   total_tokens: int
+  num_requests: int = 1
 
   def __add__(self, other: 'LMSamplingUsage') -> 'LMSamplingUsage':
     return LMSamplingUsage(
         prompt_tokens=self.prompt_tokens + other.prompt_tokens,
         completion_tokens=self.completion_tokens + other.completion_tokens,
         total_tokens=self.total_tokens + other.total_tokens,
+        num_requests=self.num_requests + other.num_requests,
     )
 
 
 class UsageNotAvailable(LMSamplingUsage):
   """Usage information not available."""
-  prompt_tokens: pg.typing.Int(0).freeze()        # pytype: disable=invalid-annotation
+  prompt_tokens: pg.typing.Int(0).freeze()       # pytype: disable=invalid-annotation
   completion_tokens: pg.typing.Int(0).freeze()   # pytype: disable=invalid-annotation
   total_tokens: pg.typing.Int(0).freeze()        # pytype: disable=invalid-annotation
+  num_requests: pg.typing.Int(1).freeze()        # pytype: disable=invalid-annotation
 
   def __bool__(self) -> bool:
     return False
@@ -726,7 +729,7 @@ class _UsageTracker:
   def __init__(self, model_ids: set[str] | None):
     self.model_ids = model_ids
     self.usages = {
-        m: LMSamplingUsage(0, 0, 0) for m in model_ids
+        m: LMSamplingUsage(0, 0, 0, 0) for m in model_ids
     } if model_ids else {}
 
   def track(self, model_id: str, usage: LMSamplingUsage):

{langfun-0.0.2.dev20240626 → langfun-0.0.2.dev20240701}/langfun/core/language_model_test.py

@@ -598,18 +598,18 @@ class LanguageModelTest(unittest.TestCase):
             list(concurrent.concurrent_map(call_lm, ['hi', 'hello']))
 
     self.assertEqual(usages2, {
-        'model2': lm_lib.LMSamplingUsage(100, 100, 200),
+        'model2': lm_lib.LMSamplingUsage(100, 100, 200, 1),
     })
     self.assertEqual(usages3, {
-        'model1': lm_lib.LMSamplingUsage(100 * 4, 100 * 4, 200 * 4),
+        'model1': lm_lib.LMSamplingUsage(100 * 4, 100 * 4, 200 * 4, 4),
     })
     self.assertEqual(usages4, {
-        'model1': lm_lib.LMSamplingUsage(100 * 4, 100 * 4, 200 * 4),
-        'model2': lm_lib.LMSamplingUsage(100, 100, 200),
+        'model1': lm_lib.LMSamplingUsage(100 * 4, 100 * 4, 200 * 4, 4),
+        'model2': lm_lib.LMSamplingUsage(100, 100, 200, 1),
     })
     self.assertEqual(usages1, {
-        'model1': lm_lib.LMSamplingUsage(100 * 5, 100 * 5, 200 * 5),
-        'model2': lm_lib.LMSamplingUsage(100, 100, 200),
+        'model1': lm_lib.LMSamplingUsage(100 * 5, 100 * 5, 200 * 5, 5),
+        'model2': lm_lib.LMSamplingUsage(100, 100, 200, 1),
     })
 
 

{langfun-0.0.2.dev20240626 → langfun-0.0.2.dev20240701}/langfun/core/llms/__init__.py

@@ -94,8 +94,10 @@ from langfun.core.llms.groq import GroqGemma7B_IT
 
 from langfun.core.llms.vertexai import VertexAI
 from langfun.core.llms.vertexai import VertexAIGeminiPro1_5
+from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_0514
 from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_0409
 from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5
+from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5_0514
 from langfun.core.llms.vertexai import VertexAIGeminiPro1
 from langfun.core.llms.vertexai import VertexAIGeminiPro1Vision
 from langfun.core.llms.vertexai import VertexAIPalm2

{langfun-0.0.2.dev20240626 → langfun-0.0.2.dev20240701}/langfun/core/llms/vertexai.py

@@ -24,6 +24,8 @@ import pyglove as pg
 
 
 SUPPORTED_MODELS_AND_SETTINGS = {
+    'gemini-1.5-pro-001': pg.Dict(api='gemini', rpm=5),
+    'gemini-1.5-flash-001': pg.Dict(api='gemini', rpm=5),
     'gemini-1.5-pro-preview-0514': pg.Dict(api='gemini', rpm=5),
     'gemini-1.5-pro-preview-0409': pg.Dict(api='gemini', rpm=5),
     'gemini-1.5-flash-preview-0514': pg.Dict(api='gemini', rpm=5),
@@ -330,12 +332,19 @@ _PDF = [
 class VertexAIGeminiPro1_5(VertexAI):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Pro model."""
 
+  model = 'gemini-1.5-pro-001'
+  supported_modalities = _PDF + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
+
+
+class VertexAIGeminiPro1_5_0514(VertexAI):  # pylint: disable=invalid-name
+  """Vertex AI Gemini 1.5 Pro preview model."""
+
   model = 'gemini-1.5-pro-preview-0514'
   supported_modalities = _PDF + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
 
 
 class VertexAIGeminiPro1_5_0409(VertexAI):  # pylint: disable=invalid-name
-  """Vertex AI Gemini 1.5 Pro model."""
+  """Vertex AI Gemini 1.5 Pro preview model."""
 
   model = 'gemini-1.5-pro-preview-0409'
   supported_modalities = _PDF + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
@@ -343,6 +352,12 @@ class VertexAIGeminiPro1_5_0409(VertexAI):  # pylint: disable=invalid-name
 
 class VertexAIGeminiFlash1_5(VertexAI):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Flash model."""
+  model = 'gemini-1.5-flash-001'
+  supported_modalities = _PDF + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
+
+
+class VertexAIGeminiFlash1_5_0514(VertexAI):  # pylint: disable=invalid-name
+  """Vertex AI Gemini 1.5 Flash preview model."""
 
   model = 'gemini-1.5-flash-preview-0514'
   supported_modalities = _PDF + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES

{langfun-0.0.2.dev20240626 → langfun-0.0.2.dev20240701}/langfun.egg-info/PKG-INFO

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