-
Notifications
You must be signed in to change notification settings - Fork 17.3k
Amazon Bedrock - Model Customization Jobs #38693
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
Merged
ferruzzi
merged 12 commits into
apache:main
from
aws-mwaa:ferruzzi/bedrock/m2-customize-model
Apr 8, 2024
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
266ae49
Amazon Bedrock - Customize Model Operator/Sensor/Waiter/Trigger
ferruzzi 906542a
fix git merge oops
ferruzzi 3999f68
pr fixes
ferruzzi 96803db
fix pr fixes which broke unit tests
ferruzzi 2fdfdf2
sensor tweaks
ferruzzi a5a3b8f
waiter unit tests
ferruzzi 49a34b8
doc fixes
ferruzzi eee5606
niko fixes
ferruzzi 44bc37c
refactor how we handle job name conflicts
ferruzzi 09c0e69
replace while True loop logic
ferruzzi fec3942
unit test tweaks
ferruzzi da75792
vincent fixes
ferruzzi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| from __future__ import annotations | ||
|
|
||
| from typing import TYPE_CHECKING, Any, Sequence | ||
|
|
||
| from airflow.configuration import conf | ||
| from airflow.providers.amazon.aws.sensors.base_aws import AwsBaseSensor | ||
| from airflow.providers.amazon.aws.triggers.bedrock import BedrockCustomizeModelCompletedTrigger | ||
| from airflow.providers.amazon.aws.utils.mixins import aws_template_fields | ||
|
|
||
| if TYPE_CHECKING: | ||
| from airflow.utils.context import Context | ||
|
|
||
| from airflow.exceptions import AirflowException, AirflowSkipException | ||
| from airflow.providers.amazon.aws.hooks.bedrock import BedrockHook | ||
|
|
||
|
|
||
| class BedrockCustomizeModelCompletedSensor(AwsBaseSensor[BedrockHook]): | ||
| """ | ||
| Poll the state of the model customization job until it reaches a terminal state; fails if the job fails. | ||
|
|
||
| .. seealso:: | ||
| For more information on how to use this sensor, take a look at the guide: | ||
| :ref:`howto/sensor:BedrockCustomizeModelCompletedSensor` | ||
|
|
||
|
|
||
| :param job_name: The name of the Bedrock model customization job. | ||
|
|
||
| :param deferrable: If True, the sensor will operate in deferrable mode. This mode requires aiobotocore | ||
| module to be installed. | ||
| (default: False, but can be overridden in config file by setting default_deferrable to True) | ||
| :param max_retries: Number of times before returning the current state. (default: 75) | ||
| :param poke_interval: Polling period in seconds to check for the status of the job. (default: 120) | ||
| :param aws_conn_id: The Airflow connection used for AWS credentials. | ||
| If this is ``None`` or empty then the default boto3 behaviour is used. If | ||
| running Airflow in a distributed manner and aws_conn_id is None or | ||
| empty, then default boto3 configuration would be used (and must be | ||
| maintained on each worker node). | ||
| :param region_name: AWS region_name. If not specified then the default boto3 behaviour is used. | ||
| :param verify: Whether or not to verify SSL certificates. See: | ||
| https://boto3.amazonaws.com/v1/documentation/api/latest/reference/core/session.html | ||
| :param botocore_config: Configuration dictionary (key-values) for botocore client. See: | ||
| https://botocore.amazonaws.com/v1/documentation/api/latest/reference/config.html | ||
| """ | ||
|
|
||
| INTERMEDIATE_STATES = ("InProgress",) | ||
| FAILURE_STATES = ("Failed", "Stopping", "Stopped") | ||
| SUCCESS_STATES = ("Completed",) | ||
| FAILURE_MESSAGE = "Bedrock model customization job sensor failed." | ||
|
|
||
| aws_hook_class = BedrockHook | ||
| template_fields: Sequence[str] = aws_template_fields("job_name") | ||
| ui_color = "#66c3ff" | ||
|
|
||
| def __init__( | ||
| self, | ||
| *, | ||
| job_name: str, | ||
| max_retries: int = 75, | ||
| poke_interval: int = 120, | ||
| deferrable: bool = conf.getboolean("operators", "default_deferrable", fallback=False), | ||
| **kwargs: Any, | ||
| ) -> None: | ||
| super().__init__(**kwargs) | ||
| self.job_name = job_name | ||
| self.poke_interval = poke_interval | ||
| self.max_retries = max_retries | ||
| self.deferrable = deferrable | ||
|
|
||
| def execute(self, context: Context) -> Any: | ||
| if self.deferrable: | ||
| self.defer( | ||
| trigger=BedrockCustomizeModelCompletedTrigger( | ||
| job_name=self.job_name, | ||
| waiter_delay=int(self.poke_interval), | ||
| waiter_max_attempts=self.max_retries, | ||
| aws_conn_id=self.aws_conn_id, | ||
| ), | ||
| method_name="poke", | ||
| ) | ||
| else: | ||
| super().execute(context=context) | ||
|
|
||
| def poke(self, context: Context) -> bool: | ||
| state = self.hook.conn.get_model_customization_job(jobIdentifier=self.job_name)["status"] | ||
| self.log.info("Job '%s' state: %s", self.job_name, state) | ||
|
|
||
| if state in self.FAILURE_STATES: | ||
| # TODO: remove this if block when min_airflow_version is set to higher than 2.7.1 | ||
| if self.soft_fail: | ||
| raise AirflowSkipException(self.FAILURE_MESSAGE) | ||
| raise AirflowException(self.FAILURE_MESSAGE) | ||
|
|
||
| return state not in self.INTERMEDIATE_STATES |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| from __future__ import annotations | ||
|
|
||
| from typing import TYPE_CHECKING | ||
|
|
||
| from airflow.providers.amazon.aws.hooks.bedrock import BedrockHook | ||
| from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger | ||
|
|
||
| if TYPE_CHECKING: | ||
| from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook | ||
|
|
||
|
|
||
| class BedrockCustomizeModelCompletedTrigger(AwsBaseWaiterTrigger): | ||
| """ | ||
| Trigger when a Bedrock model customization job is complete. | ||
|
|
||
| :param job_name: The name of the Bedrock model customization job. | ||
| :param waiter_delay: The amount of time in seconds to wait between attempts. (default: 120) | ||
| :param waiter_max_attempts: The maximum number of attempts to be made. (default: 75) | ||
| :param aws_conn_id: The Airflow connection used for AWS credentials. | ||
| """ | ||
|
|
||
| def __init__( | ||
| self, | ||
| *, | ||
| job_name: str, | ||
| waiter_delay: int = 120, | ||
| waiter_max_attempts: int = 75, | ||
| aws_conn_id: str | None = None, | ||
| ) -> None: | ||
| super().__init__( | ||
| serialized_fields={"job_name": job_name}, | ||
|
ferruzzi marked this conversation as resolved.
|
||
| waiter_name="model_customization_job_complete", | ||
| waiter_args={"jobIdentifier": job_name}, | ||
| failure_message="Bedrock model customization failed.", | ||
| status_message="Status of Bedrock model customization job is", | ||
| status_queries=["status"], | ||
| return_key="job_name", | ||
| return_value=job_name, | ||
| waiter_delay=waiter_delay, | ||
| waiter_max_attempts=waiter_max_attempts, | ||
| aws_conn_id=aws_conn_id, | ||
| ) | ||
|
|
||
| def hook(self) -> AwsGenericHook: | ||
| return BedrockHook(aws_conn_id=self.aws_conn_id) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.