Refactoring

Author: jhamon

pinecone/control/pinecone.py

@@ -238,7 +238,7 @@ def Index(self, name: str = "", host: str = "", **kwargs) -> "Index":
             index_host = normalize_host(host)
         else:
             # Otherwise, get host url from describe_index using the index name
-            index_host = self.index_host_store.get_host(self.index_api, self.config, name)
+            index_host = self.db.index._get_host(name)
 
         return _Index(
             host=index_host,

pinecone/control/resources/index.py

@@ -131,10 +131,10 @@ def delete(self, name: str, timeout: Optional[int] = None):
             return
 
         if timeout is None:
-            while self.has_index(name):
+            while self.has(name):
                 time.sleep(5)
         else:
-            while self.has_index(name) and timeout >= 0:
+            while self.has(name) and timeout >= 0:
                 time.sleep(5)
                 timeout -= 5
         if timeout and timeout < 0:
@@ -183,3 +183,9 @@ def configure(
             tags=tags,
         )
         api_instance.configure_index(name, configure_index_request=req)
+
+    def _get_host(self, name: str) -> str:
+        """@private"""
+        return self.index_host_store.get_host(
+            api=self.index_api, config=self.config, index_name=name
+        )

pinecone/control/resources_asyncio/index.py

@@ -16,8 +16,8 @@
     GcpRegion,
     AzureRegion,
 )
-from .types import CreateIndexForModelEmbedTypedDict
-from .request_factory import PineconeDBControlRequestFactory
+from pinecone.control.types import CreateIndexForModelEmbedTypedDict
+from pinecone.control.request_factory import PineconeDBControlRequestFactory
 
 logger = logging.getLogger(__name__)
 """ @private """

pinecone/grpc/pinecone.py

@@ -122,7 +122,7 @@ def Index(self, name: str = "", host: str = "", **kwargs):
             raise ValueError("Either name or host must be specified")
 
         # Use host if it is provided, otherwise get host from describe_index
-        index_host = host or self.index_host_store.get_host(self.index_api, self.config, name)
+        index_host = host or self.db.index._get_host(name)
 
         pt = kwargs.pop("pool_threads", None) or self.pool_threads