langfun 0.1.0__tar.gz → 0.1.1.dev20240720__tar.gz

{langfun-0.1.0 → langfun-0.1.1.dev20240720}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.0
+Version: 0.1.1.dev20240720
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -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 → langfun-0.1.1.dev20240720}/README.md

@@ -45,12 +45,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 → langfun-0.1.1.dev20240720}/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-0.1.0 → langfun-0.1.1.dev20240720}/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-0.1.0 → langfun-0.1.1.dev20240720}/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-0.1.0 → langfun-0.1.1.dev20240720}/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-0.1.0 → langfun-0.1.1.dev20240720}/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 → langfun-0.1.1.dev20240720}/langfun.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.0
+Version: 0.1.1.dev20240720
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -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]