langfun 0.1.2.dev202412020805__py3-none-any.whl → 0.1.2.dev202412030804__py3-none-any.whl

langfun/core/llms/vertexai_test.py

@@ -13,13 +13,12 @@
 # limitations under the License.
 """Tests for Gemini models."""
 
+import base64
 import os
 from typing import Any
 import unittest
 from unittest import mock
 
-from google.cloud.aiplatform import models as aiplatform_models
-from vertexai import generative_models
 import langfun.core as lf
 from langfun.core import modalities as lf_modalities
 from langfun.core.llms import vertexai
@@ -39,33 +38,6 @@ example_image = (
 )
 
 
-def mock_generate_content(content, generation_config, **kwargs):
-  del kwargs
-  c = pg.Dict(generation_config.to_dict())
-  return generative_models.GenerationResponse.from_dict({
-      'candidates': [
-          {
-              'index': 0,
-              'content': {
-                  'role': 'model',
-                  'parts': [
-                      {
-                          'text': (
-                              f'This is a response to {content[0]} with '
-                              f'temperature={c.temperature}, '
-                              f'top_p={c.top_p}, '
-                              f'top_k={c.top_k}, '
-                              f'max_tokens={c.max_output_tokens}, '
-                              f'stop={"".join(c.stop_sequences)}.'
-                          )
-                      },
-                  ],
-              },
-          },
-      ]
-  })
-
-
 def mock_requests_post(url: str, json: dict[str, Any], **kwargs):
   del url, kwargs
   c = pg.Dict(json['generationConfig'])
@@ -100,273 +72,7 @@ def mock_requests_post(url: str, json: dict[str, Any], **kwargs):
   return response
 
 
-def mock_endpoint_predict(instances, **kwargs):
-  del kwargs
-  assert len(instances) == 1
-  return aiplatform_models.Prediction(
-      predictions=[
-          f"This is a response to {instances[0]['prompt']} with"
-          f" temperature={instances[0]['temperature']},"
-          f" top_p={instances[0]['top_p']}, top_k={instances[0]['top_k']},"
-          f" max_tokens={instances[0]['max_tokens']}."
-      ],
-      deployed_model_id='',
-  )
-
-
 class VertexAITest(unittest.TestCase):
-  """Tests for Vertex model."""
-
-  def test_content_from_message_text_only(self):
-    text = 'This is a beautiful day'
-    model = vertexai.VertexAIGeminiPro1Vision()
-    chunks = model._content_from_message(lf.UserMessage(text))
-    self.assertEqual(chunks, [text])
-
-  def test_content_from_message_mm(self):
-    message = lf.UserMessage(
-        'This is an <<[[image]]>>, what is it?',
-        image=lf_modalities.Image.from_bytes(example_image),
-    )
-
-    # Non-multimodal model.
-    with self.assertRaisesRegex(lf.ModalityError, 'Unsupported modality'):
-      vertexai.VertexAIPalm2()._content_from_message(message)
-
-    model = vertexai.VertexAIGeminiPro1Vision()
-    chunks = model._content_from_message(message)
-    self.maxDiff = None
-    self.assertEqual([chunks[0], chunks[2]], ['This is an', ', what is it?'])
-    self.assertIsInstance(chunks[1], generative_models.Part)
-
-  def test_generation_response_to_message_text_only(self):
-    response = generative_models.GenerationResponse.from_dict({
-        'candidates': [
-            {
-                'index': 0,
-                'content': {
-                    'role': 'model',
-                    'parts': [
-                        {
-                            'text': 'hello world',
-                        },
-                    ],
-                },
-            },
-        ],
-    })
-    model = vertexai.VertexAIGeminiPro1Vision()
-    message = model._generation_response_to_message(response)
-    self.assertEqual(message, lf.AIMessage('hello world'))
-
-  def test_model_hub(self):
-    with mock.patch(
-        'vertexai.generative_models.'
-        'GenerativeModel.__init__'
-    ) as mock_model_init:
-      mock_model_init.side_effect = lambda *args, **kwargs: None
-      model = vertexai._VERTEXAI_MODEL_HUB.get_generative_model(
-          'gemini-1.0-pro'
-      )
-      self.assertIsNotNone(model)
-      self.assertIs(
-          vertexai._VERTEXAI_MODEL_HUB.get_generative_model('gemini-1.0-pro'),
-          model,
-      )
-
-    with mock.patch(
-        'vertexai.language_models.'
-        'TextGenerationModel.from_pretrained'
-    ) as mock_model_init:
-
-      class TextGenerationModel:
-        pass
-
-      mock_model_init.side_effect = lambda *args, **kw: TextGenerationModel()
-      model = vertexai._VERTEXAI_MODEL_HUB.get_text_generation_model(
-          'text-bison'
-      )
-      self.assertIsNotNone(model)
-      self.assertIs(
-          vertexai._VERTEXAI_MODEL_HUB.get_text_generation_model('text-bison'),
-          model,
-      )
-
-  def test_project_and_location_check(self):
-    with self.assertRaisesRegex(ValueError, 'Please specify `project`'):
-      _ = vertexai.VertexAIGeminiPro1Vision()._api_initialized
-
-    with self.assertRaisesRegex(ValueError, 'Please specify `location`'):
-      _ = vertexai.VertexAIGeminiPro1Vision(project='abc')._api_initialized
-
-    self.assertTrue(
-        vertexai.VertexAIGeminiPro1Vision(
-            project='abc', location='us-central1'
-        )._api_initialized
-    )
-
-    os.environ['VERTEXAI_PROJECT'] = 'abc'
-    os.environ['VERTEXAI_LOCATION'] = 'us-central1'
-    self.assertTrue(vertexai.VertexAIGeminiPro1Vision()._api_initialized)
-    del os.environ['VERTEXAI_PROJECT']
-    del os.environ['VERTEXAI_LOCATION']
-
-  def test_generation_config(self):
-    model = vertexai.VertexAIGeminiPro1Vision()
-    json_schema = {
-        'type': 'object',
-        'properties': {
-            'name': {'type': 'string'},
-        },
-        'required': ['name'],
-        'title': 'Person',
-    }
-    config = model._generation_config(
-        lf.UserMessage('hi', json_schema=json_schema),
-        lf.LMSamplingOptions(
-            temperature=2.0,
-            top_p=1.0,
-            top_k=20,
-            max_tokens=1024,
-            stop=['\n'],
-        ),
-    )
-    actual = config.to_dict()
-    # There is a discrepancy between the `property_ordering` in the
-    # Google-internal version and the open-source version.
-    actual['response_schema'].pop('property_ordering', None)
-    if pg.KeyPath.parse('response_schema.type_').get(actual):
-      actual['response_schema']['type'] = actual['response_schema'].pop('type_')
-    if pg.KeyPath.parse('response_schema.properties.name.type_').get(actual):
-      actual['response_schema']['properties']['name']['type'] = actual[
-          'response_schema']['properties']['name'].pop('type_')
-
-    self.assertEqual(
-        actual,
-        dict(
-            temperature=2.0,
-            top_p=1.0,
-            top_k=20.0,
-            max_output_tokens=1024,
-            stop_sequences=['\n'],
-            response_mime_type='application/json',
-            response_schema={
-                'type': 'OBJECT',
-                'properties': {
-                    'name': {'type': 'STRING'}
-                },
-                'required': ['name'],
-                'title': 'Person',
-            }
-        ),
-    )
-    with self.assertRaisesRegex(
-        ValueError, '`json_schema` must be a dict, got'
-    ):
-      model._generation_config(
-          lf.UserMessage('hi', json_schema='not a dict'),
-          lf.LMSamplingOptions(),
-      )
-
-  def test_call_generative_model(self):
-    with mock.patch(
-        'vertexai.generative_models.'
-        'GenerativeModel.__init__'
-    ) as mock_model_init:
-      mock_model_init.side_effect = lambda *args, **kwargs: None
-
-      with mock.patch(
-          'vertexai.generative_models.'
-          'GenerativeModel.generate_content'
-      ) as mock_generate:
-        mock_generate.side_effect = mock_generate_content
-
-        lm = vertexai.VertexAIGeminiPro1Vision(
-            project='abc', location='us-central1'
-        )
-        self.assertEqual(
-            lm(
-                'hello',
-                temperature=2.0,
-                top_p=1.0,
-                top_k=20,
-                max_tokens=1024,
-                stop='\n',
-            ).text,
-            (
-                'This is a response to hello with temperature=2.0, '
-                'top_p=1.0, top_k=20.0, max_tokens=1024, stop=\n.'
-            ),
-        )
-
-  def test_call_text_generation_model(self):
-    with mock.patch(
-        'vertexai.language_models.'
-        'TextGenerationModel.from_pretrained'
-    ) as mock_model_init:
-
-      class TextGenerationModel:
-
-        def predict(self, prompt, **kwargs):
-          c = pg.Dict(kwargs)
-          return pg.Dict(
-              text=(
-                  f'This is a response to {prompt} with '
-                  f'temperature={c.temperature}, '
-                  f'top_p={c.top_p}, '
-                  f'top_k={c.top_k}, '
-                  f'max_tokens={c.max_output_tokens}, '
-                  f'stop={"".join(c.stop_sequences)}.'
-              )
-          )
-
-      mock_model_init.side_effect = lambda *args, **kw: TextGenerationModel()
-      lm = vertexai.VertexAIPalm2(project='abc', location='us-central1')
-      self.assertEqual(
-          lm(
-              'hello',
-              temperature=2.0,
-              top_p=1.0,
-              top_k=20,
-              max_tokens=1024,
-              stop='\n',
-          ).text,
-          (
-              'This is a response to hello with temperature=2.0, '
-              'top_p=1.0, top_k=20, max_tokens=1024, stop=\n.'
-          ),
-      )
-
-  def test_call_endpoint_model(self):
-    with mock.patch(
-        'google.cloud.aiplatform.models.Endpoint.__init__'
-    ) as mock_model_init:
-      mock_model_init.side_effect = lambda *args, **kwargs: None
-      with mock.patch(
-          'google.cloud.aiplatform.models.Endpoint.predict'
-      ) as mock_model_predict:
-
-        mock_model_predict.side_effect = mock_endpoint_predict
-        lm = vertexai.VertexAI(
-            'custom',
-            endpoint_name='123',
-            project='abc',
-            location='us-central1',
-        )
-        self.assertEqual(
-            lm(
-                'hello',
-                temperature=2.0,
-                top_p=1.0,
-                top_k=20,
-                max_tokens=50,
-            ),
-            'This is a response to hello with temperature=2.0, top_p=1.0,'
-            ' top_k=20, max_tokens=50.',
-        )
-
-
-class VertexRestfulAITest(unittest.TestCase):
   """Tests for Vertex model with REST API."""
 
   def test_content_from_message_text_only(self):
@@ -376,9 +82,9 @@ class VertexRestfulAITest(unittest.TestCase):
     self.assertEqual(chunks, {'role': 'user', 'parts': [{'text': text}]})
 
   def test_content_from_message_mm(self):
+    image = lf_modalities.Image.from_bytes(example_image)
     message = lf.UserMessage(
-        'This is an <<[[image]]>>, what is it?',
-        image=lf_modalities.Image.from_bytes(example_image),
+        'This is an <<[[image]]>>, what is it?', image=image
     )
 
     # Non-multimodal model.
@@ -386,46 +92,25 @@ class VertexRestfulAITest(unittest.TestCase):
       vertexai.VertexAIGeminiPro1()._content_from_message(message)
 
     model = vertexai.VertexAIGeminiPro1Vision()
-    chunks = model._content_from_message(message)
-    self.maxDiff = None
-    self.assertEqual([chunks[0], chunks[2]], ['This is an', ', what is it?'])
-    self.assertIsInstance(chunks[1], generative_models.Part)
-
-  def test_generation_response_to_message_text_only(self):
-    response = generative_models.GenerationResponse.from_dict({
-        'candidates': [
-            {
-                'index': 0,
-                'content': {
-                    'role': 'model',
-                    'parts': [
-                        {
-                            'text': 'hello world',
-                        },
-                    ],
+    content = model._content_from_message(message)
+    self.assertEqual(
+        content,
+        {
+            'role': 'user',
+            'parts': [
+                {'text': 'This is an'},
+                {
+                    'inlineData': {
+                        'data': base64.b64encode(example_image).decode(),
+                        'mimeType': 'image/png',
+                    }
                 },
-            },
-        ],
-    })
-    model = vertexai.VertexAIGeminiPro1Vision()
-    message = model._generation_response_to_message(response)
-    self.assertEqual(message, lf.AIMessage('hello world'))
-
-  def test_model_hub(self):
-    with mock.patch(
-        'vertexai.generative_models.'
-        'GenerativeModel.__init__'
-    ) as mock_model_init:
-      mock_model_init.side_effect = lambda *args, **kwargs: None
-      model = vertexai._VERTEXAI_MODEL_HUB.get_generative_model(
-          'gemini-1.0-pro'
-      )
-      self.assertIsNotNone(model)
-      self.assertIs(
-          vertexai._VERTEXAI_MODEL_HUB.get_generative_model('gemini-1.0-pro'),
-          model,
-      )
+                {'text': ', what is it?'},
+            ],
+        },
+    )
 
+  @mock.patch.object(vertexai.VertexAI, 'credentials', new=True)
   def test_project_and_location_check(self):
     with self.assertRaisesRegex(ValueError, 'Please specify `project`'):
       _ = vertexai.VertexAIGeminiPro1()._api_initialized
@@ -496,6 +181,7 @@ class VertexRestfulAITest(unittest.TestCase):
           lf.LMSamplingOptions(),
       )
 
+  @mock.patch.object(vertexai.VertexAI, 'credentials', new=True)
   def test_call_model(self):
     with mock.patch('requests.Session.post') as mock_generate:
       mock_generate.side_effect = mock_requests_post

{langfun-0.1.2.dev202412020805.dist-info → langfun-0.1.2.dev202412030804.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.2.dev202412020805
+Version: 0.1.2.dev202412030804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -30,9 +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-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"
@@ -42,18 +40,11 @@ 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-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-vertex
-Requires-Dist: google-cloud-aiplatform>=1.5.0; extra == "llm-google-vertex"
 Provides-Extra: llm-google-genai
 Requires-Dist: google-generativeai>=0.3.2; extra == "llm-google-genai"
-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"
@@ -212,9 +203,7 @@ If you want to customize your installation, you can select specific features usi
 | 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.                     |

{langfun-0.1.2.dev202412020805.dist-info → langfun-0.1.2.dev202412030804.dist-info}/RECORD

@@ -79,7 +79,7 @@ langfun/core/eval/v2/reporting_test.py,sha256=JxffbUPWInUyLjo-AQVFrllga884Mdfm05
 langfun/core/eval/v2/runners.py,sha256=zJmu-amUiYv1g0Ek4c3mXkBgp-AFvSF7WpXVZCCf7Y4,14245
 langfun/core/eval/v2/runners_test.py,sha256=UeiUNygux_U6iGVG18rhp68ZE4hoWeoT6XsXvSjxNQg,11620
 langfun/core/eval/v2/test_helper.py,sha256=pDpZTBnWRR5xjJv3Uy3NWEzArqlL8FTMOgeR4C53F5M,2348
-langfun/core/llms/__init__.py,sha256=5djybv30-27qaVjZY50IkT66UdvLa-2xfGX-vOfeM0I,6573
+langfun/core/llms/__init__.py,sha256=C4hyLflqOQT841nMfclcxcnOhdP83zR0GGW29PnA-vU,6216
 langfun/core/llms/anthropic.py,sha256=uJXVgaFONL8okOSVQ4VGMGht_VZ30m1hoLzmDbIjmks,13990
 langfun/core/llms/anthropic_test.py,sha256=-2U4kc_pgBM7wqxu8RuxzyHPGww1EAWqKUvN4PW8Btw,8058
 langfun/core/llms/compositional.py,sha256=csW_FLlgL-tpeyCOTVvfUQkMa_zCN5Y2I-YbSNuK27U,2872
@@ -92,12 +92,12 @@ langfun/core/llms/groq.py,sha256=dCnR3eAECEKuKKAAj-PDTs8NRHl6CQPdf57m1f6a79U,103
 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=_VwOSuDsyXDngUM2iiES0CW1aN0BzMjXNBMegLzm4J4,23209
-langfun/core/llms/openai_test.py,sha256=_8cd3VRNEUfE0-Ko1RiM6MlC5hjalRj7nYTJNhG1p3E,18907
+langfun/core/llms/openai.py,sha256=l49v6RubfInvV0iG114AymTKNogTX4u4N-UFCeSgIxw,20963
+langfun/core/llms/openai_test.py,sha256=kOWa1nf-nJvtYY10REUw5wojh3ZgfU8tRaCZ8wUgJbA,16623
 langfun/core/llms/rest.py,sha256=sWbYUV8S3SuOg9giq7xwD-xDRfaF7NP_ig7bI52-Rj4,3442
 langfun/core/llms/rest_test.py,sha256=NZ3Nf0XQVpT9kLP5cBVo_yBHLI7vWTYhWQxYEJVMGs4,3472
-langfun/core/llms/vertexai.py,sha256=EZhJrdN-SsZVV0KT3NHzaJLVKsNMxCT6M3W6f5fpIWQ,27068
-langfun/core/llms/vertexai_test.py,sha256=nGv59yE4xu1zUxqmP_U941QjSBrr_sW15Q2YakuxMv4,16982
+langfun/core/llms/vertexai.py,sha256=48GFuf04NOeInvwHeLhs-iEyxL03VCjtw05BGcKio0s,14172
+langfun/core/llms/vertexai_test.py,sha256=ffcA5yPecnQy_rhkuYAw_6o1iLW8AR8FgswmHt6aAys,6725
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
 langfun/core/llms/cache/in_memory.py,sha256=l6b-iU9OTfTRo9Zmg4VrQIuArs4cCJDOpXiEpvNocjo,5004
@@ -148,8 +148,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=Ot__1P1M8oJfoTp-M9-PQ6HUXqZKyMwvZ5f7yQ3yfyM,2326
-langfun-0.1.2.dev202412020805.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202412020805.dist-info/METADATA,sha256=c3yjg186RyrDaIHGLMpmXsI7-Kqj4V1vLGxYsjJJN2Y,8890
-langfun-0.1.2.dev202412020805.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-langfun-0.1.2.dev202412020805.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202412020805.dist-info/RECORD,,
+langfun-0.1.2.dev202412030804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202412030804.dist-info/METADATA,sha256=BG5zoGi1sstPc97R4aTE51aiVfa02LLq-BRHRb8R_3Q,8281
+langfun-0.1.2.dev202412030804.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+langfun-0.1.2.dev202412030804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202412030804.dist-info/RECORD,,