From e159fb10a8917f33426d2f1ce0161797f735e38c Mon Sep 17 00:00:00 2001 From: Sebastian Morawiec Date: Fri, 27 Sep 2024 12:15:17 +0200 Subject: [PATCH 1/2] update dependnecies for latest release --- projects/orquestra-sdk/pyproject.toml | 6 +++--- .../src/orquestra/sdk/_client/_base/_docker_images.py | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/projects/orquestra-sdk/pyproject.toml b/projects/orquestra-sdk/pyproject.toml index 66b3313d4..cf4679b4c 100644 --- a/projects/orquestra-sdk/pyproject.toml +++ b/projects/orquestra-sdk/pyproject.toml @@ -26,7 +26,7 @@ requires-python = ">= 3.8" # version we can easily install and test, even if there are older versions with # the same API. dependencies = [ - "orquestra-workflow-shared~=1.0.0", + "orquestra-workflow-shared~=2.0.0", # Schema definition "pydantic>1.10.7", @@ -72,11 +72,11 @@ dependencies = [ [project.optional-dependencies] ray = [ - "orquestra-workflow-runtime[ray]~=1.0.0", + "orquestra-workflow-runtime[ray]~=2.0.0", ] dashboard = [ - "orquestra-workflow-runtime[dashboard]~=1.0.0", + "orquestra-workflow-runtime[dashboard]~=2.0.0", ] all = ["orquestra-sdk[dashboard]"] diff --git a/projects/orquestra-sdk/src/orquestra/sdk/_client/_base/_docker_images.py b/projects/orquestra-sdk/src/orquestra/sdk/_client/_base/_docker_images.py index 100fa7a67..b13acb0bf 100644 --- a/projects/orquestra-sdk/src/orquestra/sdk/_client/_base/_docker_images.py +++ b/projects/orquestra-sdk/src/orquestra/sdk/_client/_base/_docker_images.py @@ -2,9 +2,5 @@ # © Copyright 2024 Zapata Computing Inc. ################################################################################ -HEAD_NODE_IMAGE = ( - "hub.stage.nexus.orquestra.io/zapatacomputing/workflow-driver-ray:head-node-1.0.0a3" -) -DEFAULT_WORKER_IMAGE = ( - "hub.stage.nexus.orquestra.io/zapatacomputing/orquestra-sdk-base:worker-1.0.0a1" -) +HEAD_NODE_IMAGE = "hub.stage.nexus.orquestra.io/zapatacomputing/workflow-driver-ray:orquestra-head-image-v1.0.0" # noqa +DEFAULT_WORKER_IMAGE = "hub.stage.nexus.orquestra.io/zapatacomputing/orquestra-sdk-base:orquestra-worker-image-v1.0.0" # noqa From 5cf1360e636c9cdf3fa8fbf35e27346244fdac65 Mon Sep 17 00:00:00 2001 From: Sebastian Morawiec Date: Fri, 27 Sep 2024 12:37:00 +0200 Subject: [PATCH 2/2] fix badly hardcoded integration truths --- .../tests/integration/ray/test_integration.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/projects/orquestra-sdk/tests/integration/ray/test_integration.py b/projects/orquestra-sdk/tests/integration/ray/test_integration.py index fd86e0654..08be65068 100644 --- a/projects/orquestra-sdk/tests/integration/ray/test_integration.py +++ b/projects/orquestra-sdk/tests/integration/ray/test_integration.py @@ -28,6 +28,7 @@ from orquestra import sdk from orquestra.sdk._client._base._config._settings import LOCAL_RUNTIME_CONFIGURATION +from orquestra.sdk._client._base._docker_images import DEFAULT_WORKER_IMAGE from orquestra.sdk._client._base._testing import _example_wfs, _ipc from orquestra.sdk._client._base._testing._example_wfs import ( workflow_parametrised_with_resources, @@ -975,17 +976,13 @@ def test_setting_resources( ( None, None, - { - "image:hub.stage.nexus.orquestra.io/zapatacomputing/orquestra-sdk-base:worker-1.0.0a1": 1 # noqa: E501 - }, + {f"image:{DEFAULT_WORKER_IMAGE}": 1}, {}, ), ( None, 1, - { - "image:hub.stage.nexus.orquestra.io/zapatacomputing/orquestra-sdk-base:worker-1.0.0a1-cuda": 1 # noqa: E501 - }, + {f"image:{DEFAULT_WORKER_IMAGE}-cuda": 1}, { "num_gpus": 1, },