flyte 2.0.0b13__py3-none-any.whl → 2.0.0b15__py3-none-any.whl

flyte/_internal/controllers/remote/_controller.py

@@ -167,7 +167,7 @@ class RemoteController(Controller):
         # It is not allowed to change the code bundle (for regular code bundles) in the middle of a run.
         code_bundle = tctx.code_bundle
 
-        if code_bundle and code_bundle.pkl:
+        if tctx.interactive_mode or (code_bundle and code_bundle.pkl):
             logger.debug(f"Building new pkl bundle for task {_task.name}")
             code_bundle = await build_pkl_bundle(
                 _task,
@@ -436,9 +436,9 @@ class RemoteController(Controller):
 
         current_action_id = tctx.action
         sub_run_output_path = storage.join(tctx.run_base_dir, info.action.name)
+        outputs_file_path: str = ""
 
         if info.interface.has_outputs():
-            outputs_file_path: str = ""
             if info.output:
                 outputs = await convert.convert_from_native_to_outputs(info.output, info.interface)
                 outputs_file_path = io.outputs_path(sub_run_output_path)
@@ -449,41 +449,41 @@ class RemoteController(Controller):
             else:
                 raise flyte.errors.RuntimeSystemError("BadTraceInfo", "Trace info does not have output or error")
 
-            typed_interface = transform_native_to_typed_interface(info.interface)
-
-            trace_action = Action.from_trace(
-                parent_action_name=current_action_id.name,
-                action_id=identifier_pb2.ActionIdentifier(
-                    name=info.action.name,
-                    run=identifier_pb2.RunIdentifier(
-                        name=current_action_id.run_name,
-                        project=current_action_id.project,
-                        domain=current_action_id.domain,
-                        org=current_action_id.org,
-                    ),
+        typed_interface = transform_native_to_typed_interface(info.interface)
+
+        trace_action = Action.from_trace(
+            parent_action_name=current_action_id.name,
+            action_id=identifier_pb2.ActionIdentifier(
+                name=info.action.name,
+                run=identifier_pb2.RunIdentifier(
+                    name=current_action_id.run_name,
+                    project=current_action_id.project,
+                    domain=current_action_id.domain,
+                    org=current_action_id.org,
                 ),
-                inputs_uri=info.inputs_path,
-                outputs_uri=outputs_file_path,
-                friendly_name=info.name,
-                group_data=tctx.group_data,
-                run_output_base=tctx.run_base_dir,
-                start_time=info.start_time,
-                end_time=info.end_time,
-                typed_interface=typed_interface if typed_interface else None,
-            )
+            ),
+            inputs_uri=info.inputs_path,
+            outputs_uri=outputs_file_path,
+            friendly_name=info.name,
+            group_data=tctx.group_data,
+            run_output_base=tctx.run_base_dir,
+            start_time=info.start_time,
+            end_time=info.end_time,
+            typed_interface=typed_interface if typed_interface else None,
+        )
 
-            async with self._parent_action_semaphore[unique_action_name(current_action_id)]:
-                try:
-                    logger.info(
-                        f"Submitting Trace action Run:[{trace_action.run_name},"
-                        f" Parent:[{trace_action.parent_action_name}],"
-                        f" Trace fn:[{info.name}], action:[{info.action.name}]"
-                    )
-                    await self.submit_action(trace_action)
-                    logger.info(f"Trace Action for [{info.name}] action id: {info.action.name}, completed!")
-                except asyncio.CancelledError:
-                    # If the action is cancelled, we need to cancel the action on the server as well
-                    raise
+        async with self._parent_action_semaphore[unique_action_name(current_action_id)]:
+            try:
+                logger.info(
+                    f"Submitting Trace action Run:[{trace_action.run_name},"
+                    f" Parent:[{trace_action.parent_action_name}],"
+                    f" Trace fn:[{info.name}], action:[{info.action.name}]"
+                )
+                await self.submit_action(trace_action)
+                logger.info(f"Trace Action for [{info.name}] action id: {info.action.name}, completed!")
+            except asyncio.CancelledError:
+                # If the action is cancelled, we need to cancel the action on the server as well
+                raise
 
     async def _submit_task_ref(
         self, invoke_seq_num: int, _task: task_definition_pb2.TaskDetails, max_inline_io_bytes: int, *args, **kwargs

flyte/_internal/imagebuild/docker_builder.py

@@ -302,11 +302,9 @@ def _get_secret_commands(layers: typing.Tuple[Layer, ...]) -> typing.List[str]:
     commands = []
 
     def _get_secret_command(secret: str | Secret) -> typing.List[str]:
-        secret_id = hash(secret)
         if isinstance(secret, str):
-            if not os.path.exists(secret):
-                raise FileNotFoundError(f"Secret file '{secret}' not found")
-            return ["--secret", f"id={secret_id},src={secret}"]
+            secret = Secret(key=secret)
+        secret_id = hash(secret)
         secret_env_key = "_".join([k.upper() for k in filter(None, (secret.group, secret.key))])
         secret_env = os.getenv(secret_env_key)
         if secret_env:
@@ -329,18 +327,16 @@ def _get_secret_mounts_layer(secrets: typing.Tuple[str | Secret, ...] | None) ->
     if secrets is None:
         return ""
     secret_mounts_layer = ""
-    for secret in secrets:
+    for s in secrets:
+        secret = Secret(key=s) if isinstance(s, str) else s
         secret_id = hash(secret)
-        if isinstance(secret, str):
-            secret_mounts_layer += f"--mount=type=secret,id={secret_id},target=/run/secrets/{os.path.basename(secret)}"
-        elif isinstance(secret, Secret):
-            if secret.mount:
-                secret_mounts_layer += f"--mount=type=secret,id={secret_id},target={secret.mount}"
-            elif secret.as_env_var:
-                secret_mounts_layer += f"--mount=type=secret,id={secret_id},env={secret.as_env_var}"
-            else:
-                secret_file_name = "_".join(list(filter(None, (secret.group, secret.key))))
-                secret_mounts_layer += f"--mount=type=secret,id={secret_id},src=/run/secrets/{secret_file_name}"
+        if secret.mount:
+            secret_mounts_layer += f"--mount=type=secret,id={secret_id},target={secret.mount}"
+        elif secret.as_env_var:
+            secret_mounts_layer += f"--mount=type=secret,id={secret_id},env={secret.as_env_var}"
+        else:
+            secret_default_env_key = "_".join(list(filter(None, (secret.group, secret.key))))
+            secret_mounts_layer += f"--mount=type=secret,id={secret_id},env={secret_default_env_key}"
 
     return secret_mounts_layer
 

flyte/_internal/imagebuild/remote_builder.py

@@ -19,6 +19,7 @@ from flyte._image import (
     CopyConfig,
     DockerIgnore,
     Env,
+    PipOption,
     PipPackages,
     PythonWheels,
     Requirements,
@@ -28,14 +29,16 @@ from flyte._image import (
 )
 from flyte._internal.imagebuild.image_builder import ImageBuilder, ImageChecker
 from flyte._internal.imagebuild.utils import copy_files_to_context
+from flyte._internal.runtime.task_serde import get_security_context
 from flyte._logging import logger
+from flyte._secret import Secret
 from flyte.remote import ActionOutputs, Run
 
 if TYPE_CHECKING:
     from flyte._protos.imagebuilder import definition_pb2 as image_definition_pb2
 
 IMAGE_TASK_NAME = "build-image"
-OPTIMIZE_TASK_NAME = "optimize_task"
+OPTIMIZE_TASK_NAME = "optimize-task"
 IMAGE_TASK_PROJECT = "system"
 IMAGE_TASK_DOMAIN = "production"
 
@@ -97,12 +100,12 @@ class RemoteImageBuilder(ImageBuilder):
         spec, context = await _validate_configuration(image)
 
         start = datetime.now(timezone.utc)
-        entity = remote.Task.get(
+        entity = await remote.Task.get(
             name=IMAGE_TASK_NAME,
             project=IMAGE_TASK_PROJECT,
             domain=IMAGE_TASK_DOMAIN,
             auto_version="latest",
-        )
+        ).override.aio(secrets=_get_build_secrets_from_image(image))
         run = cast(
             Run,
             await flyte.with_runcontext(project=IMAGE_TASK_PROJECT, domain=IMAGE_TASK_DOMAIN).run.aio(
@@ -179,9 +182,27 @@ def _get_layers_proto(image: Image, context_path: Path) -> "image_definition_pb2
 
     layers = []
     for layer in image._layers:
+        secret_mounts = None
+        pip_options = None
+
+        if isinstance(layer, PipOption):
+            pip_options = image_definition_pb2.PipOptions(
+                index_url=layer.index_url,
+                extra_index_urls=layer.extra_index_urls,
+                pre=layer.pre,
+                extra_args=layer.extra_args,
+            )
+
+        if hasattr(layer, "secret_mounts"):
+            sc = get_security_context(layer.secret_mounts)
+            secret_mounts = sc.secrets if sc else None
+
         if isinstance(layer, AptPackages):
             apt_layer = image_definition_pb2.Layer(
-                apt_packages=image_definition_pb2.AptPackages(packages=layer.packages)
+                apt_packages=image_definition_pb2.AptPackages(
+                    packages=layer.packages,
+                    secret_mounts=secret_mounts,
+                ),
             )
             layers.append(apt_layer)
         elif isinstance(layer, PythonWheels):
@@ -189,12 +210,8 @@ def _get_layers_proto(image: Image, context_path: Path) -> "image_definition_pb2
             wheel_layer = image_definition_pb2.Layer(
                 python_wheels=image_definition_pb2.PythonWheels(
                     dir=str(dst_path.relative_to(context_path)),
-                    options=image_definition_pb2.PipOptions(
-                        index_url=layer.index_url,
-                        extra_index_urls=layer.extra_index_urls,
-                        pre=layer.pre,
-                        extra_args=layer.extra_args,
-                    ),
+                    options=pip_options,
+                    secret_mounts=secret_mounts,
                 )
             )
             layers.append(wheel_layer)
@@ -204,12 +221,8 @@ def _get_layers_proto(image: Image, context_path: Path) -> "image_definition_pb2
             requirements_layer = image_definition_pb2.Layer(
                 requirements=image_definition_pb2.Requirements(
                     file=str(dst_path.relative_to(context_path)),
-                    options=image_definition_pb2.PipOptions(
-                        index_url=layer.index_url,
-                        extra_index_urls=layer.extra_index_urls,
-                        pre=layer.pre,
-                        extra_args=layer.extra_args,
-                    ),
+                    options=pip_options,
+                    secret_mounts=secret_mounts,
                 )
             )
             layers.append(requirements_layer)
@@ -226,12 +239,8 @@ def _get_layers_proto(image: Image, context_path: Path) -> "image_definition_pb2
             pip_layer = image_definition_pb2.Layer(
                 pip_packages=image_definition_pb2.PipPackages(
                     packages=packages,
-                    options=image_definition_pb2.PipOptions(
-                        index_url=layer.index_url,
-                        extra_index_urls=layer.extra_index_urls,
-                        pre=layer.pre,
-                        extra_args=layer.extra_args,
-                    ),
+                    options=pip_options,
+                    secret_mounts=secret_mounts,
                 )
             )
             layers.append(pip_layer)
@@ -250,7 +259,10 @@ def _get_layers_proto(image: Image, context_path: Path) -> "image_definition_pb2
             layers.append(uv_layer)
         elif isinstance(layer, Commands):
             commands_layer = image_definition_pb2.Layer(
-                commands=image_definition_pb2.Commands(cmd=list(layer.commands))
+                commands=image_definition_pb2.Commands(
+                    cmd=list(layer.commands),
+                    secret_mounts=secret_mounts,
+                )
             )
             layers.append(commands_layer)
         elif isinstance(layer, DockerIgnore):
@@ -287,3 +299,20 @@ def _get_layers_proto(image: Image, context_path: Path) -> "image_definition_pb2
 
 def _get_fully_qualified_image_name(outputs: ActionOutputs) -> str:
     return outputs.pb2.literals[0].value.scalar.primitive.string_value
+
+
+def _get_build_secrets_from_image(image: Image) -> Optional[typing.List[Secret]]:
+    secrets = []
+    DEFAULT_SECRET_DIR = Path("etc/flyte/secrets")
+    for layer in image._layers:
+        if isinstance(layer, (PipOption, Commands, AptPackages)) and layer.secret_mounts is not None:
+            for secret_mount in layer.secret_mounts:
+                # Mount all the image secrets to a default directory that will be passed to the BuildKit server.
+                if isinstance(secret_mount, Secret):
+                    secrets.append(Secret(key=secret_mount.key, group=secret_mount.group, mount=DEFAULT_SECRET_DIR))
+                elif isinstance(secret_mount, str):
+                    secrets.append(Secret(key=secret_mount, mount=DEFAULT_SECRET_DIR))
+                else:
+                    raise ValueError(f"Unsupported secret_mount type: {type(secret_mount)}")
+
+    return secrets

flyte/_internal/runtime/entrypoints.py

@@ -142,6 +142,7 @@ async def load_and_run_task(
     code_bundle: CodeBundle | None = None,
     input_path: str | None = None,
     image_cache: ImageCache | None = None,
+    interactive_mode: bool = False,
 ):
     """
     This method is invoked from the runtime/CLI and is used to run a task. This creates the context tree,
@@ -159,6 +160,7 @@ async def load_and_run_task(
     :param code_bundle: The code bundle to use for the task.
     :param input_path: The input path to use for the task.
     :param image_cache: Mappings of Image identifiers to image URIs.
+    :param interactive_mode: Whether to run the task in interactive mode.
     """
     task = await _download_and_load_task(code_bundle, resolver, resolver_args)
 
@@ -175,4 +177,5 @@ async def load_and_run_task(
         code_bundle=code_bundle,
         input_path=input_path,
         image_cache=image_cache,
+        interactive_mode=interactive_mode,
     )

flyte/_internal/runtime/task_serde.py

@@ -54,7 +54,7 @@ def translate_task_to_wire(
     return task_definition_pb2.TaskSpec(
         task_template=tt,
         default_inputs=default_inputs,
-        short_name=task.friendly_name[:_MAX_TASK_SHORT_NAME_LENGTH],
+        short_name=task.short_name[:_MAX_TASK_SHORT_NAME_LENGTH],
         environment=env,
     )
 
@@ -145,7 +145,6 @@ def get_proto_task(task: TaskTemplate, serialize_context: SerializationContext)
             logger.debug(f"Detected pkl bundle for task {task.name}, using computed version as cache version")
             cache_version = serialize_context.code_bundle.computed_version
         else:
-            version_parameters = None
             if isinstance(task, AsyncFunctionTaskTemplate):
                 version_parameters = VersionParameters(func=task.func, image=task.image)
             else:

flyte/_internal/runtime/taskrunner.py

@@ -110,16 +110,18 @@ async def run_task(
 async def convert_and_run(
     *,
     task: TaskTemplate,
-    inputs: Inputs,
     action: ActionID,
     controller: Controller,
     raw_data_path: RawDataPath,
     version: str,
     output_path: str,
     run_base_dir: str,
+    inputs: Inputs = Inputs.empty(),
+    input_path: str | None = None,
     checkpoints: Checkpoints | None = None,
     code_bundle: CodeBundle | None = None,
     image_cache: ImageCache | None = None,
+    interactive_mode: bool = False,
 ) -> Tuple[Optional[Outputs], Optional[Error]]:
     """
     This method is used to convert the inputs to native types, and run the task. It assumes you are running
@@ -130,6 +132,7 @@ async def convert_and_run(
         action=action,
         checkpoints=checkpoints,
         code_bundle=code_bundle,
+        input_path=input_path,
         output_path=output_path,
         run_base_dir=run_base_dir,
         version=version,
@@ -137,8 +140,10 @@ async def convert_and_run(
         compiled_image_cache=image_cache,
         report=flyte.report.Report(name=action.name),
         mode="remote" if not ctx.data.task_context else ctx.data.task_context.mode,
+        interactive_mode=interactive_mode,
     )
     with ctx.replace_task_context(tctx):
+        inputs = await load_inputs(input_path) if input_path else inputs
         inputs_kwargs = await convert_inputs_to_native(inputs, task.native_interface)
         out, err = await run_task(tctx=tctx, controller=controller, task=task, inputs=inputs_kwargs)
         if err is not None:
@@ -161,15 +166,15 @@ async def extract_download_run_upload(
     code_bundle: CodeBundle | None = None,
     input_path: str | None = None,
     image_cache: ImageCache | None = None,
+    interactive_mode: bool = False,
 ):
     """
     This method is invoked from the CLI (urun) and is used to run a task. This assumes that the context tree
     has already been created, and the task has been loaded. It also handles the loading of the task.
     """
-    inputs = await load_inputs(input_path) if input_path else None
     outputs, err = await convert_and_run(
         task=task,
-        inputs=inputs or Inputs.empty(),
+        input_path=input_path,
         action=action,
         controller=controller,
         raw_data_path=raw_data_path,
@@ -179,6 +184,7 @@ async def extract_download_run_upload(
         checkpoints=checkpoints,
         code_bundle=code_bundle,
         image_cache=image_cache,
+        interactive_mode=interactive_mode,
     )
     if err is not None:
         path = await upload_error(err.err, output_path)

flyte/_protos/common/identifier_pb2.py

@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
 from flyte._protos.validate.validate import validate_pb2 as validate_dot_validate__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x63ommon/identifier.proto\x12\x0f\x63loudidl.common\x1a\x17validate/validate.proto\"~\n\x11ProjectIdentifier\x12+\n\x0corganization\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x0corganization\x12\x1f\n\x06\x64omain\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x06\x64omain\x12\x1b\n\x04name\x18\x03 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"T\n\x11\x43lusterIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"O\n\x15\x43lusterPoolIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"_\n\x17\x43lusterConfigIdentifier\x12+\n\x0corganization\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x0corganization\x12\x17\n\x02id\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x02id\"3\n\x0eUserIdentifier\x12!\n\x07subject\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x07subject\":\n\x15\x41pplicationIdentifier\x12!\n\x07subject\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x07subject\"Q\n\x0eRoleIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"O\n\rOrgIdentifier\x12>\n\x04name\x18\x01 \x01(\tB*\xfa\x42\'r%\x10\x01\x18?2\x1f^[a-z0-9]([-a-z0-9]*[a-z0-9])?$R\x04name\"y\n\x18ManagedClusterIdentifier\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\x12:\n\x03org\x18\x03 \x01(\x0b\x32\x1e.cloudidl.common.OrgIdentifierB\x08\xfa\x42\x05\x8a\x01\x02\x10\x01R\x03orgJ\x04\x08\x01\x10\x02\"S\n\x10PolicyIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"\x93\x01\n\rRunIdentifier\x12\x1b\n\x03org\x18\x01 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18?R\x03org\x12#\n\x07project\x18\x02 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18?R\x07project\x12!\n\x06\x64omain\x18\x03 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18?R\x06\x64omain\x12\x1d\n\x04name\x18\x04 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18\x1eR\x04name\"m\n\x10\x41\x63tionIdentifier\x12:\n\x03run\x18\x01 \x01(\x0b\x32\x1e.cloudidl.common.RunIdentifierB\x08\xfa\x42\x05\x8a\x01\x02\x10\x01R\x03run\x12\x1d\n\x04name\x18\x02 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18\x1eR\x04name\"\x86\x01\n\x17\x41\x63tionAttemptIdentifier\x12H\n\taction_id\x18\x01 \x01(\x0b\x32!.cloudidl.common.ActionIdentifierB\x08\xfa\x42\x05\x8a\x01\x02\x10\x01R\x08\x61\x63tionId\x12!\n\x07\x61ttempt\x18\x02 \x01(\rB\x07\xfa\x42\x04*\x02 \x00R\x07\x61ttemptB\xb0\x01\n\x13\x63om.cloudidl.commonB\x0fIdentifierProtoH\x02P\x01Z)github.com/unionai/cloud/gen/pb-go/common\xa2\x02\x03\x43\x43X\xaa\x02\x0f\x43loudidl.Common\xca\x02\x0f\x43loudidl\\Common\xe2\x02\x1b\x43loudidl\\Common\\GPBMetadata\xea\x02\x10\x43loudidl::Commonb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x63ommon/identifier.proto\x12\x0f\x63loudidl.common\x1a\x17validate/validate.proto\"~\n\x11ProjectIdentifier\x12+\n\x0corganization\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x0corganization\x12\x1f\n\x06\x64omain\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x06\x64omain\x12\x1b\n\x04name\x18\x03 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"T\n\x11\x43lusterIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"O\n\x15\x43lusterPoolIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"_\n\x17\x43lusterConfigIdentifier\x12+\n\x0corganization\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x0corganization\x12\x17\n\x02id\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x02id\"\x88\x01\n\x19\x43lusterNodepoolIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12*\n\x0c\x63luster_name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x0b\x63lusterName\x12\x1b\n\x04name\x18\x03 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"3\n\x0eUserIdentifier\x12!\n\x07subject\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x07subject\":\n\x15\x41pplicationIdentifier\x12!\n\x07subject\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x07subject\"Q\n\x0eRoleIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"O\n\rOrgIdentifier\x12>\n\x04name\x18\x01 \x01(\tB*\xfa\x42\'r%\x10\x01\x18?2\x1f^[a-z0-9]([-a-z0-9]*[a-z0-9])?$R\x04name\"y\n\x18ManagedClusterIdentifier\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\x12:\n\x03org\x18\x03 \x01(\x0b\x32\x1e.cloudidl.common.OrgIdentifierB\x08\xfa\x42\x05\x8a\x01\x02\x10\x01R\x03orgJ\x04\x08\x01\x10\x02\"S\n\x10PolicyIdentifier\x12\"\n\x0corganization\x18\x01 \x01(\tR\x0corganization\x12\x1b\n\x04name\x18\x02 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"\x93\x01\n\rRunIdentifier\x12\x1b\n\x03org\x18\x01 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18?R\x03org\x12#\n\x07project\x18\x02 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18?R\x07project\x12!\n\x06\x64omain\x18\x03 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18?R\x06\x64omain\x12\x1d\n\x04name\x18\x04 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18\x1eR\x04name\"m\n\x10\x41\x63tionIdentifier\x12:\n\x03run\x18\x01 \x01(\x0b\x32\x1e.cloudidl.common.RunIdentifierB\x08\xfa\x42\x05\x8a\x01\x02\x10\x01R\x03run\x12\x1d\n\x04name\x18\x02 \x01(\tB\t\xfa\x42\x06r\x04\x10\x01\x18\x1eR\x04name\"\x86\x01\n\x17\x41\x63tionAttemptIdentifier\x12H\n\taction_id\x18\x01 \x01(\x0b\x32!.cloudidl.common.ActionIdentifierB\x08\xfa\x42\x05\x8a\x01\x02\x10\x01R\x08\x61\x63tionId\x12!\n\x07\x61ttempt\x18\x02 \x01(\rB\x07\xfa\x42\x04*\x02 \x00R\x07\x61ttemptB\xb0\x01\n\x13\x63om.cloudidl.commonB\x0fIdentifierProtoH\x02P\x01Z)github.com/unionai/cloud/gen/pb-go/common\xa2\x02\x03\x43\x43X\xaa\x02\x0f\x43loudidl.Common\xca\x02\x0f\x43loudidl\\Common\xe2\x02\x1b\x43loudidl\\Common\\GPBMetadata\xea\x02\x10\x43loudidl::Commonb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -34,6 +34,10 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _CLUSTERCONFIGIDENTIFIER.fields_by_name['organization']._serialized_options = b'\372B\004r\002\020\001'
   _CLUSTERCONFIGIDENTIFIER.fields_by_name['id']._options = None
   _CLUSTERCONFIGIDENTIFIER.fields_by_name['id']._serialized_options = b'\372B\004r\002\020\001'
+  _CLUSTERNODEPOOLIDENTIFIER.fields_by_name['cluster_name']._options = None
+  _CLUSTERNODEPOOLIDENTIFIER.fields_by_name['cluster_name']._serialized_options = b'\372B\004r\002\020\001'
+  _CLUSTERNODEPOOLIDENTIFIER.fields_by_name['name']._options = None
+  _CLUSTERNODEPOOLIDENTIFIER.fields_by_name['name']._serialized_options = b'\372B\004r\002\020\001'
   _USERIDENTIFIER.fields_by_name['subject']._options = None
   _USERIDENTIFIER.fields_by_name['subject']._serialized_options = b'\372B\004r\002\020\001'
   _APPLICATIONIDENTIFIER.fields_by_name['subject']._options = None
@@ -72,22 +76,24 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_CLUSTERPOOLIDENTIFIER']._serialized_end=362
   _globals['_CLUSTERCONFIGIDENTIFIER']._serialized_start=364
   _globals['_CLUSTERCONFIGIDENTIFIER']._serialized_end=459
-  _globals['_USERIDENTIFIER']._serialized_start=461
-  _globals['_USERIDENTIFIER']._serialized_end=512
-  _globals['_APPLICATIONIDENTIFIER']._serialized_start=514
-  _globals['_APPLICATIONIDENTIFIER']._serialized_end=572
-  _globals['_ROLEIDENTIFIER']._serialized_start=574
-  _globals['_ROLEIDENTIFIER']._serialized_end=655
-  _globals['_ORGIDENTIFIER']._serialized_start=657
-  _globals['_ORGIDENTIFIER']._serialized_end=736
-  _globals['_MANAGEDCLUSTERIDENTIFIER']._serialized_start=738
-  _globals['_MANAGEDCLUSTERIDENTIFIER']._serialized_end=859
-  _globals['_POLICYIDENTIFIER']._serialized_start=861
-  _globals['_POLICYIDENTIFIER']._serialized_end=944
-  _globals['_RUNIDENTIFIER']._serialized_start=947
-  _globals['_RUNIDENTIFIER']._serialized_end=1094
-  _globals['_ACTIONIDENTIFIER']._serialized_start=1096
-  _globals['_ACTIONIDENTIFIER']._serialized_end=1205
-  _globals['_ACTIONATTEMPTIDENTIFIER']._serialized_start=1208
-  _globals['_ACTIONATTEMPTIDENTIFIER']._serialized_end=1342
+  _globals['_CLUSTERNODEPOOLIDENTIFIER']._serialized_start=462
+  _globals['_CLUSTERNODEPOOLIDENTIFIER']._serialized_end=598
+  _globals['_USERIDENTIFIER']._serialized_start=600
+  _globals['_USERIDENTIFIER']._serialized_end=651
+  _globals['_APPLICATIONIDENTIFIER']._serialized_start=653
+  _globals['_APPLICATIONIDENTIFIER']._serialized_end=711
+  _globals['_ROLEIDENTIFIER']._serialized_start=713
+  _globals['_ROLEIDENTIFIER']._serialized_end=794
+  _globals['_ORGIDENTIFIER']._serialized_start=796
+  _globals['_ORGIDENTIFIER']._serialized_end=875
+  _globals['_MANAGEDCLUSTERIDENTIFIER']._serialized_start=877
+  _globals['_MANAGEDCLUSTERIDENTIFIER']._serialized_end=998
+  _globals['_POLICYIDENTIFIER']._serialized_start=1000
+  _globals['_POLICYIDENTIFIER']._serialized_end=1083
+  _globals['_RUNIDENTIFIER']._serialized_start=1086
+  _globals['_RUNIDENTIFIER']._serialized_end=1233
+  _globals['_ACTIONIDENTIFIER']._serialized_start=1235
+  _globals['_ACTIONIDENTIFIER']._serialized_end=1344
+  _globals['_ACTIONATTEMPTIDENTIFIER']._serialized_start=1347
+  _globals['_ACTIONATTEMPTIDENTIFIER']._serialized_end=1481
 # @@protoc_insertion_point(module_scope)

flyte/_protos/common/identifier_pb2.pyi

@@ -39,6 +39,16 @@ class ClusterConfigIdentifier(_message.Message):
     id: str
     def __init__(self, organization: _Optional[str] = ..., id: _Optional[str] = ...) -> None: ...
 
+class ClusterNodepoolIdentifier(_message.Message):
+    __slots__ = ["organization", "cluster_name", "name"]
+    ORGANIZATION_FIELD_NUMBER: _ClassVar[int]
+    CLUSTER_NAME_FIELD_NUMBER: _ClassVar[int]
+    NAME_FIELD_NUMBER: _ClassVar[int]
+    organization: str
+    cluster_name: str
+    name: str
+    def __init__(self, organization: _Optional[str] = ..., cluster_name: _Optional[str] = ..., name: _Optional[str] = ...) -> None: ...
+
 class UserIdentifier(_message.Message):
     __slots__ = ["subject"]
     SUBJECT_FIELD_NUMBER: _ClassVar[int]

flyte/_protos/imagebuilder/definition_pb2.py

@@ -11,10 +11,11 @@ from google.protobuf.internal import builder as _builder
 _sym_db = _symbol_database.Default()
 
 
+from flyteidl.core import security_pb2 as flyteidl_dot_core_dot_security__pb2
 from flyte._protos.validate.validate import validate_pb2 as validate_dot_validate__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dimagebuilder/definition.proto\x12\x15\x63loudidl.imagebuilder\x1a\x17validate/validate.proto\".\n\x0fImageIdentifier\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"S\n\x05Image\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.cloudidl.imagebuilder.ImageIdentifierR\x02id\x12\x12\n\x04\x66qin\x18\x02 \x01(\tR\x04\x66qin\")\n\x0b\x41ptPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\"\x84\x01\n\nPipOptions\x12\x1b\n\tindex_url\x18\x02 \x01(\tR\x08indexUrl\x12(\n\x10\x65xtra_index_urls\x18\x03 \x03(\tR\x0e\x65xtraIndexUrls\x12\x10\n\x03pre\x18\x04 \x01(\x08R\x03pre\x12\x1d\n\nextra_args\x18\x05 \x01(\tR\textraArgs\"f\n\x0bPipPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\x12;\n\x07options\x18\x02 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\"_\n\x0cRequirements\x12\x12\n\x04\x66ile\x18\x01 \x01(\tR\x04\x66ile\x12;\n\x07options\x18\x02 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\"]\n\x0cPythonWheels\x12\x10\n\x03\x64ir\x18\x01 \x01(\tR\x03\x64ir\x12;\n\x07options\x18\x02 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\"~\n\tUVProject\x12\x1c\n\tpyproject\x18\x01 \x01(\tR\tpyproject\x12\x16\n\x06uvlock\x18\x02 \x01(\tR\x06uvlock\x12;\n\x07options\x18\x03 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\"\x1c\n\x08\x43ommands\x12\x10\n\x03\x63md\x18\x02 \x03(\tR\x03\x63md\"#\n\x07WorkDir\x12\x18\n\x07workdir\x18\x01 \x01(\tR\x07workdir\"0\n\nCopyConfig\x12\x10\n\x03src\x18\x01 \x01(\tR\x03src\x12\x10\n\x03\x64st\x18\x02 \x01(\tR\x03\x64st\"\x99\x01\n\x03\x45nv\x12Q\n\renv_variables\x18\x01 \x03(\x0b\x32,.cloudidl.imagebuilder.Env.EnvVariablesEntryR\x0c\x65nvVariables\x1a?\n\x11\x45nvVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xed\x04\n\x05Layer\x12G\n\x0c\x61pt_packages\x18\x01 \x01(\x0b\x32\".cloudidl.imagebuilder.AptPackagesH\x00R\x0b\x61ptPackages\x12G\n\x0cpip_packages\x18\x02 \x01(\x0b\x32\".cloudidl.imagebuilder.PipPackagesH\x00R\x0bpipPackages\x12=\n\x08\x63ommands\x18\x03 \x01(\x0b\x32\x1f.cloudidl.imagebuilder.CommandsH\x00R\x08\x63ommands\x12I\n\x0crequirements\x18\x04 \x01(\x0b\x32#.cloudidl.imagebuilder.RequirementsH\x00R\x0crequirements\x12J\n\rpython_wheels\x18\x05 \x01(\x0b\x32#.cloudidl.imagebuilder.PythonWheelsH\x00R\x0cpythonWheels\x12:\n\x07workdir\x18\x06 \x01(\x0b\x32\x1e.cloudidl.imagebuilder.WorkDirH\x00R\x07workdir\x12\x44\n\x0b\x63opy_config\x18\x07 \x01(\x0b\x32!.cloudidl.imagebuilder.CopyConfigH\x00R\ncopyConfig\x12\x41\n\nuv_project\x18\x08 \x01(\x0b\x32 .cloudidl.imagebuilder.UVProjectH\x00R\tuvProject\x12.\n\x03\x65nv\x18\t \x01(\x0b\x32\x1a.cloudidl.imagebuilder.EnvH\x00R\x03\x65nvB\x07\n\x05layer\"\xa3\x01\n\tImageSpec\x12\x1d\n\nbase_image\x18\x01 \x01(\tR\tbaseImage\x12%\n\x0epython_version\x18\x02 \x01(\tR\rpythonVersion\x12\x34\n\x06layers\x18\x03 \x03(\x0b\x32\x1c.cloudidl.imagebuilder.LayerR\x06layers\x12\x1a\n\x08platform\x18\x04 \x03(\tR\x08platformB\xd4\x01\n\x19\x63om.cloudidl.imagebuilderB\x0f\x44\x65\x66initionProtoH\x02P\x01Z/github.com/unionai/cloud/gen/pb-go/imagebuilder\xa2\x02\x03\x43IX\xaa\x02\x15\x43loudidl.Imagebuilder\xca\x02\x15\x43loudidl\\Imagebuilder\xe2\x02!Cloudidl\\Imagebuilder\\GPBMetadata\xea\x02\x16\x43loudidl::Imagebuilderb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dimagebuilder/definition.proto\x12\x15\x63loudidl.imagebuilder\x1a\x1c\x66lyteidl/core/security.proto\x1a\x17validate/validate.proto\".\n\x0fImageIdentifier\x12\x1b\n\x04name\x18\x01 \x01(\tB\x07\xfa\x42\x04r\x02\x10\x01R\x04name\"S\n\x05Image\x12\x36\n\x02id\x18\x01 \x01(\x0b\x32&.cloudidl.imagebuilder.ImageIdentifierR\x02id\x12\x12\n\x04\x66qin\x18\x02 \x01(\tR\x04\x66qin\"e\n\x0b\x41ptPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\x12:\n\rsecret_mounts\x18\x02 \x03(\x0b\x32\x15.flyteidl.core.SecretR\x0csecretMounts\"\x84\x01\n\nPipOptions\x12\x1b\n\tindex_url\x18\x02 \x01(\tR\x08indexUrl\x12(\n\x10\x65xtra_index_urls\x18\x03 \x03(\tR\x0e\x65xtraIndexUrls\x12\x10\n\x03pre\x18\x04 \x01(\x08R\x03pre\x12\x1d\n\nextra_args\x18\x05 \x01(\tR\textraArgs\"\xa2\x01\n\x0bPipPackages\x12\x1a\n\x08packages\x18\x01 \x03(\tR\x08packages\x12;\n\x07options\x18\x02 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\x12:\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x15.flyteidl.core.SecretR\x0csecretMounts\"\x9b\x01\n\x0cRequirements\x12\x12\n\x04\x66ile\x18\x01 \x01(\tR\x04\x66ile\x12;\n\x07options\x18\x02 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\x12:\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x15.flyteidl.core.SecretR\x0csecretMounts\"\x99\x01\n\x0cPythonWheels\x12\x10\n\x03\x64ir\x18\x01 \x01(\tR\x03\x64ir\x12;\n\x07options\x18\x02 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\x12:\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x15.flyteidl.core.SecretR\x0csecretMounts\"\xba\x01\n\tUVProject\x12\x1c\n\tpyproject\x18\x01 \x01(\tR\tpyproject\x12\x16\n\x06uvlock\x18\x02 \x01(\tR\x06uvlock\x12;\n\x07options\x18\x03 \x01(\x0b\x32!.cloudidl.imagebuilder.PipOptionsR\x07options\x12:\n\rsecret_mounts\x18\x04 \x03(\x0b\x32\x15.flyteidl.core.SecretR\x0csecretMounts\"X\n\x08\x43ommands\x12\x10\n\x03\x63md\x18\x02 \x03(\tR\x03\x63md\x12:\n\rsecret_mounts\x18\x03 \x03(\x0b\x32\x15.flyteidl.core.SecretR\x0csecretMounts\"#\n\x07WorkDir\x12\x18\n\x07workdir\x18\x01 \x01(\tR\x07workdir\"0\n\nCopyConfig\x12\x10\n\x03src\x18\x01 \x01(\tR\x03src\x12\x10\n\x03\x64st\x18\x02 \x01(\tR\x03\x64st\"\x99\x01\n\x03\x45nv\x12Q\n\renv_variables\x18\x01 \x03(\x0b\x32,.cloudidl.imagebuilder.Env.EnvVariablesEntryR\x0c\x65nvVariables\x1a?\n\x11\x45nvVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xed\x04\n\x05Layer\x12G\n\x0c\x61pt_packages\x18\x01 \x01(\x0b\x32\".cloudidl.imagebuilder.AptPackagesH\x00R\x0b\x61ptPackages\x12G\n\x0cpip_packages\x18\x02 \x01(\x0b\x32\".cloudidl.imagebuilder.PipPackagesH\x00R\x0bpipPackages\x12=\n\x08\x63ommands\x18\x03 \x01(\x0b\x32\x1f.cloudidl.imagebuilder.CommandsH\x00R\x08\x63ommands\x12I\n\x0crequirements\x18\x04 \x01(\x0b\x32#.cloudidl.imagebuilder.RequirementsH\x00R\x0crequirements\x12J\n\rpython_wheels\x18\x05 \x01(\x0b\x32#.cloudidl.imagebuilder.PythonWheelsH\x00R\x0cpythonWheels\x12:\n\x07workdir\x18\x06 \x01(\x0b\x32\x1e.cloudidl.imagebuilder.WorkDirH\x00R\x07workdir\x12\x44\n\x0b\x63opy_config\x18\x07 \x01(\x0b\x32!.cloudidl.imagebuilder.CopyConfigH\x00R\ncopyConfig\x12\x41\n\nuv_project\x18\x08 \x01(\x0b\x32 .cloudidl.imagebuilder.UVProjectH\x00R\tuvProject\x12.\n\x03\x65nv\x18\t \x01(\x0b\x32\x1a.cloudidl.imagebuilder.EnvH\x00R\x03\x65nvB\x07\n\x05layer\"\xa3\x01\n\tImageSpec\x12\x1d\n\nbase_image\x18\x01 \x01(\tR\tbaseImage\x12%\n\x0epython_version\x18\x02 \x01(\tR\rpythonVersion\x12\x34\n\x06layers\x18\x03 \x03(\x0b\x32\x1c.cloudidl.imagebuilder.LayerR\x06layers\x12\x1a\n\x08platform\x18\x04 \x03(\tR\x08platformB\xd4\x01\n\x19\x63om.cloudidl.imagebuilderB\x0f\x44\x65\x66initionProtoH\x02P\x01Z/github.com/unionai/cloud/gen/pb-go/imagebuilder\xa2\x02\x03\x43IX\xaa\x02\x15\x43loudidl.Imagebuilder\xca\x02\x15\x43loudidl\\Imagebuilder\xe2\x02!Cloudidl\\Imagebuilder\\GPBMetadata\xea\x02\x16\x43loudidl::Imagebuilderb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -26,34 +27,34 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _IMAGEIDENTIFIER.fields_by_name['name']._serialized_options = b'\372B\004r\002\020\001'
   _ENV_ENVVARIABLESENTRY._options = None
   _ENV_ENVVARIABLESENTRY._serialized_options = b'8\001'
-  _globals['_IMAGEIDENTIFIER']._serialized_start=81
-  _globals['_IMAGEIDENTIFIER']._serialized_end=127
-  _globals['_IMAGE']._serialized_start=129
-  _globals['_IMAGE']._serialized_end=212
-  _globals['_APTPACKAGES']._serialized_start=214
-  _globals['_APTPACKAGES']._serialized_end=255
-  _globals['_PIPOPTIONS']._serialized_start=258
-  _globals['_PIPOPTIONS']._serialized_end=390
-  _globals['_PIPPACKAGES']._serialized_start=392
-  _globals['_PIPPACKAGES']._serialized_end=494
-  _globals['_REQUIREMENTS']._serialized_start=496
-  _globals['_REQUIREMENTS']._serialized_end=591
-  _globals['_PYTHONWHEELS']._serialized_start=593
-  _globals['_PYTHONWHEELS']._serialized_end=686
-  _globals['_UVPROJECT']._serialized_start=688
-  _globals['_UVPROJECT']._serialized_end=814
-  _globals['_COMMANDS']._serialized_start=816
-  _globals['_COMMANDS']._serialized_end=844
-  _globals['_WORKDIR']._serialized_start=846
-  _globals['_WORKDIR']._serialized_end=881
-  _globals['_COPYCONFIG']._serialized_start=883
-  _globals['_COPYCONFIG']._serialized_end=931
-  _globals['_ENV']._serialized_start=934
-  _globals['_ENV']._serialized_end=1087
-  _globals['_ENV_ENVVARIABLESENTRY']._serialized_start=1024
-  _globals['_ENV_ENVVARIABLESENTRY']._serialized_end=1087
-  _globals['_LAYER']._serialized_start=1090
-  _globals['_LAYER']._serialized_end=1711
-  _globals['_IMAGESPEC']._serialized_start=1714
-  _globals['_IMAGESPEC']._serialized_end=1877
+  _globals['_IMAGEIDENTIFIER']._serialized_start=111
+  _globals['_IMAGEIDENTIFIER']._serialized_end=157
+  _globals['_IMAGE']._serialized_start=159
+  _globals['_IMAGE']._serialized_end=242
+  _globals['_APTPACKAGES']._serialized_start=244
+  _globals['_APTPACKAGES']._serialized_end=345
+  _globals['_PIPOPTIONS']._serialized_start=348
+  _globals['_PIPOPTIONS']._serialized_end=480
+  _globals['_PIPPACKAGES']._serialized_start=483
+  _globals['_PIPPACKAGES']._serialized_end=645
+  _globals['_REQUIREMENTS']._serialized_start=648
+  _globals['_REQUIREMENTS']._serialized_end=803
+  _globals['_PYTHONWHEELS']._serialized_start=806
+  _globals['_PYTHONWHEELS']._serialized_end=959
+  _globals['_UVPROJECT']._serialized_start=962
+  _globals['_UVPROJECT']._serialized_end=1148
+  _globals['_COMMANDS']._serialized_start=1150
+  _globals['_COMMANDS']._serialized_end=1238
+  _globals['_WORKDIR']._serialized_start=1240
+  _globals['_WORKDIR']._serialized_end=1275
+  _globals['_COPYCONFIG']._serialized_start=1277
+  _globals['_COPYCONFIG']._serialized_end=1325
+  _globals['_ENV']._serialized_start=1328
+  _globals['_ENV']._serialized_end=1481
+  _globals['_ENV_ENVVARIABLESENTRY']._serialized_start=1418
+  _globals['_ENV_ENVVARIABLESENTRY']._serialized_end=1481
+  _globals['_LAYER']._serialized_start=1484
+  _globals['_LAYER']._serialized_end=2105
+  _globals['_IMAGESPEC']._serialized_start=2108
+  _globals['_IMAGESPEC']._serialized_end=2271
 # @@protoc_insertion_point(module_scope)