Merge pull request #75 from pinecone-io/certifi-certs

Fix log level updates and set default openapi_config ssl_ca_cert bundle to point to certifi bundle

Author: mutayroei

CHANGELOG.md

@@ -0,0 +1,23 @@
+# Changelog
+
+## [Unreleased]
+
+### Changed
+- `pinecone.init()` can now be used to set the pinecone logger's log level.
+- The python client `pinecone.config.OpenApiConfiguration` object now uses the certifi package's SSL CA bundle by default. This should fix HTTPS connection errors in certain environments depending on their default CA bundle, including some Google Colab notebooks. 
+
+## [2.0.0] - 2020-10-04
+### Added
+- New major release!
+
+### Changed
+- `pinecone.create_index()` now requires a `dimension` parameter.
+- The `pinecone.Index` interface has changed:
+  - `Index.upsert`, `Index.query`, `Index.fetch`, and `Index.delete` now take different parameters and return different results.
+  - `Index.info` has been removed. See `Index.describe_index_stats()` as an alternative.
+  - The `Index()` constructor no longer validates index existence. This is instead done on all operations executed using the Index instance.
+
+
+[Unreleased]: https://github.com/pinecone-io/pinecone-python-client/compare/v2.0.1...HEAD
+[2.0.1]: https://github.com/pinecone-io/pinecone-python-client/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/pinecone-io/pinecone-python-client/compare/v2.0.0...v2.0.1

pinecone/config.py

@@ -5,6 +5,7 @@
 from typing import NamedTuple
 import os
 
+import certifi
 from loguru import logger
 import requests
 import sentry_sdk
@@ -14,7 +15,7 @@
 from pinecone.core.api_action import ActionAPI, WhoAmIResponse
 from pinecone.core.utils.constants import CLIENT_VERSION
 from pinecone.core.utils.sentry import sentry_decorator as sentry
-from pinecone.core.client.configuration import Configuration
+from pinecone.core.client.configuration import Configuration as OpenApiConfiguration
 
 __all__ = [
     "Config", "logger", "init"
@@ -35,7 +36,7 @@ class ConfigBase(NamedTuple):
     project_name: str = ""
     controller_host: str = ""
     log_level: str = ""
-    openapi_config: Configuration = None
+    openapi_config: OpenApiConfiguration = None
 
 
 class _CONFIG:
@@ -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 = OpenApiConfiguration.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
 
@@ -188,7 +194,7 @@ def LOG_LEVEL(self):
 
 @sentry
 def init(api_key: str = None, host: str = None, environment: str = None, project_name: str = None,
-         log_level: str = None, openapi_config: Configuration = None,
+         log_level: str = None, openapi_config: OpenApiConfiguration = None,
          config: str = "~/.pinecone", **kwargs):
     """Initializes the Pinecone client.
 
@@ -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