Set default openapi_config ssl_ca_cert bundle to point to certifi bundle

Author: benjaminran

pinecone/config.py

@@ -5,6 +5,7 @@
 from typing import NamedTuple
 import os
 
+import certifi
 from loguru import logger
 import requests
 import sentry_sdk
@@ -50,6 +51,7 @@ class _CONFIG:
     """
 
     def __init__(self):
+        self._loguru_handler_id = None
         self.reset()
 
     def validate(self):
@@ -108,11 +110,11 @@ def reset(self, config_file=None, **kwargs):
         self._config = config
 
         # Set OpenAPI client config
+        default_openapi_config = Configuration.get_default_copy()
+        default_openapi_config.ssl_ca_cert = certifi.where()
         openapi_config = (
                 kwargs.pop("openapi_config", None)
-                or os.getenv("PINECONE_OPENAPI_CONFIG")
-                or file_config.pop("openapi_config", None)
-                or Configuration.get_default_copy()
+                or default_openapi_config
         )
 
         config = config._replace(openapi_config=openapi_config)
@@ -122,8 +124,12 @@ def reset(self, config_file=None, **kwargs):
         log_level = (
                 kwargs.pop("log_level", None)
                 or os.getenv("PINECONE_LOG_LEVEL")
+                or os.getenv("PINECONE_LOGGING")
                 or file_config.pop("log_level", None)
         )
+        if log_level or not self._loguru_handler_id:
+            logger.remove(self._loguru_handler_id)
+            self._loguru_handler_id = logger.add(sys.stdout, enqueue=True, level=(log_level or "ERROR"))
         config = config._replace(log_level=log_level)
         self._config = config
 
@@ -207,9 +213,6 @@ def init(api_key: str = None, host: str = None, environment: str = None, project
         logger.warning("API key is required.")
 
 
-logger.remove()
-logger.add(sys.stdout, enqueue=True, level=(os.getenv("PINECONE_LOGGING") or "ERROR"))
-
 Config = _CONFIG()
 
 # Init

tests/unit/test_config.py

@@ -0,0 +1,23 @@
+import pinecone
+from pinecone.config import logger, Config
+
+
+def test_update_log_level():
+    default_level = 'ERROR'
+    assert list(logger._core.handlers.values())[0].levelno == logger.level(default_level).no
+    new_level = 'INFO'
+    pinecone.init(log_level=new_level)
+    assert list(logger._core.handlers.values())[0].levelno == logger.level(new_level).no
+
+
+def test_multi_init():
+    env = 'test-env'
+    level = 'INFO'
+    # first init() sets log level
+    pinecone.init(log_level=level)
+    assert Config.ENVIRONMENT == 'us-west1-gcp'
+    assert list(logger._core.handlers.values())[0].levelno == logger.level(level).no
+    # next init() shouldn't clobber log level
+    pinecone.init(environment=env)
+    assert Config.ENVIRONMENT == env
+    assert list(logger._core.handlers.values())[0].levelno == logger.level(level).no