fix(env): choose the correct .env file from cwd

Author: giuliastf

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uipath"
-version = "2.1.31"
+version = "2.1.32"
 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/__init__.py

@@ -3,6 +3,7 @@
 
 import click
 
+from ._utils._common import load_environment_variables
 from .cli_auth import auth as auth
 from .cli_deploy import deploy as deploy  # type: ignore
 from .cli_dev import dev as dev
@@ -43,6 +44,7 @@ def _get_safe_version() -> str:
     help="Display the current version of uipath.",
 )
 def cli(lv: bool, v: bool) -> None:
+    load_environment_variables()
     if lv:
         try:
             version = importlib.metadata.version("uipath-langchain")

src/uipath/_cli/_auth/_auth_server.py

@@ -7,11 +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/_evals/progress_reporter.py

@@ -3,9 +3,11 @@
 import json
 import logging
 import os
-from typing import Any, List
+from typing import TYPE_CHECKING, Any, List
+
+if TYPE_CHECKING:
+    pass
 
-from uipath import UiPath
 from uipath._cli._evals._evaluators import EvaluatorBase
 from uipath._cli._evals._models._evaluation_set import EvaluationStatus
 from uipath._cli._evals._models._evaluators import EvalItemResult, ScoreType
@@ -32,6 +34,8 @@ def __init__(
             no_of_evals: Number of evaluations in the set
             evaluators: List of evaluator instances
         """
+        from uipath import UiPath
+
         self._eval_set_id = eval_set_id
         self.agent_snapshot = agent_snapshot
         self._no_of_evals = no_of_evals

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

@@ -7,7 +7,6 @@
 from urllib.parse import urlparse
 
 import click
-from dotenv import load_dotenv
 
 from ..telemetry import track
 from ._auth._auth_server import HTTPServer
@@ -18,7 +17,6 @@
 from ._utils._common import environment_options
 from ._utils._console import ConsoleLogger
 
-load_dotenv(override=True)
 console = ConsoleLogger()
 
 

src/uipath/_cli/cli_eval.py

@@ -5,15 +5,13 @@
 from typing import List, Optional, Tuple
 
 import click
-from dotenv import load_dotenv
 
 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)
 
 
 class LiteralOption(click.Option):

src/uipath/_cli/cli_init.py

@@ -6,7 +6,6 @@
 from typing import Any, Dict, Optional
 
 import click
-from dotenv import load_dotenv
 
 from .._utils.constants import ENV_TELEMETRY_ENABLED
 from ..telemetry import track
@@ -125,9 +124,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
 
@@ -21,7 +20,6 @@
 from ._utils._processes import get_release_info
 
 logger = logging.getLogger(__name__)
-load_dotenv(override=True)
 console = ConsoleLogger()
 
 
@@ -63,8 +61,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,7 +4,6 @@
 
 import click
 import httpx
-from dotenv import load_dotenv
 
 from .._utils._ssl_context import get_httpx_client_kwargs
 from ..telemetry import track
@@ -70,9 +69,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}"}