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

Add is_inside func to ImageSpec #1601

Merged
merged 7 commits into from
Apr 30, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
7 changes: 7 additions & 0 deletions flytekit/image_spec/image_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
from dataclasses_json import dataclass_json
from docker.errors import APIError, ImageNotFound

FLYTE_IMAGE_NAME = "FLYTE_IMAGE_NAME"


@dataclass_json
@dataclass
Expand Down Expand Up @@ -52,6 +54,11 @@ def image_name(self) -> str:
container_image = f"{self.registry}/{container_image}"
return container_image

def is_inside(self) -> bool:
pingsutw marked this conversation as resolved.
Show resolved Hide resolved
if os.environ.get(FLYTE_IMAGE_NAME):
return os.environ.get(FLYTE_IMAGE_NAME) == self.image_name()
return True

def exist(self) -> bool:
"""
Check if the image exists in the registry.
Expand Down
4 changes: 2 additions & 2 deletions plugins/flytekit-envd/flytekitplugins/envd/image_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from flytekit.configuration import DefaultImages
from flytekit.core import context_manager
from flytekit.image_spec.image_spec import ImageBuildEngine, ImageSpec, ImageSpecBuilder
from flytekit.image_spec.image_spec import FLYTE_IMAGE_NAME, ImageBuildEngine, ImageSpec, ImageSpecBuilder


class EnvdImageSpecBuilder(ImageSpecBuilder):
Expand Down Expand Up @@ -39,7 +39,7 @@ def create_envd_config(image_spec: ImageSpec) -> str:
packages = [] if image_spec.packages is None else image_spec.packages
apt_packages = [] if image_spec.apt_packages is None else image_spec.apt_packages
env = {} if image_spec.env is None else image_spec.env
env.update({"PYTHONPATH": "/root"})
env.update({"PYTHONPATH": "/root", FLYTE_IMAGE_NAME: image_spec.image_name()})
pingsutw marked this conversation as resolved.
Show resolved Hide resolved

envd_config = f"""# syntax=v1

Expand Down
13 changes: 12 additions & 1 deletion tests/flytekit/unit/core/image_spec/test_image_spec.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import os

import pytest

from flytekit.image_spec import ImageSpec
from flytekit.image_spec.image_spec import ImageBuildEngine, ImageSpecBuilder, calculate_hash_from_image_spec
from flytekit.image_spec.image_spec import (
FLYTE_IMAGE_NAME,
ImageBuildEngine,
ImageSpecBuilder,
calculate_hash_from_image_spec,
)


def test_image_spec():
Expand All @@ -22,6 +29,10 @@ def test_image_spec():
assert image_spec.builder == "envd"
assert image_spec.source_root is None
assert image_spec.env is None
assert image_spec.is_inside() is True
assert image_spec.image_name() == "flytekit:yZ8jICcDTLoDArmNHbWNwg.."
os.environ[FLYTE_IMAGE_NAME] = "flytekit:123"
assert image_spec.is_inside() is False

class DummyImageSpecBuilder(ImageSpecBuilder):
def build_image(self, img):
Expand Down