Config / init refactor for state encapsulation

pinecone/__init__.py

@@ -3,22 +3,10 @@
 """
 from .config import *
 from .exceptions import *
-from .manage import *
-from .index import *
+from .control.pinecone import Pinecone
+from .data.index import *
 
 try:
-    from .grpc.index_grpc import *
+    from .data.grpc.index_grpc import *
 except ImportError:
     pass  # ignore for non-[grpc] installations
-
-# Kept for backwards-compatibility
-UpsertResult = None
-"""@private"""
-DeleteResult = None
-"""@private"""
-QueryResult = None
-"""@private"""
-FetchResult = None
-"""@private"""
-InfoResult = None
-"""@private"""

pinecone/config/__init__.py

@@ -0,0 +1,2 @@
+from .config import Config
+from .pinecone_config import PineconeConfig

pinecone/config/config.py

@@ -0,0 +1,69 @@
+from typing import NamedTuple
+import os
+
+from pinecone.utils import check_kwargs
+from pinecone.exceptions import PineconeConfigurationError
+from pinecone.core.client.exceptions import ApiKeyError
+from pinecone.config.openapi import OpenApiConfigFactory
+from pinecone.core.client.configuration import Configuration as OpenApiConfiguration
+
+
+class ConfigBase(NamedTuple):
+    api_key: str = ""
+    host: str = ""
+    openapi_config: OpenApiConfiguration = None
+
+
+class Config:
+    """
+
+    Configurations are resolved in the following order:
+
+    - configs passed as keyword parameters
+    - configs specified in environment variables
+    - default values (if applicable)
+    """
+
+    """Initializes the Pinecone client.
+
+    :param api_key: Required if not set in config file or by environment variable ``PINECONE_API_KEY``.
+    :param host: Optional. Controller host.
+    :param openapi_config: Optional. Set OpenAPI client configuration.
+    """
+
+    def __init__(
+        self,
+        api_key: str = None,
+        host: str = None,
+        openapi_config: OpenApiConfiguration = None,
+        **kwargs,
+    ):
+        api_key = api_key or kwargs.pop("api_key", None) or os.getenv("PINECONE_API_KEY")
+        host = host or kwargs.pop("host", None)
+        openapi_config = (
+            openapi_config
+            or kwargs.pop("openapi_config", None)
+            or OpenApiConfigFactory.build(api_key=api_key, host=host)
+        )
+
+        check_kwargs(self.__init__, kwargs)
+        self._config = ConfigBase(api_key, host, openapi_config)
+        self.validate()
+
+    def validate(self):
+        if not self._config.api_key:
+            raise PineconeConfigurationError("You haven't specified an Api-Key.")
+        if not self._config.host:
+            raise PineconeConfigurationError("You haven't specified a host.")
+
+    @property
+    def API_KEY(self):
+        return self._config.api_key
+
+    @property
+    def HOST(self):
+        return self._config.host
+
+    @property
+    def OPENAPI_CONFIG(self):
+        return self._config.openapi_config

pinecone/config/logging.py

@@ -0,0 +1,8 @@
+import logging
+
+PARENT_LOGGER_NAME = "pinecone"
+DEFAULT_PARENT_LOGGER_LEVEL = "ERROR"
+
+_logger = logging.getLogger(__name__)
+_parent_logger = logging.getLogger(PARENT_LOGGER_NAME)
+_parent_logger.setLevel(DEFAULT_PARENT_LOGGER_LEVEL)