langfun 0.1.1.dev20240827__py3-none-any.whl → 0.1.1.dev202408282153__py3-none-any.whl

langfun/core/concurrent.py

@@ -13,17 +13,30 @@
 # limitations under the License.
 """Utility library for handling concurrency in langfun."""
 
+import abc
 import collections
 import concurrent.futures
 import dataclasses
+import io
 import random
+import sys
 import threading
 import time
 from typing import Any, Callable, Iterable, Iterator, Literal, Sequence, Tuple, Type, Union
 
 from langfun.core import component
+from langfun.core import text_formatting
 import pyglove as pg
-from tqdm import auto as tqdm
+
+
+progress_bar: Literal['tqdm', 'console', None] = None
+
+try:
+  from tqdm import auto as tqdm   # pylint: disable=g-import-not-at-top
+  progress_bar = 'tqdm'
+except ImportError as e:
+  progress_bar = 'console'
+  tqdm = None
 
 
 def with_context_access(func: Callable[..., Any]) -> Callable[..., Any]:
@@ -142,7 +155,6 @@ def with_retry(
         attempt = 1
       return base_interval() * (2 ** (attempt - 1))
 
-    wait_interval = None
     wait_intervals = []
     errors = []
     while True:
@@ -356,17 +368,17 @@ class ProgressBar:
     label: str | None
     total: int
     color: str | None = None
-    postfix: dict[str, str] | None = None
+    status: dict[str, Any] | None = None
 
   @dataclasses.dataclass
   class Update:
     """Progress bar update."""
     bar_id: int
     delta: int
-    postfix: Union[dict[str, str], str, None] = None
+    status: Union[dict[str, Any], str, None] = None
     color: str | None = None
 
-  _progress_bars: dict[int, tqdm.tqdm] = {}
+  _progress_bars: dict[int, '_ProgressControl'] = {}
   _install_requests: list[tuple[int, Settings]] = []
   _updates: collections.deque[Update] = collections.deque()
   _uninstall_requests: list[int] = []
@@ -378,11 +390,11 @@ class ProgressBar:
       label: str | None,
       total: int,
       color: str | None = None,
-      postfix: dict[str, str] | None = None,
+      status: dict[str, Any] | None = None,
       ) -> int:
     """Installs a progress bar and returns a reference id."""
     with cls._lock:
-      settings = ProgressBar.Settings(label, total, color, postfix)
+      settings = ProgressBar.Settings(label, total, color, status)
       bar_id = id(settings)
       cls._install_requests.append((bar_id, settings))
       return bar_id
@@ -392,15 +404,17 @@ class ProgressBar:
       cls,
       bar_id: int,
       delta: int = 0,
-      postfix: Union[dict[str, str], str, None] = None,
+      status: Union[dict[str, Any], str, None] = None,
       color: str | None = None,
       refresh: bool = True,
       ) -> None:
     """Report the progress for a label."""
+    if status is not None and not isinstance(status, (str, dict)):
+      raise ValueError(f'Unsupported status: {status}')
     with cls._lock:
       cls._updates.append(
           ProgressBar.Update(
-              bar_id=bar_id, delta=delta, postfix=postfix, color=color,
+              bar_id=bar_id, delta=delta, status=status, color=color,
           )
       )
     if refresh:
@@ -422,11 +436,11 @@ class ProgressBar:
       # Process install requests.
       if cls._install_requests:
         for bar_id, settings in cls._install_requests:
-          cls._progress_bars[bar_id] = tqdm.tqdm(
+          cls._progress_bars[bar_id] = _progress_control(
               total=settings.total,
-              desc=settings.label,
-              colour=settings.color,
-              postfix=settings.postfix)
+              label=settings.label,
+              color=settings.color,
+              status=settings.status)
         cls._install_requests.clear()
 
       # Process updates.
@@ -441,15 +455,11 @@ class ProgressBar:
         if update.delta > 0:
           bar.update(update.delta)
 
-        if isinstance(update.postfix, str):
-          bar.set_postfix_str(update.postfix, refresh=False)
-        elif isinstance(update.postfix, dict):
-          bar.set_postfix(update.postfix, refresh=False)
-        elif update.postfix is not None:
-          raise ValueError(f'Unsupported postfix: {update.postfix}')
+        if update.status is not None:
+          bar.set_status(update.status)
 
         if update.color is not None:
-          bar.colour = update.color
+          bar.set_color(update.color)
         updated_bars.add(bar)
 
       # Refresh each updated bar just once.
@@ -603,7 +613,7 @@ def concurrent_map(
         if len(error_text) >= 64:
           error_text = error_text[:64] + '...'
         status['LastError'] = error_text
-      ProgressBar.update(bar_id, delta=1, postfix=status)
+      ProgressBar.update(bar_id, delta=1, status=status)
 
   try:
     if ordered:
@@ -729,5 +739,122 @@ class ExecutorPool:
       raise ValueError(f'Unsupported value: {maybe_executor}.')
 
 
+class _ProgressControl(pg.Object):
+  """Abstract progress control."""
+  # Disable symbolic comparison so the hash is based on object address.
+  use_symbolic_comparison = False
+
+  total: int
+  label: str | None
+  color: str | None
+  status: str | dict[str, Any] | None
+
+  def set_color(self, color: str | None):
+    with pg.notify_on_change(False):
+      self.rebind(color=color)
+
+  def set_status(self, status: str | dict[str, Any] | None):
+    with pg.notify_on_change(False):
+      self.rebind(status=status)
+
+  @abc.abstractmethod
+  def update(self, delta):
+    """Update progress."""
+
+  @abc.abstractmethod
+  def refresh(self) -> None:
+    """Refresh progress bar."""
+
+
+class _TqdmProgressControl(_ProgressControl):
+  """Tqdm-based progress control."""
+
+  def _on_bound(self):
+    super()._on_bound()
+    assert tqdm is not None
+    self._tqdm = tqdm.tqdm(
+        total=self.total,
+        desc=self.label,
+        colour=self.color,
+        postfix=self.status,
+    )
+
+  def update(self, delta: int) -> None:
+    self._tqdm.update(delta)
+
+  def refresh(self):
+    self._tqdm.set_description(self.label, refresh=False)
+    if isinstance(self.status, str):
+      self._tqdm.set_postfix_str(self.status, refresh=False)
+    else:
+      self._tqdm.set_postfix(self.status, refresh=False)
+    self._tqdm.colour = self.color
+    self._tqdm.refresh()
+
+
+class _ConsoleProgressControl(_ProgressControl):
+  """Simple progress control by printing the status to the console."""
+
+  def _on_bound(self):
+    super()._on_bound()
+    self._progress = 0
+
+  def update(self, delta: int) -> None:
+    self._progress += delta
+
+  def refresh(self):
+    s = io.StringIO()
+    if self.label is not None:
+      s.write(text_formatting.colored(self.label, 'red', styles=['bold']))
+      s.write(': ')
+    s.write(
+        text_formatting.colored(
+            '%d%% (%d/%d)' %
+            (
+                self._progress * 100 // self.total,
+                self._progress,
+                self.total,
+            ),
+            color=self.color or 'green'
+        )
+    )
+    if self.status is not None:
+      status = repr(self.status) if isinstance(
+          self.status, dict) else self.status
+      s.write(f' : {status}')
+    sys.stderr.write(s.getvalue() + '\n')
+
+
+class _NoopProgressControl(_ProgressControl):
+  """No-op progress control."""
+
+  def update(self, delta: int) -> None:
+    pass
+
+  def refresh(self) -> None:
+    pass
+
+
+def _progress_control(
+    total: int,
+    label: str | None,
+    color: str | None,
+    status: str | dict[str, Any] | None,
+) -> _ProgressControl:
+  """Creates a process control."""
+  if progress_bar == 'tqdm':
+    if not tqdm:
+      raise RuntimeError(
+          'Please install package "tqdm" to use `tqdm` progress bar.'
+      )
+    return _TqdmProgressControl(total, label, color, status)
+  elif progress_bar == 'console':
+    return _ConsoleProgressControl(total, label, color, status)
+  elif progress_bar is None:
+    return _NoopProgressControl(total, label, color, status)
+  else:
+    raise ValueError(f'Unsupported progress bar type: {progress_bar}')
+
+
 # The global executor pool based on resource IDs.
 _executor_pool = ExecutorPool()

langfun/core/concurrent_test.py

@@ -233,6 +233,57 @@ class ProgressTest(unittest.TestCase):
     self.assertIs(p.last_error, job2.error)
 
 
+class ProgressControlTest(unittest.TestCase):
+
+  def test_noop(self):
+    concurrent.progress_bar = None
+    ctrl = concurrent._progress_control(100, 'noop', 'blue', None)
+    self.assertIsInstance(ctrl, concurrent._NoopProgressControl)
+    string_io = io.StringIO()
+    with contextlib.redirect_stderr(string_io):
+      ctrl.update(1)
+      ctrl.refresh()
+    self.assertEqual(string_io.getvalue(), '')
+    concurrent.progress_bar = 'tqdm'
+
+  def test_console(self):
+    concurrent.progress_bar = 'console'
+    ctrl = concurrent._progress_control(100, 'foo', 'blue', None)
+    self.assertIsInstance(ctrl, concurrent._ConsoleProgressControl)
+    string_io = io.StringIO()
+    with contextlib.redirect_stderr(string_io):
+      ctrl.set_status('bar')
+      ctrl.update(10)
+      ctrl.refresh()
+    self.assertEqual(
+        string_io.getvalue(),
+        '\x1b[1m\x1b[31mfoo\x1b[0m: \x1b[34m10% (10/100)\x1b[0m : bar\n'
+    )
+    concurrent.progress_bar = 'tqdm'
+
+  def test_tqdm(self):
+    concurrent.progress_bar = 'tqdm'
+    string_io = io.StringIO()
+    with contextlib.redirect_stderr(string_io):
+      ctrl = concurrent._progress_control(100, 'foo', 'blue', None)
+      self.assertIsInstance(ctrl, concurrent._TqdmProgressControl)
+      ctrl.update(10)
+      ctrl.refresh()
+    self.assertIn('10/100', string_io.getvalue())
+
+    tqdm = concurrent.tqdm
+    concurrent.tqdm = None
+    with self.assertRaisesRegex(RuntimeError, 'install package "tqdm"'):
+      _ = concurrent._progress_control(100, 'foo', 'blue', None)
+    concurrent.tqdm = tqdm
+
+  def test_unsupported(self):
+    concurrent.progress_bar = 'unknown'
+    with self.assertRaisesRegex(ValueError, 'Unsupported progress bar type'):
+      _ = concurrent._progress_control(100, 'foo', 'blue', None)
+    concurrent.progress_bar = 'tqdm'
+
+
 class ProgressBarTest(unittest.TestCase):
 
   def test_multithread_support(self):
@@ -241,13 +292,12 @@ class ProgressBarTest(unittest.TestCase):
       bar_id = concurrent.ProgressBar.install(None, 5)
       def fun(x):
         del x
-        concurrent.ProgressBar.update(bar_id, 1, postfix=None)
+        concurrent.ProgressBar.update(bar_id, 1, status=None)
 
       for _ in concurrent.concurrent_execute(fun, range(5)):
         concurrent.ProgressBar.refresh()
       concurrent.ProgressBar.uninstall(bar_id)
     output_str = string_io.getvalue()
-    print(output_str)
     self.assertIn('100%', output_str)
     self.assertIn('5/5', output_str)
 
@@ -255,12 +305,12 @@ class ProgressBarTest(unittest.TestCase):
     string_io = io.StringIO()
     with contextlib.redirect_stderr(string_io):
       bar_id = concurrent.ProgressBar.install(None, 4)
-      concurrent.ProgressBar.update(bar_id, 1, postfix=None)
-      concurrent.ProgressBar.update(bar_id, 1, postfix='hello')
-      concurrent.ProgressBar.update(bar_id, color='lightgreen')
-      concurrent.ProgressBar.update(bar_id, 2, postfix=dict(x=1))
-      with self.assertRaisesRegex(ValueError, 'Unsupported postfix'):
-        concurrent.ProgressBar.update(bar_id, 0, postfix=1)
+      concurrent.ProgressBar.update(bar_id, 1, status=None)
+      concurrent.ProgressBar.update(bar_id, 1, status='hello')
+      concurrent.ProgressBar.update(bar_id, color='green')
+      concurrent.ProgressBar.update(bar_id, 2, status=dict(x=1))
+      with self.assertRaisesRegex(ValueError, 'Unsupported status'):
+        concurrent.ProgressBar.update(bar_id, 0, status=1)
       concurrent.ProgressBar.uninstall(bar_id)
     self.assertIn('1/4', string_io.getvalue())
     self.assertIn('2/4', string_io.getvalue())

langfun/core/eval/base.py

@@ -242,7 +242,7 @@ class Evaluable(lf.Component):
       ):
         if show_progress:
           lf.concurrent.ProgressBar.update(
-              progress_bar, postfix='LOADING SAVED RESULTS...', color='yellow'
+              progress_bar, status='LOADING SAVED RESULTS...', color='yellow'
           )
         if self.try_load_result():
           run_status = 'CACHED'
@@ -271,7 +271,7 @@ class Evaluable(lf.Component):
         if should_save:
           if show_progress:
             lf.concurrent.ProgressBar.update(
-                progress_bar, postfix='SAVING RESULTS...', color='yellow'
+                progress_bar, status='SAVING RESULTS...', color='yellow'
             )
 
           # Save evaluation results.
@@ -284,7 +284,7 @@ class Evaluable(lf.Component):
       if show_progress:
         lf.concurrent.ProgressBar.update(
             progress_bar,
-            postfix=self._completion_status(run_status),
+            status=self._completion_status(run_status),
             color='green',
         )
     else:
@@ -340,7 +340,7 @@ class Evaluable(lf.Component):
               f'[#{leaf.index} - {leaf.node.id}]',
               total=leaf.node.num_examples if leaf.enabled else 0,
               color='cyan' if leaf.enabled else 'yellow',
-              postfix=None if leaf.enabled else 'SKIPPED.')
+              status=None if leaf.enabled else 'SKIPPED.')
 
         # Run leaf groups in parallel.
         try:
@@ -354,7 +354,7 @@ class Evaluable(lf.Component):
           # Save results for non-leaf nodes.
           lf.concurrent.ProgressBar.update(
               overview_bar,
-              postfix='SAVING RESULTS...',
+              status='SAVING RESULTS...',
               color='yellow')
 
           for node in self.nonleaf_nodes:
@@ -364,7 +364,7 @@ class Evaluable(lf.Component):
 
           if should_save and summary:
             lf.concurrent.ProgressBar.update(
-                overview_bar, postfix='FINALIZING SUMMARY...'
+                overview_bar, status='FINALIZING SUMMARY...'
             )
 
             summary.save(os.path.join(self.root_dir, Evaluable.SUMMARY_HTML))
@@ -378,7 +378,7 @@ class Evaluable(lf.Component):
           # Signal all task completed by making the bar green.
           lf.concurrent.ProgressBar.update(
               overview_bar,
-              postfix='COMPLETED',
+              status='COMPLETED',
               color='green')
 
         finally:

langfun/core/llms/google_genai.py

@@ -18,12 +18,29 @@ import functools
 import os
 from typing import Annotated, Any, Literal
 
-import google.generativeai as genai
 import langfun.core as lf
 from langfun.core import modalities as lf_modalities
 import pyglove as pg
 
 
+try:
+  import google.generativeai as genai   # pylint: disable=g-import-not-at-top
+  BlobDict = genai.types.BlobDict
+  GenerativeModel = genai.GenerativeModel
+  Completion = genai.types.Completion
+  GenerationConfig = genai.GenerationConfig
+  GenerateContentResponse = genai.types.GenerateContentResponse
+  ChatResponse = genai.types.ChatResponse
+except ImportError:
+  genai = None
+  BlobDict = Any
+  GenerativeModel = Any
+  Completion = Any
+  GenerationConfig = Any
+  GenerateContentResponse = Any
+  ChatResponse = Any
+
+
 @lf.use_init_args(['model'])
 class GenAI(lf.LanguageModel):
   """Language models provided by Google GenAI."""
@@ -59,10 +76,16 @@ class GenAI(lf.LanguageModel):
 
   def _on_bound(self):
     super()._on_bound()
+    if genai is None:
+      raise RuntimeError(
+          'Please install "langfun[llm-google-genai]" to use '
+          'Google Generative AI models.'
+      )
     self.__dict__.pop('_api_initialized', None)
 
   @functools.cached_property
   def _api_initialized(self):
+    assert genai is not None
     api_key = self.api_key or os.environ.get('GOOGLE_API_KEY', None)
     if not api_key:
       raise ValueError(
@@ -78,6 +101,7 @@ class GenAI(lf.LanguageModel):
   @classmethod
   def dir(cls) -> list[str]:
     """Lists generative models."""
+    assert genai is not None
     return [
         m.name.lstrip('models/')
         for m in genai.list_models()
@@ -100,7 +124,7 @@ class GenAI(lf.LanguageModel):
 
   def _generation_config(self, options: lf.LMSamplingOptions) -> dict[str, Any]:
     """Creates generation config from langfun sampling options."""
-    return genai.GenerationConfig(
+    return GenerationConfig(
         candidate_count=options.n,
         temperature=options.temperature,
         top_p=options.top_p,
@@ -111,7 +135,7 @@ class GenAI(lf.LanguageModel):
 
   def _content_from_message(
       self, prompt: lf.Message
-  ) -> list[str | genai.types.BlobDict]:
+  ) -> list[str | BlobDict]:
     """Gets Evergreen formatted content from langfun message."""
     formatted = lf.UserMessage(prompt.text)
     formatted.source = prompt
@@ -131,7 +155,7 @@ class GenAI(lf.LanguageModel):
             if modality.is_text:
               chunk = modality.to_text()
             else:
-              chunk = genai.types.BlobDict(
+              chunk = BlobDict(
                   data=modality.to_bytes(),
                   mime_type=modality.mime_type
               )
@@ -143,7 +167,7 @@ class GenAI(lf.LanguageModel):
     return chunks
 
   def _response_to_result(
-      self, response: genai.types.GenerateContentResponse | pg.Dict
+      self, response: GenerateContentResponse | pg.Dict
   ) -> lf.LMSamplingResult:
     """Parses generative response into message."""
     samples = []
@@ -182,8 +206,8 @@ class _LegacyGenerativeModel(pg.Object):
 
   def generate_content(
       self,
-      input_content: list[str | genai.types.BlobDict],
-      generation_config: genai.GenerationConfig,
+      input_content: list[str | BlobDict],
+      generation_config: GenerationConfig,
   ) -> pg.Dict:
     """Generate content."""
     segments = []
@@ -195,7 +219,7 @@ class _LegacyGenerativeModel(pg.Object):
 
   @abc.abstractmethod
   def generate(
-      self, prompt: str, generation_config: genai.GenerationConfig) -> pg.Dict:
+      self, prompt: str, generation_config: GenerationConfig) -> pg.Dict:
     """Generate response based on prompt."""
 
 
@@ -203,9 +227,10 @@ class _LegacyCompletionModel(_LegacyGenerativeModel):
   """Legacy GenAI completion model."""
 
   def generate(
-      self, prompt: str, generation_config: genai.GenerationConfig
+      self, prompt: str, generation_config: GenerationConfig
   ) -> pg.Dict:
-    completion: genai.types.Completion = genai.generate_text(
+    assert genai is not None
+    completion: Completion = genai.generate_text(
         model=f'models/{self.model}',
         prompt=prompt,
         temperature=generation_config.temperature,
@@ -227,9 +252,10 @@ class _LegacyChatModel(_LegacyGenerativeModel):
   """Legacy GenAI chat model."""
 
   def generate(
-      self, prompt: str, generation_config: genai.GenerationConfig
+      self, prompt: str, generation_config: GenerationConfig
   ) -> pg.Dict:
-    response: genai.types.ChatResponse = genai.chat(
+    assert genai is not None
+    response: ChatResponse = genai.chat(
         model=f'models/{self.model}',
         messages=prompt,
         temperature=generation_config.temperature,
@@ -253,8 +279,9 @@ class _ModelHub:
 
   def get(
       self, model_name: str
-  ) -> genai.GenerativeModel | _LegacyGenerativeModel:
+  ) -> GenerativeModel | _LegacyGenerativeModel:
     """Gets a generative model by model id."""
+    assert genai is not None
     model = self._model_cache.get(model_name, None)
     if model is None:
       model_info = genai.get_model(f'models/{model_name}')

langfun/core/llms/openai.py

@@ -16,15 +16,31 @@
 import collections
 import functools
 import os
-from typing import Annotated, Any, cast
+from typing import Annotated, Any
 
 import langfun.core as lf
 from langfun.core import modalities as lf_modalities
-import openai
-from openai import error as openai_error
-from openai import openai_object
 import pyglove as pg
 
+try:
+  import openai  # pylint: disable=g-import-not-at-top
+
+  if hasattr(openai, 'error'):
+    # For lower versions.
+    ServiceUnavailableError = openai.error.ServiceUnavailableError
+    RateLimitError = openai.error.RateLimitError
+    APITimeoutError = (
+        openai.error.APIError,
+        '.*The server had an error processing your request'
+    )
+  else:
+    # For higher versions.
+    ServiceUnavailableError = getattr(openai, 'InternalServerError')
+    RateLimitError = getattr(openai, 'RateLimitError')
+    APITimeoutError = getattr(openai, 'APITimeoutError')
+except ImportError:
+  openai = None
+
 
 # From https://platform.openai.com/settings/organization/limits
 _DEFAULT_TPM = 250000
@@ -119,6 +135,10 @@ class OpenAI(lf.LanguageModel):
   def _on_bound(self):
     super()._on_bound()
     self.__dict__.pop('_api_initialized', None)
+    if openai is None:
+      raise RuntimeError(
+          'Please install "langfun[llm-openai]" to use OpenAI models.'
+      )
 
   @functools.cached_property
   def _api_initialized(self):
@@ -149,6 +169,7 @@ class OpenAI(lf.LanguageModel):
 
   @classmethod
   def dir(cls):
+    assert openai is not None
     return openai.Model.list()
 
   @property
@@ -195,11 +216,11 @@ class OpenAI(lf.LanguageModel):
   ) -> list[lf.LMSamplingResult]:
 
     def _open_ai_completion(prompts):
+      assert openai is not None
       response = openai.Completion.create(
           prompt=[p.text for p in prompts],
           **self._get_request_args(self.sampling_options),
       )
-      response = cast(openai_object.OpenAIObject, response)
       # Parse response.
       samples_by_index = collections.defaultdict(list)
       for choice in response.choices:
@@ -222,12 +243,9 @@ class OpenAI(lf.LanguageModel):
         _open_ai_completion,
         [prompts],
         retry_on_errors=(
-            openai_error.ServiceUnavailableError,
-            openai_error.RateLimitError,
-            # Handling transient OpenAI server error (code 500). Check out
-            # https://platform.openai.com/docs/guides/error-codes/error-codes
-            (openai_error.APIError,
-             '.*The server had an error processing your request'),
+            ServiceUnavailableError,
+            RateLimitError,
+            APITimeoutError,
         ),
     )[0]
 
@@ -292,10 +310,8 @@ class OpenAI(lf.LanguageModel):
         )
       messages.append(dict(role='user', content=_content_from_message(prompt)))
 
-      response = cast(
-          openai_object.OpenAIObject,
-          openai.ChatCompletion.create(messages=messages, **request_args)
-      )
+      assert openai is not None
+      response = openai.ChatCompletion.create(messages=messages, **request_args)
 
       samples = []
       for choice in response.choices:
@@ -330,8 +346,9 @@ class OpenAI(lf.LanguageModel):
         _open_ai_chat_completion,
         prompts,
         retry_on_errors=(
-            openai_error.ServiceUnavailableError,
-            openai_error.RateLimitError,
+            ServiceUnavailableError,
+            RateLimitError,
+            APITimeoutError
         ),
     )
 

langfun/core/llms/vertexai.py

@@ -17,11 +17,28 @@ import functools
 import os
 from typing import Annotated, Any
 
-from google.auth import credentials as credentials_lib
 import langfun.core as lf
 from langfun.core import modalities as lf_modalities
 import pyglove as pg
 
+try:
+  # pylint: disable=g-import-not-at-top
+  from google.auth import credentials as credentials_lib
+  import vertexai
+  from google.cloud.aiplatform import models as aiplatform_models
+  from vertexai import generative_models
+  from vertexai import language_models
+  # pylint: enable=g-import-not-at-top
+
+  Credentials = credentials_lib.Credentials
+except ImportError:
+  credentials_lib = None   # pylint: disable=invalid-name
+  vertexai = None
+  generative_models = None
+  language_models = None
+  aiplatform_models = None
+  Credentials = Any
+
 
 SUPPORTED_MODELS_AND_SETTINGS = {
     'gemini-1.5-pro-001': pg.Dict(api='gemini', rpm=50),
@@ -78,7 +95,7 @@ class VertexAI(lf.LanguageModel):
   ] = None
 
   credentials: Annotated[
-      credentials_lib.Credentials | None,
+      Credentials | None,
       (
           'Credentials to use. If None, the default credentials to the '
           'environment will be used.'
@@ -93,6 +110,10 @@ class VertexAI(lf.LanguageModel):
   def _on_bound(self):
     super()._on_bound()
     self.__dict__.pop('_api_initialized', None)
+    if generative_models is None:
+      raise RuntimeError(
+          'Please install "langfun[llm-google-vertex]" to use Vertex AI models.'
+      )
 
   @functools.cached_property
   def _api_initialized(self):
@@ -112,7 +133,7 @@ class VertexAI(lf.LanguageModel):
 
     credentials = self.credentials
     # Placeholder for Google-internal credentials.
-    import vertexai
+    assert vertexai is not None
     vertexai.init(project=project, location=location, credentials=credentials)
     return True
 
@@ -138,7 +159,7 @@ class VertexAI(lf.LanguageModel):
       self, prompt: lf.Message, options: lf.LMSamplingOptions
   ) -> Any:  # generative_models.GenerationConfig
     """Creates generation config from langfun sampling options."""
-    from vertexai import generative_models
+    assert generative_models is not None
     # Users could use `metadata_json_schema` to pass additional
     # request arguments.
     json_schema = prompt.metadata.get('json_schema')
@@ -169,7 +190,7 @@ class VertexAI(lf.LanguageModel):
       self, prompt: lf.Message
   ) -> list[str | Any]:
     """Gets generation input from langfun message."""
-    from vertexai import generative_models
+    assert generative_models is not None
     chunks = []
 
     for lf_chunk in prompt.chunk():
@@ -296,8 +317,8 @@ class VertexAI(lf.LanguageModel):
 
   def _sample_endpoint_model(self, prompt: lf.Message) -> lf.LMSamplingResult:
     """Samples a text generation model."""
-    from google.cloud.aiplatform import models
-    model = models.Endpoint(self.endpoint_name)
+    assert aiplatform_models is not None
+    model = aiplatform_models.Endpoint(self.endpoint_name)
     # TODO(chengrun): Add support for stop_sequences.
     predict_options = dict(
         temperature=self.sampling_options.temperature
@@ -337,7 +358,7 @@ class _ModelHub:
     """Gets a generative model by model id."""
     model = self._generative_model_cache.get(model_id, None)
     if model is None:
-      from vertexai import generative_models
+      assert generative_models is not None
       model = generative_models.GenerativeModel(model_id)
       self._generative_model_cache[model_id] = model
     return model
@@ -348,7 +369,7 @@ class _ModelHub:
     """Gets a text generation model by model id."""
     model = self._text_generation_model_cache.get(model_id, None)
     if model is None:
-      from vertexai import language_models
+      assert language_models is not None
       model = language_models.TextGenerationModel.from_pretrained(model_id)
       self._text_generation_model_cache[model_id] = model
     return model

langfun/core/modalities/image.py

@@ -15,9 +15,21 @@
 
 import functools
 import io
+from typing import Any
 
 from langfun.core.modalities import mime
-from PIL import Image as pil_image
+
+try:
+  from PIL import Image as pil_image    # pylint: disable=g-import-not-at-top
+  PILImage = pil_image.Image
+  pil_open = pil_image.open
+except ImportError:
+  PILImage = Any
+
+  def pil_open(*unused_args, **unused_kwargs):
+    raise RuntimeError(
+        'Please install "langfun[mime-pil]" to enable PIL image support.'
+    )
 
 
 class Image(mime.Mime):
@@ -34,14 +46,14 @@ class Image(mime.Mime):
 
   @functools.cached_property
   def size(self) -> tuple[int, int]:
-    img = pil_image.open(io.BytesIO(self.to_bytes()))
+    img = pil_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()))
+  def to_pil_image(self) -> PILImage:   # pytype: disable=invalid-annotation
+    return pil_open(io.BytesIO(self.to_bytes()))
 
   @classmethod
-  def from_pil_image(cls, img: pil_image.Image) -> 'Image':
+  def from_pil_image(cls, img: PILImage) -> 'Image':  # pytype: disable=invalid-annotation
     buf = io.BytesIO()
     img.save(buf, format='PNG')
     return cls.from_bytes(buf.getvalue())

langfun/core/modalities/mime.py

@@ -17,11 +17,20 @@ import base64
 import functools
 from typing import Annotated, Iterable, Type, Union
 import langfun.core as lf
-import magic
 import pyglove as pg
 import requests
 
 
+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.'
+    )
+
+
 class Mime(lf.Modality):
   """Base for MIME data."""
 
@@ -38,7 +47,7 @@ class Mime(lf.Modality):
   @functools.cached_property
   def mime_type(self) -> str:
     """Returns the MIME type."""
-    mime = magic.from_buffer((self.to_bytes()), mime=True)
+    mime = from_buffer((self.to_bytes()), mime=True)
     if (
         self.MIME_PREFIX
         and not mime.lower().startswith(self.MIME_PREFIX)
@@ -136,14 +145,14 @@ class Mime(lf.Modality):
   def from_uri(cls, uri: str, **kwargs) -> 'Mime':
     if cls is Mime:
       content = cls.download(uri)
-      mime = magic.from_buffer(content, mime=True).lower()
+      mime = from_buffer(content, mime=True).lower()
       return cls.class_from_mime_type(mime)(uri=uri, content=content, **kwargs)
     return cls(uri=uri, content=None, **kwargs)
 
   @classmethod
   def from_bytes(cls, content: bytes | str, **kwargs) -> 'Mime':
     if cls is Mime:
-      mime = magic.from_buffer(content, mime=True).lower()
+      mime = from_buffer(content, mime=True).lower()
       return cls.class_from_mime_type(mime)(content=content, **kwargs)
     return cls(content=content, **kwargs)
 

langfun/core/modalities/ms_office.py

@@ -30,10 +30,15 @@ class Xlsx(mime.Mime):
   )
 
   def to_html(self) -> str:
-    import pandas as pd  # pylint: disable=g-import-not-at-top
-
-    df = pd.read_excel(io.BytesIO(self.to_bytes()))
-    return df.to_html()
+    try:
+      import pandas as pd  # pylint: disable=g-import-not-at-top
+      import openpyxl      # pylint: disable=g-import-not-at-top, unused-import
+      df = pd.read_excel(io.BytesIO(self.to_bytes()))
+      return df.to_html()
+    except ImportError as e:
+      raise RuntimeError(
+          'Please install "langfun[mime-xlsx]" to enable XLSX support.'
+      ) from e
 
   def _repr_html_(self) -> str:
     return self.to_html()
@@ -58,10 +63,14 @@ class Docx(mime.Mime):
   )
 
   def to_xml(self) -> str:
-    import docx  # pylint: disable=g-import-not-at-top
-
-    doc = docx.Document(io.BytesIO(self.to_bytes()))
-    return str(doc.element.xml)
+    try:
+      import docx  # pylint: disable=g-import-not-at-top
+      doc = docx.Document(io.BytesIO(self.to_bytes()))
+      return str(doc.element.xml)
+    except ImportError as e:
+      raise RuntimeError(
+          'Please install "langfun[mime-docx]" to enable Docx support.'
+      ) from e
 
   def _repr_html_(self) -> str:
     return self.to_xml()

langfun/core/text_formatting.py

@@ -16,7 +16,11 @@
 import io
 import re
 from typing import Any
-import termcolor
+
+try:
+  import termcolor      # pylint: disable=g-import-not-at-top
+except ImportError:
+  termcolor = None
 
 
 # Regular expression for ANSI color characters.
@@ -49,6 +53,8 @@ def colored(
   Returns:
     A string with ANSI color characters embracing the entire text.
   """
+  if not termcolor:
+    return text
   return termcolor.colored(
       text,
       color=color,

langfun/core/text_formatting_test.py

@@ -42,6 +42,24 @@ class TextFormattingTest(unittest.TestCase):
     )
     self.assertEqual(text_formatting.decolored(colored_text), original_text)
 
+  def test_colored_without_termcolor(self):
+    termcolor = text_formatting.termcolor
+    text_formatting.termcolor = None
+    original_text = inspect.cleandoc("""
+        Hi {{ foo }}
+        {# print x if x is present #}
+        {% if x %}
+        {{ x }}
+        {% endif %}
+        """)
+
+    colored_text = text_formatting.colored_template(
+        text_formatting.colored(original_text, color='blue')
+    )
+    self.assertEqual(colored_text, original_text)
+    self.assertEqual(text_formatting.decolored(colored_text), original_text)
+    text_formatting.termcolor = termcolor
+
 
 if __name__ == '__main__':
   unittest.main()

{langfun-0.1.1.dev20240827.dist-info → langfun-0.1.1.dev202408282153.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.1.dev20240827
+Version: 0.1.1.dev202408282153
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -21,19 +21,54 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: google-cloud-aiplatform>=1.5.0
-Requires-Dist: google-generativeai>=0.3.2
+Requires-Dist: pyglove>=0.4.5.dev20240824
 Requires-Dist: jinja2>=3.1.2
-Requires-Dist: openai==0.27.2
-Requires-Dist: openpyxl>=3.1.0
-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.0.0
+Provides-Extra: all
+Requires-Dist: pyglove>=0.4.5.dev20240824; extra == "all"
+Requires-Dist: jinja2>=3.1.2; 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-cloud-aiplatform>=1.5.0; extra == "all"
+Requires-Dist: google-generativeai>=0.3.2; extra == "all"
+Requires-Dist: openai>=0.27.2; extra == "all"
+Requires-Dist: python-magic>=0.4.27; extra == "all"
+Requires-Dist: python-docx>=0.8.11; extra == "all"
+Requires-Dist: pillow>=10.0.0; extra == "all"
+Requires-Dist: openpyxl>=3.1.0; extra == "all"
+Requires-Dist: pandas>=2.0.3; extra == "all"
+Provides-Extra: llm
+Requires-Dist: google-cloud-aiplatform>=1.5.0; extra == "llm"
+Requires-Dist: google-generativeai>=0.3.2; extra == "llm"
+Requires-Dist: openai>=0.27.2; extra == "llm"
+Provides-Extra: llm-google
+Requires-Dist: google-cloud-aiplatform>=1.5.0; extra == "llm-google"
+Requires-Dist: google-generativeai>=0.3.2; extra == "llm-google"
+Provides-Extra: llm-google-genai
+Requires-Dist: google-generativeai>=0.3.2; extra == "llm-google-genai"
+Provides-Extra: llm-google-vertex
+Requires-Dist: google-cloud-aiplatform>=1.5.0; extra == "llm-google-vertex"
+Provides-Extra: llm-openai
+Requires-Dist: openai>=0.27.2; extra == "llm-openai"
+Provides-Extra: mime
+Requires-Dist: python-magic>=0.4.27; extra == "mime"
+Requires-Dist: python-docx>=0.8.11; extra == "mime"
+Requires-Dist: pillow>=10.0.0; extra == "mime"
+Requires-Dist: openpyxl>=3.1.0; extra == "mime"
+Requires-Dist: pandas>=2.0.3; extra == "mime"
+Provides-Extra: mime-auto
+Requires-Dist: python-magic>=0.4.27; extra == "mime-auto"
+Provides-Extra: mime-docx
+Requires-Dist: python-docx>=0.8.11; extra == "mime-docx"
+Provides-Extra: mime-pil
+Requires-Dist: pillow>=10.0.0; extra == "mime-pil"
+Provides-Extra: mime-xlsx
+Requires-Dist: openpyxl>=3.1.0; extra == "mime-xlsx"
+Requires-Dist: pandas>=2.0.3; extra == "mime-xlsx"
+Provides-Extra: ui
+Requires-Dist: termcolor==1.1.0; extra == "ui"
+Requires-Dist: tqdm>=4.64.1; extra == "ui"
 
 <div align="center">
 <img src="https://raw.githubusercontent.com/google/langfun/main/docs/_static/logo.svg" width="520px" alt="logo"></img>
@@ -152,16 +187,45 @@ See [Langfun 101](https://colab.research.google.com/github/google/langfun/blob/m
 
 ## Install
 
+Langfun offers a range of features through [Extras](https://packaging.python.org/en/latest/tutorials/installing-packages/#installing-extras), allowing users to install only what they need. The minimal installation of Langfun requires only [PyGlove](https://github.com/google/pyglove), [Jinja2](https://github.com/pallets/jinja/), and [requests](https://github.com/psf/requests). To install Langfun with its minimal dependencies, use:
+
 ```
 pip install langfun
 ```
 
-Or install nightly build with:
+For a complete installation with all dependencies, use:
 
 ```
-pip install langfun --pre
+pip install langfun[all]
 ```
 
+To install a nightly build, include the `--pre` flag, like this:
+
+```
+pip install langfun[all] --pre
+```
 
+If you want to customize your installation, you can select specific features using package names like `langfun[X1, X2, ..., Xn]`, where `Xi` corresponds to a tag from the list below:
+
+| Tag                 |  Description                             |
+| ------------------- | ---------------------------------------- |
+| all                 | All Langfun features.                    |
+| llm                 | All supported LLMs.                      |
+| llm-google          | All supported Google-powered LLMs.       |
+| llm-google-vertexai | LLMs powered by Google Cloud VertexAI    |
+| llm-google-genai    | LLMs powered by Google Generative AI API |
+| llm-openai          | LLMs powered by OpenAI                   |
+| mime                | All MIME supports.                       |
+| mime-auto           | Automatic MIME type detection.           |
+| mime-docx           | DocX format support.                     |
+| mime-pil            | Image support for PIL.                   |
+| mime-xlsx           | XlsX format support.                     |
+| ui                  | UI enhancements                          |
+
+
+For example, to install a nightly build that includes Google-powered LLMs, full modality support, and UI enhancements, use:
+```
+pip install langfun[llm-google,mime,ui] --pre
+```
 
 *Disclaimer: this is not an officially supported Google product.*

{langfun-0.1.1.dev20240827.dist-info → langfun-0.1.1.dev202408282153.dist-info}/RECORD

@@ -2,8 +2,8 @@ langfun/__init__.py,sha256=ZqERg4fvvtFwr5L41Lfev9FSuCBm8PbQrZmcKvvloxE,2274
 langfun/core/__init__.py,sha256=r86kuy-BiJIveqnXx5OklUUXtMG3q79nWRBum6zFOCQ,4835
 langfun/core/component.py,sha256=Icyoj9ICoJoK2r2PHbrFXbxnseOr9QZZOvKWklLWNo8,10276
 langfun/core/component_test.py,sha256=q15Xn51cVTu2RKxZ9U5VQgT3bm6RQ4638bKhWBtvW5o,8220
-langfun/core/concurrent.py,sha256=TRc49pJ3HQro2kb5FtcWkHjhBm8UcgE8RJybU5cU3-0,24537
-langfun/core/concurrent_test.py,sha256=9HWnS4ja5Ji1ALfJs2zIt7w4w0oNm9dOZM7bgzoX5ag,15176
+langfun/core/concurrent.py,sha256=qZteOkA7jzLt7a5AVmNqDc5ZEvj_hwiLECqGMVYdzSU,27756
+langfun/core/concurrent_test.py,sha256=ULVrE6JGzsClRBLHAlqLF1A2mfxMO2X0245qYTYQ76o,16943
 langfun/core/console.py,sha256=bk5rNPNm9rMGW5YT2HixxU04p2umnoabn5SDz6Dqe88,2317
 langfun/core/console_test.py,sha256=5SYJdxpJGLgdSSQqqMPoA1X6jpsLD8rgcyk-EgI65oE,1077
 langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,11140
@@ -27,8 +27,8 @@ langfun/core/subscription.py,sha256=euawEuSZP-BHydaT-AQpfYFL0m5pWPGcW0upFhrojqc,
 langfun/core/subscription_test.py,sha256=Y4ZdbZEwm83YNZBxHff0QR4QUa4rdaNXA3_jfIcArBo,8717
 langfun/core/template.py,sha256=UhNNGUDJ4StUhPBKzHmjym36khxHOGWGr9MDxBwgxQA,22284
 langfun/core/template_test.py,sha256=cb005qM_3dvJikaPDB3rirfIrMAIIVRpoiXGREGJ43o,15468
-langfun/core/text_formatting.py,sha256=ytjj7opnRJ6w-pkglL2CZUyfYDXLpNf65E42LBb31gc,5158
-langfun/core/text_formatting_test.py,sha256=nyKC6tn2L4hPJiqQHgxcbQsJJi4A4Nbj8FiO8iT6B80,1514
+langfun/core/text_formatting.py,sha256=d7t9vaY6aCn1dkfkikpNYnBy5E_i93vHbfyDWFclGZU,5284
+langfun/core/text_formatting_test.py,sha256=ck0Xzdd4YF4CtCUj7VE0GybfbAyKQ8p3xkM1FBGrqIk,2096
 langfun/core/coding/__init__.py,sha256=5utju_fwEsImaiftx4oXKl9FAM8p281k8-Esdh_-m1w,835
 langfun/core/coding/python/__init__.py,sha256=MJ-vubliz-ebrZH3OBRKBwMi0S9-FrhGCp8YQLR6_I4,1776
 langfun/core/coding/python/correction.py,sha256=a2aFUt9ocbXTCR6Z6OGNjQZDI1LfU0PBkSe7hJB8dEM,6589
@@ -44,7 +44,7 @@ langfun/core/coding/python/parsing_test.py,sha256=9vAWF484kWIm6JZq8NFiMgKUDhXV-d
 langfun/core/coding/python/permissions.py,sha256=1QWGHvzL8MM0Ok_auQ9tURqZHtdOfJaDpBzZ29GUE-c,2544
 langfun/core/coding/python/permissions_test.py,sha256=w5EDb8QxpxgJyZkojyzVWQvDfg366zn99-g__6TbPQ0,2699
 langfun/core/eval/__init__.py,sha256=Ogdr9OtTywhhLPHi3AZzOD2mXX2oyaHWflrSTMm96uA,1899
-langfun/core/eval/base.py,sha256=yuKIJzelGyhWrNaAS9ziioSwwhn2LgoK4Z6eZahRLtU,74758
+langfun/core/eval/base.py,sha256=YU_R9pKITKWyWa5-dSY8Q5O9pK8xioWX1ZdqYVOZcK8,74751
 langfun/core/eval/base_test.py,sha256=VEraWaRybSxOCOcZrZouNkiroDEPR6uyFBJoAz-1pQg,26930
 langfun/core/eval/matching.py,sha256=9GX8HfO9jKxgNLAivgy5K88Xhoh6Z7Pptq65pe7vht8,9762
 langfun/core/eval/matching_test.py,sha256=f7iVyXH5KGJBWt4Wp14Bt9J3X59A6Ayfog9MbuFvPew,5532
@@ -57,17 +57,17 @@ langfun/core/llms/anthropic.py,sha256=Gon3fOi31RhZFgNd0ijyTnKnUdp9hrWrCoSXyO4UaL
 langfun/core/llms/anthropic_test.py,sha256=T-swuMkfnlgs8Fpif4rtXs579exGk0TsbLMirXDZCkg,5533
 langfun/core/llms/fake.py,sha256=gCHBYBLvBCsC78HI1hpoqXCS-p1FMTgY1P1qh_sGBPk,3070
 langfun/core/llms/fake_test.py,sha256=sIl_Mg7nFVjaN7AJhYCpA_qzDJpSnJzkazepGXpfQQg,7338
-langfun/core/llms/google_genai.py,sha256=Rl5a5CyF_6Y0BYYArKk8yMaenv1rH3MUQLy6b3dfMRI,10202
+langfun/core/llms/google_genai.py,sha256=OYrlKIEY57CFWYwndvEdhXLwffNvDwKXyy9ULZTNeYI,10885
 langfun/core/llms/google_genai_test.py,sha256=iTISk3tJ4-3gjWmzcKQhEbH3ke4AkEiCu8rAGtB7SvU,7535
 langfun/core/llms/groq.py,sha256=pqtyOZ_1_OJMOg8xATWT_B_SVbuT9nMRf4VkH9GzW8g,6308
 langfun/core/llms/groq_test.py,sha256=GYF_Qtq5S1H1TrKH38t6_lkdroqT7v-joYLDKnmS9e0,5274
 langfun/core/llms/llama_cpp.py,sha256=9tXQntSCDtjTF3bnyJrAPCr4N6wycy5nXYvp9uduygE,2843
 langfun/core/llms/llama_cpp_test.py,sha256=MWO_qaOeKjRniGjcaWPDScd7HPaIJemqUZoslrt4FPs,1806
-langfun/core/llms/openai.py,sha256=lRfR2iim7OdzMCJCf1DXB5YVfSwflvUucMWY3dsMaRA,15798
+langfun/core/llms/openai.py,sha256=aZ5RgRBomVhBtzJtGYu9EM-qm07WEDcJr127VGpc_Sg,16161
 langfun/core/llms/openai_test.py,sha256=02KeysRppXcAwA4SBUow8hKolFiEU9_lTSdlVHZletM,17518
 langfun/core/llms/rest.py,sha256=laopuq-zD8V-3Y6eFDngftHEbE66VlUkCD2-rvvRaLU,3388
 langfun/core/llms/rest_test.py,sha256=NZ3Nf0XQVpT9kLP5cBVo_yBHLI7vWTYhWQxYEJVMGs4,3472
-langfun/core/llms/vertexai.py,sha256=tXAnP357XhcsETTnk6M-hH4xyFi7tk6fsaf3tjzsY6E,14501
+langfun/core/llms/vertexai.py,sha256=mEQVwO3Kf3rGRmsI-qKrV6vg0hYy6OH1lEVOM81cb3U,15134
 langfun/core/llms/vertexai_test.py,sha256=EPR-mB2hNUpvpf7E8m_k5bh04epdQTVUuYU6hPgZyu8,10321
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
@@ -79,11 +79,11 @@ 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=uBSAwExnSD4MevhK9Z4qExPlLVFBQLUfjPOAldtWFOI,1387
+langfun/core/modalities/image.py,sha256=DyVV17Ii-vJmwA7Mo23B40m4VxZg_WXc0KPKN8Q4Mlc,1756
 langfun/core/modalities/image_test.py,sha256=A0aYblxpnKABDgm2OVPxF8iRq4qFVanM9TPcaewkAgA,3774
-langfun/core/modalities/mime.py,sha256=7oYvwYZHb3uhjiL2rF6kvQWsWufY0UXl72wfDXC59ys,5918
+langfun/core/modalities/mime.py,sha256=-BEIAcIGzPdPgwUZ2yqFj6NGsBYGCiqeNqIWVeaNnTI,6164
 langfun/core/modalities/mime_test.py,sha256=kmRiPP-3Py02NnKPu0oPexSIJ-MXaaE2UYY82ga0TV8,2913
-langfun/core/modalities/ms_office.py,sha256=jOidMSdWCaV9RILpGz8VJkpTSpHJNoirD53jzQvcytM,3388
+langfun/core/modalities/ms_office.py,sha256=_dUgUCfK-hsEMOjgA_q3hUgKC4n8iAufKy7Sh2Gs1Jo,3780
 langfun/core/modalities/ms_office_test.py,sha256=d_NZ0QU23NydenYZgNj6YxgO5ZYzjg-HCbglsVJGp04,87866
 langfun/core/modalities/pdf.py,sha256=mfaeCbUA4JslFVTARiJh8hW7imvL4tLVw9gUhO5bAZA,727
 langfun/core/modalities/pdf_test.py,sha256=KE40zJD3Whe6ty2OULkp1J8jwLmB4ZjGXlGekluTP48,1952
@@ -119,8 +119,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.dev20240827.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.1.dev20240827.dist-info/METADATA,sha256=O4CZgKKxbwRK492QWVfyTGmU1RnRBLyWs12Uo9F8ldM,5234
-langfun-0.1.1.dev20240827.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-langfun-0.1.1.dev20240827.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.1.dev20240827.dist-info/RECORD,,
+langfun-0.1.1.dev202408282153.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.1.dev202408282153.dist-info/METADATA,sha256=QF_FZsBIPmWG9chJNbkoDrgRq_jnT75KFLaXKN44dp8,8825
+langfun-0.1.1.dev202408282153.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+langfun-0.1.1.dev202408282153.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.1.dev202408282153.dist-info/RECORD,,

{langfun-0.1.1.dev20240827.dist-info → langfun-0.1.1.dev202408282153.dist-info}/WHEEL

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