langfun 0.1.2.dev202505170804__py3-none-any.whl → 0.1.2.dev202505180804__py3-none-any.whl

langfun/core/data/conversion/gemini.py

@@ -31,10 +31,12 @@ class GeminiMessageConverter(lf.MessageConverter):
           'Chunk preprocessor for Langfun chunk to Gemini chunk conversion. '
           'It will be applied before each Langfun chunk is converted. '
           'If returns None, the chunk will be skipped.'
-      )
+      ),
   ] = None
 
-  def to_value(self, message: lf.Message) -> dict[str, Any]:
+  def to_value(
+      self, message: lf.Message, always_send_content: bool = True
+  ) -> dict[str, Any]:
     """Converts a Langfun message to Gemini API."""
     parts = []
     for chunk in message.chunk():
@@ -44,7 +46,7 @@ class GeminiMessageConverter(lf.MessageConverter):
           continue
 
       if isinstance(chunk, str):
-        parts.append(self._convert_chunk(chunk))
+        parts.append(self._convert_chunk(chunk, always_send_content))
       else:
         if isinstance(chunk, lf_modalities.Mime):
           modalities = [chunk]
@@ -54,10 +56,14 @@ class GeminiMessageConverter(lf.MessageConverter):
           modalities = chunk
         else:
           raise ValueError(f'Unsupported content type: {chunk!r}.')
-        parts.extend(self._convert_chunk(c) for c in modalities)
+        parts.extend(
+            self._convert_chunk(c, always_send_content) for c in modalities
+        )
     return dict(role=self.get_role(message), parts=parts)
 
-  def _convert_chunk(self, chunk: str | lf.Modality) -> Any:
+  def _convert_chunk(
+      self, chunk: str | lf.Modality, always_send_content: bool = True
+  ) -> Any:
     """Converts a Langfun chunk to Gemini chunk."""
     if isinstance(chunk, str):
       return {'text': chunk}
@@ -73,8 +79,10 @@ class GeminiMessageConverter(lf.MessageConverter):
       }
     if chunk.is_text:
       return {'text': chunk.to_text()}
-    if chunk.uri and chunk.uri.lower().startswith(
-        ('http:', 'https:', 'ftp:')
+    if (
+        not always_send_content
+        and chunk.uri
+        and chunk.uri.lower().startswith(('http:', 'https:', 'ftp:'))
     ):
       return {
           'fileData': {

langfun/core/data/conversion/gemini_test.py

@@ -58,11 +58,8 @@ class GeminiConversionTest(unittest.TestCase):
   def test_as_format_with_image(self):
     self.assertEqual(
         lf.Template(
-            'What are the common words from {{image}}, {{pdf}} and {{video}}?',
+            'What are the common words from {{image}} and {{video}}?',
             image=lf_modalities.Image.from_bytes(image_content),
-            pdf=lf_modalities.Custom.from_uri(
-                'https://my.pdf', mime='application/pdf'
-            ),
             video=lf_modalities.Custom.from_uri(
                 'https://www.youtube.com/watch?v=abcd', mime='text/html'
             ),
@@ -79,15 +76,6 @@ class GeminiConversionTest(unittest.TestCase):
                         'mimeType': 'image/png',
                     }
                 },
-                {
-                    'text': ','
-                },
-                {
-                    'fileData': {
-                        'fileUri': 'https://my.pdf',
-                        'mimeType': 'application/pdf',
-                    }
-                },
                 {
                     'text': 'and'
                 },

{langfun-0.1.2.dev202505170804.dist-info → langfun-0.1.2.dev202505180804.dist-info}/METADATA

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

{langfun-0.1.2.dev202505170804.dist-info → langfun-0.1.2.dev202505180804.dist-info}/RECORD

@@ -46,8 +46,8 @@ langfun/core/data/__init__.py,sha256=qllw9ST1vveZv-1E0VM5hezn1YH-OcqGI-yFqQYnWgI
 langfun/core/data/conversion/__init__.py,sha256=ZcGntBruvvZSfESO-Tha1nzHfgWEK7I1u78Jw8gsoVU,883
 langfun/core/data/conversion/anthropic.py,sha256=0xf1sWt6WhmG8EsaeLY4Ee7S3FcDWKPOtn6caCBhtrQ,4431
 langfun/core/data/conversion/anthropic_test.py,sha256=R43PyveNUCHNCvfu6RFsTk0EIKK8M1Gzng0Kay8TlE8,8534
-langfun/core/data/conversion/gemini.py,sha256=k-BJFQ_xuYRTNH_k0cJlZlhN1VrQHiFjckSxRCyUGNY,5523
-langfun/core/data/conversion/gemini_test.py,sha256=KIaWdY8CIn0YMaSomxTizvwCrljvt7lbDi3WSEbb1FE,7637
+langfun/core/data/conversion/gemini.py,sha256=fQ5yjwmQLTb-YJN1p6n3cxM9TQoniOkaLvT-p-jMoP8,5722
+langfun/core/data/conversion/gemini_test.py,sha256=G-av2BUngBkxOkJz94CMpZRGq6DGDBvgLltoezuohm0,7239
 langfun/core/data/conversion/openai.py,sha256=sSpkDSxMJWJ3I1dNICBCzvLsJv4iiLg8FPYLtubBJUM,4181
 langfun/core/data/conversion/openai_test.py,sha256=38WV_3ofFZiUF10bTKnZp4VyuDP5-81aR3h3Q0HlBm0,5283
 langfun/core/eval/__init__.py,sha256=OEXr1ZRuvLuhJJfuQ1ZWQ-SvYzjyrtiAAEogYaB7E6o,1933
@@ -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.dev202505170804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202505170804.dist-info/METADATA,sha256=U2rauYCb-_LY_r_xxtlTa61nIxkMWL4icBLDu5SrW8Y,8178
-langfun-0.1.2.dev202505170804.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-langfun-0.1.2.dev202505170804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202505170804.dist-info/RECORD,,
+langfun-0.1.2.dev202505180804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202505180804.dist-info/METADATA,sha256=DI4w_LawSCzpgClMnLKFSx8lKZrs98KY1EPtsjb0Ooo,8178
+langfun-0.1.2.dev202505180804.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+langfun-0.1.2.dev202505180804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202505180804.dist-info/RECORD,,