langfun 0.1.1.dev20240721__py3-none-any.whl → 0.1.1.dev20240724__py3-none-any.whl

langfun/core/llms/__init__.py

@@ -29,6 +29,7 @@ from langfun.core.llms.rest import REST
 
 # Gemini models.
 from langfun.core.llms.google_genai import GenAI
+from langfun.core.llms.google_genai import GeminiFlash1_5
 from langfun.core.llms.google_genai import GeminiPro
 from langfun.core.llms.google_genai import GeminiPro1_5
 from langfun.core.llms.google_genai import GeminiProVision

langfun/core/modalities/image.py

@@ -15,6 +15,7 @@
 
 import functools
 import io
+
 from langfun.core.modalities import mime
 from PIL import Image as pil_image
 
@@ -31,6 +32,16 @@ class Image(mime.Mime):
   def _html(self, uri: str) -> str:
     return f'<img src="{uri}">'
 
+  @functools.cached_property
   def size(self) -> tuple[int, int]:
     img = pil_image.open(io.BytesIO(self.to_bytes()))
     return img.size
+
+  def to_pil_image(self) -> pil_image.Image:
+    return pil_image.open(io.BytesIO(self.to_bytes()))
+
+  @classmethod
+  def from_pil_image(cls, img: pil_image.Image) -> 'Image':
+    buf = io.BytesIO()
+    img.save(buf, format='PNG')
+    return cls.from_bytes(buf.getvalue())

langfun/core/modalities/image_test.py

@@ -12,12 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Image tests."""
+import io
 import unittest
 from unittest import mock
 
 import langfun.core as lf
 from langfun.core.modalities import image as image_lib
 from langfun.core.modalities import mime as mime_lib
+import PIL.Image as pil_image
 import pyglove as pg
 
 
@@ -81,7 +83,19 @@ class ImageTest(unittest.TestCase):
     image = image_lib.Image.from_uri('http://mock/web/a.png')
     with mock.patch('requests.get') as mock_requests_get:
       mock_requests_get.side_effect = mock_request
-      self.assertEqual(image.size(), (24, 24))
+      self.assertEqual(image.size, (24, 24))
+
+  def test_to_pil_image(self):
+    image = image_lib.Image.from_uri('http://mock/web/a.png')
+    with mock.patch('requests.get') as mock_requests_get:
+      mock_requests_get.side_effect = mock_request
+      self.assertIsInstance(image.to_pil_image(), pil_image.Image)
+
+  def test_from_pil_image(self):
+    image = pil_image.open(io.BytesIO(image_content))
+    self.assertIsInstance(
+        image_lib.Image.from_pil_image(image), image_lib.Image
+    )
 
 
 if __name__ == '__main__':

{langfun-0.1.1.dev20240721.dist-info → langfun-0.1.1.dev20240724.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.1.dev20240721
+Version: 0.1.1.dev20240724
 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>

{langfun-0.1.1.dev20240721.dist-info → langfun-0.1.1.dev20240724.dist-info}/RECORD

@@ -52,7 +52,7 @@ langfun/core/eval/patching.py,sha256=R0s2eAd1m97exQt06dmUL0V_MBG0W2Hxg7fhNB7cXW0
 langfun/core/eval/patching_test.py,sha256=8kCd54Egjju22FMgtJuxEsrXkW8ifs-UUBHtrCG1L6w,4775
 langfun/core/eval/scoring.py,sha256=1J7IATo-8FXUR0SBqk9icztHiM0lWkBFcWUo-vUURgQ,6376
 langfun/core/eval/scoring_test.py,sha256=O8olHbrUEg60gMxwOkWzKBJZpZoUlmVnBANX5Se2SXM,4546
-langfun/core/llms/__init__.py,sha256=3OA4uQczFEKHoIUcWDO3myesdeDISLUWJ8fjp6zjGww,4551
+langfun/core/llms/__init__.py,sha256=sRD_PjfD5wKuzANCOCjChjuZHUn2Q1WruZeVflqej5M,4609
 langfun/core/llms/anthropic.py,sha256=Gon3fOi31RhZFgNd0ijyTnKnUdp9hrWrCoSXyO4UaLw,7316
 langfun/core/llms/anthropic_test.py,sha256=T-swuMkfnlgs8Fpif4rtXs579exGk0TsbLMirXDZCkg,5533
 langfun/core/llms/fake.py,sha256=Dd7-6ka9pFf3fcWZyczamjOqQ91MOI-m7We3Oc9Ffmo,2927
@@ -79,8 +79,8 @@ langfun/core/memories/conversation_history_test.py,sha256=AaW8aNoFjxNusanwJDV0r3
 langfun/core/modalities/__init__.py,sha256=F8P72IwFiTpEseTR2tYEJyQMlDW7fd9csvGJquLKJNg,1269
 langfun/core/modalities/audio.py,sha256=Qxo7bYjLKQ1gVJVomr9RqR2SvxY826QgXhTzzk437Sk,952
 langfun/core/modalities/audio_test.py,sha256=gWCB9h3FyrdGqro3ajBXqkw0lU0W1sBjOOq6wZbl7Fg,2027
-langfun/core/modalities/image.py,sha256=sMMmjNYUTdPViDOqc93WtSFrzE1-GRrEv-6I3eb8iYY,1083
-langfun/core/modalities/image_test.py,sha256=Rcq4b77E9-Vp6rhqJ5ZIh0yJkEtcJbZZwjTjlu9dx8E,3282
+langfun/core/modalities/image.py,sha256=uBSAwExnSD4MevhK9Z4qExPlLVFBQLUfjPOAldtWFOI,1387
+langfun/core/modalities/image_test.py,sha256=A0aYblxpnKABDgm2OVPxF8iRq4qFVanM9TPcaewkAgA,3774
 langfun/core/modalities/mime.py,sha256=7oYvwYZHb3uhjiL2rF6kvQWsWufY0UXl72wfDXC59ys,5918
 langfun/core/modalities/mime_test.py,sha256=kmRiPP-3Py02NnKPu0oPexSIJ-MXaaE2UYY82ga0TV8,2913
 langfun/core/modalities/ms_office.py,sha256=jOidMSdWCaV9RILpGz8VJkpTSpHJNoirD53jzQvcytM,3388
@@ -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.1.dev20240721.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.1.dev20240721.dist-info/METADATA,sha256=e9k1GL8sFT6ZMYB965oqZPNNzB8bSQp7O7KAc_HKzao,5247
-langfun-0.1.1.dev20240721.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
-langfun-0.1.1.dev20240721.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.1.dev20240721.dist-info/RECORD,,
+langfun-0.1.1.dev20240724.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.1.dev20240724.dist-info/METADATA,sha256=XZS-DIas-Z5Pyn39RVPGQwkHqp3OshgQAHoBtipbI-Q,5247
+langfun-0.1.1.dev20240724.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+langfun-0.1.1.dev20240724.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.1.dev20240724.dist-info/RECORD,,

{langfun-0.1.1.dev20240721.dist-info → langfun-0.1.1.dev20240724.dist-info}/WHEEL

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