Using the GEMINI_API_KEY by default instead of the GOOGLE_API_KEY one (google-gemini#418)

* Using the GEMINI_API_KEY by default instead of the GOOGLE_API_KEY one
The Google API key can be misleading since it's not really an overall key for all of Google API and only for the Gemini ones.

* Formatting

* Update google/generativeai/client.py

* revert elif

---------

Co-authored-by: Mark Daoust <[email protected]>

Author: Giom-V

README.md

@@ -27,7 +27,7 @@ See the [Gemini API Cookbook](https://github.com/google-gemini/gemini-api-cookbo
 import google.generativeai as genai
 import os
 
-genai.configure(api_key=os.environ["GOOGLE_API_KEY"])
+genai.configure(api_key=os.environ["GEMINI_API_KEY"])
 ```
 
 3. Create a model and run a prompt.

google/generativeai/client.py

@@ -132,7 +132,8 @@ def configure(
         """Initializes default client configurations using specified parameters or environment variables.
 
         If no API key has been provided (either directly, or on `client_options`) and the
-        `GOOGLE_API_KEY` environment variable is set, it will be used as the API key.
+        `GEMINI_API_KEY` environment variable is set, it will be used as the API key. If not,
+        if the `GOOGLE_API_KEY` environement variable is set, it will be used as the API key.
 
         Note: Not all arguments are detailed below. Refer to the `*ServiceClient` classes in
         `google.ai.generativelanguage` for details on the other arguments.
@@ -141,8 +142,8 @@ def configure(
             transport: A string, one of: [`rest`, `grpc`, `grpc_asyncio`].
             api_key: The API-Key to use when creating the default clients (each service uses
                 a separate client). This is a shortcut for `client_options={"api_key": api_key}`.
-                If omitted, and the `GOOGLE_API_KEY` environment variable is set, it will be
-                used.
+                If omitted, and the `GEMINI_API_KEY` or the `GOOGLE_API_KEY` environment variable
+                are set, they will be used in this order of priority.
             default_metadata: Default (key, value) metadata pairs to send with every request.
                 when using `transport="rest"` these are sent as HTTP headers.
         """
@@ -162,6 +163,11 @@ def configure(
             if api_key is None:
                 # If no key is provided explicitly, attempt to load one from the
                 # environment.
+                api_key = os.getenv("GEMINI_API_KEY")
+
+            if api_key is None:
+                # If the GEMINI_API_KEY doesn't exist, attempt to load the
+                # GOOGLE_API_KEY from the environment.
                 api_key = os.getenv("GOOGLE_API_KEY")
 
             client_options.api_key = api_key

google/generativeai/types/discuss_types.py

@@ -121,7 +121,7 @@ class ChatResponse(abc.ABC):
     ```
     import google.generativeai as genai
 
-    genai.configure(api_key=os.environ['GOOGLE_API_KEY'])
+    genai.configure(api_key=os.environ['GEMINI_API_KEY'])
 
     response = genai.chat(messages=["Hello."])
     print(response.last) #  'Hello! What can I help you with?'