langfun 0.0.2.dev20240508__tar.gz → 0.0.2.dev20240510__tar.gz

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/PKG-INFO

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

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/langfun/core/llms/__init__.py

@@ -27,6 +27,7 @@ from langfun.core.llms.fake import StaticSequence
 # Gemini models.
 from langfun.core.llms.google_genai import GenAI
 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
 from langfun.core.llms.google_genai import Palm2
 from langfun.core.llms.google_genai import Palm2_IT

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/langfun/core/llms/google_genai.py

@@ -34,6 +34,7 @@ class GenAI(lf.LanguageModel):
           'gemini-pro-vision',
           'text-bison-001',
           'chat-bison-001',
+          'gemini-1.5-pro-latest',
       ],
       'Model name.',
   ]
@@ -262,6 +263,13 @@ _GOOGLE_GENAI_MODEL_HUB = _ModelHub()
 #
 
 
+class GeminiPro1_5(GenAI):  # pylint: disable=invalid-name
+  """Gemini Pro latest model."""
+
+  model = 'gemini-1.5-pro-latest'
+  multimodal = True
+
+
 class GeminiPro(GenAI):
   """Gemini Pro model."""
 

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/langfun/core/llms/openai.py

@@ -233,8 +233,9 @@ class OpenAI(lf.LanguageModel):
         for chunk in prompt.chunk():
           if isinstance(chunk, str):
             item = dict(type='text', text=chunk)
-          elif isinstance(chunk, lf_modalities.Image) and chunk.uri:
-            item = dict(type='image_url', image_url=dict(url=chunk.uri))
+          elif isinstance(chunk, lf_modalities.Image):
+            uri = chunk.uri or chunk.content_uri
+            item = dict(type='image_url', image_url=dict(url=uri))
           else:
             raise ValueError(f'Unsupported modality object: {chunk!r}.')
           content.append(item)

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/langfun/core/modalities/image.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 """Image modality."""
 
-import base64
 import imghdr
 from typing import cast
 from langfun.core.modalities import mime
@@ -36,5 +35,4 @@ class Image(mime.MimeType):
   def _repr_html_(self) -> str:
     if self.uri and self.uri.lower().startswith(('http:', 'https:', 'ftp:')):
       return f'<img src="{self.uri}">'
-    image_raw = base64.b64encode(self.to_bytes()).decode()
-    return f'<img src="data:image/{self.image_format};base64,{image_raw}">'
+    return f'<img src="{self.content_uri}">'

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/langfun/core/modalities/mime.py

@@ -14,6 +14,7 @@
 """MIME type data."""
 
 import abc
+import base64
 from typing import Annotated, Union
 import langfun.core as lf
 import pyglove as pg
@@ -54,6 +55,11 @@ class MimeType(lf.Modality):
     self.rebind(content=content, skip_notification=True)
     return self.content
 
+  @property
+  def content_uri(self) -> str:
+    base64_content = base64.b64encode(self.to_bytes()).decode()
+    return f'data:{self.mime_type};base64,{base64_content}'
+
   @classmethod
   def from_uri(cls, uri: str, **kwargs) -> 'MimeType':
     return cls(uri=uri, content=None, **kwargs)

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/langfun/core/modalities/video.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 """Video modality."""
 
-import base64
 from typing import cast
 from langfun.core.modalities import mime
 
@@ -40,8 +39,7 @@ class Video(mime.MimeType):
   def _repr_html_(self) -> str:
     if self.uri and self.uri.lower().startswith(('http:', 'https:', 'ftp:')):
       return f'<video controls> <source src="{self.uri}"> </video>'
-    video_raw = base64.b64encode(self.to_bytes()).decode()
     return (
         '<video controls> <source'
-        f' src="data:video/{self.video_format};base64,{video_raw}"> </video>'
+        f' src="data:video/{self.content_uri}"> </video>'
     )

{langfun-0.0.2.dev20240508 → langfun-0.0.2.dev20240510}/langfun.egg-info/PKG-INFO

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