Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨Computational backend: passing labels and envs 🗃️ #4429

Merged
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
3943065
passing labels and envs
sanderegg Jun 27, 2023
f731212
renamed and have test check that it is as expected
sanderegg Jun 28, 2023
96df3e3
remove deprecated fixtures
sanderegg Jun 28, 2023
89670e8
fixed unit tests
sanderegg Jun 28, 2023
304fcc3
real_fct runs now
sanderegg Jun 28, 2023
f51205a
rename
sanderegg Jun 28, 2023
a242a6f
add required arguments
sanderegg Jun 28, 2023
d3d0123
ruff
sanderegg Jun 29, 2023
66fd911
ruff
sanderegg Jun 29, 2023
a25d6ca
ruff
sanderegg Jun 29, 2023
aa3f77c
ruff
sanderegg Jun 29, 2023
d83ee6d
ruffing
sanderegg Jun 29, 2023
2f9c2a1
fixing tests
sanderegg Jun 29, 2023
64a7f3b
ruff
sanderegg Jun 29, 2023
03d3f36
cleanup
sanderegg Jun 29, 2023
71f16ef
transform alias in protocol
sanderegg Jun 29, 2023
c76a2a8
moved RemoteFct to dask-task-lib
sanderegg Jun 29, 2023
ce60946
use right names
sanderegg Jun 29, 2023
577a778
private
sanderegg Jun 29, 2023
b266d39
refactor
sanderegg Jun 29, 2023
b4ea1ae
linter
sanderegg Jun 29, 2023
38f39d6
ruff refinement
sanderegg Jun 29, 2023
3684516
improve error waiting
sanderegg Jun 29, 2023
27cbbc5
working
sanderegg Jun 29, 2023
05ff169
set up labels
sanderegg Jun 29, 2023
81058ea
direct templating
sanderegg Jun 29, 2023
b43f252
simplify
sanderegg Jun 29, 2023
a1ac0de
adding product name and user agent
sanderegg Jun 29, 2023
08de7af
add a metadata column
sanderegg Jun 29, 2023
2a87c76
use metadata column to store product name and user agent
sanderegg Jun 29, 2023
dcdc6cc
ongoing
sanderegg Jun 29, 2023
748e79d
invalid rule
sanderegg Jun 30, 2023
131edf2
refactoring
sanderegg Jun 30, 2023
3fbf0f8
refactoring
sanderegg Jun 30, 2023
c768096
refactoring
sanderegg Jun 30, 2023
754f7f1
linter
sanderegg Jun 30, 2023
57ea25f
prepare concept for ENVs
sanderegg Jun 30, 2023
d2da357
refactor
sanderegg Jun 30, 2023
f6484cd
getting there?
sanderegg Jun 30, 2023
b88702e
pass headers to the computation service
sanderegg Jun 30, 2023
33a05cd
linter
sanderegg Jun 30, 2023
b1b849a
backwards compatibility
sanderegg Jun 30, 2023
5e8da56
some old services do not have these settings
sanderegg Jun 30, 2023
e69cba9
added some test
sanderegg Jun 30, 2023
1f3dd27
added a test that possibly fails
sanderegg Jun 30, 2023
c68fe58
set type aliases
sanderegg Jul 3, 2023
7d2fadf
sql 2.0
sanderegg Jul 3, 2023
e6d5c96
refactoring testing
sanderegg Jul 3, 2023
bc1cbee
ruff
sanderegg Jul 3, 2023
eddd7ac
fix method call
sanderegg Jul 3, 2023
ea9592f
fix imports
sanderegg Jul 3, 2023
8685cb9
improve fail fast
sanderegg Jul 3, 2023
17ed2fb
fix test
sanderegg Jul 3, 2023
e378150
fix test
sanderegg Jul 3, 2023
f988508
sonar
sanderegg Jul 3, 2023
dd2b61e
sql 2.0
sanderegg Jul 3, 2023
cb2a463
properly mock directorv
sanderegg Jul 3, 2023
40ec2c6
fix unit tests
sanderegg Jul 3, 2023
97e098a
set a default dict instead of None
sanderegg Jul 4, 2023
d1ea7c9
@pcrespov review: explicit variables
sanderegg Jul 4, 2023
32e4f19
forgot to connect
sanderegg Jul 4, 2023
47dd9dc
fix DB migration revision
sanderegg Jul 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix method call
  • Loading branch information
sanderegg committed Jul 4, 2023
commit eddd7ac050dbb0b62cdff8b25b0cdf2d6202ed68
Original file line number Diff line number Diff line change
@@ -48,7 +48,6 @@
from servicelib.logging_utils import log_catch
from settings_library.s3 import S3Settings
from simcore_sdk.node_ports_v2 import FileLinkType
from simcore_service_director_v2.models.domains.comp_runs import MetadataDict
from tenacity._asyncio import AsyncRetrying
from tenacity.before_sleep import before_sleep_log
from tenacity.stop import stop_after_attempt
@@ -60,6 +59,7 @@
ComputationalBackendTaskResultsNotReadyError,
)
from ..core.settings import AppSettings, ComputationalBackendSettings
from ..models.domains.comp_runs import MetadataDict
from ..models.domains.comp_tasks import Image
from ..models.schemas.clusters import ClusterDetails, Scheduler
from ..modules.storage import StorageClient
@@ -303,8 +303,21 @@ def _comp_sidecar_fct( # noqa: PLR0913
node_id,
file_link_type=self.tasks_file_link_type,
)
task_labels = compute_task_labels(user_id, project_id, node_id, metadata)
task_envs = compute_task_envs(node_image)
task_labels = await compute_task_labels(
self.app,
user_id=user_id,
project_id=project_id,
node_id=node_id,
metadata=metadata,
)
task_envs = await compute_task_envs(
self.app,
user_id=user_id,
project_id=project_id,
node_id=node_id,
node_image=node_image,
metadata=metadata,
)

try:
assert self.app.state # nosec