orca-sdk 0.1.2__tar.gz → 0.1.3__tar.gz

{orca_sdk-0.1.2 → orca_sdk-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orca_sdk
-Version: 0.1.2
+Version: 0.1.3
 Summary: SDK for interacting with Orca Services
 License-Expression: Apache-2.0
 Author: Orca DB Inc.

{orca_sdk-0.1.2 → orca_sdk-0.1.3}/orca_sdk/__init__.py

@@ -4,7 +4,7 @@ OrcaSDK is a Python library for building and using retrieval augmented models in
 
 from ._utils.common import UNSET, CreateMode, DropMode
 from .classification_model import ClassificationMetrics, ClassificationModel
-from .client import orca_api
+from .client import OrcaClient
 from .credentials import OrcaCredentials
 from .datasource import Datasource
 from .embedding_model import (

{orca_sdk-0.1.2 → orca_sdk-0.1.3}/orca_sdk/_utils/auth.py

@@ -6,8 +6,7 @@ from typing import List, Literal
 
 from dotenv import load_dotenv
 
-from ..client import ApiKeyMetadata, orca_api
-from ..credentials import OrcaCredentials
+from ..client import ApiKeyMetadata, OrcaClient
 from .common import DropMode
 
 load_dotenv()  # this needs to be here to ensure env is populated before accessing it
@@ -19,7 +18,8 @@ _DEFAULT_ORG_ID = os.environ.get("DEFAULT_ORG_ID", "10e50000-0000-4000-a000-a78d
 
 def _create_api_key(org_id: str, name: str, scopes: list[Literal["ADMINISTER", "PREDICT"]] = ["ADMINISTER"]) -> str:
     """Creates an API key for the given organization"""
-    response = orca_api.POST(
+    client = OrcaClient._resolve_client()
+    response = client.POST(
         "/auth/api_key",
         json={"name": name, "scope": scopes},
         headers={"Api-Key": _ORCA_ROOT_ACCESS_API_KEY, "Org-Id": org_id},
@@ -29,13 +29,15 @@ def _create_api_key(org_id: str, name: str, scopes: list[Literal["ADMINISTER", "
 
 def _list_api_keys(org_id: str) -> List[ApiKeyMetadata]:
     """Lists all API keys for the given organization"""
-    return orca_api.GET("/auth/api_key", headers={"Api-Key": _ORCA_ROOT_ACCESS_API_KEY, "Org-Id": org_id})
+    client = OrcaClient._resolve_client()
+    return client.GET("/auth/api_key", headers={"Api-Key": _ORCA_ROOT_ACCESS_API_KEY, "Org-Id": org_id})
 
 
 def _delete_api_key(org_id: str, name: str, if_not_exists: DropMode = "error") -> None:
     """Deletes the API key with the given name from the organization"""
     try:
-        orca_api.DELETE(
+        client = OrcaClient._resolve_client()
+        client.DELETE(
             "/auth/api_key/{name_or_id}",
             params={"name_or_id": name},
             headers={"Api-Key": _ORCA_ROOT_ACCESS_API_KEY, "Org-Id": org_id},
@@ -47,14 +49,16 @@ def _delete_api_key(org_id: str, name: str, if_not_exists: DropMode = "error") -
 
 def _delete_org(org_id: str) -> None:
     """Deletes the organization"""
-    orca_api.DELETE("/auth/org", headers={"Api-Key": _ORCA_ROOT_ACCESS_API_KEY, "Org-Id": org_id})
+    client = OrcaClient._resolve_client()
+    client.DELETE("/auth/org", headers={"Api-Key": _ORCA_ROOT_ACCESS_API_KEY, "Org-Id": org_id})
 
 
 def _authenticate_local_api(org_id: str = _DEFAULT_ORG_ID, api_key_name: str = "local") -> None:
     """Connect to the local API at http://localhost:1584/ and authenticate with a new API key"""
     _delete_api_key(org_id, api_key_name, if_not_exists="ignore")
-    OrcaCredentials.set_api_url("http://localhost:1584")
-    OrcaCredentials.set_api_key(_create_api_key(org_id, api_key_name))
+    client = OrcaClient._resolve_client()
+    client.base_url = "http://localhost:1584"
+    client.headers.update({"Api-Key": _create_api_key(org_id, api_key_name)})
     logging.info(f"Authenticated against local API at 'http://localhost:1584' with '{api_key_name}' API key")