langfun 0.1.2.dev202410100804__py3-none-any.whl → 0.1.2.dev202410110804__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- langfun/core/logging.py +144 -43
- langfun/core/logging_test.py +33 -0
- langfun/core/message.py +238 -70
- langfun/core/message_test.py +70 -45
- langfun/core/modalities/audio.py +1 -1
- langfun/core/modalities/audio_test.py +1 -1
- langfun/core/modalities/image.py +1 -1
- langfun/core/modalities/image_test.py +9 -3
- langfun/core/modalities/mime.py +39 -3
- langfun/core/modalities/mime_test.py +39 -0
- langfun/core/modalities/ms_office.py +2 -5
- langfun/core/modalities/ms_office_test.py +1 -1
- langfun/core/modalities/pdf_test.py +1 -1
- langfun/core/modalities/video.py +1 -1
- langfun/core/modalities/video_test.py +2 -2
- langfun/core/structured/mapping.py +38 -0
- langfun/core/structured/mapping_test.py +55 -0
- langfun/core/structured/schema.py +34 -0
- langfun/core/template.py +107 -1
- langfun/core/template_test.py +37 -0
- {langfun-0.1.2.dev202410100804.dist-info → langfun-0.1.2.dev202410110804.dist-info}/METADATA +1 -1
- {langfun-0.1.2.dev202410100804.dist-info → langfun-0.1.2.dev202410110804.dist-info}/RECORD +25 -25
- {langfun-0.1.2.dev202410100804.dist-info → langfun-0.1.2.dev202410110804.dist-info}/LICENSE +0 -0
- {langfun-0.1.2.dev202410100804.dist-info → langfun-0.1.2.dev202410110804.dist-info}/WHEEL +0 -0
- {langfun-0.1.2.dev202410100804.dist-info → langfun-0.1.2.dev202410110804.dist-info}/top_level.txt +0 -0
langfun/core/message_test.py
CHANGED
@@ -15,6 +15,7 @@
|
|
15
15
|
|
16
16
|
import inspect
|
17
17
|
import unittest
|
18
|
+
from langfun.core import language_model
|
18
19
|
from langfun.core import message
|
19
20
|
from langfun.core import modality
|
20
21
|
import pyglove as pg
|
@@ -26,9 +27,6 @@ class CustomModality(modality.Modality):
|
|
26
27
|
def to_bytes(self):
|
27
28
|
return self.content.encode()
|
28
29
|
|
29
|
-
def _repr_html_(self):
|
30
|
-
return f'<div>CustomModality: {self.content}</div>'
|
31
|
-
|
32
30
|
|
33
31
|
class MessageTest(unittest.TestCase):
|
34
32
|
|
@@ -39,11 +37,19 @@ class MessageTest(unittest.TestCase):
|
|
39
37
|
|
40
38
|
d = pg.Dict(x=A())
|
41
39
|
|
42
|
-
m = message.UserMessage(
|
40
|
+
m = message.UserMessage(
|
41
|
+
'hi',
|
42
|
+
metadata=dict(x=1), x=pg.Ref(d.x),
|
43
|
+
y=2,
|
44
|
+
tags=['lm-input']
|
45
|
+
)
|
43
46
|
self.assertEqual(m.metadata, {'x': pg.Ref(d.x), 'y': 2})
|
44
47
|
self.assertEqual(m.sender, 'User')
|
45
48
|
self.assertIs(m.x, d.x)
|
46
49
|
self.assertEqual(m.y, 2)
|
50
|
+
self.assertTrue(m.has_tag('lm-input'))
|
51
|
+
self.assertTrue(m.has_tag(('lm-input', '')))
|
52
|
+
self.assertFalse(m.has_tag('lm-response'))
|
47
53
|
|
48
54
|
with self.assertRaises(AttributeError):
|
49
55
|
_ = m.z
|
@@ -332,50 +338,69 @@ class MessageTest(unittest.TestCase):
|
|
332
338
|
)
|
333
339
|
)
|
334
340
|
|
335
|
-
def
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
341
|
+
def assert_html_content(self, html, expected):
|
342
|
+
expected = inspect.cleandoc(expected).strip()
|
343
|
+
actual = html.content.strip()
|
344
|
+
if actual != expected:
|
345
|
+
print(actual)
|
346
|
+
self.assertEqual(actual, expected)
|
347
|
+
|
348
|
+
def test_html_user_message(self):
|
349
|
+
self.assert_html_content(
|
350
|
+
message.UserMessage(
|
351
|
+
'what is a <div>'
|
352
|
+
).to_html(enable_summary_tooltip=False),
|
353
|
+
"""
|
354
|
+
<details open class="pyglove user-message lf-message"><summary><div class="summary_title">UserMessage(...)</div></summary><div class="complex_value"><div class="message-tags"></div><div class="message-text">what is a <div></div><div class="message-metadata"><details class="pyglove dict"><summary><div class="summary_name">metadata</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><span class="empty_container"></span></div></details></div></div></details>
|
355
|
+
"""
|
340
356
|
)
|
341
|
-
self.
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
'
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
|
350
|
-
'border-radius:10px; padding:5px; margin-top: 5px; margin-bottom: '
|
351
|
-
'5px; white-space: pre-wrap">img1</span> and <span style'
|
352
|
-
'="color: black;background-color: #f7dc6f;display:inline-block; '
|
353
|
-
'border-radius:10px; padding:5px; margin-top: 5px; margin-bottom: '
|
354
|
-
'5px; white-space: pre-wrap">x.img2</span> </span><div style='
|
355
|
-
'"padding-left: 20px; margin-top: 10px"><table style="border-top: '
|
356
|
-
'1px solid #EEEEEE;"><tr><td style="padding: 5px; vertical-align: '
|
357
|
-
'top; border-bottom: 1px solid #EEEEEE"><span style="color: black;'
|
358
|
-
'background-color: #f7dc6f;display:inline-block; border-radius:'
|
359
|
-
'10px; padding:5px; margin-top: 5px; margin-bottom: 0px; '
|
360
|
-
'white-space: pre-wrap">img1</span></td><td style="padding: 15px '
|
361
|
-
'5px 5px 5px; vertical-align: top; border-bottom: 1px solid '
|
362
|
-
'#EEEEEE;"><div>CustomModality: foo</div></td></tr><tr><td style='
|
363
|
-
'"padding: 5px; vertical-align: top; border-bottom: 1px solid '
|
364
|
-
'#EEEEEE"><span style="color: black;background-color: #f7dc6f;'
|
365
|
-
'display:inline-block; border-radius:10px; padding:5px; margin-top:'
|
366
|
-
' 5px; margin-bottom: 0px; white-space: pre-wrap">x.img2</span>'
|
367
|
-
'</td><td style="padding: 15px 5px 5px 5px; vertical-align: top; '
|
368
|
-
'border-bottom: 1px solid #EEEEEE;"><div>CustomModality: bar</div>'
|
369
|
-
'</td></tr></table></div></div>'
|
370
|
-
)
|
357
|
+
self.assert_html_content(
|
358
|
+
message.UserMessage(
|
359
|
+
'what is this <<[[image]]>>',
|
360
|
+
tags=['lm-input'],
|
361
|
+
image=CustomModality('bird')
|
362
|
+
).to_html(enable_summary_tooltip=False, include_message_metadata=False),
|
363
|
+
"""
|
364
|
+
<details open class="pyglove user-message lf-message"><summary><div class="summary_title">UserMessage(...)</div></summary><div class="complex_value"><div class="message-tags"><span>lm-input</span></div><div class="message-text">what is this<div class="modality-in-text"><details class="pyglove custom-modality"><summary><div class="summary_name">image</div><div class="summary_title">CustomModality(...)</div></summary><div class="complex_value custom-modality"><table><tr><td><span class="object_key str">content</span><span class="tooltip key-path">metadata.image.content</span></td><td><div><span class="simple_value str">'bird'</span></div></td></tr></table></div></details></div></div></div></details>
|
365
|
+
"""
|
371
366
|
)
|
372
|
-
|
373
|
-
|
374
|
-
|
367
|
+
|
368
|
+
def test_html_ai_message(self):
|
369
|
+
image = CustomModality('foo')
|
370
|
+
user_message = message.UserMessage(
|
371
|
+
'What is in this image? <<[[image]]>> this is a test',
|
372
|
+
metadata=dict(image=image),
|
373
|
+
source=message.UserMessage('User input'),
|
374
|
+
tags=['lm-input']
|
375
375
|
)
|
376
|
-
|
377
|
-
'
|
378
|
-
|
376
|
+
ai_message = message.AIMessage(
|
377
|
+
'My name is Gemini',
|
378
|
+
metadata=dict(
|
379
|
+
result=pg.Dict(x=1, y=2, z=pg.Dict(a=[12, 323])),
|
380
|
+
usage=language_model.LMSamplingUsage(10, 2, 12)
|
381
|
+
),
|
382
|
+
tags=['lm-response', 'lm-output'],
|
383
|
+
source=user_message,
|
384
|
+
)
|
385
|
+
self.assert_html_content(
|
386
|
+
ai_message.to_html(enable_summary_tooltip=False),
|
387
|
+
"""
|
388
|
+
<details open class="pyglove ai-message lf-message"><summary><div class="summary_title">AIMessage(...)</div></summary><div class="complex_value"><div class="message-tags"><span>lm-response</span><span>lm-output</span></div><div class="message-text">My name is Gemini</div><div class="message-result"><details open class="pyglove dict"><summary><div class="summary_name">result</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">x</span><span class="tooltip key-path">metadata.result.x</span></td><td><div><span class="simple_value int">1</span></div></td></tr><tr><td><span class="object_key str">y</span><span class="tooltip key-path">metadata.result.y</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">z</span><span class="tooltip key-path">metadata.result.z</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">a</span><span class="tooltip key-path">metadata.result.z.a</span></td><td><div><details class="pyglove list"><summary><div class="summary_title">List(...)</div></summary><div class="complex_value list"><table><tr><td><span class="object_key int">0</span><span class="tooltip key-path">metadata.result.z.a[0]</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key int">1</span><span class="tooltip key-path">metadata.result.z.a[1]</span></td><td><div><span class="simple_value int">323</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div><div class="message-usage"><details open class="pyglove lm-sampling-usage"><summary><div class="summary_name">llm usage</div><div class="summary_title">LMSamplingUsage(...)</div></summary><div class="complex_value lm-sampling-usage"><table><tr><td><span class="object_key str">prompt_tokens</span><span class="tooltip key-path">metadata.usage.prompt_tokens</span></td><td><div><span class="simple_value int">10</span></div></td></tr><tr><td><span class="object_key str">completion_tokens</span><span class="tooltip key-path">metadata.usage.completion_tokens</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">total_tokens</span><span class="tooltip key-path">metadata.usage.total_tokens</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key str">num_requests</span><span class="tooltip key-path">metadata.usage.num_requests</span></td><td><div><span class="simple_value int">1</span></div></td></tr></table></div></details></div><div class="message-metadata"><details class="pyglove dict"><summary><div class="summary_name">metadata</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">result</span><span class="tooltip key-path">metadata.result</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">x</span><span class="tooltip key-path">metadata.result.x</span></td><td><div><span class="simple_value int">1</span></div></td></tr><tr><td><span class="object_key str">y</span><span class="tooltip key-path">metadata.result.y</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">z</span><span class="tooltip key-path">metadata.result.z</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">a</span><span class="tooltip key-path">metadata.result.z.a</span></td><td><div><details class="pyglove list"><summary><div class="summary_title">List(...)</div></summary><div class="complex_value list message-metadata"><table><tr><td><span class="object_key int">0</span><span class="tooltip key-path">metadata.result.z.a[0]</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key int">1</span><span class="tooltip key-path">metadata.result.z.a[1]</span></td><td><div><span class="simple_value int">323</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr><tr><td><span class="object_key str">usage</span><span class="tooltip key-path">metadata.usage</span></td><td><div><details class="pyglove lm-sampling-usage"><summary><div class="summary_title">LMSamplingUsage(...)</div></summary><div class="complex_value lm-sampling-usage message-metadata"><table><tr><td><span class="object_key str">prompt_tokens</span><span class="tooltip key-path">metadata.usage.prompt_tokens</span></td><td><div><span class="simple_value int">10</span></div></td></tr><tr><td><span class="object_key str">completion_tokens</span><span class="tooltip key-path">metadata.usage.completion_tokens</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">total_tokens</span><span class="tooltip key-path">metadata.usage.total_tokens</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key str">num_requests</span><span class="tooltip key-path">metadata.usage.num_requests</span></td><td><div><span class="simple_value int">1</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div><details open class="pyglove user-message lf-message"><summary><div class="summary_name">source</div><div class="summary_title">UserMessage(...)</div></summary><div class="complex_value"><div class="message-tags"><span>lm-input</span></div><div class="message-text">What is in this image?<div class="modality-in-text"><details class="pyglove custom-modality"><summary><div class="summary_name">image</div><div class="summary_title">CustomModality(...)</div></summary><div class="complex_value custom-modality"><table><tr><td><span class="object_key str">content</span><span class="tooltip key-path">source.metadata.image.content</span></td><td><div><span class="simple_value str">'foo'</span></div></td></tr></table></div></details></div>this is a test</div><div class="message-metadata"><details class="pyglove dict"><summary><div class="summary_name">metadata</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">image</span><span class="tooltip key-path">source.metadata.image</span></td><td><div><details class="pyglove custom-modality"><summary><div class="summary_title">CustomModality(...)</div></summary><div class="complex_value custom-modality message-metadata"><table><tr><td><span class="object_key str">content</span><span class="tooltip key-path">source.metadata.image.content</span></td><td><div><span class="simple_value str">'foo'</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></div></details></div></details>
|
389
|
+
"""
|
390
|
+
)
|
391
|
+
self.assert_html_content(
|
392
|
+
ai_message.to_html(
|
393
|
+
enable_summary_tooltip=False,
|
394
|
+
collapse_modalities_in_text=False,
|
395
|
+
collapse_llm_usage=True,
|
396
|
+
collapse_message_result_level=0,
|
397
|
+
collapse_message_metadata_level=0,
|
398
|
+
collapse_source_message_level=0,
|
399
|
+
source_tag=None,
|
400
|
+
),
|
401
|
+
"""
|
402
|
+
<details open class="pyglove ai-message lf-message"><summary><div class="summary_title">AIMessage(...)</div></summary><div class="complex_value"><div class="message-tags"><span>lm-response</span><span>lm-output</span></div><div class="message-text">My name is Gemini</div><div class="message-result"><details class="pyglove dict"><summary><div class="summary_name">result</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">x</span><span class="tooltip key-path">metadata.result.x</span></td><td><div><span class="simple_value int">1</span></div></td></tr><tr><td><span class="object_key str">y</span><span class="tooltip key-path">metadata.result.y</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">z</span><span class="tooltip key-path">metadata.result.z</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">a</span><span class="tooltip key-path">metadata.result.z.a</span></td><td><div><details class="pyglove list"><summary><div class="summary_title">List(...)</div></summary><div class="complex_value list"><table><tr><td><span class="object_key int">0</span><span class="tooltip key-path">metadata.result.z.a[0]</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key int">1</span><span class="tooltip key-path">metadata.result.z.a[1]</span></td><td><div><span class="simple_value int">323</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div><div class="message-usage"><details class="pyglove lm-sampling-usage"><summary><div class="summary_name">llm usage</div><div class="summary_title">LMSamplingUsage(...)</div></summary><div class="complex_value lm-sampling-usage"><table><tr><td><span class="object_key str">prompt_tokens</span><span class="tooltip key-path">metadata.usage.prompt_tokens</span></td><td><div><span class="simple_value int">10</span></div></td></tr><tr><td><span class="object_key str">completion_tokens</span><span class="tooltip key-path">metadata.usage.completion_tokens</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">total_tokens</span><span class="tooltip key-path">metadata.usage.total_tokens</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key str">num_requests</span><span class="tooltip key-path">metadata.usage.num_requests</span></td><td><div><span class="simple_value int">1</span></div></td></tr></table></div></details></div><div class="message-metadata"><details class="pyglove dict"><summary><div class="summary_name">metadata</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">result</span><span class="tooltip key-path">metadata.result</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">x</span><span class="tooltip key-path">metadata.result.x</span></td><td><div><span class="simple_value int">1</span></div></td></tr><tr><td><span class="object_key str">y</span><span class="tooltip key-path">metadata.result.y</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">z</span><span class="tooltip key-path">metadata.result.z</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">a</span><span class="tooltip key-path">metadata.result.z.a</span></td><td><div><details class="pyglove list"><summary><div class="summary_title">List(...)</div></summary><div class="complex_value list message-metadata"><table><tr><td><span class="object_key int">0</span><span class="tooltip key-path">metadata.result.z.a[0]</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key int">1</span><span class="tooltip key-path">metadata.result.z.a[1]</span></td><td><div><span class="simple_value int">323</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr><tr><td><span class="object_key str">usage</span><span class="tooltip key-path">metadata.usage</span></td><td><div><details class="pyglove lm-sampling-usage"><summary><div class="summary_title">LMSamplingUsage(...)</div></summary><div class="complex_value lm-sampling-usage message-metadata"><table><tr><td><span class="object_key str">prompt_tokens</span><span class="tooltip key-path">metadata.usage.prompt_tokens</span></td><td><div><span class="simple_value int">10</span></div></td></tr><tr><td><span class="object_key str">completion_tokens</span><span class="tooltip key-path">metadata.usage.completion_tokens</span></td><td><div><span class="simple_value int">2</span></div></td></tr><tr><td><span class="object_key str">total_tokens</span><span class="tooltip key-path">metadata.usage.total_tokens</span></td><td><div><span class="simple_value int">12</span></div></td></tr><tr><td><span class="object_key str">num_requests</span><span class="tooltip key-path">metadata.usage.num_requests</span></td><td><div><span class="simple_value int">1</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div><details class="pyglove user-message lf-message"><summary><div class="summary_name">source</div><div class="summary_title">UserMessage(...)</div></summary><div class="complex_value"><div class="message-tags"><span>lm-input</span></div><div class="message-text">What is in this image?<div class="modality-in-text"><details open class="pyglove custom-modality"><summary><div class="summary_name">image</div><div class="summary_title">CustomModality(...)</div></summary><div class="complex_value custom-modality"><table><tr><td><span class="object_key str">content</span><span class="tooltip key-path">source.metadata.image.content</span></td><td><div><span class="simple_value str">'foo'</span></div></td></tr></table></div></details></div>this is a test</div><div class="message-metadata"><details class="pyglove dict"><summary><div class="summary_name">metadata</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><table><tr><td><span class="object_key str">image</span><span class="tooltip key-path">source.metadata.image</span></td><td><div><details class="pyglove custom-modality"><summary><div class="summary_title">CustomModality(...)</div></summary><div class="complex_value custom-modality message-metadata"><table><tr><td><span class="object_key str">content</span><span class="tooltip key-path">source.metadata.image.content</span></td><td><div><span class="simple_value str">'foo'</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div><details class="pyglove user-message lf-message"><summary><div class="summary_name">source</div><div class="summary_title">UserMessage(...)</div></summary><div class="complex_value"><div class="message-tags"></div><div class="message-text">User input</div><div class="message-metadata"><details class="pyglove dict"><summary><div class="summary_name">metadata</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict message-metadata"><span class="empty_container"></span></div></details></div></div></details></div></details></div></details>
|
403
|
+
"""
|
379
404
|
)
|
380
405
|
|
381
406
|
|
langfun/core/modalities/audio.py
CHANGED
@@ -26,5 +26,5 @@ class Audio(mime.Mime):
|
|
26
26
|
def audio_format(self) -> str:
|
27
27
|
return self.mime_type.removeprefix(self.MIME_PREFIX + '/')
|
28
28
|
|
29
|
-
def
|
29
|
+
def _mime_control_for(self, uri: str) -> str:
|
30
30
|
return f'<audio controls> <source src="{uri}"> </audio>'
|
@@ -53,7 +53,7 @@ class AudioFileTest(unittest.TestCase):
|
|
53
53
|
self.assertEqual(audio.audio_format, 'x-wav')
|
54
54
|
self.assertEqual(audio.mime_type, 'audio/x-wav')
|
55
55
|
self.assertEqual(
|
56
|
-
audio.
|
56
|
+
audio._raw_html(),
|
57
57
|
'<audio controls> <source src="http://mock/web/a.wav"> </audio>',
|
58
58
|
)
|
59
59
|
self.assertEqual(audio.to_bytes(), content_bytes)
|
langfun/core/modalities/image.py
CHANGED
@@ -41,7 +41,7 @@ class Image(mime.Mime):
|
|
41
41
|
def image_format(self) -> str:
|
42
42
|
return self.mime_type.removeprefix(self.MIME_PREFIX + '/')
|
43
43
|
|
44
|
-
def
|
44
|
+
def _mime_control_for(self, uri: str) -> str:
|
45
45
|
return f'<img src="{uri}">'
|
46
46
|
|
47
47
|
@functools.cached_property
|
@@ -45,7 +45,7 @@ class ImageTest(unittest.TestCase):
|
|
45
45
|
def test_from_bytes(self):
|
46
46
|
image = image_lib.Image.from_bytes(image_content)
|
47
47
|
self.assertEqual(image.image_format, 'png')
|
48
|
-
self.assertIn('data:image/png;base64,', image.
|
48
|
+
self.assertIn('data:image/png;base64,', image._raw_html())
|
49
49
|
self.assertEqual(image.to_bytes(), image_content)
|
50
50
|
with self.assertRaisesRegex(
|
51
51
|
lf.ModalityError, '.* cannot be converted to text'
|
@@ -67,7 +67,10 @@ class ImageTest(unittest.TestCase):
|
|
67
67
|
with mock.patch('requests.get') as mock_requests_get:
|
68
68
|
mock_requests_get.side_effect = mock_request
|
69
69
|
self.assertEqual(image.image_format, 'png')
|
70
|
-
self.assertEqual(
|
70
|
+
self.assertEqual(
|
71
|
+
image._raw_html(),
|
72
|
+
'<img src="http://mock/web/a.png">'
|
73
|
+
)
|
71
74
|
self.assertEqual(image.to_bytes(), image_content)
|
72
75
|
|
73
76
|
def test_from_uri_base_cls(self):
|
@@ -76,7 +79,10 @@ class ImageTest(unittest.TestCase):
|
|
76
79
|
image = mime_lib.Mime.from_uri('http://mock/web/a.png')
|
77
80
|
self.assertIsInstance(image, image_lib.Image)
|
78
81
|
self.assertEqual(image.image_format, 'png')
|
79
|
-
self.assertEqual(
|
82
|
+
self.assertEqual(
|
83
|
+
image._raw_html(),
|
84
|
+
'<img src="http://mock/web/a.png">'
|
85
|
+
)
|
80
86
|
self.assertEqual(image.to_bytes(), image_content)
|
81
87
|
|
82
88
|
def test_image_size(self):
|
langfun/core/modalities/mime.py
CHANGED
@@ -178,14 +178,50 @@ class Mime(lf.Modality):
|
|
178
178
|
assert content is not None
|
179
179
|
return content
|
180
180
|
|
181
|
-
def
|
181
|
+
def _html_tree_view_content(
|
182
|
+
self,
|
183
|
+
**kwargs) -> str:
|
184
|
+
return self._raw_html()
|
185
|
+
|
186
|
+
def _html_tree_view_render(
|
187
|
+
self,
|
188
|
+
view: pg.views.HtmlTreeView,
|
189
|
+
raw_mime_content: bool = pg.View.PresetArgValue(False), # pytype: disable=annotation-type-mismatch
|
190
|
+
display_modality_when_hover: bool = pg.View.PresetArgValue(False), # pytype: disable=annotation-type-mismatch
|
191
|
+
**kwargs
|
192
|
+
):
|
193
|
+
if raw_mime_content:
|
194
|
+
return pg.Html(self._raw_html())
|
195
|
+
else:
|
196
|
+
if display_modality_when_hover:
|
197
|
+
kwargs.update(
|
198
|
+
display_modality_when_hover=True,
|
199
|
+
enable_summary_tooltip=True,
|
200
|
+
)
|
201
|
+
return super()._html_tree_view_render(view=view, **kwargs)
|
202
|
+
|
203
|
+
def _html_tree_view_tooltip(
|
204
|
+
self,
|
205
|
+
*,
|
206
|
+
view: pg.views.HtmlTreeView,
|
207
|
+
content: pg.Html | str | None = None,
|
208
|
+
display_modality_when_hover: bool = pg.View.PresetArgValue(False), # pytype: disable=annotation-type-mismatch
|
209
|
+
**kwargs
|
210
|
+
):
|
211
|
+
if content is None and display_modality_when_hover:
|
212
|
+
content = self._raw_html()
|
213
|
+
return super()._html_tree_view_tooltip(
|
214
|
+
view=view, content=content, **kwargs
|
215
|
+
)
|
216
|
+
|
217
|
+
def _raw_html(self) -> str:
|
182
218
|
if self.uri and self.uri.lower().startswith(('http:', 'https:', 'ftp:')):
|
183
219
|
uri = self.uri
|
184
220
|
else:
|
185
221
|
uri = self.content_uri
|
186
|
-
return self.
|
222
|
+
return self._mime_control_for(uri)
|
187
223
|
|
188
|
-
def
|
224
|
+
def _mime_control_for(self, uri) -> str:
|
189
225
|
return f'<embed type="{self.mime_type}" src="{uri}"/>'
|
190
226
|
|
191
227
|
|
@@ -12,6 +12,7 @@
|
|
12
12
|
# See the License for the specific language governing permissions and
|
13
13
|
# limitations under the License.
|
14
14
|
"""MIME tests."""
|
15
|
+
import inspect
|
15
16
|
import unittest
|
16
17
|
from unittest import mock
|
17
18
|
|
@@ -77,6 +78,44 @@ class CustomMimeTest(unittest.TestCase):
|
|
77
78
|
self.assertEqual(content.to_bytes(), 'bar')
|
78
79
|
self.assertEqual(content.mime_type, 'text/plain')
|
79
80
|
|
81
|
+
def assert_html_content(self, html, expected):
|
82
|
+
expected = inspect.cleandoc(expected).strip()
|
83
|
+
actual = html.content.strip()
|
84
|
+
if actual != expected:
|
85
|
+
print(actual)
|
86
|
+
self.assertEqual(actual, expected)
|
87
|
+
|
88
|
+
def test_html(self):
|
89
|
+
self.assert_html_content(
|
90
|
+
mime.Custom('text/plain', b'foo').to_html(
|
91
|
+
enable_summary_tooltip=False,
|
92
|
+
enable_key_tooltip=False,
|
93
|
+
),
|
94
|
+
"""
|
95
|
+
<details open class="pyglove custom"><summary><div class="summary_title">Custom(...)</div></summary><embed type="text/plain" src="data:text/plain;base64,Zm9v"/></details>
|
96
|
+
"""
|
97
|
+
)
|
98
|
+
self.assert_html_content(
|
99
|
+
mime.Custom('text/plain', b'foo').to_html(
|
100
|
+
enable_summary_tooltip=False,
|
101
|
+
enable_key_tooltip=False,
|
102
|
+
raw_mime_content=True,
|
103
|
+
),
|
104
|
+
"""
|
105
|
+
<embed type="text/plain" src="data:text/plain;base64,Zm9v"/>
|
106
|
+
"""
|
107
|
+
)
|
108
|
+
self.assert_html_content(
|
109
|
+
mime.Custom('text/plain', b'foo').to_html(
|
110
|
+
enable_summary_tooltip=False,
|
111
|
+
enable_key_tooltip=False,
|
112
|
+
display_modality_when_hover=True,
|
113
|
+
),
|
114
|
+
"""
|
115
|
+
<details open class="pyglove custom"><summary><div class="summary_title">Custom(...)</div><span class="tooltip custom"><embed type="text/plain" src="data:text/plain;base64,Zm9v"/></span></summary><embed type="text/plain" src="data:text/plain;base64,Zm9v"/></details>
|
116
|
+
"""
|
117
|
+
)
|
118
|
+
|
80
119
|
|
81
120
|
if __name__ == '__main__':
|
82
121
|
unittest.main()
|
@@ -29,7 +29,7 @@ class Xlsx(mime.Mime):
|
|
29
29
|
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
|
30
30
|
)
|
31
31
|
|
32
|
-
def
|
32
|
+
def _raw_html(self) -> str:
|
33
33
|
try:
|
34
34
|
import pandas as pd # pylint: disable=g-import-not-at-top
|
35
35
|
import openpyxl # pylint: disable=g-import-not-at-top, unused-import
|
@@ -40,9 +40,6 @@ class Xlsx(mime.Mime):
|
|
40
40
|
'Please install "langfun[mime-xlsx]" to enable XLSX support.'
|
41
41
|
) from e
|
42
42
|
|
43
|
-
def _repr_html_(self) -> str:
|
44
|
-
return self.to_html()
|
45
|
-
|
46
43
|
def _is_compatible(self, mime_types: Iterable[str]) -> bool:
|
47
44
|
return bool(set(mime_types).intersection([
|
48
45
|
'text/html',
|
@@ -52,7 +49,7 @@ class Xlsx(mime.Mime):
|
|
52
49
|
def _make_compatible(self, mime_types: Iterable[str]) -> mime.Mime:
|
53
50
|
"""Returns the MimeType of the converted file."""
|
54
51
|
del mime_types
|
55
|
-
return mime.Mime(uri=self.uri, content=self.
|
52
|
+
return mime.Mime(uri=self.uri, content=self._raw_html())
|
56
53
|
|
57
54
|
|
58
55
|
class Docx(mime.Mime):
|
@@ -347,7 +347,7 @@ class XlsxTest(unittest.TestCase):
|
|
347
347
|
),
|
348
348
|
)
|
349
349
|
self.assertEqual(content.to_bytes(), xlsx_bytes)
|
350
|
-
self.assertEqual(content.
|
350
|
+
self.assertEqual(content._raw_html(), expected_xlsx_html)
|
351
351
|
|
352
352
|
|
353
353
|
class PptxTest(unittest.TestCase):
|
langfun/core/modalities/video.py
CHANGED
@@ -26,5 +26,5 @@ class Video(mime.Mime):
|
|
26
26
|
def video_format(self) -> str:
|
27
27
|
return self.mime_type.removeprefix(self.MIME_PREFIX + '/')
|
28
28
|
|
29
|
-
def
|
29
|
+
def _mime_control_for(self, uri: str) -> str:
|
30
30
|
return f'<video controls> <source src="{uri}"> </video>'
|
@@ -38,7 +38,7 @@ class VideoContentTest(unittest.TestCase):
|
|
38
38
|
video = video_lib.Video.from_bytes(mp4_bytes)
|
39
39
|
self.assertEqual(video.mime_type, 'video/mp4')
|
40
40
|
self.assertEqual(video.video_format, 'mp4')
|
41
|
-
self.assertIn('data:video/mp4;base64,', video.
|
41
|
+
self.assertIn('data:video/mp4;base64,', video._raw_html())
|
42
42
|
self.assertEqual(video.to_bytes(), mp4_bytes)
|
43
43
|
|
44
44
|
def test_bad_video(self):
|
@@ -56,7 +56,7 @@ class VideoFileTest(unittest.TestCase):
|
|
56
56
|
self.assertEqual(video.video_format, 'mp4')
|
57
57
|
self.assertEqual(video.mime_type, 'video/mp4')
|
58
58
|
self.assertEqual(
|
59
|
-
video.
|
59
|
+
video._raw_html(),
|
60
60
|
'<video controls> <source src="http://mock/web/a.mp4"> </video>',
|
61
61
|
)
|
62
62
|
self.assertEqual(video.to_bytes(), mp4_bytes)
|
@@ -183,6 +183,44 @@ class MappingExample(lf.NaturalLanguageFormattable, lf.Component):
|
|
183
183
|
result.write(lf.colored(str(self.metadata), color='cyan'))
|
184
184
|
return result.getvalue().strip()
|
185
185
|
|
186
|
+
def _html_tree_view_content(
|
187
|
+
self,
|
188
|
+
*,
|
189
|
+
parent: Any,
|
190
|
+
view: pg.views.HtmlTreeView,
|
191
|
+
root_path: pg.KeyPath,
|
192
|
+
**kwargs,
|
193
|
+
):
|
194
|
+
def render_value(value, **kwargs):
|
195
|
+
if isinstance(value, lf.Template):
|
196
|
+
# Make a shallow copy to make sure modalities are rooted by
|
197
|
+
# the input.
|
198
|
+
value = value.clone().render()
|
199
|
+
return view.render(value, **kwargs)
|
200
|
+
|
201
|
+
exclude_keys = []
|
202
|
+
if not self.context:
|
203
|
+
exclude_keys.append('context')
|
204
|
+
if not self.schema:
|
205
|
+
exclude_keys.append('schema')
|
206
|
+
if not self.metadata:
|
207
|
+
exclude_keys.append('metadata')
|
208
|
+
|
209
|
+
kwargs.pop('special_keys', None)
|
210
|
+
kwargs.pop('exclude_keys', None)
|
211
|
+
return view.complex_value(
|
212
|
+
self.sym_init_args,
|
213
|
+
parent=self,
|
214
|
+
root_path=root_path,
|
215
|
+
render_value_fn=render_value,
|
216
|
+
special_keys=['input', 'output', 'context', 'schema', 'metadata'],
|
217
|
+
exclude_keys=exclude_keys,
|
218
|
+
**kwargs
|
219
|
+
)
|
220
|
+
|
221
|
+
def _html_tree_view_collapse_level(self) -> int:
|
222
|
+
return 2
|
223
|
+
|
186
224
|
|
187
225
|
class Mapping(lf.LangFunc):
|
188
226
|
"""Base class for mapping.
|
@@ -14,6 +14,7 @@
|
|
14
14
|
"""Tests for structured mapping example."""
|
15
15
|
|
16
16
|
import inspect
|
17
|
+
from typing import Any
|
17
18
|
import unittest
|
18
19
|
|
19
20
|
import langfun.core as lf
|
@@ -164,6 +165,60 @@ class MappingExampleTest(unittest.TestCase):
|
|
164
165
|
pg.eq(pg.from_json_str(example.to_json_str()), example)
|
165
166
|
)
|
166
167
|
|
168
|
+
def assert_html_content(self, html, expected):
|
169
|
+
expected = inspect.cleandoc(expected).strip()
|
170
|
+
actual = html.content.strip()
|
171
|
+
if actual != expected:
|
172
|
+
print(actual)
|
173
|
+
self.assertEqual(actual, expected)
|
174
|
+
|
175
|
+
def test_html(self):
|
176
|
+
|
177
|
+
class Answer(pg.Object):
|
178
|
+
answer: int
|
179
|
+
|
180
|
+
class Addition(lf.Template):
|
181
|
+
"""Template Addition.
|
182
|
+
|
183
|
+
{{x}} + {{y}} = ?
|
184
|
+
"""
|
185
|
+
x: Any
|
186
|
+
y: Any
|
187
|
+
|
188
|
+
example = mapping.MappingExample(
|
189
|
+
input=Addition(x=1, y=2),
|
190
|
+
schema=Answer,
|
191
|
+
context='compute 1 + 1',
|
192
|
+
output=Answer(answer=3),
|
193
|
+
metadata={'foo': 'bar'},
|
194
|
+
)
|
195
|
+
self.assert_html_content(
|
196
|
+
example.to_html(
|
197
|
+
enable_summary_tooltip=False, include_message_metadata=False
|
198
|
+
),
|
199
|
+
"""
|
200
|
+
<details open class="pyglove mapping-example"><summary><div class="summary_title">MappingExample(...)</div></summary><div class="complex_value mapping-example"><div class="special_value"><details open class="pyglove user-message lf-message"><summary><div class="summary_name">input</div><div class="summary_title">UserMessage(...)</div></summary><div class="complex_value"><div class="message-tags"><span>rendered</span></div><div class="message-text">1 + 2 = ?</div></div></details></div><div class="special_value"><details open class="pyglove answer"><summary><div class="summary_name">output</div><div class="summary_title">Answer(...)</div></summary><div class="complex_value answer"><table><tr><td><span class="object_key str">answer</span><span class="tooltip key-path">output.answer</span></td><td><div><span class="simple_value int">3</span></div></td></tr></table></div></details></div><div class="special_value"><details open class="pyglove str"><summary><div class="summary_name">context</div><div class="summary_title">'compute 1 + 1'</div></summary><span class="simple_value str">'compute 1 + 1'</span></details></div><div class="special_value"><details open class="pyglove schema"><summary><div class="summary_name">schema</div><div class="summary_title">Schema(...)</div></summary><div class="lf-schema-definition">Answer
|
201
|
+
|
202
|
+
```python
|
203
|
+
class Answer:
|
204
|
+
answer: int
|
205
|
+
```</div></details></div><div class="special_value"><details open class="pyglove dict"><summary><div class="summary_name">metadata</div><div class="summary_title">Dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">foo</span><span class="tooltip key-path">metadata.foo</span></td><td><div><span class="simple_value str">'bar'</span></div></td></tr></table></div></details></div></div></details>
|
206
|
+
"""
|
207
|
+
)
|
208
|
+
|
209
|
+
example = mapping.MappingExample(
|
210
|
+
input=Addition(x=1, y=2),
|
211
|
+
output=Answer(answer=3),
|
212
|
+
)
|
213
|
+
self.assert_html_content(
|
214
|
+
example.to_html(
|
215
|
+
enable_summary_tooltip=False, include_message_metadata=False
|
216
|
+
),
|
217
|
+
"""
|
218
|
+
<details open class="pyglove mapping-example"><summary><div class="summary_title">MappingExample(...)</div></summary><div class="complex_value mapping-example"><div class="special_value"><details open class="pyglove user-message lf-message"><summary><div class="summary_name">input</div><div class="summary_title">UserMessage(...)</div></summary><div class="complex_value"><div class="message-tags"><span>rendered</span></div><div class="message-text">1 + 2 = ?</div></div></details></div><div class="special_value"><details open class="pyglove answer"><summary><div class="summary_name">output</div><div class="summary_title">Answer(...)</div></summary><div class="complex_value answer"><table><tr><td><span class="object_key str">answer</span><span class="tooltip key-path">output.answer</span></td><td><div><span class="simple_value int">3</span></div></td></tr></table></div></details></div></div></details>
|
219
|
+
"""
|
220
|
+
)
|
221
|
+
|
167
222
|
|
168
223
|
if __name__ == '__main__':
|
169
224
|
unittest.main()
|
@@ -189,6 +189,40 @@ class Schema(lf.NaturalLanguageFormattable, pg.Object):
|
|
189
189
|
return value
|
190
190
|
return cls(parse_value_spec(value))
|
191
191
|
|
192
|
+
def _html_tree_view_content(
|
193
|
+
self,
|
194
|
+
*,
|
195
|
+
view: pg.views.HtmlTreeView,
|
196
|
+
root_path: pg.KeyPath,
|
197
|
+
**kwargs,
|
198
|
+
):
|
199
|
+
return pg.Html.element(
|
200
|
+
'div',
|
201
|
+
[self.schema_str(protocol='python')],
|
202
|
+
css_class=['lf-schema-definition']
|
203
|
+
).add_style(
|
204
|
+
"""
|
205
|
+
.lf-schema-definition {
|
206
|
+
color: blue;
|
207
|
+
margin: 5px;
|
208
|
+
white-space: pre-wrap;
|
209
|
+
}
|
210
|
+
"""
|
211
|
+
)
|
212
|
+
|
213
|
+
def _html_tree_view_tooltip(
|
214
|
+
self,
|
215
|
+
*,
|
216
|
+
view: pg.views.HtmlTreeView,
|
217
|
+
content: pg.Html | str | None = None,
|
218
|
+
**kwargs,
|
219
|
+
):
|
220
|
+
return view.tooltip(
|
221
|
+
self,
|
222
|
+
content=content or pg.Html.escape(self.schema_str(protocol='python')),
|
223
|
+
**kwargs
|
224
|
+
)
|
225
|
+
|
192
226
|
|
193
227
|
def _top_level_object_specs_from_value(value: pg.Symbolic) -> list[Type[Any]]:
|
194
228
|
"""Returns a list of top level value specs from a symbolic value."""
|