dagster-cloud-cli 1.13.4__tar.gz → 1.13.5__tar.gz

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dagster-cloud-cli
-Version: 1.13.4
+Version: 1.13.5
 Project-URL: Homepage, https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-cloud-cli
 Author-email: Dagster Labs <hello@dagsterlabs.com>
 License-Expression: Apache-2.0
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: click
-Requires-Dist: dagster-shared==1.13.4
+Requires-Dist: dagster-shared==1.13.5
 Requires-Dist: github3-py
 Requires-Dist: jinja2
 Requires-Dist: packaging>=20.9
@@ -23,10 +23,3 @@ Requires-Dist: setuptools
 Requires-Dist: tomli>=1.1.0; python_version < '3.11'
 Requires-Dist: typer>=0.15.0
 Requires-Dist: validators
-Provides-Extra: test
-Requires-Dist: flaky; extra == 'test'
-Requires-Dist: freezegun; extra == 'test'
-Requires-Dist: pex<2.60.0,>=2.1.132; extra == 'test'
-Requires-Dist: pip; extra == 'test'
-Requires-Dist: pytest-mock==3.14.0; extra == 'test'
-Requires-Dist: pytest>=8; extra == 'test'

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/commands/ci/__init__.py

@@ -1060,7 +1060,7 @@ def _deploy(
                 else {}
             ),
         }
-        if build_output.strategy == "python-executable":
+        if isinstance(build_output, state.PexBuildOutput):
             metrics.instrument_add_tags([CliEventTags.server_strategy.pex])
             location_args["pex_tag"] = build_output.pex_tag
             location_args["python_version"] = build_output.python_version

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/commands/config.py

@@ -32,7 +32,10 @@ def set_deployment(
 
     config = read_config()
     new_config = DagsterPlusCliConfig(
-        **{**config.__dict__, "default_deployment": deployment},
+        **{  # ty: ignore[invalid-argument-type]
+            **config.__dict__,
+            "default_deployment": deployment,
+        },
     )
     write_config(new_config)
 

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/config/jinja_template_loader.py

@@ -40,6 +40,6 @@ class JinjaTemplateLoader:
 
         env = Environment(loader=FileSystemLoader(template_path))
         env.filters["to_yaml"] = self.to_yaml
-        env.globals["get_env"] = self.get_env
+        env.globals["get_env"] = self.get_env  # ty: ignore[invalid-assignment]
         template = env.get_template(filename)
         return template.render(context)

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/config_utils.py

@@ -3,7 +3,10 @@ import functools
 import inspect
 import os
 from pathlib import Path
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from typer.models import OptionInfo
 
 import yaml
 from click import Context
@@ -98,7 +101,7 @@ def get_location_load_timeout() -> int:
 
     env_val = os.getenv(LOCATION_LOAD_TIMEOUT_ENV_VAR_NAME)
 
-    return int(cast("str", env_val)) if env_val is not None else default_timeout
+    return int(env_val) if env_val is not None else default_timeout
 
 
 def get_agent_heartbeat_timeout(default_timeout: int | None) -> int | None:
@@ -108,7 +111,7 @@ def get_agent_heartbeat_timeout(default_timeout: int | None) -> int | None:
     """
     env_val = os.getenv(AGENT_HEARTBEAT_TIMEOUT_ENV_VAR_NAME)
 
-    return int(cast("str", env_val)) if env_val is not None else None
+    return int(env_val) if env_val is not None else None
 
 
 def get_user_token(ctx: Context | None = None) -> str | None:
@@ -151,20 +154,20 @@ def get_org_url(organization: str, dagster_env: str | None):
 
 
 # Typer Option definitions for common CLI config options (organization, deployment, user token)
-ORGANIZATION_OPTION = Option(
+ORGANIZATION_OPTION = Option(  # ty: ignore[no-matching-overload]
     get_organization,
     "--organization",
     "-o",
     help="Organization to target.",
-    show_default=get_organization(),  # type: ignore
+    show_default=get_organization(),
 )
-DEPLOYMENT_OPTION = Option(
+DEPLOYMENT_OPTION = Option(  # ty: ignore[no-matching-overload]
     get_deployment,
     "--deployment",
     "-d",
     help="Deployment to target.",
     autocompletion=available_deployment_names,
-    show_default=get_deployment(),  # type: ignore
+    show_default=get_deployment(),
 )
 
 DAGSTER_ENV_OPTION = Option(
@@ -174,13 +177,14 @@ DAGSTER_ENV_OPTION = Option(
     envvar="DAGSTER_CLOUD_ENV",
 )
 
-USER_TOKEN_OPTION = Option(
+_user_token = get_user_token()
+USER_TOKEN_OPTION = Option(  # ty: ignore[no-matching-overload]
     get_user_token,
     "--api-token",
     "--user-token",
     "-u",
     help="Cloud user token.",
-    show_default=ui.censor_token(get_user_token()) if get_user_token() else None,  # type: ignore
+    show_default=ui.censor_token(_user_token) if _user_token else None,
 )
 URL_OPTION = Option(
     get_url,
@@ -235,7 +239,7 @@ def dagster_cloud_options(
         wrapped_sig = inspect.signature(to_wrap)
         params = collections.OrderedDict(wrapped_sig.parameters)
 
-        options = {
+        options: dict[str, tuple[Any, OptionInfo]] = {
             ORGANIZATION_CLI_ARGUMENT: (str, ORGANIZATION_OPTION),
             TOKEN_CLI_ARGUMENT_VAR: (str, USER_TOKEN_OPTION),
         }
@@ -254,13 +258,13 @@ def dagster_cloud_options(
 
         has_location_load_timeout_param = LOCATION_LOAD_TIMEOUT_ARGUMENT_VAR in params
         if has_location_load_timeout_param:
-            options[LOCATION_LOAD_TIMEOUT_ARGUMENT_VAR] = (  # pyright: ignore[reportArgumentType]
+            options[LOCATION_LOAD_TIMEOUT_ARGUMENT_VAR] = (
                 int,
                 LOCATION_LOAD_TIMEOUT_OPTION,
             )
         has_agent_heartbeat_timeout_param = AGENT_HEARTBEAT_TIMEOUT_ARGUMENT_VAR in params
         if has_agent_heartbeat_timeout_param:
-            options[AGENT_HEARTBEAT_TIMEOUT_ARGUMENT_VAR] = (  # pyright: ignore[reportArgumentType]
+            options[AGENT_HEARTBEAT_TIMEOUT_ARGUMENT_VAR] = (
                 int,
                 get_agent_heartbeat_timeout_option(default_timeout=60),
             )
@@ -278,7 +282,7 @@ def dagster_cloud_options(
                 and kwargs.get(DEPLOYMENT_CLI_ARGUMENT)
             ):
                 kwargs[URL_CLI_ARGUMENT] = gql.url_from_config(
-                    organization=kwargs.get(ORGANIZATION_CLI_ARGUMENT),  # pyright: ignore[reportArgumentType]
+                    organization=kwargs.get(ORGANIZATION_CLI_ARGUMENT),  # ty: ignore[invalid-argument-type]
                     deployment=kwargs.get(DEPLOYMENT_CLI_ARGUMENT),
                 )
 

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/core/pex_builder/deps.py

@@ -16,9 +16,11 @@ from dataclasses import dataclass
 import click
 from dagster_shared.utils import find_uv_workspace_root
 from packaging import version
+from packaging.requirements import InvalidRequirement, Requirement
+from packaging.utils import canonicalize_name
 
 try:
-    import tomllib  # pyright: ignore[reportMissingImports]
+    import tomllib  # ty: ignore[unresolved-import]
 except ImportError:
     # Python < 3.11 fallback
     import tomli as tomllib
@@ -460,19 +462,39 @@ def get_pyproject_toml_deps(code_directory: str) -> list[str]:
             else:
                 lines.append(dep_name)
 
-    # Handle [tool.uv.sources] - resolve workspace and path dependencies to local paths
+    # Handle [tool.uv.sources] - resolve workspace and path dependencies to local paths.
+    # Match by canonical package name so version specifiers and extras in the requirement
+    # line don't defeat the lookup. Skip entries gated on a `group =` qualifier: pex builds
+    # have no active group context, so group-conditional sources must not be applied
+    # (otherwise a test-only local-path override would leak into the production deps pex).
     uv_sources = pyproject_data.get("tool", {}).get("uv", {}).get("sources", {})
     if uv_sources:
+        sources_by_canonical = {
+            canonicalize_name(name): cfg for name, cfg in uv_sources.items() if "group" not in cfg
+        }
         resolved_lines = []
         for line in lines:
-            source_config = uv_sources.get(line)
+            try:
+                package_name = canonicalize_name(Requirement(line).name)
+            except InvalidRequirement:
+                ui.print(
+                    f"[uv.sources] could not parse requirement line {line!r}; "
+                    "passing through unchanged"
+                )
+                resolved_lines.append(line)
+                continue
+            source_config = sources_by_canonical.get(package_name)
             if source_config:
                 if source_config.get("workspace"):
-                    resolved_path = _resolve_uv_workspace_dep(line, code_directory)
+                    resolved_path = _resolve_uv_workspace_dep(package_name, code_directory)
                     if resolved_path:
+                        ui.print(
+                            f"[uv.sources] resolved {line!r} to workspace path {resolved_path}"
+                        )
                         resolved_lines.append(resolved_path)
                         continue
                 elif "path" in source_config:
+                    ui.print(f"[uv.sources] resolved {line!r} to path {source_config['path']}")
                     resolved_lines.append(source_config["path"])
                     continue
             resolved_lines.append(line)

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/entrypoint.py

@@ -33,8 +33,8 @@ has_dagster_cloud = importlib.util.find_spec("dagster_cloud") is not None
 
 
 if has_dagster_cloud:
-    from dagster_cloud.agent.cli import app as agent_app  # type: ignore
-    from dagster_cloud.pex.grpc.server.cli import app as pex_app  # type: ignore
+    from dagster_cloud.agent.cli import app as agent_app
+    from dagster_cloud.pex.grpc.server.cli import app as pex_app
 else:
     agent_app = create_stub_app("dagster-cloud")
     pex_app = create_stub_app("dagster-cloud")

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/gql.py

@@ -682,7 +682,7 @@ def launch_run(
     config: dict[str, Any],
     asset_keys: list[str] | None,
 ) -> str:
-    formatted_tags = [{"key": cast("str", k), "value": cast("str", v)} for k, v in tags.items()]
+    formatted_tags = [{"key": k, "value": v} for k, v in tags.items()]
 
     params: dict[str, Any] = {
         "selector": {

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/types.py

@@ -9,13 +9,15 @@ class CliEventType(Enum):
 
 
 AgentStrategyTags = Enum(
-    "agent-strategy", {"hybrid": "agent-strategy:hybrid", "serverless": "agent-strategy:serverless"}
+    "agent-strategy",  # ty: ignore[mismatched-type-name]
+    {"hybrid": "agent-strategy:hybrid", "serverless": "agent-strategy:serverless"},
 )
 ServerStrategyTags = Enum(
-    "server-strategy", {"docker": "server-strategy:docker", "pex": "server-strategy:pex"}
+    "server-strategy",  # ty: ignore[mismatched-type-name]
+    {"docker": "server-strategy:docker", "pex": "server-strategy:pex"},
 )
 SourceTags = Enum(
-    "source",
+    "source",  # ty: ignore[mismatched-type-name]
     {
         "bitbucket": "source:bitbucket",
         "buildkite": "source:buildkite",
@@ -30,7 +32,7 @@ SourceTags = Enum(
     },
 )
 SubcommandTags = Enum(
-    "subcommand",
+    "subcommand",  # ty: ignore[mismatched-type-name]
     {
         "dagster_cloud_ci": "subcommand:dagster-cloud-ci",
         "dagster_cloud_serverless": "subcommand:dagster-cloud-serverless",

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli/utils.py

@@ -87,8 +87,8 @@ def add_options(options: dict[str, tuple[Any, "OptionInfo"]]):
                 }
             return to_wrap(*args, **modified_kwargs)
 
-        wrap_function.__signature__ = sig  # pyright: ignore[reportAttributeAccessIssue]
-        wrap_function.modified_options = True  # pyright: ignore[reportAttributeAccessIssue]
+        wrap_function.__signature__ = sig  # ty: ignore[unresolved-attribute]
+        wrap_function.modified_options = True  # ty: ignore[unresolved-attribute]
         return wrap_function
 
     return decorator

dagster_cloud_cli-1.13.5/dagster_cloud_cli/version.py

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

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli_tests/config/test_config_loader.py

@@ -104,18 +104,22 @@ def test_config_loader(tmpdir):
         result = loader.load_from_template(template_file, context)
         assert isinstance(result, ProcessedDagsterCloudConfig)
         assert len(result.locations) == 1
-        assert result.locations[0].location_name == "foo"
-        assert result.locations[0].code_source.package_name == "foo"
-        assert result.locations[0].build.model_dump() == {
+        location = result.locations[0]
+        assert location.location_name == "foo"
+        assert location.code_source is not None
+        assert location.code_source.package_name == "foo"
+        assert location.build is not None
+        assert location.build.model_dump() == {
             "directory": "foo",
             "registry": "my-registry.io/my-org",
         }
-        assert result.locations[0].image == "foo"
-        assert set(result.locations[0].container_context["k8s"]["env_vars"]) == {
+        assert location.image == "foo"
+        assert location.container_context is not None
+        assert set(location.container_context["k8s"]["env_vars"]) == {
             "foo=foo",
             "global=overridden",
         }
-        assert result.locations[0].container_context["k8s"]["resources"] == {
+        assert location.container_context["k8s"]["resources"] == {
             "requests": {"cpu": "1", "memory": "32Gi"},
             "limits": {"cpu": "2", "memory": "32Gi"},
         }

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli_tests/test_gql.py

@@ -18,7 +18,7 @@ def test_mark_cli_event_doesnt_raise():
 
     mark_cli_event(
         client=client,
-        event_type=MagicMock(),
+        event_type=MagicMock(),  # ty: ignore[invalid-argument-type]
         duration_seconds=MagicMock(),
         tags=MagicMock(),
     )

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/dagster_cloud_cli_tests/test_pyproject_toml_support.py

@@ -612,6 +612,64 @@ build-backend = "hatchling.build"
     )
 
 
+def test_get_deps_requirements_uv_sources_path_with_version_specifier(tmp_path):
+    """[tool.uv.sources] entries must resolve even when the dependency line carries a
+    version specifier or extras (e.g. `pkg==1.0.0`, `pkg[test]`).
+    """
+    python_version = version.Version(f"{sys.version_info.major}.{sys.version_info.minor}")
+
+    app_dir = tmp_path / "my-app"
+    app_dir.mkdir()
+    (app_dir / "my_app").mkdir()
+    (app_dir / "my_app" / "__init__.py").write_text("")
+    (app_dir / "pyproject.toml").write_text("""
+[project]
+name = "my-app"
+version = "0.1.0"
+dependencies = [
+    "local-utils==1!0+dev",
+    "Local-Utils-Extras[test]",
+]
+
+[tool.uv.sources]
+local-utils = { path = "../local-utils" }
+local-utils-extras = { path = "../local-utils-extras" }
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+""")
+
+    for name in ("local-utils", "local-utils-extras"):
+        d = tmp_path / name
+        d.mkdir()
+        (d / name.replace("-", "_")).mkdir()
+        (d / name.replace("-", "_") / "__init__.py").write_text("")
+        (d / "pyproject.toml").write_text(f"""
+[project]
+name = "{name}"
+version = "0.1.0"
+dependencies = []
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+""")
+
+    local_packages, deps_requirements = deps.get_deps_requirements(str(app_dir), python_version)
+    deps_lines = [
+        line.strip()
+        for line in deps_requirements.requirements_txt.strip().split("\n")
+        if line.strip()
+    ]
+
+    assert str(tmp_path / "local-utils") in local_packages.local_package_paths
+    assert str(tmp_path / "local-utils-extras") in local_packages.local_package_paths
+    assert not any("local-utils" in dep for dep in deps_lines), (
+        f"local-utils* should resolve to local paths, not deps: {deps_lines}"
+    )
+
+
 def test_get_deps_requirements_uv_workspace(tmp_path):
     """Test get_deps_requirements correctly handles uv workspace local dependencies.
 

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dagster-cloud-cli"
-version = "1.13.4"
+version = "1.13.5"
 description = ""
 authors = [
     { name = "Dagster Labs", email = "hello@dagsterlabs.com" },
@@ -21,7 +21,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "dagster-shared==1.13.4",
+    "dagster-shared==1.13.5",
     "packaging>=20.9",
     "questionary",
     "requests",
@@ -43,11 +43,18 @@ dagster-cloud = "dagster_cloud_cli.entrypoint:app"
 dagster-plus = "dagster_cloud_cli.entrypoint:app"
 
 [project.optional-dependencies]
+
+[dependency-groups]
 test = [
+    "dagster-shared",
     "freezegun",
     "pytest>=8",
     "pytest-mock==3.14.0",
-    "flaky",
+    "pytest-rerunfailures",
     "pex>=2.1.132,<2.60.0",
     "pip",
 ]
+
+[tool.uv.sources.dagster-shared]
+path = "../../../python_modules/libraries/dagster-shared"
+editable = true

{dagster_cloud_cli-1.13.4 → dagster_cloud_cli-1.13.5}/tox.ini

@@ -1,10 +1,13 @@
 [tox]
 requires =
-    tox-uv>=1
+    tox-uv>=1.16
 envlist=py311
 skipsdist = True
 
 [testenv]
+runner = uv-venv-lock-runner
+uv_sync_locked = false
+uv_sync_flags = --frozen
 download = True
 setenv =
   DD_DOGSTATSD_DISABLE = true
@@ -21,9 +24,8 @@ passenv =
     POSTGRES_FUNCTION_SCOPED_TEST_DB_HOST
     UV_CACHE_DIR
     DAGSTER_INTERNAL_GIT_REPO_DIR
-deps =
-  -e .[test]
-  -e ../../../python_modules/libraries/dagster-shared
+dependency_groups =
+    test
 allowlist_externals =
   /bin/bash
   echo