langfun 0.1.2.dev202507150805__tar.gz → 0.1.2.dev202507160804__tar.gz

{langfun-0.1.2.dev202507150805 → langfun-0.1.2.dev202507160804}/PKG-INFO

@@ -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 → langfun-0.1.2.dev202507160804}/README.md

@@ -142,37 +142,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 → langfun-0.1.2.dev202507160804}/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-0.1.2.dev202507150805 → langfun-0.1.2.dev202507160804}/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 → langfun-0.1.2.dev202507160804}/langfun.egg-info/PKG-INFO

@@ -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 → langfun-0.1.2.dev202507160804}/langfun.egg-info/requires.txt

@@ -1,24 +1,21 @@
-pyglove>=0.4.5.dev202409110000
 jinja2>=3.1.2
+puremagic>=1.20
+pyglove>=0.4.5.dev202507140812
 requests>=2.31.0
 
 [all]
-pyglove>=0.4.5.dev202409110000
 jinja2>=3.1.2
+puremagic>=1.20
+pyglove>=0.4.5.dev202507140812
 requests>=2.31.0
-termcolor==1.1.0
-tqdm>=4.64.1
 google-auth>=2.16.0
-python-magic>=0.4.27
 pillow>=10.0.0
+termcolor==1.1.0
+tqdm>=4.64.1
 
 [mime]
-python-magic>=0.4.27
 pillow>=10.0.0
 
-[mime-auto]
-python-magic>=0.4.27
-
 [mime-pil]
 pillow>=10.0.0