Skip to content

SK-1731: Fix env credentials inconsistency #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saileshwar-skyflow merged 7 commits into from
Jan 8, 2025
Merged

SK-1731: Fix env credentials inconsistency #150

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce6c329
SK-1407: Added pr review template (#142)
saileshwar-skyflow Nov 27, 2024
a19d353
SK-1731: Fix api key inconsistency
saileshwar-skyflow Jan 8, 2025
f07bc1f
SK-1731: Fix env creds inconsistency
saileshwar-skyflow Jan 8, 2025
75c3e2b
SK-1731: Merge branch 'main' into SK-1731-fix-api-key-inconsistency
saileshwar-skyflow Jan 8, 2025
6ccbc1b
SK-1731: Merge branch 'release/24.11.2' into SK-1731-fix-api-key-inco…
saileshwar-skyflow Jan 8, 2025
f2159b3
SK-1731: Removed pull request template
saileshwar-skyflow Jan 8, 2025
3db24b1
SK-1731: Fix env creds inconsistency
saileshwar-skyflow Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions skyflow/utils/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import json
import urllib.parse
from dotenv import load_dotenv
import dotenv
from requests.sessions import PreparedRequest
from requests.models import HTTPError
import requests
Expand All @@ -13,7 +14,6 @@
from skyflow.generated.rest import V1UpdateRecordResponse, V1BulkDeleteRecordResponse, \
V1DetokenizeResponse, V1TokenizeResponse, V1GetQueryResponse, V1BulkGetRecordResponse
from skyflow.utils.logger import log_error, log_error_log

from . import SkyflowMessages, SDK_VERSION
from .enums import Env, ContentType, EnvUrls
from skyflow.vault.data import InsertResponse, UpdateResponse, DeleteResponse, QueryResponse, GetResponse
Expand All @@ -24,7 +24,8 @@
invalid_input_error_code = SkyflowMessages.ErrorCodes.INVALID_INPUT.value

def get_credentials(config_level_creds = None, common_skyflow_creds = None, logger = None):
dotenv_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), ".env")
dotenv.load_dotenv()
dotenv_path = dotenv.find_dotenv(usecwd=True)
if dotenv_path:
load_dotenv(dotenv_path)
env_skyflow_credentials = os.getenv("SKYFLOW_CREDENTIALS")
Expand Down
Loading