Merge branch 'main' into 3-13

Change-Id: Ifb5440630c1ba4933f34f78923f119a3896faa68

Author: MarkDaoust

.github/workflows/samples.yaml

@@ -28,6 +28,7 @@ jobs:
           
           for file in ${NEW_FILES}; do
             echo "Testing $file"
+            name=$(basename $file)
             if [[ -f ${file} ]]; then
               # File exists, so needs to be listed.
               if ! grep -q $name ${README}; then

CONTRIBUTING.md

@@ -93,10 +93,11 @@ pytest
 
 Or to debug, use:
 
-```commandline
+```
 pip install nose2
 
 nose2 --debugger
+```
 
 ### Type checking 
 
@@ -124,7 +125,6 @@ black .
 python docs/build_docs.py
 ```
 
-
 [setup]: https://cloud.google.com/nodejs/docs/setup
 [projects]: https://console.cloud.google.com/project
 [billing]: https://support.google.com/cloud/answer/6293499#enable-billing

README.md

@@ -9,7 +9,7 @@ The Google AI Python SDK is the easiest way for Python developers to build with
 ## Get started with the Gemini API
 1. Go to [Google AI Studio](https://aistudio.google.com/).
 2. Login with your Google account.
-3. [Create](https://aistudio.google.com/app/apikey) an API key. Note that in Europe the free tier is not available.
+3. [Create](https://aistudio.google.com/app/apikey) an API key.
 4. Try a Python SDK [quickstart](https://github.com/google-gemini/gemini-api-cookbook/blob/main/quickstarts/Prompting.ipynb) in the [Gemini API Cookbook](https://github.com/google-gemini/gemini-api-cookbook/).
 5. For detailed instructions, try the 
 [Python SDK tutorial](https://ai.google.dev/tutorials/python_quickstart) on [ai.google.dev](https://ai.google.dev).
@@ -33,7 +33,7 @@ genai.configure(api_key=os.environ["GEMINI_API_KEY"])
 3. Create a model and run a prompt.
 
 ```python
-model = genai.GenerativeModel('gemini-1.0-pro-latest')
+model = genai.GenerativeModel('gemini-1.5-flash')
 response = model.generate_content("The opposite of hot is")
 print(response.text)
 ```

google/generativeai/__init__.py

@@ -48,10 +48,6 @@
 
 from google.generativeai.client import configure
 
-from google.generativeai.discuss import chat
-from google.generativeai.discuss import chat_async
-from google.generativeai.discuss import count_message_tokens
-
 from google.generativeai.embedding import embed_content
 from google.generativeai.embedding import embed_content_async
 
@@ -77,19 +73,13 @@
 from google.generativeai.operations import list_operations
 from google.generativeai.operations import get_operation
 
-from google.generativeai.text import generate_text
-from google.generativeai.text import generate_embeddings
-from google.generativeai.text import count_text_tokens
-
 from google.generativeai.types import GenerationConfig
 
 __version__ = version.__version__
 
-del discuss
 del embedding
 del files
 del generative_models
-del text
 del models
 del client
 del operations

google/generativeai/answer.py

@@ -283,7 +283,7 @@ def generate_answer(
         answer_style: Style in which the grounded answer should be returned.
         safety_settings: Safety settings for generated output. Defaults to None.
         temperature: Controls the randomness of the output.
-        client: If you're not relying on a default client, you pass a `glm.TextServiceClient` instead.
+        client: If you're not relying on a default client, you pass a `glm.GenerativeServiceClient` instead.
         request_options: Options for the request.
 
     Returns:
@@ -337,7 +337,7 @@ async def generate_answer_async(
         answer_style: Style in which the grounded answer should be returned.
         safety_settings: Safety settings for generated output. Defaults to None.
         temperature: Controls the randomness of the output.
-        client: If you're not relying on a default client, you pass a `glm.TextServiceClient` instead.
+        client: If you're not relying on a default client, you pass a `glm.GenerativeServiceClient` instead.
 
     Returns:
         A `types.Answer` containing the model's text answer response.

google/generativeai/client.py

@@ -2,9 +2,9 @@
 
 import os
 import contextlib
+import inspect
 import dataclasses
 import pathlib
-import types
 from typing import Any, cast
 from collections.abc import Sequence
 import httplib2
@@ -30,6 +30,21 @@
     __version__ = "0.0.0"
 
 USER_AGENT = "genai-py"
+
+#### Caution! ####
+#  - It would make sense for the discovery URL to respect the client_options.endpoint setting.
+#    - That would make testing Files on the staging server possible.
+#  - We tried fixing this once, but broke colab in the process because their endpoint didn't forward the discovery
+#    requests. https://github.com/google-gemini/generative-ai-python/pull/333
+#  - Kaggle would have a similar problem  (b/362278209).
+#    - I think their proxy would forward the discovery traffic.
+#    - But they don't need to intercept the files-service at all, and uploads of large files could overload them.
+#      - Do the scotty uploads go to the same domain?
+#    - If you do route the discovery call to kaggle, be sure to attach the default_metadata (they need it).
+#  - One solution to all this would be if configure could take overrides per service.
+#    - set client_options.endpoint, but use a different endpoint for file service? It's not clear how best to do that
+#      through the file service.
+##################
 GENAI_API_DISCOVERY_URL = "https://generativelanguage.googleapis.com/$discovery/rest"
 
 
@@ -50,7 +65,7 @@ def __init__(self, *args, **kwargs):
         self._discovery_api = None
         super().__init__(*args, **kwargs)
 
-    def _setup_discovery_api(self):
+    def _setup_discovery_api(self, metadata: dict | Sequence[tuple[str, str]] = ()):
         api_key = self._client_options.api_key
         if api_key is None:
             raise ValueError(
@@ -61,6 +76,7 @@ def _setup_discovery_api(self):
             http=httplib2.Http(),
             postproc=lambda resp, content: (resp, content),
             uri=f"{GENAI_API_DISCOVERY_URL}?version=v1beta&key={api_key}",
+            headers=dict(metadata),
         )
         response, content = request.execute()
         request.http.close()
@@ -78,9 +94,10 @@ def create_file(
         name: str | None = None,
         display_name: str | None = None,
         resumable: bool = True,
+        metadata: Sequence[tuple[str, str]] = (),
     ) -> protos.File:
         if self._discovery_api is None:
-            self._setup_discovery_api()
+            self._setup_discovery_api(metadata)
 
         file = {}
         if name is not None:
@@ -92,6 +109,8 @@ def create_file(
             filename=path, mimetype=mime_type, resumable=resumable
         )
         request = self._discovery_api.media().upload(body={"file": file}, media_body=media)
+        for key, value in metadata:
+            request.headers[key] = value
         result = request.execute()
 
         return self.get_file({"name": result["file"]["name"]})
@@ -108,9 +127,6 @@ async def create_file(self, *args, **kwargs):
 class _ClientManager:
     client_config: dict[str, Any] = dataclasses.field(default_factory=dict)
     default_metadata: Sequence[tuple[str, str]] = ()
-
-    discuss_client: glm.DiscussServiceClient | None = None
-    discuss_async_client: glm.DiscussServiceAsyncClient | None = None
     clients: dict[str, Any] = dataclasses.field(default_factory=dict)
 
     def configure(
@@ -119,7 +135,7 @@ def configure(
         api_key: str | None = None,
         credentials: ga_credentials.Credentials | dict | None = None,
         # The user can pass a string to choose `rest` or `grpc` or 'grpc_asyncio'.
-        # See `_transport_registry` in `DiscussServiceClientMeta`.
+        # See _transport_registry in the google.ai.generativelanguage package.
         # Since the transport classes align with the client classes it wouldn't make
         # sense to accept a `Transport` object here even though the client classes can.
         # We could accept a dict since all the `Transport` classes take the same args,
@@ -229,16 +245,14 @@ def make_client(self, name):
         def keep(name, f):
             if name.startswith("_"):
                 return False
-            elif name == "create_file":
-                return False
-            elif not isinstance(f, types.FunctionType):
-                return False
-            elif isinstance(f, classmethod):
+
+            if not callable(f):
                 return False
-            elif isinstance(f, staticmethod):
+
+            if "metadata" not in inspect.signature(f).parameters.keys():
                 return False
-            else:
-                return True
+
+            return True
 
         def add_default_metadata_wrapper(f):
             def call(*args, metadata=(), **kwargs):
@@ -247,7 +261,7 @@ def call(*args, metadata=(), **kwargs):
 
             return call
 
-        for name, value in cls.__dict__.items():
+        for name, value in inspect.getmembers(cls):
             if not keep(name, value):
                 continue
             f = getattr(client, name)
@@ -281,7 +295,6 @@ def configure(
     api_key: str | None = None,
     credentials: ga_credentials.Credentials | dict | None = None,
     # The user can pass a string to choose `rest` or `grpc` or 'grpc_asyncio'.
-    # See `_transport_registry` in `DiscussServiceClientMeta`.
     # Since the transport classes align with the client classes it wouldn't make
     # sense to accept a `Transport` object here even though the client classes can.
     # We could accept a dict since all the `Transport` classes take the same args,
@@ -326,14 +339,6 @@ def get_default_cache_client() -> glm.CacheServiceClient:
     return _client_manager.get_default_client("cache")
 
 
-def get_default_discuss_client() -> glm.DiscussServiceClient:
-    return _client_manager.get_default_client("discuss")
-
-
-def get_default_discuss_async_client() -> glm.DiscussServiceAsyncClient:
-    return _client_manager.get_default_client("discuss_async")
-
-
 def get_default_file_client() -> glm.FilesServiceClient:
     return _client_manager.get_default_client("file")
 
@@ -350,10 +355,6 @@ def get_default_generative_async_client() -> glm.GenerativeServiceAsyncClient:
     return _client_manager.get_default_client("generative_async")
 
 
-def get_default_text_client() -> glm.TextServiceClient:
-    return _client_manager.get_default_client("text")
-
-
 def get_default_operations_client() -> operations_v1.OperationsClient:
     return _client_manager.get_default_client("operations")