langfun 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

langfun/__init__.py

@@ -75,4 +75,4 @@ CodeError = coding.CodeError
 # pylint: enable=g-import-not-at-top
 # pylint: enable=g-bad-import-order
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"

langfun/core/coding/python/parsing.py

@@ -161,7 +161,8 @@ class PythonCodeParser(lf.Component):
 
           # Peek forward to see if it could be a valid string.
           nt, nnt_start = _next_token(code_text, i + 1)
-          if nt in (',', '[', ']', '}', ')', '+', '*', '%', '\n', ':'):
+          if (len(c) == 3
+              or nt in (',', '[', ']', '}', ')', '+', '*', '%', '\n', ':')):
             end_quote = True
           elif nt == ' ':
             # Detect if . could be a method invocation.

langfun/core/concurrent_test.py

@@ -256,18 +256,18 @@ class ProgressBarTest(unittest.TestCase):
     with contextlib.redirect_stderr(string_io):
       bar_id = concurrent.ProgressBar.install(None, 4)
       concurrent.ProgressBar.update(bar_id, 1, postfix=None)
-      self.assertIn('1/4', string_io.getvalue())
       concurrent.ProgressBar.update(bar_id, 1, postfix='hello')
-      self.assertIn('2/4', string_io.getvalue())
-      self.assertIn('hello', string_io.getvalue())
       concurrent.ProgressBar.update(bar_id, color='lightgreen')
-      self.assertIn('2/4', string_io.getvalue())
       concurrent.ProgressBar.update(bar_id, 2, postfix=dict(x=1))
-      self.assertIn('4/4', string_io.getvalue())
-      self.assertIn('x=1', string_io.getvalue())
       with self.assertRaisesRegex(ValueError, 'Unsupported postfix'):
         concurrent.ProgressBar.update(bar_id, 0, postfix=1)
       concurrent.ProgressBar.uninstall(bar_id)
+    self.assertIn('1/4', string_io.getvalue())
+    self.assertIn('2/4', string_io.getvalue())
+    self.assertIn('hello', string_io.getvalue())
+    self.assertNotIn('3/4', string_io.getvalue())
+    self.assertIn('4/4', string_io.getvalue())
+    self.assertIn('x=1', string_io.getvalue())
 
 
 class ConcurrentMapTest(unittest.TestCase):

langfun/core/message.py

@@ -318,7 +318,7 @@ class Message(natural_language.NaturalLanguageFormattable, pg.Object):
     while chunk_start < len(text):
       ref_start = text.find(modality.Modality.REF_START, ref_end)
       if ref_start == -1:
-        add_text_chunk(text[chunk_start:].strip())
+        add_text_chunk(text[chunk_start:].strip(' '))
         break
 
       var_start = ref_start + len(modality.Modality.REF_START)
@@ -330,29 +330,31 @@ class Message(natural_language.NaturalLanguageFormattable, pg.Object):
       var_name = text[var_start:ref_end].strip()
       var_value = self.get_modality(var_name)
       if var_value is not None:
-        add_text_chunk(text[chunk_start:ref_start].strip())
+        add_text_chunk(text[chunk_start:ref_start].strip(' '))
         chunks.append(var_value)
         chunk_start = ref_end + len(modality.Modality.REF_END)
     return chunks
 
   @classmethod
   def from_chunks(
-      cls, chunks: list[str | modality.Modality], separator: str = '\n'
+      cls, chunks: list[str | modality.Modality], separator: str = ' '
   ) -> 'Message':
     """Assembly a message from a list of string or modality objects."""
     fused_text = io.StringIO()
     ref_index = 0
     metadata = dict()
-
+    last_char = None
     for i, chunk in enumerate(chunks):
-      if i > 0:
+      if i > 0 and last_char not in ('\t', ' ', '\n'):
         fused_text.write(separator)
       if isinstance(chunk, str):
         fused_text.write(chunk)
+        last_char = chunk[-1]
       else:
         assert isinstance(chunk, modality.Modality), chunk
         var_name = f'obj{ref_index}'
         fused_text.write(modality.Modality.text_marker(var_name))
+        last_char = modality.Modality.REF_END[-1]
         # Make a reference if the chunk is already owned by another object
         # to avoid copy.
         metadata[var_name] = pg.maybe_ref(chunk)

langfun/core/message_test.py

@@ -295,7 +295,7 @@ class MessageTest(unittest.TestCase):
             [
                 'Hi, this is',
                 CustomModality('foo'),
-                'and this is {{b}}.',
+                'and this is {{b}}.\n',
                 CustomModality('bar'),
                 '{{something else',
             ],
@@ -306,11 +306,8 @@ class MessageTest(unittest.TestCase):
             message.AIMessage.from_chunks(chunks),
             message.AIMessage(
                 inspect.cleandoc("""
-                    Hi, this is
-                    <<[[obj0]]>>
-                    and this is {{b}}.
-                    <<[[obj1]]>>
-                    {{something else
+                    Hi, this is <<[[obj0]]>> and this is {{b}}.
+                    <<[[obj1]]>> {{something else
                     """),
                 obj0=pg.Ref(m.a),
                 obj1=pg.Ref(m.x.c),

{langfun-0.1.0.dist-info → langfun-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.0
+Version: 0.1.1
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -26,14 +26,14 @@ Requires-Dist: google-generativeai >=0.3.2
 Requires-Dist: jinja2 >=3.1.2
 Requires-Dist: openai ==0.27.2
 Requires-Dist: openpyxl >=3.1.0
-Requires-Dist: pandas >=2.1.4
+Requires-Dist: pandas >=2.0.3
 Requires-Dist: pyglove >=0.4.5.dev20240423
 Requires-Dist: python-docx >=0.8.11
 Requires-Dist: python-magic >=0.4.27
 Requires-Dist: requests >=2.31.0
 Requires-Dist: termcolor ==1.1.0
 Requires-Dist: tqdm >=4.64.1
-Requires-Dist: pillow >=10.1.0
+Requires-Dist: pillow >=10.0.0
 
 <div align="center">
 <img src="https://raw.githubusercontent.com/google/langfun/main/docs/_static/logo.svg" width="520px" alt="logo"></img>
@@ -82,12 +82,11 @@ Langfun is *simple and elegant*:
 import langfun as lf
 import pyglove as pg
 
-from typing import Literal
 from IPython import display
 
 class Item(pg.Object):
   name: str
-  size: Literal['large', 'medium', 'small']
+  color: str
 
 class ImageDescription(pg.Object):
   items: list[Item]

{langfun-0.1.0.dist-info → langfun-0.1.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-langfun/__init__.py,sha256=mPN6TszWxnQKhlnMGvEvu56etujXb1Zcy4DDMUy1IH8,2274
+langfun/__init__.py,sha256=ZqERg4fvvtFwr5L41Lfev9FSuCBm8PbQrZmcKvvloxE,2274
 langfun/core/__init__.py,sha256=Mdp1a2YnXdSmfTfbUwuAnEWYbjA3rXXGtbxl5fljZyg,4812
 langfun/core/component.py,sha256=Icyoj9ICoJoK2r2PHbrFXbxnseOr9QZZOvKWklLWNo8,10276
 langfun/core/component_test.py,sha256=q15Xn51cVTu2RKxZ9U5VQgT3bm6RQ4638bKhWBtvW5o,8220
 langfun/core/concurrent.py,sha256=TRc49pJ3HQro2kb5FtcWkHjhBm8UcgE8RJybU5cU3-0,24537
-langfun/core/concurrent_test.py,sha256=mwFMZhDUdppnDr7vDSTwcbMHwrdsIoKJwRYNtl4ZWL4,15185
+langfun/core/concurrent_test.py,sha256=9HWnS4ja5Ji1ALfJs2zIt7w4w0oNm9dOZM7bgzoX5ag,15176
 langfun/core/console.py,sha256=bk5rNPNm9rMGW5YT2HixxU04p2umnoabn5SDz6Dqe88,2317
 langfun/core/console_test.py,sha256=5SYJdxpJGLgdSSQqqMPoA1X6jpsLD8rgcyk-EgI65oE,1077
 langfun/core/langfunc.py,sha256=RvIcRjIq0jWYRu1xim-FYe4HSrt97r3GMBO_PuagUmw,11060
@@ -13,8 +13,8 @@ langfun/core/language_model_test.py,sha256=TlNmVUfBfDQZzIiiBqCBTrxgcoyj2qNp3kONv
 langfun/core/logging.py,sha256=FyZRxUy2TTF6tWLhQCRpCvfH55WGUdNgQjUTK_SQLnY,5320
 langfun/core/logging_test.py,sha256=qvm3RObYP3knO2PnXR9evBRl4gH621GnjnwywbGbRfg,1833
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
-langfun/core/message.py,sha256=Rw3yC9HyGRjMhfDgyNjGlSCALEyDDbJ0_o6qTXeeDiQ,15738
-langfun/core/message_test.py,sha256=b6DDRoQ5j3uK-dc0QPSLelNTKaXX10MxJrRiI61iGX4,9574
+langfun/core/message.py,sha256=3tm9HW_mnh0GmlyuJxMK8_KpQvx9GtXgVXYQTzoegJo,15882
+langfun/core/message_test.py,sha256=74W5odVTvhY2U4KBBnHfTbCqD0z4cexO-9GWJQzRLO8,9516
 langfun/core/modality.py,sha256=Tla4t86DUYHpbZ2G7dy1r19fTj_Ga5XOvlYp6lbWa-Q,3512
 langfun/core/modality_test.py,sha256=HyZ5xONKQ0Fw18SzoWAq-Ob9njOXIIjBo1hNtw-rudw,2400
 langfun/core/natural_language.py,sha256=3ynSnaYQnjE60LIPK5fyMgdIjubnPYZwzGq4rWPeloE,1177
@@ -39,7 +39,7 @@ langfun/core/coding/python/execution.py,sha256=raZix62g2fwt6Lgykll2DFzkLlEjVqN9E
 langfun/core/coding/python/execution_test.py,sha256=lExY6GMLeuCsCKXgM2KbAPJ6kqSlfHmz3RG0-dqfVcI,7197
 langfun/core/coding/python/generation.py,sha256=xivSeOKGN00HnG1TLuFhPfP-JyRuRrSELxVJW2ngqIQ,7750
 langfun/core/coding/python/generation_test.py,sha256=54bgKr1DgzYFLoqR8bTn7Yjol0gPCuR6XvRltR4l6YM,2777
-langfun/core/coding/python/parsing.py,sha256=uyvI1c5OLZhMVK2Oltkl3oJxSLlG0wadlpQcYPEE0-U,7097
+langfun/core/coding/python/parsing.py,sha256=LMg8REP4VDY0YQjtPAGNAW4rKlMNdSXF8m19wMT9yrY,7128
 langfun/core/coding/python/parsing_test.py,sha256=9vAWF484kWIm6JZq8NFiMgKUDhXV-deRl1QMmNERfAA,7386
 langfun/core/coding/python/permissions.py,sha256=1QWGHvzL8MM0Ok_auQ9tURqZHtdOfJaDpBzZ29GUE-c,2544
 langfun/core/coding/python/permissions_test.py,sha256=w5EDb8QxpxgJyZkojyzVWQvDfg366zn99-g__6TbPQ0,2699
@@ -117,8 +117,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=rBW2Qr8yi-aWYwoTwRR-n1peKyMX9QXPZXURjLgoiRs,2264
-langfun-0.1.0.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.0.dist-info/METADATA,sha256=MUO2hj8fPm1zMlG9yIN8x0Ct1zisC39u769k5TlPJG0,5293
-langfun-0.1.0.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
-langfun-0.1.0.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.0.dist-info/RECORD,,
+langfun-0.1.1.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.1.dist-info/METADATA,sha256=wQ1jpdRAOtWbpPuoXL9m_0v0yUiFxraPcmJ8X6k6qms,5235
+langfun-0.1.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+langfun-0.1.1.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.1.dist-info/RECORD,,

{langfun-0.1.0.dist-info → langfun-0.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.3)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any