dagster-cloud-cli 1.13.7__tar.gz → 1.13.8__tar.gz

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: dagster-cloud-cli
-Version: 1.13.7
+Version: 1.13.8
 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
 License-File: LICENSE
 Requires-Python: <3.15,>=3.10
 Requires-Dist: click
-Requires-Dist: dagster-shared==1.13.7
+Requires-Dist: dagster-shared==1.13.8
 Requires-Dist: github3-py
 Requires-Dist: jinja2
 Requires-Dist: packaging>=20.9

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli/commands/ci/__init__.py

@@ -832,6 +832,7 @@ def _build_docker(
     name = location_state.location_name
     docker_utils.verify_docker()
     registry_info = utils.get_registry_info(url)
+    repo_location = name if registry_info.get("is_harbor") else None
 
     docker_image_tag = docker_utils.default_image_tag(
         location_state.deployment_name, name, location_state.build.commit_hash
@@ -853,15 +854,18 @@ def _build_docker(
         base_image=docker_base_image,
         dockerfile_path=dockerfile_path,
         use_editable_dagster=use_editable_dagster,
+        location_name=repo_location,
     )
     if retval != 0:
         raise ui.error(f"Failed to build docker image for location {name}")
 
-    retval = docker_utils.upload_image(docker_image_tag, registry_info)
+    retval = docker_utils.upload_image(docker_image_tag, registry_info, location_name=repo_location)
     if retval != 0:
         raise ui.error(f"Failed to upload docker image for location {name}")
 
-    image = f"{registry_info['registry_url']}:{docker_image_tag}"
+    image = docker_utils.full_image_ref(
+        registry_info["registry_url"], repo_location, docker_image_tag
+    )
     ui.print(f"Built and uploaded image {image} for location {name}")
 
     return state.DockerBuildOutput(image=image)

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli/commands/serverless/__init__.py

@@ -212,7 +212,6 @@ def deploy_command(
     if not source_directory:
         raise ui.error("No source directory provided.")
 
-    _check_source_directory(source_directory)
     docker_utils.verify_docker()
 
     env_vars = kwargs.get("env", [])
@@ -221,21 +220,29 @@ def deploy_command(
     with gql.graphql_client_from_url(url, api_token, deployment_name=deployment) as client:
         ecr_info = gql.get_ecr_info(client)
         registry = ecr_info["registry_url"]
+        repo_location = location_name if ecr_info.get("is_harbor") else None
 
         image_tag = kwargs.get("image") or docker_utils.default_image_tag(
             deployment, location_name, kwargs.get("commit_hash")
         )
         retval = docker_utils.build_image(
-            source_directory, image_tag, ecr_info, env_vars, base_image, use_editable_dagster=False
+            source_directory,
+            image_tag,
+            ecr_info,
+            env_vars,
+            base_image,
+            use_editable_dagster=False,
+            location_name=repo_location,
         )
         if retval != 0:
             return
 
-        retval = docker_utils.upload_image(image_tag, ecr_info)
+        retval = docker_utils.upload_image(image_tag, ecr_info, location_name=repo_location)
         if retval != 0:
             return
 
-        location_args = {**kwargs, "image": f"{registry}:{image_tag}"}
+        full_image = docker_utils.full_image_ref(registry, repo_location, image_tag)
+        location_args = {**kwargs, "image": full_image}
         location_document = get_location_document(location_name, location_args)
         gql.add_or_update_code_location(client, location_document)
 

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli/core/pex_builder/deps.py

@@ -419,19 +419,15 @@ def get_pyproject_toml_deps(code_directory: str) -> list[str]:
     except Exception as e:
         raise ValueError(f"Error parsing pyproject.toml: {e}")
 
-    lines = []
-
     # Handle dependencies in [project] section (PEP 621)
     project_section = pyproject_data.get("project", {})
     dependencies = project_section.get("dependencies", [])
-    for dep in dependencies:
-        lines.append(str(dep))
+    lines = [str(dep) for dep in dependencies]
 
     # Handle optional dependencies in [project.optional-dependencies]
     optional_deps = project_section.get("optional-dependencies", {})
     for group_deps in optional_deps.values():
-        for dep in group_deps:
-            lines.append(str(dep))
+        lines.extend(str(dep) for dep in group_deps)
 
     # Handle legacy [tool.poetry.dependencies] for Poetry projects
     poetry_section = pyproject_data.get("tool", {}).get("poetry", {})

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli/core/pex_builder/source.py

@@ -58,19 +58,14 @@ def _build_local_package(local_dir: str, build_dir: str, python_interpreter: str
         ]
         subprocess.run(command, check=True, cwd=local_dir)
     elif os.path.exists(os.path.join(local_dir, "pyproject.toml")):
-        ui.print(f"Building package at {local_dir!r} using {python_interpreter} -m pip install")
-        # Use pip install with --target to build and install the package to the build directory
-        # This handles pyproject.toml files properly using modern Python build standards
-        command = [
-            python_interpreter,
-            "-m",
-            "pip",
-            "install",
-            "--target",
-            build_dir,
-            "--no-deps",  # Don't install dependencies, just the package itself
-            ".",
-        ]
+        install_args = ["--target", build_dir, "--no-deps", "."]
+        uv_path = shutil.which("uv")
+        if uv_path:
+            ui.print(f"Building package at {local_dir!r} using uv pip install")
+            command = [uv_path, "pip", "install", "--python", python_interpreter, *install_args]
+        else:
+            ui.print(f"Building package at {local_dir!r} using {python_interpreter} -m pip install")
+            command = [python_interpreter, "-m", "pip", "install", *install_args]
         subprocess.run(command, check=True, cwd=local_dir)
     else:
         ui.warn(f"No setup.py or pyproject.toml found in {local_dir!r} - will not build.")

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli/docker_utils.py

@@ -34,6 +34,26 @@ def _template_dockerfile(env_vars, custom_base_image=None) -> Generator[bytes, N
         yield bytes(dockerfile_content, "utf-8")
 
 
+def full_image_ref(
+    registry_url: str,
+    location_name: str | None,
+    image_tag: str,
+) -> str:
+    """Build the full Docker image reference.
+
+    For Harbor-backed registries the registry URL already contains a
+    deployment-scoped prefix (``host/project/depl-prefix``).  Each code
+    location gets its own repository nested under that prefix, so the
+    reference becomes ``host/project/depl-prefix/location:tag``.
+
+    For legacy ECR registries (or when *location_name* is ``None``) the
+    reference falls back to the previous ``registry:tag`` format.
+    """
+    if location_name:
+        return f"{registry_url}/{location_name}:{image_tag}"
+    return f"{registry_url}:{image_tag}"
+
+
 def build_image(
     source_directory,
     image: str,
@@ -42,8 +62,9 @@ def build_image(
     base_image: str | None,
     use_editable_dagster: bool,
     dockerfile_path: str | None = None,
+    location_name: str | None = None,
 ) -> int:
-    registry = registry_info["registry_url"]
+    full_ref = full_image_ref(registry_info["registry_url"], location_name, image)
 
     with ExitStack() as stack:
         if dockerfile_path:
@@ -58,7 +79,7 @@ def build_image(
             "build",
             source_directory,
             "-t",
-            f"{registry}:{image}",
+            full_ref,
             "-f",
             file_path,
             "--platform",
@@ -74,7 +95,7 @@ def build_image(
         return subprocess.run(cmd, input=build_input, check=True).returncode
 
 
-def upload_image(image, registry_info) -> int:
+def upload_image(image, registry_info, location_name: str | None = None) -> int:
     registry = registry_info["registry_url"]
     aws_token = registry_info["aws_auth_token"]
     if not registry or not aws_token:
@@ -89,9 +110,8 @@ def upload_image(image, registry_info) -> int:
         input=password.encode(),
         check=True,
     )
-    return subprocess.call(
-        ["docker", "push", f"{registry}:{image}"], stderr=sys.stderr, stdout=sys.stdout
-    )
+    full_ref = full_image_ref(registry, location_name, image)
+    return subprocess.call(["docker", "push", full_ref], stderr=sys.stderr, stdout=sys.stdout)
 
 
 def default_image_tag(deployment: str, location_name: str, commit_hash: str | None) -> str:

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli/gql.py

@@ -715,6 +715,7 @@ query CliGetEcrInfo {
         awsRegion
         awsAuthToken
         registryAllowCustomBase
+        registryIsHarbor
         registryUrl
     }
 }
@@ -728,6 +729,7 @@ def get_ecr_info(client: DagsterCloudGraphQLClient) -> Any:
         "aws_region": data["serverless"]["awsRegion"],
         "aws_auth_token": data["serverless"]["awsAuthToken"],
         "allow_custom_base": data["serverless"]["registryAllowCustomBase"],
+        "is_harbor": data["serverless"].get("registryIsHarbor", False),
     }
 
 

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli/types.py

@@ -43,10 +43,7 @@ SubcommandTags = Enum(
 class CliEventTags:
     @classmethod
     def enums(cls):
-        attrs = []
-        for attr in cls.__dict__.values():
-            if isinstance(attr, EnumMeta):
-                attrs.append(attr)
+        attrs = [attr for attr in cls.__dict__.values() if isinstance(attr, EnumMeta)]
         return attrs
 
     @classmethod

dagster_cloud_cli-1.13.8/dagster_cloud_cli/version.py

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

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/dagster_cloud_cli_tests/test_pyproject_toml_support.py

@@ -163,8 +163,9 @@ dependencies = ["requests>=2.25.0"]
 
 
 @patch("subprocess.run")
-def test_build_local_package_with_pyproject_toml(mock_run, temp_dir):
-    """Test building a package with pyproject.toml."""
+@patch("shutil.which", return_value=None)
+def test_build_local_package_with_pyproject_toml(mock_which, mock_run, temp_dir):
+    """Test building a package with pyproject.toml falls back to pip when uv is not available."""
     mock_run.return_value = None
 
     pyproject_path = Path(temp_dir) / "pyproject.toml"
@@ -196,6 +197,42 @@ version = "0.1.0"
     assert command == expected_command
 
 
+@patch("subprocess.run")
+@patch("shutil.which", return_value="/usr/bin/uv")
+def test_build_local_package_with_pyproject_toml_uses_uv(mock_which, mock_run, temp_dir):
+    """Test building a package with pyproject.toml uses uv when available."""
+    mock_run.return_value = None
+
+    pyproject_path = Path(temp_dir) / "pyproject.toml"
+    pyproject_path.write_text("""
+[project]
+name = "test-package"
+version = "0.1.0"
+""")
+
+    build_dir = Path(temp_dir) / "build"
+    build_dir.mkdir()
+
+    source._build_local_package(temp_dir, str(build_dir), "python")  # noqa: SLF001
+
+    mock_run.assert_called_once()
+    args, _kwargs = mock_run.call_args
+    command = args[0]
+
+    expected_command = [
+        "/usr/bin/uv",
+        "pip",
+        "install",
+        "--python",
+        "python",
+        "--target",
+        str(build_dir),
+        "--no-deps",
+        ".",
+    ]
+    assert command == expected_command
+
+
 @patch("subprocess.run")
 def test_build_local_package_prefers_setup_py(mock_run, temp_dir):
     """Test that setup.py is preferred over pyproject.toml when both exist."""

{dagster_cloud_cli-1.13.7 → dagster_cloud_cli-1.13.8}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dagster-cloud-cli"
-version = "1.13.7"
+version = "1.13.8"
 requires-python = ">=3.10,<3.15"
 description = ""
 authors = [
@@ -14,7 +14,7 @@ authors = [
 ]
 license = "Apache-2.0"
 dependencies = [
-    "dagster-shared==1.13.7",
+    "dagster-shared==1.13.8",
     "packaging>=20.9",
     "questionary",
     "requests",

dagster_cloud_cli-1.13.7/dagster_cloud_cli/version.py

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