langfun 0.1.2.dev202501050804__tar.gz → 0.1.2.dev202501060804__tar.gz

{langfun-0.1.2.dev202501050804 → langfun-0.1.2.dev202501060804}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.2.dev202501050804
+Version: 0.1.2.dev202501060804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -30,7 +30,7 @@ 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-generativeai>=0.3.2; extra == "all"
+Requires-Dist: google-auth>=2.16.0; 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"
@@ -39,12 +39,8 @@ Requires-Dist: pandas>=2.0.3; extra == "all"
 Provides-Extra: ui
 Requires-Dist: termcolor==1.1.0; extra == "ui"
 Requires-Dist: tqdm>=4.64.1; extra == "ui"
-Provides-Extra: llm
-Requires-Dist: google-generativeai>=0.3.2; extra == "llm"
-Provides-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: vertexai
+Requires-Dist: google-auth>=2.16.0; extra == "vertexai"
 Provides-Extra: mime
 Requires-Dist: python-magic>=0.4.27; extra == "mime"
 Requires-Dist: python-docx>=0.8.11; extra == "mime"
@@ -201,9 +197,7 @@ If you want to customize your installation, you can select specific features usi
 | Tag                 |  Description                             |
 | ------------------- | ---------------------------------------- |
 | all                 | All Langfun features.                    |
-| llm                 | All supported LLMs.                      |
-| llm-google          | All supported Google-powered LLMs.       |
-| llm-google-genai    | LLMs powered by Google Generative AI API |
+| vertexai            | VertexAI access.                         |
 | mime                | All MIME supports.                       |
 | mime-auto           | Automatic MIME type detection.           |
 | mime-docx           | DocX format support.                     |
@@ -212,9 +206,9 @@ If you want to customize your installation, you can select specific features usi
 | ui                  | UI enhancements                          |
 
 
-For example, to install a nightly build that includes Google-powered LLMs, full modality support, and UI enhancements, use:
+For example, to install a nightly build that includes VertexAI access, full modality support, and UI enhancements, use:
 ```
-pip install langfun[llm-google,mime,ui] --pre
+pip install langfun[vertexai,mime,ui] --pre
 ```
 
 *Disclaimer: this is not an officially supported Google product.*

{langfun-0.1.2.dev202501050804 → langfun-0.1.2.dev202501060804}/README.md

@@ -138,9 +138,7 @@ If you want to customize your installation, you can select specific features usi
 | Tag                 |  Description                             |
 | ------------------- | ---------------------------------------- |
 | all                 | All Langfun features.                    |
-| llm                 | All supported LLMs.                      |
-| llm-google          | All supported Google-powered LLMs.       |
-| llm-google-genai    | LLMs powered by Google Generative AI API |
+| vertexai            | VertexAI access.                         |
 | mime                | All MIME supports.                       |
 | mime-auto           | Automatic MIME type detection.           |
 | mime-docx           | DocX format support.                     |
@@ -149,9 +147,9 @@ If you want to customize your installation, you can select specific features usi
 | ui                  | UI enhancements                          |
 
 
-For example, to install a nightly build that includes Google-powered LLMs, full modality support, and UI enhancements, use:
+For example, to install a nightly build that includes VertexAI access, full modality support, and UI enhancements, use:
 ```
-pip install langfun[llm-google,mime,ui] --pre
+pip install langfun[vertexai,mime,ui] --pre
 ```
 
 *Disclaimer: this is not an officially supported Google product.*

{langfun-0.1.2.dev202501050804 → langfun-0.1.2.dev202501060804}/langfun/core/eval/v2/reporting.py

@@ -51,6 +51,7 @@ class HtmlReporter(experiment_lib.Plugin):
     self._update_thread = None
     self._stop_update = False
     self._stop_update_experiment_ids = set()
+    self._experiment_index_lock = None
 
   def on_run_start(
       self,
@@ -61,6 +62,9 @@ class HtmlReporter(experiment_lib.Plugin):
     self._last_experiment_report_time = {leaf.id: 0 for leaf in root.leaf_nodes}
     self._stop_update = False
     self._stop_update_experiment_ids = set()
+    self._experiment_index_lock = {
+        leaf.id: threading.Lock() for leaf in root.leaf_nodes
+    }
     self._update_thread = threading.Thread(
         target=self._update_thread_func, args=(runner,)
     )
@@ -170,7 +174,8 @@ class HtmlReporter(experiment_lib.Plugin):
                   card_view=False,
               ),
           )
-          html.save(index_html_path)
+          with self._experiment_index_lock[experiment.id]:
+            html.save(index_html_path)
           experiment.info(
               f'Updated {index_html_path!r} in {t.elapse:.2f} seconds.',
           )
@@ -185,11 +190,11 @@ class HtmlReporter(experiment_lib.Plugin):
         time.time() - self._last_experiment_report_time[experiment.id]
         > self.experiment_report_interval
     ):
+      self._last_experiment_report_time[experiment.id] = time.time()
       if background:
         runner.background_run(_save)
       else:
         _save()
-      self._last_experiment_report_time[experiment.id] = time.time()
 
   def _save_example_html(
       self, runner: Runner, experiment: Experiment, example: Example

{langfun-0.1.2.dev202501050804 → langfun-0.1.2.dev202501060804}/langfun/core/llms/__init__.py

@@ -32,16 +32,30 @@ from langfun.core.llms.rest import REST
 
 # Gemini models.
 from langfun.core.llms.google_genai import GenAI
-from langfun.core.llms.google_genai import GeminiFlash2_0ThinkingExp
+from langfun.core.llms.google_genai import GeminiFlash2_0ThinkingExp_20241219
 from langfun.core.llms.google_genai import GeminiFlash2_0Exp
-from langfun.core.llms.google_genai import GeminiExp_20241114
 from langfun.core.llms.google_genai import GeminiExp_20241206
-from langfun.core.llms.google_genai import GeminiFlash1_5
+from langfun.core.llms.google_genai import GeminiExp_20241114
 from langfun.core.llms.google_genai import GeminiPro1_5
-from langfun.core.llms.google_genai import GeminiPro
-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
+from langfun.core.llms.google_genai import GeminiPro1_5_002
+from langfun.core.llms.google_genai import GeminiPro1_5_001
+from langfun.core.llms.google_genai import GeminiFlash1_5
+from langfun.core.llms.google_genai import GeminiFlash1_5_002
+from langfun.core.llms.google_genai import GeminiFlash1_5_001
+from langfun.core.llms.google_genai import GeminiPro1
+
+from langfun.core.llms.vertexai import VertexAI
+from langfun.core.llms.vertexai import VertexAIGeminiFlash2_0ThinkingExp_20241219
+from langfun.core.llms.vertexai import VertexAIGeminiFlash2_0Exp
+from langfun.core.llms.vertexai import VertexAIGeminiExp_20241206
+from langfun.core.llms.vertexai import VertexAIGeminiExp_20241114
+from langfun.core.llms.vertexai import VertexAIGeminiPro1_5
+from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_002
+from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_001
+from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5
+from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5_002
+from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5_001
+from langfun.core.llms.vertexai import VertexAIGeminiPro1
 
 # OpenAI models.
 from langfun.core.llms.openai import OpenAI
@@ -124,25 +138,6 @@ from langfun.core.llms.groq import GroqGemma_7B_IT
 from langfun.core.llms.groq import GroqWhisper_Large_v3
 from langfun.core.llms.groq import GroqWhisper_Large_v3Turbo
 
-from langfun.core.llms.vertexai import VertexAI
-from langfun.core.llms.vertexai import VertexAIGemini2_0
-from langfun.core.llms.vertexai import VertexAIGeminiFlash2_0Exp
-from langfun.core.llms.vertexai import VertexAIGeminiFlash2_0ThinkingExp
-from langfun.core.llms.vertexai import VertexAIGemini1_5
-from langfun.core.llms.vertexai import VertexAIGeminiPro1_5
-from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_001
-from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_002
-from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_0514
-from langfun.core.llms.vertexai import VertexAIGeminiPro1_5_0409
-from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5
-from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5_001
-from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5_002
-from langfun.core.llms.vertexai import VertexAIGeminiFlash1_5_0514
-from langfun.core.llms.vertexai import VertexAIGeminiPro1
-from langfun.core.llms.vertexai import VertexAIGeminiPro1Vision
-from langfun.core.llms.vertexai import VertexAIEndpoint
-
-
 # LLaMA C++ models.
 from langfun.core.llms.llama_cpp import LlamaCppRemote
 

{langfun-0.1.2.dev202501050804 → langfun-0.1.2.dev202501060804}/langfun/core/llms/cache/in_memory.py

@@ -15,6 +15,7 @@
 
 import collections
 import contextlib
+import json
 from typing import Annotated, Any, Iterator
 import langfun.core as lf
 from langfun.core.llms.cache import base
@@ -49,6 +50,11 @@ class InMemory(base.LMCacheBase):
             "Creating a new cache as cache file '%s' does not exist.",
             self.filename,
         )
+      except json.JSONDecodeError:
+        pg.logging.warning(
+            "Creating a new cache as cache file '%s' is corrupted.",
+            self.filename,
+        )
 
   def model_ids(self) -> list[str]:
     """Returns the model ids of cached queires."""

{langfun-0.1.2.dev202501050804 → langfun-0.1.2.dev202501060804}/langfun/core/llms/cache/in_memory_test.py

@@ -295,6 +295,11 @@ class InMemoryLMCacheTest(unittest.TestCase):
     self.assertEqual(cache2.stats.num_updates, 2)
     cache2.save()
 
+    # Corrupted file.
+    pg.io.writefile(path, 'bad_content')
+    cache3 = in_memory.InMemory(path)
+    self.assertEqual(len(cache3), 0)
+
 
 class LmCacheTest(unittest.TestCase):