langfun 0.1.2.dev202410010804__tar.gz → 0.1.2.dev202410050804__tar.gz

{langfun-0.1.2.dev202410010804 → langfun-0.1.2.dev202410050804}/PKG-INFO

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

{langfun-0.1.2.dev202410010804 → langfun-0.1.2.dev202410050804}/langfun/core/eval/matching.py

@@ -171,31 +171,6 @@ class Matching(base.Evaluation):
   ) -> None:
     super().save(definition, result, report)
 
-    if result:
-      # Save matches.
-      pg.save(
-          [
-              pg.symbolic.deref(
-                  pg.Dict(input=input, output=output), recursive=True
-              )
-              for input, output, _ in self.matches
-          ],
-          os.path.join(self.dir, Matching.MATCHES_JSON),
-      )
-
-      # Save mismatches.
-      pg.save(
-          [
-              # We force the output to be dict as its type may be defined
-              # within functors which could be deserialized.
-              pg.symbolic.deref(
-                  pg.Dict(input=input, output=output), recursive=True
-              )
-              for input, output, _ in self.mismatches
-          ],
-          os.path.join(self.dir, Matching.MISMATCHES_JSON),
-      )
-
     if report:
       pg.save(
           self._html([self._render_result, self._render_matches]),

{langfun-0.1.2.dev202410010804 → langfun-0.1.2.dev202410050804}/langfun/core/eval/matching_test.py

@@ -152,18 +152,6 @@ class MatchingTest(unittest.TestCase):
             os.path.join(s.dir, matching.Matching.CACHE_JSON)
         )
     )
-    self.assertTrue(
-        os.path.exists(
-            os.path.join(s.dir, matching.Matching.MATCHES_JSON)
-        )
-    )
-    self.assertTrue(
-        os.path.exists(
-            os.path.join(
-                s.dir, matching.Matching.MISMATCHES_JSON
-            )
-        )
-    )
     self.assertTrue(
         os.path.exists(
             os.path.join(

{langfun-0.1.2.dev202410010804 → langfun-0.1.2.dev202410050804}/langfun/core/llms/__init__.py

@@ -102,6 +102,7 @@ from langfun.core.llms.groq import GroqMistral_8x7B
 from langfun.core.llms.groq import GroqGemma7B_IT
 
 from langfun.core.llms.vertexai import VertexAI
+from langfun.core.llms.vertexai import VertexAIGemini1_5
 from langfun.core.llms.vertexai import VertexAIGeminiPro1_5
 from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_Latest
 from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_001

{langfun-0.1.2.dev202410010804 → langfun-0.1.2.dev202410050804}/langfun/core/llms/vertexai.py

@@ -416,104 +416,84 @@ _DOCUMENT_TYPES = [
     'text/plain',
     'text/csv',
     'text/html',
+    'text/xml',
+    'text/x-script.python',
+    'application/json',
 ]
 
 
-class VertexAIGeminiPro1_5_Latest(VertexAI):  # pylint: disable=invalid-name
-  """Vertex AI Gemini 1.5 Pro model."""
+class VertexAIGemini1_5(VertexAI):  # pylint: disable=invalid-name
+  """Vertex AI Gemini 1.5 model."""
 
-  model = 'gemini-1.5-pro-latest'
   supported_modalities = (
       _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
   )
 
 
-class VertexAIGeminiPro1_5(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiPro1_5_Latest(VertexAIGemini1_5):  # pylint: disable=invalid-name
+  """Vertex AI Gemini 1.5 Pro model."""
+
+  model = 'gemini-1.5-pro-latest'
+
+
+class VertexAIGeminiPro1_5(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Pro model."""
 
   model = 'gemini-1.5-pro'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiPro1_5_002(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiPro1_5_002(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Pro model."""
 
   model = 'gemini-1.5-pro-002'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiPro1_5_001(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiPro1_5_001(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Pro model."""
 
   model = 'gemini-1.5-pro-001'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiPro1_5_0514(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiPro1_5_0514(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Pro preview model."""
 
   model = 'gemini-1.5-pro-preview-0514'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiPro1_5_0409(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiPro1_5_0409(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Pro preview model."""
 
   model = 'gemini-1.5-pro-preview-0409'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiFlash1_5_Latest(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiFlash1_5_Latest(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Flash model."""
 
   model = 'gemini-1.5-flash-latest'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiFlash1_5(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiFlash1_5(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Flash model."""
+
   model = 'gemini-1.5-flash'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiFlash1_5_002(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiFlash1_5_002(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Flash model."""
 
   model = 'gemini-1.5-flash-002'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiFlash1_5_001(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiFlash1_5_001(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Flash model."""
+
   model = 'gemini-1.5-flash-001'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
-class VertexAIGeminiFlash1_5_0514(VertexAI):  # pylint: disable=invalid-name
+class VertexAIGeminiFlash1_5_0514(VertexAIGemini1_5):  # pylint: disable=invalid-name
   """Vertex AI Gemini 1.5 Flash preview model."""
 
   model = 'gemini-1.5-flash-preview-0514'
-  supported_modalities = (
-      _DOCUMENT_TYPES + _IMAGE_TYPES + _AUDIO_TYPES + _VIDEO_TYPES
-  )
 
 
 class VertexAIGeminiPro1(VertexAI):  # pylint: disable=invalid-name

{langfun-0.1.2.dev202410010804 → langfun-0.1.2.dev202410050804}/langfun.egg-info/PKG-INFO

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