intuned-runtime 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

intuned_cli/__init__.py

@@ -1,3 +1,4 @@
+import os
 import sys
 
 import arguably
@@ -8,7 +9,7 @@ from intuned_cli.utils.console import console
 from intuned_cli.utils.error import CLIError
 from intuned_cli.utils.error import log_automation_error
 from runtime.context.context import IntunedContext
-from runtime.errors.run_api_errors import AutomationError
+from runtime.errors.run_api_errors import RunApiError
 
 from . import commands
 
@@ -17,6 +18,15 @@ def run():
     dotenv = find_dotenv(usecwd=True)
     if dotenv:
         load_dotenv(dotenv, override=True)
+        from runtime.env import cli_env_var_key
+
+        os.environ[cli_env_var_key] = "true"
+        os.environ["RUN_ENVIRONMENT"] = "AUTHORING"
+
+        if not os.environ.get("FUNCTIONS_DOMAIN"):
+            from intuned_cli.utils.backend import get_base_url
+
+            os.environ["FUNCTIONS_DOMAIN"] = get_base_url().replace("/$", "")
     try:
         with IntunedContext():
             arguably.run(name="intuned")
@@ -26,7 +36,7 @@ def run():
             console.print(f"[bold red]{e.message}[/bold red]")
         else:
             console.print(e.message)
-    except AutomationError as e:
+    except RunApiError as e:
         log_automation_error(e)
     except KeyboardInterrupt:
         console.print("[bold red]Aborted[/bold red]")

intuned_cli/commands/__init__.py

@@ -16,3 +16,4 @@ from .run_authsession_create_command import run__authsession__create as run__aut
 from .run_authsession_update_command import run__authsession__update as run__authsession__update  # type: ignore
 from .run_authsession_validate_command import run__authsession__validate as run__authsession__validate  # type: ignore
 from .run_command import run as run  # type: ignore
+from .save_command import save as save  # type: ignore

intuned_cli/commands/attempt_api_command.py

@@ -25,7 +25,7 @@ async def attempt__api(
         parameters (str): Path to JSON file containing API parameters or the parameters as a JSON string.
         auth_session (str | None, optional): [-a/--auth-session]. ID of the auth session to use for the API. This is expected to be in ./auth-session-instances/<id>
         proxy (str | None, optional): [--proxy]. Proxy URL to use. Defaults to None.
-        timeout (str, optional): [--timeout]. Timeout - milliseconds or pytimeparse-formatted string. Defaults to "10 min".
+        timeout (str, optional): [--timeout]. Timeout - seconds or pytimeparse-formatted string. Defaults to "10 min".
         headless (bool, optional): [--headless]. Run the API in headless mode (default: False). This will not open a browser window.
         output_file (str | None, optional): [-o/--output-file]. Output file path. Defaults to None.
     """

intuned_cli/commands/attempt_authsession_check_command.py

@@ -19,7 +19,7 @@ async def attempt__authsession__check(
     Args:
         id (str): ID of the auth session to check
         proxy (str | None, optional): [--proxy]. Proxy URL to use for the auth session command. Defaults to None.
-        timeout (str, optional): [--timeout]. Timeout for the auth session command - milliseconds or pytimeparse-formatted string. Defaults to "10 min".
+        timeout (str, optional): [--timeout]. Timeout for the auth session command - seconds or pytimeparse-formatted string. Defaults to "10 min".
         headless (bool, optional): [--headless]. Run the API in headless mode (default: False). This will not open a browser window.
     """
     await assert_auth_enabled()

intuned_cli/commands/attempt_authsession_create_command.py

@@ -22,7 +22,7 @@ async def attempt__authsession__create(
         parameters (str): Parameters for the auth session command
         id (str | None, optional): [--id]. ID of the auth session to use for the command. Defaults to ./auth-session-instances/[current timestamp].json.
         proxy (str | None, optional): [--proxy]. Proxy URL to use for the auth session command. Defaults to None.
-        timeout (str, optional): [--timeout]. Timeout for the auth session command - milliseconds or pytimeparse-formatted string. Defaults to "10 min".
+        timeout (str, optional): [--timeout]. Timeout for the auth session command - seconds or pytimeparse-formatted string. Defaults to "10 min".
         headless (bool, optional): [--headless]. Run the API in headless mode (default: False). This will not open a browser window.
     """
     await assert_auth_enabled()

intuned_cli/commands/deploy_command.py

@@ -1,9 +1,9 @@
 import arguably
 
 from intuned_cli.controller.deploy import deploy_project
-from intuned_cli.controller.deploy import get_intuned_api_auth_credentials
-from intuned_cli.controller.deploy import validate_intuned_project
-from intuned_cli.controller.deploy import validate_project_name
+from intuned_cli.controller.save import validate_intuned_project
+from intuned_cli.controller.save import validate_project_name
+from intuned_cli.utils.backend import get_intuned_api_auth_credentials
 from intuned_cli.utils.error import CLIError
 
 
@@ -15,7 +15,7 @@ async def deploy(
     workspace_id: str | None = None,
     api_key: str | None = None,
 ):
-    """Deploys the application.
+    """Saves and deploys the project to Intuned.
 
     Args:
         project_name (str | None, optional): The name of the project to deploy.

intuned_cli/commands/run_api_command.py

@@ -34,7 +34,7 @@ async def run__api(
         no_auth_session_auto_recreate (bool, optional): [--no-auth-session-auto-recreate]. Disable auto recreate for auth session. Defaults to False.
         auth_session_check_attempts (int, optional): [--auth-session-check-attempts]. Auth session check attempts. Defaults to 1.
         auth_session_create_attempts (int, optional): [--auth-session-create-attempts]. Auth session create attempts. Defaults to 1.
-        timeout (str, optional): [--timeout]. Timeout - milliseconds or pytimeparse-formatted string. Defaults to "10 min".
+        timeout (str, optional): [--timeout]. Timeout - seconds or pytimeparse-formatted string. Defaults to "10 min".
         headless (bool, optional): [--headless]. Run the API in headless mode (default: False). This will not open a browser window.
         output_file (str | None, optional): [-o/--output-file]. Output file path. Defaults to None.
     """

intuned_cli/commands/run_authsession_create_command.py

@@ -26,7 +26,7 @@ async def run__authsession__create(
         check_attempts (int, optional): [--check-attempts]. Number of attempts to check the auth session validity. Defaults to 1.
         create_attempts (int, optional): [--create-attempts]. Number of attempts to create a new auth session if it is invalid. Defaults to 1.
         proxy (str | None, optional): [--proxy]. Proxy URL to use for the auth session command. Defaults to None.
-        timeout (str, optional): [--timeout]. Timeout for the auth session command - milliseconds or pytimeparse-formatted string. Defaults to "10 min".
+        timeout (str, optional): [--timeout]. Timeout for the auth session command - seconds or pytimeparse-formatted string. Defaults to "10 min".
         headless (bool, optional): [--headless]. Run the API in headless mode (default: False). This will not open a browser window.
     """
     await assert_auth_enabled()

intuned_cli/commands/run_authsession_update_command.py

@@ -26,7 +26,7 @@ async def run__authsession__update(
         check_attempts (int, optional): [--check-attempts]. Number of attempts to check the auth session validity. Defaults to 1.
         create_attempts (int, optional): [--create-attempts]. Number of attempts to create a new auth session if it is invalid. Defaults to 1.
         proxy (str | None, optional): [--proxy]. Proxy URL to use for the auth session command. Defaults to None.
-        timeout (str, optional): [--timeout]. Timeout for the auth session command - milliseconds or pytimeparse-formatted string. Defaults to "10 min".
+        timeout (str, optional): [--timeout]. Timeout for the auth session command - seconds or pytimeparse-formatted string. Defaults to "10 min".
         headless (bool, optional): [--headless]. Run the API in headless mode (default: False). This will not open a browser window.
     """
     await assert_auth_enabled()

intuned_cli/commands/run_authsession_validate_command.py

@@ -24,7 +24,7 @@ async def run__authsession__validate(
         check_attempts (int, optional): [--check-attempts]. Number of attempts to check the auth session validity. Defaults to 1.
         create_attempts (int, optional): [--create-attempts]. Number of attempts to create a new auth session if it is invalid. Defaults to 1.
         proxy (str | None, optional): [--proxy]. Proxy URL to use for the auth session command. Defaults to None.
-        timeout (str, optional): [--timeout]. Timeout for the auth session command - milliseconds or pytimeparse-formatted string. Defaults to "10 min".
+        timeout (str, optional): [--timeout]. Timeout for the auth session command - seconds or pytimeparse-formatted string. Defaults to "10 min".
         no_auto_recreate (bool, optional): [--no-auto-recreate]. Disable auto recreation of the auth session if it is invalid. Defaults to False.
         headless (bool, optional): [--headless]. Run the API in headless mode (default: False). This will not open a browser window.
     """

intuned_cli/commands/save_command.py

@@ -0,0 +1,47 @@
+import arguably
+
+from intuned_cli.controller.save import save_project
+from intuned_cli.controller.save import validate_intuned_project
+from intuned_cli.controller.save import validate_project_name
+from intuned_cli.utils.backend import get_intuned_api_auth_credentials
+from intuned_cli.utils.error import CLIError
+
+
+@arguably.command  # type: ignore
+async def save(
+    project_name: str | None = None,
+    /,
+    *,
+    workspace_id: str | None = None,
+    api_key: str | None = None,
+):
+    """Saves the project to Intuned without deploying it.
+
+    Args:
+        project_name (str | None, optional): The name of the project to save.
+        workspace_id (str | None, optional): The ID of the workspace to save to.
+        api_key (str | None, optional): The API key to use for authentication.
+    """
+    try:
+        intuned_json = await validate_intuned_project()
+    except CLIError as e:
+        raise CLIError(
+            f"[bold red]Project to be saved is not a valid Intuned project:[/bold red][bright_red] {e}[/bright_red]\n",
+            auto_color=False,
+        ) from e
+
+    project_name = project_name or intuned_json.project_name
+    if not project_name:
+        raise CLIError("Project name is required")
+
+    validate_project_name(project_name)
+
+    workspace_id, api_key = await get_intuned_api_auth_credentials(
+        intuned_json=intuned_json, workspace_id=workspace_id, api_key=api_key
+    )
+
+    await save_project(
+        project_name=project_name,
+        workspace_id=workspace_id,
+        api_key=api_key,
+    )

intuned_cli/controller/__test__/test_api.py

@@ -187,7 +187,6 @@ class TestAttemptApi:
             assert call_args.run_options.headless is False
             assert call_args.run_options.proxy == proxy_config
             assert call_args.auth.session.state is auth
-            assert call_args.auth.run_check is False
 
     @pytest.mark.asyncio
     async def test_attempt_api_returns_result_and_extended_payloads_if_run_api_succeeds(

intuned_cli/controller/api.py

@@ -197,7 +197,6 @@ async def attempt_api(
                 automation_function=AutomationFunction(name=f"api/{api_name}", params=parameters),
                 auth=Auth(
                     session=StateSession(state=auth),
-                    run_check=False,
                 )
                 if auth
                 else None,

intuned_cli/controller/authsession.py

@@ -276,7 +276,6 @@ async def run_check(
                     session=StateSession(
                         state=auth,
                     ),
-                    run_check=False,
                 ),
             ),
             import_function=await get_cli_import_function(),

intuned_cli/controller/deploy.py

@@ -1,29 +1,15 @@
 import asyncio
-import json
-import os
-import re
 import time
-import uuid
 from itertools import cycle
-from typing import Any
 from typing import Literal
 
 import httpx
-import pathspec
-import toml
-from anyio import Path
 from pydantic import BaseModel
 
-from intuned_cli.types import DirectoryNode
-from intuned_cli.types import FileNode
-from intuned_cli.types import FileNodeContent
-from intuned_cli.types import FileSystemTree
-from intuned_cli.types import IntunedJson
-from intuned_cli.utils.api_helpers import load_intuned_json
+from intuned_cli.controller.save import save_project
 from intuned_cli.utils.backend import get_base_url
 from intuned_cli.utils.console import console
 from intuned_cli.utils.error import CLIError
-from intuned_cli.utils.exclusions import exclusions
 
 supported_playwright_versions = ["1.46.0", "1.52.0"]
 
@@ -31,189 +17,6 @@ project_deploy_timeout = 10 * 60
 project_deploy_check_period = 5
 
 
-class IntunedPyprojectToml(BaseModel):
-    class _Tool(BaseModel):
-        class _Poetry(BaseModel):
-            dependencies: dict[str, Any]
-
-        poetry: _Poetry
-
-    tool: _Tool
-
-
-async def validate_intuned_project():
-    cwd = await Path().resolve()
-
-    pyproject_toml_path = cwd / "pyproject.toml"
-
-    if not await pyproject_toml_path.exists():
-        raise CLIError("pyproject.toml file is missing in the current directory.")
-
-    content = await pyproject_toml_path.read_text()
-    json_content = toml.loads(content)
-    try:
-        pyproject_toml = IntunedPyprojectToml.model_validate(json_content)
-    except Exception as e:
-        raise CLIError(f"Failed to parse pyproject.toml: {e}") from e
-
-    playwright_version = pyproject_toml.tool.poetry.dependencies.get("playwright")
-
-    if playwright_version not in supported_playwright_versions:
-        raise CLIError(
-            f"Unsupported Playwright version '{playwright_version}'. "
-            f"Supported versions are: {', '.join(supported_playwright_versions)}."
-        )
-
-    intuned_json = await load_intuned_json()
-
-    api_folder = cwd / "api"
-    if not await api_folder.exists() or not await api_folder.is_dir():
-        raise CLIError("api directory does not exist in the current directory.")
-
-    if intuned_json.auth_sessions.enabled:
-        auth_sessions_folder = cwd / "auth-sessions"
-        if not await auth_sessions_folder.exists() or not await auth_sessions_folder.is_dir():
-            raise CLIError("auth-sessions directory does not exist in the api directory.")
-
-    return intuned_json
-
-
-def validate_project_name(project_name: str):
-    if len(project_name) > 50:
-        raise CLIError("Project name must be 50 characters or less.")
-
-    project_name_regex = r"^[a-z0-9]+(?:[-_][a-z0-9]+)*$"
-    if not re.match(project_name_regex, project_name):
-        raise CLIError("Project name can only contain lowercase letters, numbers, hyphens, and underscores in between.")
-
-    try:
-        import uuid
-
-        uuid.UUID(project_name)
-        raise CLIError("Project name cannot be a UUID.")
-    except ValueError:
-        # Not a valid UUID, continue
-        pass
-
-
-async def get_intuned_api_auth_credentials(
-    *, intuned_json: IntunedJson, workspace_id: str | None, api_key: str | None
-) -> tuple[str, str]:
-    """
-    Retrieves the Intuned API authentication credentials from environment variables.
-
-    Returns:
-        tuple: A tuple containing the workspace ID and API key.
-    """
-    workspace_id = workspace_id or intuned_json.workspace_id
-    api_key = api_key or os.environ.get("INTUNED_API_KEY")
-
-    if not workspace_id:
-        raise CLIError("Workspace ID is required. Please provide it via command line options or Intuned.json")
-
-    if not api_key:
-        raise CLIError(
-            "API key is required. Please provide it via command line options or INTUNED_API_KEY environment variable."
-        )
-
-    return workspace_id, api_key
-
-
-async def get_file_tree_from_project(path: Path, *, exclude: list[str] | None = None):
-    # Create pathspec object for gitignore-style pattern matching
-    spec = None
-    if exclude:
-        spec = pathspec.PathSpec.from_lines("gitwildmatch", exclude)
-
-    async def traverse(current_path: Path, tree: FileSystemTree):
-        async for entry in current_path.iterdir():
-            relative_path_name = entry.relative_to(path).as_posix()
-            basename = entry.name
-
-            # Check if this path should be excluded
-            if spec and spec.match_file(relative_path_name):
-                continue
-
-            if await entry.is_dir():
-                subtree = FileSystemTree(root={})
-                tree.root[basename] = DirectoryNode(directory=subtree)
-                # For directories, check if the directory itself is excluded
-                # If not excluded, traverse into it
-                await traverse(entry, subtree)
-            elif await entry.is_file():
-                tree.root[basename] = FileNode(file=FileNodeContent(contents=await entry.read_text()))
-
-    results = FileSystemTree(root={})
-    await traverse(path, results)
-    return results
-
-
-def mapFileTreeToIdeFileTree(file_tree: FileSystemTree):
-    """
-    Maps the file tree to IDE parameters format by processing parameters directory
-    and converting it to ____testParameters structure.
-    """
-
-    if not file_tree:
-        return
-
-    parameters_node = file_tree.root.get("parameters")
-    if parameters_node is None:
-        return
-
-    if not isinstance(parameters_node, DirectoryNode):
-        return
-
-    api_parameters_map: dict[str, list[dict[str, Any]]] = {}
-    cli_parameters = list(parameters_node.directory.root.keys())
-    test_parameters = DirectoryNode(directory=FileSystemTree(root={}))
-
-    for parameter_key in cli_parameters:
-        # If parameter of type directory, discard it and continue
-        parameter = parameters_node.directory.root[parameter_key]
-
-        if isinstance(parameter, DirectoryNode):
-            continue
-
-        if not parameter.file.contents.strip():
-            continue
-
-        try:
-            parameter_payload = json.loads(parameter.file.contents)
-        except json.JSONDecodeError:
-            continue
-
-        if "__api-name" not in parameter_payload:
-            continue
-
-        api = parameter_payload["__api-name"]
-        # Create parameter value by excluding __api-name
-        parameter_value = {k: v for k, v in parameter_payload.items() if k != "__api-name"}
-
-        test_parameter: dict[str, Any] = {
-            "name": parameter_key.replace(".json", ""),
-            "lastUsed": False,
-            "id": str(uuid.uuid4()),
-            "value": json.dumps(parameter_value),
-        }
-
-        if api not in api_parameters_map:
-            api_parameters_map[api] = []
-        api_parameters_map[api].append(test_parameter)
-
-    for api, parameters in api_parameters_map.items():
-        # By default, last one used is the last one in the map
-        if len(parameters) > 0:
-            parameters[-1]["lastUsed"] = True
-
-        test_parameters.directory.root[f"{api}.json"] = FileNode(
-            file=FileNodeContent(contents=json.dumps(parameters, indent=2))
-        )
-
-    del file_tree.root["parameters"]
-    file_tree.root["____testParameters"] = test_parameters
-
-
 class DeployStatus(BaseModel):
     status: Literal["completed", "failed", "pending"]
     message: str | None = None
@@ -257,25 +60,20 @@ async def deploy_project(
     workspace_id: str,
     api_key: str,
 ):
+    await save_project(
+        project_name=project_name,
+        workspace_id=workspace_id,
+        api_key=api_key,
+    )
     base_url = get_base_url()
-    url = f"{base_url}/api/v1/workspace/{workspace_id}/projects/create"
+    url = f"{base_url}/api/v1/workspace/{workspace_id}/projects/{project_name}/deploy"
     headers = {
         "x-api-key": api_key,
         "Content-Type": "application/json",
     }
-    cwd = await Path().resolve()
-    file_tree = await get_file_tree_from_project(cwd, exclude=exclusions)
-    mapFileTreeToIdeFileTree(file_tree)
-
-    payload: dict[str, Any] = {
-        "name": project_name,
-        "codeTree": file_tree.model_dump(mode="json"),
-        "isCli": True,
-        "language": "python",
-    }
 
     async with httpx.AsyncClient() as client:
-        response = await client.post(url, headers=headers, json=payload)
+        response = await client.post(url, headers=headers)
         if response.status_code < 200 or response.status_code >= 300:
             if response.status_code == 401:
                 raise CLIError("Invalid API key. Please check your API key and try again.")