langfun 0.1.2.dev202507150805__py3-none-any.whl → 0.1.2.dev202507160804__py3-none-any.whl

langfun/core/modalities/audio_test.py

@@ -34,8 +34,8 @@ class AudioTest(unittest.TestCase):
 
   def test_audio_content(self):
     audio = audio_lib.Audio.from_bytes(content_bytes)
-    self.assertEqual(audio.mime_type, 'audio/x-wav')
-    self.assertEqual(audio.audio_format, 'x-wav')
+    self.assertIn(audio.mime_type, ('audio/wave', 'audio/x-wav'))
+    self.assertIn(audio.audio_format, ('wave', 'x-wav'))
     self.assertEqual(audio.to_bytes(), content_bytes)
 
   def test_bad_audio(self):
@@ -50,8 +50,8 @@ class AudioFileTest(unittest.TestCase):
     audio = audio_lib.Audio.from_uri('http://mock/web/a.wav')
     with mock.patch('requests.get') as mock_requests_get:
       mock_requests_get.side_effect = mock_request
-      self.assertEqual(audio.audio_format, 'x-wav')
-      self.assertEqual(audio.mime_type, 'audio/x-wav')
+      self.assertIn(audio.audio_format, ('wave', 'x-wav'))
+      self.assertIn(audio.mime_type, ('audio/wave', 'audio/x-wav'))
       self.assertEqual(
           audio._raw_html(),
           '<audio controls> <source src="http://mock/web/a.wav"> </audio>',

langfun/core/modalities/mime.py

@@ -18,18 +18,21 @@ import functools
 from typing import Annotated, Any, Iterable, Type, Union
 import langfun.core as lf
 # Placeholder for Google-internal internet access import.
+import puremagic as pm
 import pyglove as pg
 import requests   # pylint: disable=unused-import
 
 
-try:
-  import magic    # pylint: disable=g-import-not-at-top
-  from_buffer = magic.from_buffer
-except ImportError:
-  def from_buffer(*unused_args, **unused_kwargs):
-    raise RuntimeError(
-        'Please install "langfun[mime-auto]" to enable automatic MIME support.'
-    )
+def _detect_mime_type(content: bytes) -> str:
+  """Returns the MIME type from the given content."""
+  try:
+    return pm.from_string(content, mime=True).lower()
+  except pm.PureError:
+    try:
+      content.decode('utf-8')
+      return 'text/plain'
+    except UnicodeDecodeError:
+      return 'application/octet-stream'
 
 
 class Mime(lf.Modality):
@@ -48,7 +51,7 @@ class Mime(lf.Modality):
   @functools.cached_property
   def mime_type(self) -> str:
     """Returns the MIME type."""
-    mime = from_buffer((self.to_bytes()), mime=True)
+    mime = _detect_mime_type(self.to_bytes())
     if (
         self.MIME_PREFIX
         and not mime.lower().startswith(self.MIME_PREFIX)
@@ -160,7 +163,7 @@ class Mime(lf.Modality):
 
     if cls is Mime:
       content = cls.download(uri)
-      mime = from_buffer(content, mime=True).lower()
+      mime = _detect_mime_type(content)
       return cls.class_from_mime_type(mime)(uri=uri, content=content, **kwargs)
     return cls(uri=uri, content=None, **kwargs)
 
@@ -184,8 +187,9 @@ class Mime(lf.Modality):
   @classmethod
   def from_bytes(cls, content: bytes | str, **kwargs) -> 'Mime':
     if cls is Mime:
-      mime = from_buffer(content, mime=True).lower()
-      return cls.class_from_mime_type(mime)(content=content, **kwargs)
+      return cls.class_from_mime_type(
+          _detect_mime_type(content)
+      )(content=content, **kwargs)
     return cls(content=content, **kwargs)
 
   @classmethod

{langfun-0.1.2.dev202507150805.dist-info → langfun-0.1.2.dev202507160804.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfun
-Version: 0.1.2.dev202507150805
+Version: 0.1.2.dev202507160804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -21,30 +21,28 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyglove>=0.4.5.dev202409110000
 Requires-Dist: jinja2>=3.1.2
+Requires-Dist: puremagic>=1.20
+Requires-Dist: pyglove>=0.4.5.dev202507140812
 Requires-Dist: requests>=2.31.0
 Provides-Extra: all
-Requires-Dist: pyglove>=0.4.5.dev202409110000; extra == "all"
 Requires-Dist: jinja2>=3.1.2; extra == "all"
+Requires-Dist: puremagic>=1.20; extra == "all"
+Requires-Dist: pyglove>=0.4.5.dev202507140812; extra == "all"
 Requires-Dist: requests>=2.31.0; extra == "all"
-Requires-Dist: termcolor==1.1.0; extra == "all"
-Requires-Dist: tqdm>=4.64.1; extra == "all"
 Requires-Dist: google-auth>=2.16.0; extra == "all"
-Requires-Dist: python-magic>=0.4.27; extra == "all"
 Requires-Dist: pillow>=10.0.0; extra == "all"
-Provides-Extra: ui
-Requires-Dist: termcolor==1.1.0; extra == "ui"
-Requires-Dist: tqdm>=4.64.1; extra == "ui"
+Requires-Dist: termcolor==1.1.0; extra == "all"
+Requires-Dist: tqdm>=4.64.1; extra == "all"
 Provides-Extra: vertexai
 Requires-Dist: google-auth>=2.16.0; extra == "vertexai"
 Provides-Extra: mime
-Requires-Dist: python-magic>=0.4.27; extra == "mime"
 Requires-Dist: pillow>=10.0.0; extra == "mime"
-Provides-Extra: mime-auto
-Requires-Dist: python-magic>=0.4.27; extra == "mime-auto"
 Provides-Extra: mime-pil
 Requires-Dist: pillow>=10.0.0; extra == "mime-pil"
+Provides-Extra: ui
+Requires-Dist: termcolor==1.1.0; extra == "ui"
+Requires-Dist: tqdm>=4.64.1; extra == "ui"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -202,37 +200,14 @@ a tag from the list below:
 | all                 | All Langfun features.                    |
 | vertexai            | VertexAI access.                         |
 | mime                | All MIME supports.                       |
-| mime-auto           | Automatic MIME type detection.           |
 | mime-pil            | Image support for PIL.                   |
 | ui                  | UI enhancements                          |
 
 For example, to install a nightly build that includes VertexAI access, full
 modality support, and UI enhancements, use:
-```
-pip install langfun[vertexai,mime,ui] --pre
-```
-
-### Solving import issue with `libmagic`
-
-Langfun utilizes `libmagic` for automatic MIME type detection to support
-multi-modal functionalities. However, `pip install libmagic` may not work
-out-of-the-box on all operation systems, sometimes leading to an
-`'ImportError: failed to find libmagic.'` error after Langfun installation.
-
-If you encounter this error, you will need to follow the recommendations below
-to fix the installation of `libmagic` library.
 
-#### OSX
-
-```
-conda install conda-forge::libmagic
 ```
-
-#### Windows:
-```
-pip install python-magic
-pip uninstall python-magic-bin
-pip install python-magic-bin
+pip install langfun[vertexai,mime,ui] --pre
 ```
 
 *Disclaimer: this is not an officially supported Google product.*

{langfun-0.1.2.dev202507150805.dist-info → langfun-0.1.2.dev202507160804.dist-info}/RECORD

@@ -117,10 +117,10 @@ langfun/core/memories/conversation_history.py,sha256=KR78PurXTSeqsRK9QG9xM7-f245
 langfun/core/memories/conversation_history_test.py,sha256=2kzAq2pUrbR01Z9jhxviIao52JK4JVjr5iGP8pwGxlU,2156
 langfun/core/modalities/__init__.py,sha256=rh74vS_oL3XzD83ZJrDzwmW-8jnJHJ3s2_Prmp3ndYQ,1116
 langfun/core/modalities/audio.py,sha256=qCrVCX690SG0ps-ZfOtNWvHn_CmdJsmxF7GySScWUqY,964
-langfun/core/modalities/audio_test.py,sha256=yyGEBYqMXmNs_F2dEtj-PX8HE040vqh-YQppsvdxPw4,2025
+langfun/core/modalities/audio_test.py,sha256=tW1vEy-Cumhf-HgDgCxlSNZqgJb2HTgqOixGWLiwOmw,2065
 langfun/core/modalities/image.py,sha256=9TMO63UHtkimouDb6e1naXWxbK7kRgSGPLzBY26BNk8,1835
 langfun/core/modalities/image_test.py,sha256=XMgtJXY75R5eo0CZ222D1QUy57_hESnttmCGWwDLt7k,3824
-langfun/core/modalities/mime.py,sha256=yr1Mhj607m-jSgSnXNuH7J2kRMJt1tAADKNguKDMM-8,8902
+langfun/core/modalities/mime.py,sha256=BSRGMHNM2X6xgYJIbGsqZyZX9JOlebeYa8-QkFEHsCw,8937
 langfun/core/modalities/mime_test.py,sha256=n084tOkeKHKMOVblCmi5s8nw4o7VYn3ynqvcrz8ww7c,5977
 langfun/core/modalities/pdf.py,sha256=mfaeCbUA4JslFVTARiJh8hW7imvL4tLVw9gUhO5bAZA,727
 langfun/core/modalities/pdf_test.py,sha256=ulZ0FbnlsU0wkrdckJ4ONZPTYRyMPO9Aob1UO6FXygk,1950
@@ -156,8 +156,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=Ot__1P1M8oJfoTp-M9-PQ6HUXqZKyMwvZ5f7yQ3yfyM,2326
-langfun-0.1.2.dev202507150805.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202507150805.dist-info/METADATA,sha256=sO0bfLTiiYrI_s4AbIEF_5v0li1JRZ1IjH492KCQrGU,8178
-langfun-0.1.2.dev202507150805.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-langfun-0.1.2.dev202507150805.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202507150805.dist-info/RECORD,,
+langfun-0.1.2.dev202507160804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202507160804.dist-info/METADATA,sha256=5XixMFne57tMJoz6n2u8ooamDxd2t7GbJCC2ogM3wgs,7380
+langfun-0.1.2.dev202507160804.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+langfun-0.1.2.dev202507160804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202507160804.dist-info/RECORD,,