fix: load dotenv from cwd

Author: radu-mocanu

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.1.23"
+version = "2.1.24"
 description = "Python SDK and CLI for UiPath Platform, enabling programmatic interaction with automation services, process management, and deployment tools."
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10"

src/uipath/_cli/_auth/_auth_server.py

@@ -7,12 +7,10 @@
 import time
 from typing import Optional
 
-from dotenv import load_dotenv
-
+from .._utils._common import load_environment_variables
 from ._oidc_utils import get_auth_config
 
-load_dotenv(override=True)
-
+load_environment_variables()
 # Server port
 PORT = 6234
 

src/uipath/_cli/_utils/_common.py

@@ -3,6 +3,7 @@
 from urllib.parse import urlparse
 
 import click
+from dotenv import find_dotenv, load_dotenv
 
 from ..spinner import Spinner
 
@@ -102,3 +103,7 @@ def clean_directory(directory: str) -> None:
 
         if os.path.isfile(file_path) and file_name.endswith(".py"):
             os.remove(file_path)
+
+
+def load_environment_variables():
+    load_dotenv(dotenv_path=find_dotenv(usecwd=True), override=True)

src/uipath/_cli/cli_auth.py

@@ -6,18 +6,17 @@
 import webbrowser
 
 import click
-from dotenv import load_dotenv
 
 from ..telemetry import track
 from ._auth._auth_server import HTTPServer
 from ._auth._client_credentials import ClientCredentialsService
 from ._auth._oidc_utils import get_auth_config, get_auth_url
 from ._auth._portal_service import PortalService, select_tenant
 from ._auth._utils import update_auth_file, update_env_file
-from ._utils._common import environment_options
+from ._utils._common import environment_options, load_environment_variables
 from ._utils._console import ConsoleLogger
 
-load_dotenv(override=True)
+load_environment_variables()
 console = ConsoleLogger()
 
 

src/uipath/_cli/cli_eval.py

@@ -5,15 +5,16 @@
 from typing import List, Optional, Tuple
 
 import click
-from dotenv import load_dotenv
+
+from uipath._cli._utils._common import load_environment_variables
 
 from .._utils.constants import ENV_JOB_ID
 from ..telemetry import track
 from ._evals.evaluation_service import EvaluationService
 from ._utils._console import ConsoleLogger
 
 console = ConsoleLogger()
-load_dotenv(override=True)
+load_environment_variables()
 
 
 class LiteralOption(click.Option):

src/uipath/_cli/cli_init.py

@@ -6,18 +6,18 @@
 from typing import Any, Dict, Optional
 
 import click
-from dotenv import load_dotenv
 
 from .._utils.constants import ENV_TELEMETRY_ENABLED
 from ..telemetry import track
 from ..telemetry._constants import _PROJECT_KEY, _TELEMETRY_CONFIG_FILE
+from ._utils._common import load_environment_variables
 from ._utils._console import ConsoleLogger
 from ._utils._input_args import generate_args
 from ._utils._parse_ast import generate_bindings_json
 from .middlewares import Middlewares
 
 console = ConsoleLogger()
-
+load_environment_variables()
 CONFIG_PATH = "uipath.json"
 
 
@@ -125,9 +125,6 @@ def write_config_file(config_data: Dict[str, Any]) -> None:
 @track
 def init(entrypoint: str, infer_bindings: bool) -> None:
     """Create uipath.json with input/output schemas and bindings."""
-    current_path = os.getcwd()
-    load_dotenv(os.path.join(current_path, ".env"), override=True)
-
     with console.spinner("Initializing UiPath project ..."):
         current_directory = os.getcwd()
         generate_env_file(current_directory)

src/uipath/_cli/cli_invoke.py

@@ -5,7 +5,6 @@
 
 import click
 import httpx
-from dotenv import load_dotenv
 
 from ._utils._console import ConsoleLogger
 
@@ -16,12 +15,12 @@
 
 from .._utils._ssl_context import get_httpx_client_kwargs
 from ..telemetry import track
-from ._utils._common import get_env_vars
+from ._utils._common import get_env_vars, load_environment_variables
 from ._utils._folders import get_personal_workspace_info
 from ._utils._processes import get_release_info
 
 logger = logging.getLogger(__name__)
-load_dotenv(override=True)
+load_environment_variables()
 console = ConsoleLogger()
 
 
@@ -63,8 +62,6 @@ def invoke(
         with open(file) as f:
             input = f.read()
     with console.spinner("Loading configuration ..."):
-        current_path = os.getcwd()
-        load_dotenv(os.path.join(current_path, ".env"), override=True)
         [base_url, token] = get_env_vars()
 
         url = f"{base_url}/orchestrator_/odata/Jobs/UiPath.Server.Configuration.OData.StartJobs"

src/uipath/_cli/cli_publish.py

@@ -4,16 +4,16 @@
 
 import click
 import httpx
-from dotenv import load_dotenv
 
 from .._utils._ssl_context import get_httpx_client_kwargs
 from ..telemetry import track
-from ._utils._common import get_env_vars
+from ._utils._common import get_env_vars, load_environment_variables
 from ._utils._console import ConsoleLogger
 from ._utils._folders import get_personal_workspace_info
 from ._utils._processes import get_release_info
 
 console = ConsoleLogger()
+load_environment_variables()
 
 
 def get_most_recent_package():
@@ -70,9 +70,6 @@ def get_available_feeds(
 @track
 def publish(feed):
     """Publish the package."""
-    current_path = os.getcwd()
-    load_dotenv(os.path.join(current_path, ".env"), override=True)
-
     [base_url, token] = get_env_vars()
     headers = {"Authorization": f"Bearer {token}"}
 

src/uipath/_cli/cli_pull.py

@@ -17,9 +17,9 @@
 from typing import Dict, Set
 
 import click
-from dotenv import load_dotenv
 
 from ..telemetry import track
+from ._utils._common import load_environment_variables
 from ._utils._console import ConsoleLogger
 from ._utils._constants import UIPATH_PROJECT_ID
 from ._utils._studio_project import (
@@ -30,7 +30,7 @@
 )
 
 console = ConsoleLogger()
-load_dotenv(override=True)
+load_environment_variables()
 
 
 def compute_normalized_hash(content: str) -> str:

src/uipath/_cli/cli_push.py

@@ -5,10 +5,10 @@
 from urllib.parse import urlparse
 
 import click
-from dotenv import load_dotenv
 
 from ..telemetry import track
 from ._push.sw_file_handler import SwFileHandler
+from ._utils._common import load_environment_variables
 from ._utils._console import ConsoleLogger
 from ._utils._constants import (
     UIPATH_PROJECT_ID,
@@ -21,7 +21,7 @@
 from ._utils._uv_helpers import handle_uv_operations
 
 console = ConsoleLogger()
-load_dotenv(override=True)
+load_environment_variables()
 
 
 def get_org_scoped_url(base_url: str) -> str: