Upload 2 files

ask_candid/base/config/connections.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass, field
+import os
 
 from dotenv import dotenv_values, find_dotenv
 
@@ -21,16 +22,13 @@ class BaseElasticAPIKeyCredential:
 
 
 __env_values__ = dotenv_values(
-    dotenv_path=find_dotenv(".env", raise_error_if_not_found=True)
+    dotenv_path=find_dotenv(".env", raise_error_if_not_found=False)
 )
 
-SEMANTIC_ELASTIC_QA = BaseElasticAPIKeyCredential(
-    cloud_id=__env_values__.get("SEMANTIC_ELASTIC_CLOUD_ID"),
-    api_key=__env_values__.get("SEMANTIC_ELASTIC_API_KEY"),
-)
+def _load_value(key: str):
+    return __env_values__.get(key) or os.getenv(key)
 
-CDS_ELASTIC = BaseElasticSearchConnection(
-    url="https://cdses.candid.org:9200",
-    username=__env_values__.get("CDS_UID"),
-    password=__env_values__.get("CDS_PWD")
+SEMANTIC_ELASTIC_QA = BaseElasticAPIKeyCredential(
+    cloud_id=_load_value("SEMANTIC_ELASTIC_CLOUD_ID"),
+    api_key=_load_value("SEMANTIC_ELASTIC_API_KEY"),
 )

ask_candid/base/config/rest.py

@@ -1,4 +1,5 @@
 from typing import TypedDict
+import os
 
 from dotenv import dotenv_values, find_dotenv
 
@@ -13,9 +14,12 @@ __env_values__ = dotenv_values(
     dotenv_path=find_dotenv(".env", raise_error_if_not_found=True)
 )
 
+def _load_value(key: str):
+    return __env_values__.get(key) or os.getenv(key)
+
 CDS_API = Api(
-    url=__env_values__.get("CDS_API_URL"),
-    key=__env_values__.get("CDS_API_KEY")
+    url=_load_value("CDS_API_URL"),
+    key=_load_value("CDS_API_KEY")
 )
 
-OPENAI = Api(url=None, key=__env_values__.get("OPENAI_API_KEY"))
+OPENAI = Api(url=None, key=_load_value("OPENAI_API_KEY"))