langfun 0.0.2.dev20240528__py3-none-any.whl → 0.0.2.dev20240529__py3-none-any.whl

langfun/core/language_model_test.py

@@ -418,8 +418,9 @@ class LanguageModelTest(unittest.TestCase):
     with contextlib.redirect_stdout(string_io):
       self.assertEqual(
           lm(message_lib.UserMessage(
-              'hi {{image}}', image=Image()), debug=True),
-          'hi {{image}}')
+              'hi <<[[image]]>>', image=Image()), debug=True),
+          'hi <<[[image]]>>'
+      )
 
     debug_info = string_io.getvalue()
     self.assertIn('[0] LM INFO', debug_info)

langfun/core/llms/google_genai_test.py

@@ -102,7 +102,7 @@ class GenAITest(unittest.TestCase):
 
   def test_content_from_message_mm(self):
     message = lf.UserMessage(
-        'This is an {{image}}, what is it?',
+        'This is an <<[[image]]>>, what is it?',
         image=lf_modalities.Image.from_bytes(example_image),
     )
 

langfun/core/llms/openai_test.py

@@ -164,7 +164,7 @@ class OpenAITest(unittest.TestCase):
         self.assertEqual(
             lm(
                 lf.UserMessage(
-                    'hello {{image}}',
+                    'hello <<[[image]]>>',
                     image=lf_modalities.Image.from_uri('https://fake/image')
                 ),
                 sampling_options=lf.LMSamplingOptions(n=2)

langfun/core/llms/vertexai_test.py

@@ -74,7 +74,7 @@ class VertexAITest(unittest.TestCase):
 
   def test_content_from_message_mm(self):
     message = lf.UserMessage(
-        'This is an {{image}}, what is it?',
+        'This is an <<[[image]]>>, what is it?',
         image=lf_modalities.Image.from_bytes(example_image),
     )
 

langfun/core/message.py

@@ -144,7 +144,7 @@ class Message(natural_language.NaturalLanguageFormattable, pg.Object):
   def from_value(cls, value: Union[str, 'Message']) -> 'Message':
     """Creates a message from a value or return value itself if a Message."""
     if isinstance(value, modality.Modality):
-      return cls('{{object}}', object=value)
+      return cls('<<[[object]]>>', object=value)
     if isinstance(value, Message):
       return value
     return cls(value)

langfun/core/message_test.py

@@ -54,7 +54,7 @@ class MessageTest(unittest.TestCase):
     self.assertTrue(
         pg.eq(
             message.UserMessage.from_value(CustomModality('foo')),
-            message.UserMessage('{{object}}', object=CustomModality('foo')),
+            message.UserMessage('<<[[object]]>>', object=CustomModality('foo')),
         )
     )
     m = message.UserMessage('hi')
@@ -258,13 +258,16 @@ class MessageTest(unittest.TestCase):
 
   def test_referred_modalities(self):
     m1 = message.UserMessage(
-        'hi, this is a {{img1}} and {{x.img2}}',
+        'hi, this is a <<[[img1]]>> and <<[[x.img2]]>>',
         img1=CustomModality('foo'),
         x=dict(img2=CustomModality('bar')),
     )
     m2 = message.SystemMessage('class Question:\n  image={{img1}}', source=m1)
     m3 = message.AIMessage(
-        'This is the {{output_image}} based on {{x.img2}}, {{unknown_var}}',
+        (
+            'This is the <<[[output_image]]>> based on <<[[x.img2]]>>, '
+            '{{unknown_var}}'
+        ),
         output_image=CustomModality('bar'),
         source=m2,
     )
@@ -279,8 +282,8 @@ class MessageTest(unittest.TestCase):
   def test_chunking(self):
     m = message.UserMessage(
         inspect.cleandoc("""
-            Hi, this is {{a}} and this is {{b}}.
-            {{x.c}} {{something else
+            Hi, this is <<[[a]]>> and this is {{b}}.
+            <<[[x.c]]>> {{something else
             """),
         a=CustomModality('foo'),
         x=dict(c=CustomModality('bar')),
@@ -294,7 +297,7 @@ class MessageTest(unittest.TestCase):
                 CustomModality('foo'),
                 'and this is {{b}}.',
                 CustomModality('bar'),
-                ' {{something else',
+                '{{something else',
             ],
         )
     )
@@ -304,10 +307,10 @@ class MessageTest(unittest.TestCase):
             message.AIMessage(
                 inspect.cleandoc("""
                     Hi, this is
-                    {{obj0}}
+                    <<[[obj0]]>>
                     and this is {{b}}.
-                    {{obj1}}
-                     {{something else
+                    <<[[obj1]]>>
+                    {{something else
                     """),
                 obj0=pg.Ref(m.a),
                 obj1=pg.Ref(m.x.c),

langfun/core/modality.py

@@ -32,8 +32,8 @@ def format_modality_as_ref(enabled: bool = True) -> ContextManager[None]:
 class Modality(component.Component):
   """Base class for multimodal object."""
 
-  REF_START = '{{'
-  REF_END = '}}'
+  REF_START = '<<[['
+  REF_END = ']]>>'
 
   def format(self, *args, **kwargs) -> str:
     if self.referred_name is None or not pg.object_utils.thread_local_get(

langfun/core/modality_test.py

@@ -37,7 +37,7 @@ class ModalityTest(unittest.TestCase):
     self.assertEqual(v.referred_name, 'x.metadata.y')
     self.assertEqual(str(v), "CustomModality(\n  content = 'a'\n)")
     with modality.format_modality_as_ref():
-      self.assertEqual(str(v), '{{x.metadata.y}}')
+      self.assertEqual(str(v), '<<[[x.metadata.y]]>>')
 
 
 class ModalityRefTest(unittest.TestCase):

langfun/core/structured/completion_test.py

@@ -464,7 +464,7 @@ class CompleteStructureTest(unittest.TestCase):
 
             MODALITY_REFERENCES:
               {
-                'examples[0].input.image': {{examples[0].input.image}}
+                'examples[0].input.image': <<[[examples[0].input.image]]>>
               }
 
             OUTPUT_OBJECT:
@@ -490,7 +490,7 @@ class CompleteStructureTest(unittest.TestCase):
 
             MODALITY_REFERENCES:
               {
-                'input.image': {{input.image}}
+                'input.image': <<[[input.image]]>>
               }
 
             OUTPUT_OBJECT:

langfun/core/structured/prompting_test.py

@@ -208,7 +208,7 @@ class QueryTest(unittest.TestCase):
         modalities.Image.from_bytes(b'mock_image'),
         int,
         lm=lm,
-        expected_snippet='\n\nINPUT_OBJECT:\n  {{input}}\n\n',
+        expected_snippet='\n\nINPUT_OBJECT:\n  <<[[input]]>>\n\n',
         expected_modalities=1,
     )
 
@@ -218,7 +218,7 @@ class QueryTest(unittest.TestCase):
         modalities.Image.from_bytes(b'mock_image'),
         None,
         lm=lm,
-        expected_snippet='{{input}}',
+        expected_snippet='<<[[input]]>>',
         exact_match=True,
         expected_modalities=1,
     )
@@ -231,7 +231,9 @@ class QueryTest(unittest.TestCase):
         this_image=modalities.Image.from_bytes(b'cat_image'),
         that_image=modalities.Image.from_bytes(b'mouse_image'),
         lm=lm,
-        expected_snippet='What are these? {{this_image}} and {{that_image}}',
+        expected_snippet=(
+            'What are these? <<[[this_image]]>> and <<[[that_image]]>>'
+        ),
         exact_match=True,
         expected_modalities=2,
     )
@@ -245,7 +247,7 @@ class QueryTest(unittest.TestCase):
         ],
         None,
         lm=lm,
-        expected_snippet='`[{{input[0]}}, {{input[1]}}]`',
+        expected_snippet='`[<<[[input[0]]]>>, <<[[input[1]]]>>]`',
         exact_match=True,
         expected_modalities=2,
     )
@@ -274,8 +276,8 @@ class QueryTest(unittest.TestCase):
 
             MODALITY_REFERENCES:
               {
-                'input[0]': {{input[0]}},
-                'input[1]': {{input[1]}}
+                'input[0]': <<[[input[0]]]>>,
+                'input[1]': <<[[input[1]]]>>
               }
             """),
         expected_modalities=2,

langfun/core/template_test.py

@@ -309,7 +309,7 @@ class RenderTest(unittest.TestCase):
         Template(
             'This is {{ x }} and {{ a }}', x=1, a=CustomModality('foo')
         ).render(),
-        'This is 1 and {{a}}',
+        'This is 1 and <<[[a]]>>',
     )
 
   def test_render_with_default(self):

{langfun-0.0.2.dev20240528.dist-info → langfun-0.0.2.dev20240529.dist-info}/METADATA

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

{langfun-0.0.2.dev20240528.dist-info → langfun-0.0.2.dev20240529.dist-info}/RECORD

@@ -9,12 +9,12 @@ langfun/core/console_test.py,sha256=5SYJdxpJGLgdSSQqqMPoA1X6jpsLD8rgcyk-EgI65oE,
 langfun/core/langfunc.py,sha256=RvIcRjIq0jWYRu1xim-FYe4HSrt97r3GMBO_PuagUmw,11060
 langfun/core/langfunc_test.py,sha256=_mfARnakX3oji5HDigFSLMd6yQ2wma-2Mgbztwqn73g,8501
 langfun/core/language_model.py,sha256=owNCgefGoPeRCHrxBhMtNdOj3orbeVml4eqLf1n211o,20760
-langfun/core/language_model_test.py,sha256=36evArVJgSQ9lRgHfMmlLW3lwjjDoiAgfTEbk2FIKa4,20122
+langfun/core/language_model_test.py,sha256=NZaSUls6cZdtxiqkqumWbtkx9zgNiJlsviYZOWkuHig,20137
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
-langfun/core/message.py,sha256=QhvV9t5qaryPcruyxxcXi3gm9QDInkSldwTtK6sVJ3c,15734
-langfun/core/message_test.py,sha256=Z23pUM5vPnDrYkIIibe2KL73D5HKur_awI0ut_EQFQA,9501
-langfun/core/modality.py,sha256=HHFBRFbYfS95ZAoDHNM6rsZYgFFiBJkDYmVnteOH_9Q,3374
-langfun/core/modality_test.py,sha256=6OUYzEo-AnX-WPjisI3jVU_cgx_JpfDyuGRbUmkoHU0,2396
+langfun/core/message.py,sha256=Rw3yC9HyGRjMhfDgyNjGlSCALEyDDbJ0_o6qTXeeDiQ,15738
+langfun/core/message_test.py,sha256=b6DDRoQ5j3uK-dc0QPSLelNTKaXX10MxJrRiI61iGX4,9574
+langfun/core/modality.py,sha256=-BZDYf5d4bmZnhZyS4QVGTSwvU7Xgs_55IOzeRmyacE,3378
+langfun/core/modality_test.py,sha256=HyZ5xONKQ0Fw18SzoWAq-Ob9njOXIIjBo1hNtw-rudw,2400
 langfun/core/natural_language.py,sha256=3ynSnaYQnjE60LIPK5fyMgdIjubnPYZwzGq4rWPeloE,1177
 langfun/core/natural_language_test.py,sha256=LHGU_1ytbkGuSZQFIFP7vP3dBlcY4-A12fT6dbjUA0E,1424
 langfun/core/sampling.py,sha256=vygWvgC8MFw0_AKNSmz-ywMXJYWf8cl0tI8QycvAmyI,5795
@@ -22,7 +22,7 @@ langfun/core/sampling_test.py,sha256=U7PANpMsl9E_pa4_Y4FzesSjcwg-u-LKHGCWSgv-8FY
 langfun/core/subscription.py,sha256=euawEuSZP-BHydaT-AQpfYFL0m5pWPGcW0upFhrojqc,10930
 langfun/core/subscription_test.py,sha256=Y4ZdbZEwm83YNZBxHff0QR4QUa4rdaNXA3_jfIcArBo,8717
 langfun/core/template.py,sha256=UhNNGUDJ4StUhPBKzHmjym36khxHOGWGr9MDxBwgxQA,22284
-langfun/core/template_test.py,sha256=Mbv0dFjboGCVvbDkHD-HacZnlCi8Ku2Hpf2UjdwGSNo,15464
+langfun/core/template_test.py,sha256=cb005qM_3dvJikaPDB3rirfIrMAIIVRpoiXGREGJ43o,15468
 langfun/core/text_formatting.py,sha256=ytjj7opnRJ6w-pkglL2CZUyfYDXLpNf65E42LBb31gc,5158
 langfun/core/text_formatting_test.py,sha256=nyKC6tn2L4hPJiqQHgxcbQsJJi4A4Nbj8FiO8iT6B80,1514
 langfun/core/coding/__init__.py,sha256=5utju_fwEsImaiftx4oXKl9FAM8p281k8-Esdh_-m1w,835
@@ -54,15 +54,15 @@ langfun/core/llms/anthropic_test.py,sha256=TMM30myyEhwF99Le4RvJEXOn8RYl0q1FRkt9Q
 langfun/core/llms/fake.py,sha256=Dd7-6ka9pFf3fcWZyczamjOqQ91MOI-m7We3Oc9Ffmo,2927
 langfun/core/llms/fake_test.py,sha256=ipKfdOcuqVcJ8lDXVpnBVb9HHG0hAVkFkMoHpWjC2cI,7212
 langfun/core/llms/google_genai.py,sha256=H1GdarpoMb9RjQz7a4BqVF6loQf3S_mMv8G8TFYrCvw,8999
-langfun/core/llms/google_genai_test.py,sha256=_UcGTfl16-aDUlEWFC2W2F8y9jPUs53RBYA6MOCpGXw,7525
+langfun/core/llms/google_genai_test.py,sha256=VT_MMmyxHMe4sl4uK_UZzWyxKFFMlF3xc3v6SljJQE0,7529
 langfun/core/llms/groq.py,sha256=NaGItVL_pkOpqPpI4bPGU27xLFRoaeizZ49v2s-4ERs,7844
 langfun/core/llms/groq_test.py,sha256=M6GtlrsOvDun_j-sR8cPh4W_moHWZNSTiThu3kuwbbc,5281
 langfun/core/llms/llama_cpp.py,sha256=Y_KkMUf3Xfac49koMUtUslKl3h-HWp3-ntq7Jaa3bdo,2385
 langfun/core/llms/llama_cpp_test.py,sha256=ZxC6defGd_HX9SFRU9U4cJiQnBKundbOrchbXuC1Z2M,1683
 langfun/core/llms/openai.py,sha256=IN46gIqfY6aEEfxCPNmyH1hrep3oWBhJDwVFilfqNkM,13657
-langfun/core/llms/openai_test.py,sha256=asSA1sVy_7hnXioD_2HTxtSDpVTKBUO_EjZuyHpwbn0,14854
+langfun/core/llms/openai_test.py,sha256=QWDzTgi8F2Z9u9ip6alK4rDEp_YraVTxWlDX5XOsKJk,14858
 langfun/core/llms/vertexai.py,sha256=rrwHRtox-gayVBjrkR_lnko98b0iFIyxsRUPgB_09T8,9921
-langfun/core/llms/vertexai_test.py,sha256=fInoOf3d2fKqF0qmb3u_9d5sZz-LK2At8M64pmpHR7s,7641
+langfun/core/llms/vertexai_test.py,sha256=PbkUTVYgbFhg5lDd3HgBJM0kr-OLVz10iph2C-SJblk,7645
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=cFfYvOIUae842pncqCAsRvqXCk2AnAsRYVx0mcIoAeY,3338
 langfun/core/llms/cache/in_memory.py,sha256=YfFyJEhLs73cUiB0ZfhMxYpdE8Iuxxw-dvMFwGHTSHw,4742
@@ -81,7 +81,7 @@ langfun/core/modalities/video.py,sha256=6qADCwwv-pEtzxMs_1YvhWgX6NqTsjviQv6IZxQP
 langfun/core/modalities/video_test.py,sha256=GbsoefSeO7y8kCYhTtp4s9E3ah_eYrb6Z-MXpS01RFc,2046
 langfun/core/structured/__init__.py,sha256=Qg1ocwsb60od8fJky3F3JAOhwjwT9WA7IX3C2j2s3zA,3707
 langfun/core/structured/completion.py,sha256=skBxt6V_fv2TBUKnzFgnPMbVY8HSYn8sY04MLok2yvs,7299
-langfun/core/structured/completion_test.py,sha256=MYxEzeScC3gFVujvrMMboBF5nh-QiVLwGgqAV3oaFUQ,19273
+langfun/core/structured/completion_test.py,sha256=2mUzDMKGF_WGfTtsnfmfMDx97dkJ-98y8leen__qWLA,19281
 langfun/core/structured/description.py,sha256=SXW4MJvshFjbR-0gw6rE21o6WXq12UlRXawvDBXMZFA,5211
 langfun/core/structured/description_test.py,sha256=UtZGjSFUaQ6130t1E5tcL7ODu0xIefkapb53TbnqsK8,7362
 langfun/core/structured/function_generation.py,sha256=pFgS3vcRAWiuFBol2x5Eeip3XqoudONsOpeJpWyjT3s,7479
@@ -91,7 +91,7 @@ langfun/core/structured/mapping_test.py,sha256=PiXklMeIa8L6KtMi3ju7J9Y39gZy0hIGz
 langfun/core/structured/parsing.py,sha256=keoVqEfzAbdULh6GawWFsTQzU91MzJXYFZjXGXLaD8g,11492
 langfun/core/structured/parsing_test.py,sha256=34wDrXaQ-EYhJLfDL8mX9K53oQMSzh5pVYdKjnESmK8,20895
 langfun/core/structured/prompting.py,sha256=cswl9c93edsYnXsZQmMzPpmqOuKnBzbgebTYBbSxwzo,8815
-langfun/core/structured/prompting_test.py,sha256=rddf5qHN8Gm_JaNMmytwiVEBm-eZVJFLQO4GljUgR44,21700
+langfun/core/structured/prompting_test.py,sha256=8orqsTVDpDb_7oFZtGHtV_zRU_j_9RaOGH1QR8IurIU,21756
 langfun/core/structured/schema.py,sha256=HDb6N7zB4z83kUYW4-ic84QgIHKpR4LZCivMeALDBVo,25967
 langfun/core/structured/schema_generation.py,sha256=U3nRQsqmMZg_qIVDh2fiY3K4JLfsAL1LcKzIFP1iXFg,5316
 langfun/core/structured/schema_generation_test.py,sha256=RM9s71kMNg2jTePwInkiW9fK1ACN37eyPeF8OII-0zw,2950
@@ -107,8 +107,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=DYVrkk7uNKCqJGEHH31HssU2BPuMItU1vJLzfcXIlYg,2156
-langfun-0.0.2.dev20240528.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.0.2.dev20240528.dist-info/METADATA,sha256=xVhkMnUYE5Xf08VcdsiVx86Rqo2qyaFAxBCc4gnN6N0,3452
-langfun-0.0.2.dev20240528.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-langfun-0.0.2.dev20240528.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.0.2.dev20240528.dist-info/RECORD,,
+langfun-0.0.2.dev20240529.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.0.2.dev20240529.dist-info/METADATA,sha256=ZN0dC6pIlryIYt3Ky_clS5em_0DJVzj08ckp3gmyca8,3452
+langfun-0.0.2.dev20240529.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+langfun-0.0.2.dev20240529.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.0.2.dev20240529.dist-info/RECORD,,