Fix shawoding caused by an empty GEMINI_API_KEY

Change-Id: I1df220253baf1b2171891ba380a0a3dde8e09a8b

Author: MarkDaoust

google/generativeai/client.py

@@ -185,12 +185,12 @@ def configure(
                     "Invalid configuration: Please set either `api_key` or `client_options['api_key']`, but not both."
                 )
         else:
-            if api_key is None:
+            if not api_key:
                 # 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 not api_key:
                 # 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")

tests/test_client.py

@@ -29,6 +29,18 @@ def test_api_key_passed_via_client_options(self):
         client_opts = client._client_manager.client_config["client_options"]
         self.assertEqual(client_opts.api_key, "AIzA_client_opts")
 
+    @mock.patch.dict(os.environ, {"GEMINI_API_KEY": "AIzA_env"})
+    def test_api_key_from_environment(self):
+        # Default to API key loaded from environment.
+        client.configure()
+        client_opts = client._client_manager.client_config["client_options"]
+        self.assertEqual(client_opts.api_key, "AIzA_env")
+
+        # But not when a key is provided explicitly.
+        client.configure(api_key="AIzA_client")
+        client_opts = client._client_manager.client_config["client_options"]
+        self.assertEqual(client_opts.api_key, "AIzA_client")
+
     @mock.patch.dict(os.environ, {"GOOGLE_API_KEY": "AIzA_env"})
     def test_api_key_from_environment(self):
         # Default to API key loaded from environment.
@@ -41,6 +53,30 @@ def test_api_key_from_environment(self):
         client_opts = client._client_manager.client_config["client_options"]
         self.assertEqual(client_opts.api_key, "AIzA_client")
 
+    @mock.patch.dict(os.environ, {"GEMINI_API_KEY": "", "GOOGLE_API_KEY": "AIzA_env"})
+    def test_empty_gemini_api_key_doesnt_shadow(self):
+        # Default to API key loaded from environment.
+        client.configure()
+        client_opts = client._client_manager.client_config["client_options"]
+        self.assertEqual(client_opts.api_key, "AIzA_env")
+
+        # But not when a key is provided explicitly.
+        client.configure(api_key="AIzA_client")
+        client_opts = client._client_manager.client_config["client_options"]
+        self.assertEqual(client_opts.api_key, "AIzA_client")
+
+    @mock.patch.dict(os.environ, {"GEMINI_API_KEY": "", "GOOGLE_API_KEY": "AIzA_env"})
+    def test_empty_google_api_key_doesnt_shadow(self):
+        # Default to API key loaded from environment.
+        client.configure()
+        client_opts = client._client_manager.client_config["client_options"]
+        self.assertEqual(client_opts.api_key, "AIzA_env")
+
+        # But not when a key is provided explicitly.
+        client.configure(api_key="AIzA_client")
+        client_opts = client._client_manager.client_config["client_options"]
+        self.assertEqual(client_opts.api_key, "AIzA_client")
+
     def test_api_key_cannot_be_set_twice(self):
         client_opts = client_options.ClientOptions(api_key="AIzA_client_opts")