langfun 0.1.1.dev20240723__tar.gz → 0.1.1.dev20240725__tar.gz

{langfun-0.1.1.dev20240723 → langfun-0.1.1.dev20240725}/PKG-INFO

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

{langfun-0.1.1.dev20240723 → langfun-0.1.1.dev20240725}/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-0.1.1.dev20240723 → langfun-0.1.1.dev20240725}/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-0.1.1.dev20240723 → langfun-0.1.1.dev20240725}/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.dev20240723 → langfun-0.1.1.dev20240725}/langfun.egg-info/PKG-INFO

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