Skip to content

Commit 4a5da6e

Browse files
Increment arthur-engine version (#904)
2 parents 6f53ff3 + 9581e4c commit 4a5da6e

File tree

247 files changed

+27170
-7486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+27170
-7486
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ values.yaml
3838

3939
ml-engine/src/genai_client/**
4040
.vagrant
41+
42+
.cursor/

deployment/README_RELEASE.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Release Process
2+
3+
## Prerequisites
4+
- Ensure all necessary commits are merged to the `dev` branch
5+
- Verify integration tests are passing for the ML engine by running them locally
6+
- Verify integration tests are passing for the GenAI engine by running them locally
7+
8+
## Dev Release
9+
1. In GitHub Actions, manually run the **Version Management** workflow with the default inputs (`dev` branch, patch bump)
10+
2. This will create a dev release and trigger the Arthur Engine CI workflow
11+
12+
## Production Release
13+
1. After the dev release pipeline has succeeded, create a PR to merge `dev` into `main`
14+
2. **Important**: The version bump commit must be the most recent commit in this PR, or the release won't be triggered
15+
3. Merge the PR to trigger the production release
16+
4. Let Madeleine know to publish the release notes on GitHub.
17+
18+
> **Note**: The version bump commit requirement prevents unintended commits from being included in the release.

deployment/cloudformation/root-arthur-engine-cpu.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,14 @@ Parameters:
319319
Type: Number
320320
Description: 'The desired number of tasks running for ML Engine ECS service'
321321
Default: 2
322+
MLEngineFargateTaskCPUValue:
323+
Type: Number
324+
Default: 2048
325+
Description: 'CPU value for AWS Fargate per ML Engine ECS task'
326+
MLEngineFargateTaskMemoryValue:
327+
Type: Number
328+
Default: 4096
329+
Description: 'Memory value for AWS Fargate per ML Engine ECS task'
322330
Metadata:
323331
AWS::CloudFormation::Interface:
324332
ParameterGroups:
@@ -404,10 +412,10 @@ Metadata:
404412
default: 'Advanced ML Engine'
405413
Parameters:
406414
- MLEngineVersion
407-
- MLEngineClientId
408-
- MLEngineClientSecret
409415
- MLEngineContainerImageLocation
410416
- MLEngineBYOAppSecurityGroupIDs
417+
- MLEngineFargateTaskCPUValue
418+
- MLEngineFargateTaskMemoryValue
411419
- Label:
412420
default: 'Advanced ML Engine (IAM)'
413421
Parameters:
@@ -563,6 +571,10 @@ Metadata:
563571
default: 'Bring-Your-Own ML Engine Task Execution Role'
564572
MLEngineBYOAppSecurityGroupIDs:
565573
default: 'Bring-Your-Own ML Engine Application Security Group IDs'
574+
MLEngineFargateTaskCPUValue:
575+
default: 'ML Engine ECS CPU Value. Must be compatible with ECS Memory Value'
576+
MLEngineFargateTaskMemoryValue:
577+
default: 'ML Engine ECS Memory Value. Must be compatible with ECS CPU Value'
566578
ArthurApiHost:
567579
default: 'Arthur Platform URL'
568580
Conditions:
@@ -743,6 +755,8 @@ Resources:
743755
MLEngineClientCredentialsSecretARN: !GetAtt [ MLEngineSecretsStack, Outputs.MLEngineClientCredentialsSecretOutput ]
744756
GenaiEngineInternalAPIKeySecretARN: !GetAtt [ GenaiEngineSecretsStack, Outputs.GenaiEngineAPIKeySecretOutput ]
745757
GenaiEngineInternalIngressHost: !Ref GenaiEngineIngressURL
758+
MLEngineFargateTaskCPUValue: !Ref MLEngineFargateTaskCPUValue
759+
MLEngineFargateTaskMemoryValue: !Ref MLEngineFargateTaskMemoryValue
746760
TemplateURL: "https://arthur-cft.s3.us-east-2.amazonaws.com/arthur-engine/templates/REPLACE_ME_GENAI_ENGINE_VERSION/ml-engine/arthur-ml-engine-ecs-task-definition.yml"
747761
GenaiEngineLBStack:
748762
Type: AWS::CloudFormation::Stack

deployment/cloudformation/root-arthur-engine-gpu.yml

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,14 @@ Parameters:
433433
Type: Number
434434
Description: 'The desired number of tasks running for ML Engine ECS service'
435435
Default: 2
436+
MLEngineFargateTaskCPUValue:
437+
Type: Number
438+
Default: 2048
439+
Description: 'CPU value for AWS Fargate per ML Engine ECS task'
440+
MLEngineFargateTaskMemoryValue:
441+
Type: Number
442+
Default: 4096
443+
Description: 'Memory value for AWS Fargate per ML Engine ECS task'
436444
Metadata:
437445
AWS::CloudFormation::Interface:
438446
ParameterGroups:
@@ -540,13 +548,39 @@ Metadata:
540548
- GenaiEngineHallucinationCheckMaxTokenLimit
541549
- GenaiEngineToxicityCheckMaxTokenLimit
542550
- GenaiEngineUsePIIModelV2
551+
- Label:
552+
default: 'Advanced ML Engine'
553+
Parameters:
554+
- MLEngineVersion
555+
- MLEngineContainerImageLocation
556+
- MLEngineBYOAppSecurityGroupIDs
557+
- MLEngineFargateTaskCPUValue
558+
- MLEngineFargateTaskMemoryValue
559+
- Label:
560+
default: 'Advanced ML Engine (IAM)'
561+
Parameters:
562+
- MLEngineBYOTaskRoleIAMArn
563+
- MLEngineBYOTaskExecutionRoleIAMArn
564+
- Label:
565+
default: 'Advanced ML Engine (Scalability)'
566+
Parameters:
567+
- MLEngineECSServiceTaskDesiredCount
568+
- MLEngineECSAutoscalingMinCapacity
569+
- MLEngineECSAutoscalingMaxCapacity
570+
- MLEngineECSScaleCPUTargetValue
571+
- MLEngineECSScaleMemoryTargetValue
572+
- MLEngineECSScaleInCooldownInSecs
573+
- MLEngineECSScaleOutCooldownInSecs
574+
- Label:
575+
default: 'Advanced ML Engine (Platform Monitoring)'
576+
Parameters:
577+
- MLEngineECSCPUAlarmThreshold
578+
- MLEngineECSMemoryAlarmThreshold
543579
ParameterLabels:
544580
ArthurResourceNamespace:
545581
default: 'Arthur Platform Resource Namespace'
546582
ArthurResourceNameSuffix:
547583
default: 'Arthur Platform Resource Name Suffix'
548-
MLEngineContainerImageLocation:
549-
default: 'ML Engine Container Image Location'
550584
ContainerRepositoryUsername:
551585
default: 'Container Repository Username'
552586
ContainerRepositoryPassword:
@@ -723,6 +757,10 @@ Metadata:
723757
default: 'ML Engine ECS Autoscaling Minimum Capacity'
724758
MLEngineECSServiceTaskDesiredCount:
725759
default: 'ML Engine ECS Service Task Desired Count'
760+
MLEngineFargateTaskCPUValue:
761+
default: 'ML Engine ECS CPU Value. Must be compatible with ECS Memory Value'
762+
MLEngineFargateTaskMemoryValue:
763+
default: 'ML Engine ECS Memory Value. Must be compatible with ECS CPU Value'
726764
Conditions:
727765
ContainerRepositoryCredentialRequired:
728766
!Not [ !Equals [ !Ref ContainerRepositoryUsername, '' ] ]
@@ -900,6 +938,8 @@ Resources:
900938
MLEngineClientCredentialsSecretARN: !GetAtt [ MLEngineSecretsStack, Outputs.MLEngineClientCredentialsSecretOutput ]
901939
GenaiEngineInternalAPIKeySecretARN: !GetAtt [ GenaiEngineSecretsStack, Outputs.GenaiEngineAPIKeySecretOutput ]
902940
GenaiEngineInternalIngressHost: !Ref GenaiEngineIngressURL
941+
MLEngineFargateTaskCPUValue: !Ref MLEngineFargateTaskCPUValue
942+
MLEngineFargateTaskMemoryValue: !Ref MLEngineFargateTaskMemoryValue
903943
TemplateURL: "https://arthur-cft.s3.us-east-2.amazonaws.com/arthur-engine/templates/REPLACE_ME_GENAI_ENGINE_VERSION/ml-engine/arthur-ml-engine-ecs-task-definition.yml"
904944
GenaiEngineLBStack:
905945
Type: AWS::CloudFormation::Stack
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://arthur-cft.s3.us-east-2.amazonaws.com/arthur-engine/templates/2.1.209/root-arthur-engine-cpu.yml&stackName=arthur-engine&param_MLEngineClientId=yourClientIdHere">
1+
<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://arthur-cft.s3.us-east-2.amazonaws.com/arthur-engine/templates/2.1.235/root-arthur-engine-cpu.yml&stackName=arthur-engine&param_MLEngineClientId=yourClientIdHere">
22
<img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch">
33
</a>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://arthur-cft.s3.us-east-2.amazonaws.com/arthur-engine/templates/2.1.209/root-arthur-engine-gpu.yml&stackName=arthur-engine&param_MLEngineClientId=yourClientIdHere">
1+
<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://arthur-cft.s3.us-east-2.amazonaws.com/arthur-engine/templates/2.1.235/root-arthur-engine-gpu.yml&stackName=arthur-engine&param_MLEngineClientId=yourClientIdHere">
22
<img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch">
33
</a>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Chart.yaml
22
apiVersion: v2
33
name: arthur-engine
4-
version: 2.1.209
4+
version: 2.1.235
55
dependencies:
66
- name: arthur-genai-engine
7-
version: 2.1.209
7+
version: 2.1.235
88
repository: oci://ghcr.io/arthur-ai/arthur-engine/charts
99
- name: arthur-ml-engine
10-
version: 2.1.209
10+
version: 2.1.235
1111
repository: oci://ghcr.io/arthur-ai/arthur-engine/charts

deployment/helm/arthur-engine/start.sh.template.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
K8S_NAMESPACE=arthur
4-
ARTHUR_ENGINE_VERSION=2.1.209
4+
ARTHUR_ENGINE_VERSION=2.1.235
55
POSTGRES_USER=arthur_genai_engine
66
POSTGRES_PASSWORD=changeme_pg_password
77
POSTGRES_ENDPOINT=mydb

deployment/helm/arthur-engine/start.sh.template.gpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
K8S_NAMESPACE=arthur
4-
ARTHUR_ENGINE_VERSION=2.1.209
4+
ARTHUR_ENGINE_VERSION=2.1.235
55
POSTGRES_USER=arthur_genai_engine
66
POSTGRES_PASSWORD=changeme_pg_password
77
POSTGRES_ENDPOINT=mydb

deployment/helm/arthur-engine/values.yaml.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ arthur-genai-engine:
9696
## Advanced - GenAI Engine
9797
###################################
9898
# GenAI Engine version
99-
genaiEngineVersion: 2.1.209
99+
genaiEngineVersion: 2.1.235
100100
# Max number of tokens GenAI Engine can process against LLM for hallucination data checks
101101
genaiEngineHallucinationCheckMaxTokenLimit: 3000
102102
# Max number of tokens GenAI Engine can process against LLM for sensitive data checks

0 commit comments

Comments
 (0)