langfun 0.1.2.dev202506250804__tar.gz → 0.1.2.dev202506270804__tar.gz

{langfun-0.1.2.dev202506250804 → langfun-0.1.2.dev202506270804}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfun
-Version: 0.1.2.dev202506250804
+Version: 0.1.2.dev202506270804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors

{langfun-0.1.2.dev202506250804 → langfun-0.1.2.dev202506270804}/langfun/core/coding/python/__init__.py

@@ -32,7 +32,6 @@ from langfun.core.coding.python.correction import correct
 from langfun.core.coding.python.correction import run_with_correction
 from langfun.core.coding.python.correction import CodeWithError
 
-from langfun.core.coding.python.sandboxing import Sandbox
 from langfun.core.coding.python.sandboxing import SandboxOutput
 from langfun.core.coding.python.sandboxing import MultiProcessingSandbox
 

{langfun-0.1.2.dev202506250804 → langfun-0.1.2.dev202506270804}/langfun/core/coding/python/sandboxing.py

@@ -16,7 +16,7 @@
 import abc
 import os
 import tempfile
-from typing import Annotated, Protocol, Self
+from typing import Annotated
 
 from langfun.core.coding.python import parsing
 import pyglove as pg
@@ -41,33 +41,6 @@ class SandboxOutput(pg.Object):
   ] = {}
 
 
-class Sandbox(Protocol):
-  """Interface for Python sandbox."""
-
-  def run(
-      self,
-      code: str,
-      **kwargs,
-  ) -> SandboxOutput:
-    """Runs code in the sandbox."""
-
-  def upload(
-      self,
-      path: str,
-      **kwargs,
-  ) -> str:
-    """Uploads a file to the sandbox."""
-
-  def clone(self) -> 'Sandbox':
-    """Clones the sandbox."""
-
-  def __enter__(self) -> Self:
-    """Sandboxes should be used as a context manager."""
-
-  def __exit__(self, exc_type, exc_value, traceback) -> None:
-    """Sandboxes should be used as a context manager."""
-
-
 class BaseSandbox(pg.Object):
   """Interface and partial implementation for Python sandbox."""
 

{langfun-0.1.2.dev202506250804 → langfun-0.1.2.dev202506270804}/langfun/core/language_model.py

@@ -769,8 +769,25 @@ class LanguageModel(component.Component):
     cls._MODEL_FACTORY[model_id_or_prefix] = factory
 
   @classmethod
-  def get(cls, model_id: str, *args, **kwargs):
-    """Creates a language model instance from a model ID."""
+  def get(cls, model_str: str, *args, **kwargs) -> 'LanguageModel':
+    """Creates a language model instance from a model str.
+
+    Args:
+      model_str: A string that identifies the model. It can be a model ID or a
+        model ID with kwargs.
+        For example, "gpt-o3?temperature=0.1&n=2" will create a GPT-o3 model
+        with temperature set to 0.1 and n set to 2.
+      *args: Additional arguments to pass to the model factory.
+      **kwargs: Additional keyword arguments to pass to the model factory.
+        kwargs provided here will take precedence over kwargs parsed from
+        model_str.
+
+    Returns:
+      A language model instance.
+    """
+    model_id, model_kwargs = cls._parse_model_str(model_str)
+    model_kwargs.update(kwargs)
+
     factory = cls._MODEL_FACTORY.get(model_id)
     if factory is None:
       factories = []
@@ -786,11 +803,45 @@ class LanguageModel(component.Component):
             'Please specify a more specific model ID.'
         )
       factory = factories[0][1]
-    return factory(model_id, *args, **kwargs)
+    return factory(model_id, *args, **model_kwargs)
 
   @classmethod
-  def dir(cls):
-    return sorted(list(LanguageModel._MODEL_FACTORY.keys()))
+  def _parse_model_str(cls, model_str: str) -> tuple[str, dict[str, Any]]:
+    """Parses a model string into model ID and kwargs."""
+    parts = model_str.split('?')
+    if len(parts) == 1:
+      return model_str, {}
+    elif len(parts) == 2:
+      model_id, kwargs_str = parts
+      kwargs = {}
+      for kv in kwargs_str.split('&'):
+        kv_parts = kv.split('=')
+        if len(kv_parts) != 2:
+          raise ValueError(f'Invalid kwargs in model string: {model_str!r}.')
+        k, v = kv_parts
+        if v.isnumeric():
+          v = int(v)
+        elif v.lower() in ('true', 'false'):
+          v = v.lower() == 'true'
+        else:
+          v = v.strip()
+          try:
+            v = float(v)
+          except ValueError:
+            pass
+        kwargs[k] = v
+      return model_id, kwargs
+    else:
+      raise ValueError(f'Invalid model string: {model_str!r}.')
+
+  @classmethod
+  def dir(cls, regex: str | None = None):
+    """Returns a list of model IDs that match the given regex."""
+    if regex is None:
+      return sorted(list(LanguageModel._MODEL_FACTORY.keys()))
+    return sorted(
+        [k for k in LanguageModel._MODEL_FACTORY.keys() if re.match(regex, k)]
+    )
 
   @pg.explicit_method_override
   def __init__(self, *args, **kwargs) -> None:

{langfun-0.1.2.dev202506250804 → langfun-0.1.2.dev202506270804}/langfun/core/language_model_test.py

@@ -196,6 +196,8 @@ class LanguageModelTest(unittest.TestCase):
     self.assertEqual(lm.failures_before_attempt, 1)
     self.assertEqual(lm.sampling_options.temperature, 0.2)
     self.assertIn('MockModel', lm_lib.LanguageModel.dir())
+    self.assertIn('MockModel', lm_lib.LanguageModel.dir('Mock.*'))
+    self.assertEqual(lm_lib.LanguageModel.dir('NotMock.*'), [])
 
     lm_lib.LanguageModel.register('mock://.*', mock_model)
     lm_lib.LanguageModel.register('mock.*', mock_model)
@@ -206,6 +208,26 @@ class LanguageModelTest(unittest.TestCase):
     with self.assertRaisesRegex(ValueError, 'Model not found'):
       lm_lib.LanguageModel.get('non-existent://test2')
 
+    lm = lm_lib.LanguageModel.get('MockModel?temperature=0.1')
+    self.assertEqual(lm.sampling_options.temperature, 0.1)
+
+    lm = lm_lib.LanguageModel.get(
+        'MockModel?temperature=0.1&name=my_model&logprobs=true&n=2'
+    )
+    self.assertEqual(lm.sampling_options.temperature, 0.1)
+    self.assertEqual(lm.sampling_options.n, 2)
+    self.assertTrue(lm.sampling_options.logprobs)
+    self.assertEqual(lm.name, 'my_model')
+
+    lm = lm_lib.LanguageModel.get('MockModel?temperature=0.1', temperature=0.2)
+    self.assertEqual(lm.sampling_options.temperature, 0.2)
+
+    with self.assertRaisesRegex(ValueError, 'Invalid model string'):
+      lm_lib.LanguageModel.get('MockModel??')
+
+    with self.assertRaisesRegex(ValueError, 'Invalid kwargs in model string'):
+      lm_lib.LanguageModel.get('MockModel?temperature=0.1&')
+
   def test_basics(self):
     lm = MockModel(1, temperature=0.5, top_k=2, max_attempts=2)
     self.assertEqual(

{langfun-0.1.2.dev202506250804 → langfun-0.1.2.dev202506270804}/langfun.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfun
-Version: 0.1.2.dev202506250804
+Version: 0.1.2.dev202506270804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors