langfun 0.0.2.dev20240527__tar.gz → 0.0.2.dev20240529__tar.gz

{langfun-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/PKG-INFO

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

{langfun-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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-0.0.2.dev20240527 → langfun-0.0.2.dev20240529}/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.dev20240527 → langfun-0.0.2.dev20240529}/langfun.egg-info/PKG-INFO

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