langfun 0.1.1.dev20240730__tar.gz → 0.1.1.dev20240802__tar.gz

{langfun-0.1.1.dev20240730 → langfun-0.1.1.dev20240802}/PKG-INFO

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

{langfun-0.1.1.dev20240730 → langfun-0.1.1.dev20240802}/langfun/core/eval/base.py

@@ -542,6 +542,8 @@ class Evaluable(lf.Component):
           'padding: 10px; border: 1px solid; margin-top: 10px">'
       )
       s.write(html.escape(m.get('formatted_text', m.text)))
+
+      # Write output.
       if m.result is not None:
         s.write(
             '<div style="color: magenta; white-space: pre-wrap;'
@@ -549,6 +551,23 @@ class Evaluable(lf.Component):
         )
         s.write(html.escape(pg.format(m.result)))
         s.write('</div>')
+
+      # Write modality information.
+      if 'lm-input' in m.tags or 'lm-response' in m.tags:
+        modalities = m.referred_modalities()
+        if modalities:
+          s.write(f'<div style="color: {text_color}; white-space: pre-wrap;'
+                  'padding: 10px; border: 1px solid; margin-top: 10px"><table>')
+          for name, modality in modalities.items():
+            s.write(f'<tr><td>{name}</td><td>')
+            if hasattr(modality, '_repr_html_'):
+              s.write(modality._repr_html_())   # pylint: disable=protected-access
+            else:
+              s.write(html.escape(pg.format(modality, max_bytes_len=32)))
+            s.write('</td></tr>')
+          s.write('</table></div>')
+
+      # Write usage information.
       if m.metadata.get('usage', None):
         s.write(
             '<div style="background-color: #EEEEEE; color: black; '

{langfun-0.1.1.dev20240730 → langfun-0.1.1.dev20240802}/langfun/core/eval/matching.py

@@ -271,9 +271,9 @@ class Matching(base.Evaluation):
     for i, (example, output, message) in enumerate(self.matches):
       bgcolor = 'white' if i % 2 == 0 else '#DDDDDD'
       s.write(f'<tr style="background-color: {bgcolor}"><td>{i + 1}</td>')
-      input_str = pg.format(example, verbose=False)
+      input_str = pg.format(example, verbose=False, max_bytes_len=32)
       s.write(f'<td style="color:green;white-space:pre-wrap">{input_str}</td>')
-      output_str = pg.format(output, verbose=False)
+      output_str = pg.format(output, verbose=False, max_bytes_len=32)
       s.write(f'<td style="color:blue;white-space:pre-wrap">{output_str}</td>')
       s.write('<td>')
       self._render_message(message, s)
@@ -296,9 +296,9 @@ class Matching(base.Evaluation):
     for i, (example, output, message) in enumerate(self.mismatches):
       bgcolor = 'white' if i % 2 == 0 else '#DDDDDD'
       s.write(f'<tr style="background-color: {bgcolor}"><td>{i + 1}</td>')
-      input_str = pg.format(example, verbose=False)
+      input_str = pg.format(example, verbose=False, max_bytes_len=32)
       s.write(f'<td style="color:green;white-space:pre-wrap">{input_str}</td>')
-      output_str = pg.format(output, verbose=False)
+      output_str = pg.format(output, verbose=False, max_bytes_len=32)
       s.write(
           f'<td style="color:magenta;white-space:pre-wrap">{output_str}</td>'
       )

{langfun-0.1.1.dev20240730 → langfun-0.1.1.dev20240802}/langfun/core/eval/scoring.py

@@ -196,9 +196,9 @@ class Scoring(base.Evaluation):
     for i, (example, output, score, message) in enumerate(self.scored):
       bgcolor = 'white' if i % 2 == 0 else '#DDDDDD'
       s.write(f'<tr style="background-color: {bgcolor}"><td>{i + 1}</td>')
-      input_str = pg.format(example, verbose=False)
+      input_str = pg.format(example, verbose=False, max_bytes_len=32)
       s.write(f'<td style="color:green;white-space:pre-wrap">{input_str}</td>')
-      output_str = pg.format(output, verbose=False)
+      output_str = pg.format(output, verbose=False, max_bytes_len=32)
       s.write(f'<td style="color:blue;white-space:pre-wrap">{output_str}</td>')
       s.write(f'<td style="color:magenta;white-space:pre-wrap">{score}</td>')
       s.write('<td>')

{langfun-0.1.1.dev20240730 → langfun-0.1.1.dev20240802}/langfun/core/llms/__init__.py

@@ -39,6 +39,8 @@ from langfun.core.llms.google_genai import Palm2_IT
 # OpenAI models.
 from langfun.core.llms.openai import OpenAI
 
+from langfun.core.llms.openai import Gpt4oMini
+from langfun.core.llms.openai import Gpt4oMini_20240718
 from langfun.core.llms.openai import Gpt4o
 from langfun.core.llms.openai import Gpt4o_20240513
 

{langfun-0.1.1.dev20240730 → langfun-0.1.1.dev20240802}/langfun/core/llms/openai.py

@@ -34,6 +34,8 @@ SUPPORTED_MODELS_AND_SETTINGS = {
     # Models from https://platform.openai.com/docs/models
     # RPM is from https://platform.openai.com/docs/guides/rate-limits
     # GPT-4o models
+    'gpt-4o-mini': pg.Dict(rpm=10000, tpm=5000000),
+    'gpt-4o-mini-2024-07-18': pg.Dict(rpm=10000, tpm=5000000),
     'gpt-4o': pg.Dict(rpm=10000, tpm=5000000),
     'gpt-4o-2024-05-13': pg.Dict(rpm=10000, tpm=5000000),
     # GPT-4-Turbo models
@@ -347,6 +349,18 @@ class Gpt4_32K_20230613(Gpt4_32K):    # pylint:disable=invalid-name
   model = 'gpt-4-32k-0613'
 
 
+class Gpt4oMini(OpenAI):
+  """GPT-4o Mini."""
+  model = 'gpt-4o-mini'
+  multimodal = True
+
+
+class Gpt4oMini_20240718(OpenAI):  # pylint:disable=invalid-name
+  """GPT-4o Mini."""
+  model = 'gpt-4o-mini-2024-07-18'
+  multimodal = True
+
+
 class Gpt4o(OpenAI):
   """GPT-4o."""
   model = 'gpt-4o'

{langfun-0.1.1.dev20240730 → langfun-0.1.1.dev20240802}/langfun.egg-info/PKG-INFO

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