fix: Fixing the issue with the capturing of env variables (#13)

* fix: Fixing the issue with the capturing of env variables

* chore: changelog update

Author: noble-varghese

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.1.48](https://github.com/Portkey-AI/portkey-python-sdk/compare/v0.1.45...v0.1.48)
+
+> 14 September 2023
+
+- fix: cache age type fix [`#11`](https://github.com/Portkey-AI/portkey-python-sdk/pull/11)
+
 #### [v0.1.45](https://github.com/Portkey-AI/portkey-python-sdk/compare/v0.1.44...v0.1.45)
 
 > 12 September 2023

portkey/__init__.py

@@ -21,9 +21,14 @@
     TextCompletionChunk,
 )
 from portkey.version import VERSION
+from portkey.api_resources.global_constants import (
+    PORTKEY_BASE_URL,
+    PORTKEY_API_KEY_ENV,
+    PORTKEY_PROXY_ENV,
+)
 
-api_key = os.environ.get("PORTKEY_API_KEY", "")
-base_url = os.environ.get("PORTKEY_PROXY", "https://api.portkey.ai")
+api_key = os.environ.get(PORTKEY_API_KEY_ENV)
+base_url = os.environ.get(PORTKEY_PROXY_ENV, PORTKEY_BASE_URL)
 config: Optional[Config] = None
 mode: Optional[Union[Modes, ModesLiteral]] = None
 __version__ = VERSION

portkey/api_resources/global_constants.py

@@ -29,3 +29,7 @@
 VERSION = "0.1.0"
 DEFAULT_TIMEOUT = 60
 PORTKEY_HEADER_PREFIX = "x-portkey-"
+PORTKEY_BASE_URL = "https://api.portkey.ai"
+
+PORTKEY_API_KEY_ENV = "PORTKEY_API_KEY"
+PORTKEY_PROXY_ENV = "PORTKEY_PROXY"

portkey/api_resources/utils.py

@@ -23,6 +23,9 @@
     MISSING_BASE_URL,
     MISSING_CONFIG_MESSAGE,
     MISSING_MODE_MESSAGE,
+    PORTKEY_BASE_URL,
+    PORTKEY_API_KEY_ENV,
+    PORTKEY_PROXY_ENV,
 )
 
 
@@ -212,7 +215,7 @@ def parse_api_key(cls, api_key, values):
 
 class ProviderOptions(Constructs):
     override_params: Optional[OverrideParams] = None
-   
+
     @validator("cache_age", always=True)
     @classmethod
     def parse_cache_age(cls, cache_age):
@@ -473,12 +476,19 @@ def parse_llms(cls, llms):
 def default_api_key() -> str:
     if portkey.api_key:
         return portkey.api_key
+    env_api_key = os.environ.get(PORTKEY_API_KEY_ENV, "")
+    if env_api_key:
+        return env_api_key
     raise ValueError(MISSING_API_KEY_ERROR_MESSAGE)
 
 
 def default_base_url() -> str:
     if portkey.base_url:
         return portkey.base_url
+
+    env_base_url = os.environ.get(PORTKEY_PROXY_ENV, PORTKEY_BASE_URL)
+    if env_base_url:
+        return env_base_url
     raise ValueError(MISSING_BASE_URL)
 
 

portkey/version.py

@@ -1 +1 @@
-VERSION = "0.1.48"
+VERSION = "0.1.49"