Merge branch 'main' into pulumi-hackweek

reginald/models/models/llama_index.py

@@ -875,11 +875,12 @@ def __init__(
         model_name : str, optional
             The model to use from the OpenAI API, by default "gpt-3.5-turbo"
         """
-        if os.getenv("OPENAI_API_KEY") is None:
+        openai_api_key = get_env_var("OPENAI_API_KEY")
+        if openai_api_key is None:
             raise ValueError("You must set OPENAI_API_KEY for OpenAI.")
 
         self.model_name = model_name
-        self.openai_api_key = get_env_var("OPENAI_API_KEY")
+        self.openai_api_key = openai_api_key
         self.temperature = 0.7
         super().__init__(*args, model_name=self.model_name, **kwargs)
 
@@ -911,18 +912,21 @@ def __init__(
         model_name : str, optional
             The deployment name of the model, by default "reginald-gpt35-turbo"
         """
-        if os.getenv("OPENAI_AZURE_API_BASE") is None:
+        openai_azure_api_base = get_env_var("OPENAI_AZURE_API_BASE", secret_value=False)
+        if openai_azure_api_base is None:
             raise ValueError(
                 "You must set OPENAI_AZURE_API_BASE to your Azure endpoint. "
                 "It should look like https://YOUR_RESOURCE_NAME.openai.azure.com/"
             )
-        if os.getenv("OPENAI_AZURE_API_KEY") is None:
+
+        openai_azure_api_key = get_env_var("OPENAI_AZURE_API_KEY")
+        if openai_azure_api_key is None:
             raise ValueError("You must set OPENAI_AZURE_API_KEY for Azure OpenAI.")
 
         # deployment name can be found in the Azure AI Studio portal
         self.deployment_name = model_name
-        self.openai_api_base = get_env_var("OPENAI_AZURE_API_BASE", secret_value=False)
-        self.openai_api_key = get_env_var("OPENAI_AZURE_API_KEY")
+        self.openai_api_base = openai_azure_api_base
+        self.openai_api_key = openai_azure_api_key
         self.openai_api_version = "2023-09-15-preview"
         self.temperature = 0.7
         super().__init__(*args, model_name="gpt-3.5-turbo", **kwargs)

reginald/parser_utils.py

@@ -21,7 +21,7 @@ def __init__(self, create_index_only: bool = False, *args, **kwargs):
         Parameters
         ----------
         create_index_only : bool, optional
-            Whether or not to only include ones related to data index creation,
+            Whether or not to only include arguments related to data index creation,
             by default False
         """
         super().__init__(*args, **kwargs)

reginald/slack_bot/setup_bot.py

@@ -32,7 +32,7 @@ def setup_slack_bot(model: ResponseModel) -> Bot:
     slack_bot = Bot(model=model)
 
     logging.info("Connecting to Slack...")
-    if os.getenv("SLACK_APP_TOKEN") is None:
+    if get_env_var("SLACK_APP_TOKEN", log=False) is None:
         logging.error("SLACK_APP_TOKEN is not set")
         sys.exit(1)
 
@@ -60,7 +60,7 @@ def setup_api_slack_bot(api_url: str, emoji: str) -> ApiBot:
     slack_bot = ApiBot(api_url=api_url, emoji=emoji)
 
     logging.info("Connecting to Slack...")
-    if os.getenv("SLACK_APP_TOKEN") is None:
+    if get_env_var("SLACK_APP_TOKEN", log=False) is None:
         logging.error("SLACK_APP_TOKEN is not set")
         sys.exit(1)
 
@@ -85,19 +85,22 @@ def setup_slack_client(slack_bot: ApiBot | Bot) -> SocketModeClient:
     SocketModeClient
         Slack client with bot
     """
-    if os.getenv("SLACK_APP_TOKEN") is None:
+    slack_app_token = get_env_var("SLACK_APP_TOKEN")
+    if slack_app_token is None:
         logging.error("SLACK_APP_TOKEN is not set")
         sys.exit(1)
-    if os.getenv("SLACK_BOT_TOKEN") is None:
+
+    slack_bot_token = get_env_var("SLACK_BOT_TOKEN")
+    if slack_bot_token is None:
         logging.error("SLACK_BOT_TOKEN is not set")
         sys.exit(1)
 
     # initialize SocketModeClient with an app-level token + AsyncWebClient
     client = SocketModeClient(
         # this app-level token will be used only for establishing a connection
-        app_token=get_env_var("SLACK_APP_TOKEN"),
+        app_token=slack_app_token,
         # you will be using this AsyncWebClient for performing Web API calls in listeners
-        web_client=AsyncWebClient(token=get_env_var("SLACK_BOT_TOKEN")),
+        web_client=AsyncWebClient(token=slack_bot_token),
         # to ensure connection doesn't go stale - we can adjust as needed.
         ping_interval=60,
     )