langfun 0.1.2.dev202501160804__tar.gz → 0.1.2.dev202501180803__tar.gz

{langfun-0.1.2.dev202501160804 → langfun-0.1.2.dev202501180803}/PKG-INFO

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

{langfun-0.1.2.dev202501160804 → langfun-0.1.2.dev202501180803}/langfun/core/llms/__init__.py

@@ -27,8 +27,15 @@ from langfun.core.llms.fake import StaticSequence
 # Compositional models.
 from langfun.core.llms.compositional import RandomChoice
 
-# REST-based models.
+# Base models by request/response protocol.
 from langfun.core.llms.rest import REST
+from langfun.core.llms.openai_compatible import OpenAICompatible
+from langfun.core.llms.gemini import Gemini
+from langfun.core.llms.anthropic import Anthropic
+
+# Base models by serving platforms.
+from langfun.core.llms.vertexai import VertexAI
+from langfun.core.llms.groq import Groq
 
 # Gemini models.
 from langfun.core.llms.google_genai import GenAI
@@ -44,7 +51,7 @@ 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 VertexAIGemini
 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
@@ -57,9 +64,6 @@ 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
 
-# Base for OpenAI-compatible models.
-from langfun.core.llms.openai_compatible import OpenAICompatible
-
 # OpenAI models.
 from langfun.core.llms.openai import OpenAI
 
@@ -114,20 +118,34 @@ from langfun.core.llms.openai import Gpt3Curie
 from langfun.core.llms.openai import Gpt3Babbage
 from langfun.core.llms.openai import Gpt3Ada
 
-from langfun.core.llms.anthropic import Anthropic
+# Anthropic models.
+
 from langfun.core.llms.anthropic import Claude35Sonnet
 from langfun.core.llms.anthropic import Claude35Sonnet20241022
 from langfun.core.llms.anthropic import Claude35Sonnet20240620
 from langfun.core.llms.anthropic import Claude3Opus
 from langfun.core.llms.anthropic import Claude3Sonnet
 from langfun.core.llms.anthropic import Claude3Haiku
-from langfun.core.llms.anthropic import VertexAIAnthropic
-from langfun.core.llms.anthropic import VertexAIClaude3_5_Sonnet_20241022
-from langfun.core.llms.anthropic import VertexAIClaude3_5_Sonnet_20240620
-from langfun.core.llms.anthropic import VertexAIClaude3_5_Haiku_20241022
-from langfun.core.llms.anthropic import VertexAIClaude3_Opus_20240229
 
-from langfun.core.llms.groq import Groq
+from langfun.core.llms.vertexai import VertexAIAnthropic
+from langfun.core.llms.vertexai import VertexAIClaude3_5_Sonnet_20241022
+from langfun.core.llms.vertexai import VertexAIClaude3_5_Sonnet_20240620
+from langfun.core.llms.vertexai import VertexAIClaude3_5_Haiku_20241022
+from langfun.core.llms.vertexai import VertexAIClaude3_Opus_20240229
+
+# Misc open source models.
+
+# Gemma models.
+from langfun.core.llms.groq import GroqGemma2_9B_IT
+from langfun.core.llms.groq import GroqGemma_7B_IT
+
+# Llama models.
+from langfun.core.llms.vertexai import VertexAILlama
+from langfun.core.llms.vertexai import VertexAILlama3_2_90B
+from langfun.core.llms.vertexai import VertexAILlama3_1_405B
+from langfun.core.llms.vertexai import VertexAILlama3_1_70B
+from langfun.core.llms.vertexai import VertexAILlama3_1_8B
+
 from langfun.core.llms.groq import GroqLlama3_2_3B
 from langfun.core.llms.groq import GroqLlama3_2_1B
 from langfun.core.llms.groq import GroqLlama3_1_70B
@@ -135,18 +153,28 @@ from langfun.core.llms.groq import GroqLlama3_1_8B
 from langfun.core.llms.groq import GroqLlama3_70B
 from langfun.core.llms.groq import GroqLlama3_8B
 from langfun.core.llms.groq import GroqLlama2_70B
+
+# Mistral models.
+from langfun.core.llms.vertexai import VertexAIMistral
+from langfun.core.llms.vertexai import VertexAIMistralLarge_20241121
+from langfun.core.llms.vertexai import VertexAIMistralLarge_20240724
+from langfun.core.llms.vertexai import VertexAIMistralNemo_20240724
+from langfun.core.llms.vertexai import VertexAICodestral_20250113
+from langfun.core.llms.vertexai import VertexAICodestral_20240529
+
 from langfun.core.llms.groq import GroqMistral_8x7B
-from langfun.core.llms.groq import GroqGemma2_9B_IT
-from langfun.core.llms.groq import GroqGemma_7B_IT
+
+# DeepSeek models.
+from langfun.core.llms.deepseek import DeepSeek
+from langfun.core.llms.deepseek import DeepSeekChat
+
+# Whisper models.
 from langfun.core.llms.groq import GroqWhisper_Large_v3
 from langfun.core.llms.groq import GroqWhisper_Large_v3Turbo
 
 # LLaMA C++ models.
 from langfun.core.llms.llama_cpp import LlamaCppRemote
 
-# DeepSeek models.
-from langfun.core.llms.deepseek import DeepSeek
-from langfun.core.llms.deepseek import DeepSeekChat
 
 # Placeholder for Google-internal imports.
 

{langfun-0.1.2.dev202501160804 → langfun-0.1.2.dev202501180803}/langfun/core/llms/anthropic.py

@@ -14,9 +14,8 @@
 """Language models from Anthropic."""
 
 import base64
-import functools
 import os
-from typing import Annotated, Any, Literal
+from typing import Annotated, Any
 
 import langfun.core as lf
 from langfun.core import modalities as lf_modalities
@@ -24,20 +23,6 @@ from langfun.core.llms import rest
 import pyglove as pg
 
 
-try:
-  # pylint: disable=g-import-not-at-top
-  from google import auth as google_auth
-  from google.auth import credentials as credentials_lib
-  from google.auth.transport import requests as auth_requests
-  Credentials = credentials_lib.Credentials
-  # pylint: enable=g-import-not-at-top
-except ImportError:
-  google_auth = None
-  auth_requests = None
-  credentials_lib = None
-  Credentials = Any  # pylint: disable=invalid-name
-
-
 SUPPORTED_MODELS_AND_SETTINGS = {
     # See https://docs.anthropic.com/claude/docs/models-overview
     # Rate limits from https://docs.anthropic.com/claude/reference/rate-limits
@@ -379,110 +364,3 @@ class Claude21(Anthropic):
 class ClaudeInstant(Anthropic):
   """Cheapest small and fast model, 100K context window."""
   model = 'claude-instant-1.2'
-
-
-#
-# Authropic models on VertexAI.
-#
-
-
-class VertexAIAnthropic(Anthropic):
-  """Anthropic models on VertexAI."""
-
-  project: Annotated[
-      str | None,
-      'Google Cloud project ID.',
-  ] = None
-
-  location: Annotated[
-      Literal['us-east5', 'europe-west1'],
-      'GCP location with Anthropic models hosted.'
-  ] = 'us-east5'
-
-  credentials: Annotated[
-      Credentials | None,    # pytype: disable=invalid-annotation
-      (
-          'Credentials to use. If None, the default credentials '
-          'to the environment will be used.'
-      ),
-  ] = None
-
-  api_version = 'vertex-2023-10-16'
-
-  def _on_bound(self):
-    super()._on_bound()
-    if google_auth is None:
-      raise ValueError(
-          'Please install "langfun[llm-google-vertex]" to use Vertex AI models.'
-      )
-    self._project = None
-    self._credentials = None
-
-  def _initialize(self):
-    project = self.project or os.environ.get('VERTEXAI_PROJECT', None)
-    if not project:
-      raise ValueError(
-          'Please specify `project` during `__init__` or set environment '
-          'variable `VERTEXAI_PROJECT` with your Vertex AI project ID.'
-      )
-    self._project = project
-    credentials = self.credentials
-    if credentials is None:
-      # Use default credentials.
-      credentials = google_auth.default(
-          scopes=['https://www.googleapis.com/auth/cloud-platform']
-      )
-    self._credentials = credentials
-
-  @functools.cached_property
-  def _session(self):
-    assert self._api_initialized
-    assert self._credentials is not None
-    assert auth_requests is not None
-    s = auth_requests.AuthorizedSession(self._credentials)
-    s.headers.update(self.headers or {})
-    return s
-
-  @property
-  def headers(self):
-    return {
-        'Content-Type': 'application/json; charset=utf-8',
-    }
-
-  @property
-  def api_endpoint(self) -> str:
-    return (
-        f'https://{self.location}-aiplatform.googleapis.com/v1/projects/'
-        f'{self._project}/locations/{self.location}/publishers/anthropic/'
-        f'models/{self.model}:streamRawPredict'
-    )
-
-  def request(
-      self,
-      prompt: lf.Message,
-      sampling_options: lf.LMSamplingOptions
-  ):
-    request = super().request(prompt, sampling_options)
-    request['anthropic_version'] = self.api_version
-    del request['model']
-    return request
-
-
-class VertexAIClaude3_Opus_20240229(VertexAIAnthropic):  # pylint: disable=invalid-name
-  """Anthropic's Claude 3 Opus model on VertexAI."""
-  model = 'claude-3-opus@20240229'
-
-
-class VertexAIClaude3_5_Sonnet_20241022(VertexAIAnthropic):  # pylint: disable=invalid-name
-  """Anthropic's Claude 3.5 Sonnet model on VertexAI."""
-  model = 'claude-3-5-sonnet-v2@20241022'
-
-
-class VertexAIClaude3_5_Sonnet_20240620(VertexAIAnthropic):  # pylint: disable=invalid-name
-  """Anthropic's Claude 3.5 Sonnet model on VertexAI."""
-  model = 'claude-3-5-sonnet@20240620'
-
-
-class VertexAIClaude3_5_Haiku_20241022(VertexAIAnthropic):  # pylint: disable=invalid-name
-  """Anthropic's Claude 3.5 Haiku model on VertexAI."""
-  model = 'claude-3-5-haiku@20241022'

{langfun-0.1.2.dev202501160804 → langfun-0.1.2.dev202501180803}/langfun/core/llms/anthropic_test.py

@@ -19,9 +19,6 @@ from typing import Any
 import unittest
 from unittest import mock
 
-from google.auth import exceptions
-from langfun.core import language_model
-from langfun.core import message as lf_message
 from langfun.core import modalities as lf_modalities
 from langfun.core.llms import anthropic
 import pyglove as pg
@@ -186,50 +183,5 @@ class AnthropicTest(unittest.TestCase):
           lm('hello', max_attempts=1)
 
 
-class VertexAIAnthropicTest(unittest.TestCase):
-  """Tests for VertexAI Anthropic models."""
-
-  def test_basics(self):
-    with self.assertRaisesRegex(ValueError, 'Please specify `project`'):
-      lm = anthropic.VertexAIClaude3_5_Sonnet_20241022()
-      lm('hi')
-
-    model = anthropic.VertexAIClaude3_5_Sonnet_20241022(project='langfun')
-
-    # NOTE(daiyip): For OSS users, default credentials are not available unless
-    # users have already set up their GCP project. Therefore we ignore the
-    # exception here.
-    try:
-      model._initialize()
-    except exceptions.DefaultCredentialsError:
-      pass
-
-    self.assertEqual(
-        model.api_endpoint,
-        (
-            'https://us-east5-aiplatform.googleapis.com/v1/projects/'
-            'langfun/locations/us-east5/publishers/anthropic/'
-            'models/claude-3-5-sonnet-v2@20241022:streamRawPredict'
-        )
-    )
-    request = model.request(
-        lf_message.UserMessage('hi'),
-        language_model.LMSamplingOptions(temperature=0.0),
-    )
-    self.assertEqual(
-        request,
-        {
-            'anthropic_version': 'vertex-2023-10-16',
-            'max_tokens': 8192,
-            'messages': [
-                {'content': [{'text': 'hi', 'type': 'text'}], 'role': 'user'}
-            ],
-            'stream': False,
-            'temperature': 0.0,
-            'top_k': 40,
-        },
-    )
-
-
 if __name__ == '__main__':
   unittest.main()

{langfun-0.1.2.dev202501160804 → langfun-0.1.2.dev202501180803}/langfun/core/llms/gemini.py

@@ -380,7 +380,7 @@ class Gemini(rest.REST):
     return (
         cost_per_1m_input_tokens * num_input_tokens
         + cost_per_1m_output_tokens * num_output_tokens
-    ) / 1000_1000
+    ) / 1000_000
 
   @property
   def model_id(self) -> str: