dagster-dg-cli 1.12.11__tar.gz → 1.12.13__tar.gz

{dagster_dg_cli-1.12.11/dagster_dg_cli.egg-info → dagster_dg_cli-1.12.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dagster-dg-cli
-Version: 1.12.11
+Version: 1.12.13
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-dg-cli
 Author: Dagster Labs
 Author-email: hello@dagsterlabs.com
@@ -13,9 +13,9 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 License-File: LICENSE
-Requires-Dist: dagster-dg-core==1.12.11
-Requires-Dist: dagster==1.12.11
-Requires-Dist: dagster-cloud-cli==1.12.11
+Requires-Dist: dagster-dg-core==1.12.13
+Requires-Dist: dagster==1.12.13
+Requires-Dist: dagster-cloud-cli==1.12.13
 Requires-Dist: typer
 Provides-Extra: test
 Requires-Dist: syrupy>=4.0.0; extra == "test"

{dagster_dg_cli-1.12.11 → dagster_dg_cli-1.12.13}/dagster_dg_cli/cli/plus/deploy/commands.py

@@ -31,6 +31,7 @@ from dagster_dg_cli.cli.plus.deploy.deploy_session import (
     finish_deploy_session,
     init_deploy_session,
 )
+from dagster_dg_cli.cli.plus.deploy.validation import _extract_dagster_env_from_url
 from dagster_dg_cli.utils.plus.build import get_agent_type
 
 if TYPE_CHECKING:
@@ -91,8 +92,50 @@ org_and_deploy_option_group = make_option_group(
 )
 
 
+build_strategy_option_group = make_option_group(
+    {
+        not_none(option.name): option
+        for option in [
+            click.Option(
+                ["--build-strategy"],
+                type=click.Choice(["docker", "python-executable"]),
+                default="docker",
+                help=(
+                    "Build strategy used to build code locations. 'docker' builds a Docker image "
+                    "(required for Hybrid agents). 'python-executable' builds PEX files "
+                    "(Serverless agents only)."
+                ),
+                envvar="DAGSTER_BUILD_STRATEGY",
+            ),
+        ]
+    }
+)
+
+
+pex_build_method_option_group = make_option_group(
+    {
+        not_none(option.name): option
+        for option in [
+            click.Option(
+                ["--pex-build-method"],
+                type=click.Choice(["local", "docker", "docker-fallback"]),
+                default="docker-fallback",
+                help=(
+                    "Build method for PEX dependencies. 'docker-fallback' tries local first then Docker (default), "
+                    "'local' uses only the current environment, 'docker' uses only a Docker builder. "
+                    "Only applies when --build-strategy=python-executable."
+                ),
+                envvar="DAGSTER_PEX_BUILD_METHOD",
+            ),
+        ]
+    }
+)
+
+
 @click.group(name="deploy", cls=DgClickGroup, invoke_without_command=True)
 @org_and_deploy_option_group
+@build_strategy_option_group
+@pex_build_method_option_group
 @click.option(
     "--python-version",
     "python_version",
@@ -141,6 +184,11 @@ org_and_deploy_option_group = make_option_group(
         ]
     ),
 )
+@click.option(
+    "--skip-validation",
+    is_flag=True,
+    help="Skip configuration validation checks (not recommended).",
+)
 @dg_editable_dagster_options
 @dg_path_options
 @dg_global_options
@@ -148,6 +196,8 @@ org_and_deploy_option_group = make_option_group(
 def deploy_group(
     organization: Optional[str],
     deployment: Optional[str],
+    build_strategy: str,
+    pex_build_method: str,
     python_version: Optional[str],
     agent_type_str: str,
     deployment_type_str: Optional[str],
@@ -159,6 +209,7 @@ def deploy_group(
     target_path: Path,
     status_url: Optional[str],
     snapshot_base_condition_str: Optional[str],
+    skip_validation: bool,
     **global_options: object,
 ) -> None:
     """Deploy a project or workspace to Dagster Plus. Handles all state management for the deploy
@@ -171,6 +222,9 @@ def deploy_group(
     Each of the individual stages of the deploy is also available as its own subcommand for additional
     customization.
     """
+    from dagster_cloud_cli.commands.ci import BuildStrategy
+    from dagster_cloud_cli.core.pex_builder.deps import BuildMethod
+
     if click.get_current_context().invoked_subcommand:
         return
 
@@ -187,6 +241,12 @@ def deploy_group(
     organization = _get_organization(organization, plus_config)
     deployment = _get_deployment(deployment, plus_config)
 
+    # Extract dagster_env from config
+    dagster_env = None
+    if DagsterPlusCliConfig.exists():
+        config = DagsterPlusCliConfig.get()
+        dagster_env = _extract_dagster_env_from_url(config.url)
+
     dg_context = DgContext.for_workspace_or_project_environment(target_path, cli_config)
     _validate_location_names(dg_context, location_names, cli_config)
 
@@ -199,6 +259,9 @@ def deploy_group(
     else:
         agent_type = get_agent_type(plus_config)
 
+    build_strategy_enum = BuildStrategy(build_strategy)
+    pex_build_method_enum = BuildMethod(pex_build_method)
+
     init_deploy_session(
         organization,
         deployment,
@@ -211,11 +274,15 @@ def deploy_group(
         location_names,
         status_url,
         snapshot_base_condition,
+        dagster_env,
+        skip_validation,
     )
 
     build_artifact(
         dg_context,
         agent_type,
+        build_strategy_enum,
+        pex_build_method_enum,
         statedir,
         bool(use_editable_dagster),
         python_version,
@@ -281,6 +348,11 @@ def _validate_location_names(
         ]
     ),
 )
+@click.option(
+    "--skip-validation",
+    is_flag=True,
+    help="Skip configuration validation checks (not recommended).",
+)
 @dg_global_options
 @cli_telemetry_wrapper
 def start_deploy_session_command(
@@ -294,6 +366,7 @@ def start_deploy_session_command(
     target_path: Path,
     status_url: Optional[str],
     snapshot_base_condition_str: Optional[str],
+    skip_validation: bool,
     **global_options: object,
 ) -> None:
     """Start a new deploy session. Determines which code locations will be deployed and what
@@ -307,6 +380,12 @@ def start_deploy_session_command(
     organization = _get_organization(organization, plus_config)
     deployment = _get_deployment(deployment, plus_config)
 
+    # Extract dagster_env from config
+    dagster_env = None
+    if DagsterPlusCliConfig.exists():
+        config = DagsterPlusCliConfig.get()
+        dagster_env = _extract_dagster_env_from_url(config.url)
+
     dg_context = DgContext.for_workspace_or_project_environment(target_path, cli_config)
     _validate_location_names(dg_context, location_names, cli_config)
     statedir = _get_statedir()
@@ -329,6 +408,8 @@ def start_deploy_session_command(
         location_names,
         status_url,
         snapshot_base_condition,
+        dagster_env,
+        skip_validation,
     )
 
 
@@ -339,6 +420,8 @@ def start_deploy_session_command(
     type=click.Choice([agent_type.value.lower() for agent_type in DgPlusAgentType]),
     help="Whether this a Hybrid or serverless code location.",
 )
+@build_strategy_option_group
+@pex_build_method_option_group
 @click.option(
     "--python-version",
     "python_version",
@@ -360,6 +443,8 @@ def start_deploy_session_command(
 @cli_telemetry_wrapper
 def build_and_push_command(
     agent_type_str: str,
+    build_strategy: str,
+    pex_build_method: str,
     python_version: Optional[str],
     use_editable_dagster: Optional[str],
     location_names: tuple[str],
@@ -369,6 +454,9 @@ def build_and_push_command(
     """Builds a Docker image to be deployed, and pushes it to the registry
     that was configured when the deploy session was started.
     """
+    from dagster_cloud_cli.commands.ci import BuildStrategy
+    from dagster_cloud_cli.core.pex_builder.deps import BuildMethod
+
     cli_config = normalize_cli_config(global_options, click.get_current_context())
 
     dg_context = DgContext.for_workspace_or_project_environment(target_path, cli_config)
@@ -381,11 +469,16 @@ def build_and_push_command(
         plus_config = DagsterPlusCliConfig.get()
         agent_type = get_agent_type(plus_config)
 
+    build_strategy_enum = BuildStrategy(build_strategy)
+    pex_build_method_enum = BuildMethod(pex_build_method)
+
     statedir = _get_statedir()
 
     build_artifact(
         dg_context,
         agent_type,
+        build_strategy_enum,
+        pex_build_method_enum,
         statedir,
         bool(use_editable_dagster),
         python_version,

{dagster_dg_cli-1.12.11 → dagster_dg_cli-1.12.13}/dagster_dg_cli/cli/plus/deploy/deploy_session.py

@@ -7,10 +7,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
 import click
-
-if TYPE_CHECKING:
-    from dagster_cloud_cli.types import SnapshotBaseDeploymentCondition
-
 import dagster_shared.check as check
 
 # Expensive imports moved to lazy loading inside functions to improve CLI startup performance
@@ -22,6 +18,11 @@ from dagster_dg_cli.cli.plus.constants import DgPlusAgentType, DgPlusDeploymentT
 from dagster_dg_cli.cli.utils import create_temp_dagster_cloud_yaml_file
 from dagster_dg_cli.utils.plus.build import create_deploy_dockerfile, get_dockerfile_path
 
+if TYPE_CHECKING:
+    from dagster_cloud_cli.commands.ci import BuildStrategy
+    from dagster_cloud_cli.core.pex_builder.deps import BuildMethod
+    from dagster_cloud_cli.types import SnapshotBaseDeploymentCondition
+
 
 def _guess_deployment_type(
     project_dir: Path, full_deployment_name: str
@@ -127,6 +128,8 @@ def init_deploy_session(
     location_names: tuple[str],
     status_url: Optional[str],
     snapshot_base_condition: Optional["SnapshotBaseDeploymentCondition"],
+    dagster_env: Optional[str],
+    skip_validation: bool = False,
 ):
     deployment_type = (
         input_deployment_type
@@ -144,7 +147,14 @@ def init_deploy_session(
 
     dagster_cloud_yaml_file = create_temp_dagster_cloud_yaml_file(dg_context, statedir)
 
-    # Lazy import for test mocking and performance
+    from dagster_dg_cli.cli.plus.deploy.validation import validate_deploy_configuration
+
+    if not skip_validation:
+        validate_deploy_configuration(
+            dagster_cloud_yaml_path=dagster_cloud_yaml_file,
+            organization=organization,
+        )
+
     from dagster_cloud_cli.commands.ci import init_impl
 
     init_impl(
@@ -156,7 +166,7 @@ def init_deploy_session(
         require_branch_deployment=deployment_type == DgPlusDeploymentType.BRANCH_DEPLOYMENT,
         git_url=git_url,
         commit_hash=commit_hash,
-        dagster_env=None,
+        dagster_env=dagster_env,
         status_url=status_url,
         snapshot_base_condition=snapshot_base_condition,
         clean_statedir=False,
@@ -167,20 +177,33 @@ def init_deploy_session(
 def build_artifact(
     dg_context: DgContext,
     agent_type: DgPlusAgentType,
+    build_strategy: "BuildStrategy",
+    pex_build_method: "BuildMethod",
     statedir: str,
     use_editable_dagster: bool,
     python_version: Optional[str],
     location_names: tuple[str],
 ):
+    from dagster_cloud_cli.commands.ci import BuildStrategy
+
     if not python_version:
         python_version = f"3.{sys.version_info.minor}"
 
+    # Validate build strategy compatibility with agent type
+    if agent_type == DgPlusAgentType.HYBRID and build_strategy == BuildStrategy.pex:
+        raise click.UsageError(
+            "Build strategy 'python-executable' is not supported for Hybrid agents. "
+            "Hybrid agents require 'docker' build strategy."
+        )
+
     requested_location_names = set(location_names)
 
     if dg_context.is_project:
         _build_artifact_for_project(
             dg_context,
             agent_type,
+            build_strategy,
+            pex_build_method,
             statedir,
             use_editable_dagster,
             python_version,
@@ -201,6 +224,8 @@ def build_artifact(
             _build_artifact_for_project(
                 project_context,
                 agent_type,
+                build_strategy,
+                pex_build_method,
                 statedir,
                 use_editable_dagster,
                 python_version,
@@ -211,6 +236,8 @@ def build_artifact(
 def _build_artifact_for_project(
     dg_context: DgContext,
     agent_type: DgPlusAgentType,
+    build_strategy: "BuildStrategy",
+    pex_build_method: "BuildMethod",
     statedir: str,
     use_editable_dagster: bool,
     python_version: str,
@@ -247,10 +274,9 @@ def _build_artifact_for_project(
         )
 
     else:
-        # Import BuildStrategy and deps locally since they're not needed for tests
+        # Import deps locally since they're not needed for tests
         # Lazy import for test mocking and performance
-        from dagster_cloud_cli.commands.ci import BuildStrategy, build_impl
-        from dagster_cloud_cli.core.pex_builder import deps
+        from dagster_cloud_cli.commands.ci import build_impl
 
         build_impl(
             statedir=str(statedir),
@@ -258,12 +284,12 @@ def _build_artifact_for_project(
             use_editable_dagster=use_editable_dagster,
             location_name=[dg_context.code_location_name],
             build_directory=str(build_directory),
-            build_strategy=BuildStrategy.docker,
+            build_strategy=build_strategy,
             docker_image_tag=None,
             docker_base_image=None,
             docker_env=[],
             python_version=python_version,
-            pex_build_method=deps.BuildMethod.LOCAL,
+            pex_build_method=pex_build_method,
             pex_deps_cache_from=None,
             pex_deps_cache_to=None,
             pex_base_image_tag=None,

dagster_dg_cli-1.12.13/dagster_dg_cli/cli/plus/deploy/validation.py

@@ -0,0 +1,70 @@
+"""Validation for dg plus deploy commands."""
+
+import pathlib
+from typing import Optional
+
+import click
+from dagster_shared.plus.config import DagsterPlusCliConfig
+
+
+def _extract_dagster_env_from_url(url: Optional[str]) -> Optional[str]:
+    """Extract dagster_env from a DagsterPlusCliConfig URL.
+
+    Args:
+        url: Base URL like "https://eu.dagster.cloud" or None
+
+    Returns:
+        "eu" if EU region, None otherwise
+    """
+    if url and "eu.dagster.cloud" in url:
+        return "eu"
+    return None
+
+
+def validate_deploy_configuration(
+    dagster_cloud_yaml_path: str,
+    organization: str,
+) -> None:
+    """Validate deployment configuration before starting deploy session.
+
+    Performs:
+    - YAML schema validation (structure, required fields, build directories)
+    - API connectivity check (token + GraphQL query)
+
+    Args:
+        dagster_cloud_yaml_path: Path to the dagster_cloud.yaml file to validate
+        organization: Dagster Cloud organization name
+
+    Raises:
+        click.ClickException: If validation fails
+    """
+    # defer for import performance
+    from dagster_cloud_cli.commands.ci import checks
+    from dagster_cloud_cli.config_utils import get_org_url
+
+    yaml_path = pathlib.Path(dagster_cloud_yaml_path)
+
+    yaml_result = checks.check_dagster_cloud_yaml(yaml_path)
+
+    dagster_env = None
+    if DagsterPlusCliConfig.exists():
+        config = DagsterPlusCliConfig.get()
+        dagster_env = _extract_dagster_env_from_url(config.url)
+
+    url = get_org_url(organization, dagster_env)
+    connect_result = checks.check_connect_dagster_cloud(url)
+
+    all_errors = yaml_result.errors + connect_result.errors
+
+    if all_errors:
+        click.echo(click.style("\nConfiguration validation failed:", fg="red", bold=True))
+        click.echo()
+        for error in all_errors:
+            click.echo(f"  • {error}")
+        click.echo()
+        click.echo(
+            click.style("Fix the errors above or use --skip-validation to bypass.", dim=True)
+        )
+        raise click.ClickException("Deploy configuration validation failed")
+
+    click.echo("Configuration validated")

dagster_dg_cli-1.12.13/dagster_dg_cli/version.py

@@ -0,0 +1 @@
+__version__ = "1.12.13"

{dagster_dg_cli-1.12.11 → dagster_dg_cli-1.12.13/dagster_dg_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dagster-dg-cli
-Version: 1.12.11
+Version: 1.12.13
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-dg-cli
 Author: Dagster Labs
 Author-email: hello@dagsterlabs.com
@@ -13,9 +13,9 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 License-File: LICENSE
-Requires-Dist: dagster-dg-core==1.12.11
-Requires-Dist: dagster==1.12.11
-Requires-Dist: dagster-cloud-cli==1.12.11
+Requires-Dist: dagster-dg-core==1.12.13
+Requires-Dist: dagster==1.12.13
+Requires-Dist: dagster-cloud-cli==1.12.13
 Requires-Dist: typer
 Provides-Extra: test
 Requires-Dist: syrupy>=4.0.0; extra == "test"

{dagster_dg_cli-1.12.11 → dagster_dg_cli-1.12.13}/dagster_dg_cli.egg-info/SOURCES.txt

@@ -75,6 +75,7 @@ dagster_dg_cli/cli/plus/create/env.py
 dagster_dg_cli/cli/plus/deploy/__init__.py
 dagster_dg_cli/cli/plus/deploy/commands.py
 dagster_dg_cli/cli/plus/deploy/deploy_session.py
+dagster_dg_cli/cli/plus/deploy/validation.py
 dagster_dg_cli/cli/plus/deploy/configure/__init__.py
 dagster_dg_cli/cli/plus/deploy/configure/commands.py
 dagster_dg_cli/cli/plus/deploy/configure/configure_build_artifacts.py

{dagster_dg_cli-1.12.11 → dagster_dg_cli-1.12.13}/dagster_dg_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
-dagster-dg-core==1.12.11
-dagster==1.12.11
-dagster-cloud-cli==1.12.11
+dagster-dg-core==1.12.13
+dagster==1.12.13
+dagster-cloud-cli==1.12.13
 typer
 
 [ai]

{dagster_dg_cli-1.12.11 → dagster_dg_cli-1.12.13}/setup.py

@@ -36,9 +36,9 @@ setup(
     packages=find_packages(exclude=["dagster_dg_cli_tests*"]),
     include_package_data=True,
     install_requires=[
-        "dagster-dg-core==1.12.11",
-        "dagster==1.12.11",
-        "dagster-cloud-cli==1.12.11",
+        "dagster-dg-core==1.12.13",
+        "dagster==1.12.13",
+        "dagster-cloud-cli==1.12.13",
         "typer",
     ],
     extras_require={

dagster_dg_cli-1.12.11/dagster_dg_cli/version.py

@@ -1 +0,0 @@
-__version__ = "1.12.11"