Skip to content

Commit 23e3135

Browse files
beniericbenieric
authored
Merge branch 'master' into distutils-removal
2 parents f3983b6 + 6df69e3 commit 23e3135

File tree

224 files changed

+12942
-4315
lines changed

Some content is hidden

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

224 files changed

+12942
-4315
lines changed

‎.github/workflows/codeql.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "CodeQL"
2+
on:
3+
push:
4+
branches: [ "master" ]
5+
pull_request:
6+
branches: [ "master" ]
7+
schedule:
8+
- cron: '30 15 * * *'
9+
jobs:
10+
analyze:
11+
name: Analyze (${{ matrix.language }})
12+
runs-on: ${{ 'ubuntu-latest' }}
13+
permissions:
14+
security-events: write
15+
packages: read
16+
17+
strategy:
18+
matrix:
19+
include:
20+
- language: python
21+
build-mode: none
22+
- language: java-kotlin
23+
build-mode: none
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6
27+
- name: Initialize CodeQL
28+
uses: github/codeql-action/init@4b1d7da102ff94aca014c0245062b1a463356d72
29+
with:
30+
languages: ${{ matrix.language }}
31+
build-mode: ${{ matrix.build-mode }}
32+
- name: Perform CodeQL Analysis
33+
uses: github/codeql-action/analyze@4b1d7da102ff94aca014c0245062b1a463356d72
34+
with:
35+
category: "/language:${{matrix.language}}"

‎.github/workflows/security-monitoring.yml

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
name: Security Monitoring
2+
3+
on:
4+
schedule:
5+
- cron: '0 16 * * *'
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.run_id }}
9+
cancel-in-progress: true
10+
11+
permissions:
12+
id-token: write
13+
14+
jobs:
15+
check-code-scanning-alerts:
16+
runs-on: ubuntu-latest
17+
outputs:
18+
code_scanning_alert_status: ${{ steps.check-code-scanning-alerts.outputs.code_scanning_alert_status }}
19+
steps:
20+
- name: Check for security alerts
21+
id: check-code-scanning-alerts
22+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
23+
with:
24+
github-token: ${{ secrets.GH_PAT }}
25+
script: |
26+
async function checkAlerts() {
27+
const owner = '${{ github.repository_owner }}';
28+
const repo = '${{ github.event.repository.name }}';
29+
const ref = 'refs/heads/master';
30+
31+
const codeScanningAlerts = await github.rest.codeScanning.listAlertsForRepo({
32+
owner,
33+
repo,
34+
ref: ref
35+
});
36+
const activeCodeScanningAlerts = codeScanningAlerts.data.filter(alert => alert.state === 'open');
37+
core.setOutput('code_scanning_alert_status', activeCodeScanningAlerts.length > 0 ? '1': '0');
38+
}
39+
await checkAlerts();
40+
41+
check-dependabot-alerts:
42+
runs-on: ubuntu-latest
43+
outputs:
44+
dependabot_alert_status: ${{ steps.check-dependabot-alerts.outputs.dependabot_alert_status }}
45+
steps:
46+
- name: Check for dependabot alerts
47+
id: check-dependabot-alerts
48+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
49+
with:
50+
github-token: ${{ secrets.GH_PAT }}
51+
script: |
52+
async function checkAlerts() {
53+
const owner = '${{ github.repository_owner }}';
54+
const repo = '${{ github.event.repository.name }}';
55+
56+
const dependabotAlerts = await github.rest.dependabot.listAlertsForRepo({
57+
owner,
58+
repo,
59+
headers: {
60+
'accept': 'applications/vnd.github+json'
61+
}
62+
});
63+
const activeDependabotAlerts = dependabotAlerts.data.filter(alert => alert.state === 'open');
64+
core.setOutput('dependabot_alert_status', activeDependabotAlerts.length > 0 ? '1': '0');
65+
}
66+
await checkAlerts();
67+
68+
check-secret-scanning-alerts:
69+
runs-on: ubuntu-latest
70+
outputs:
71+
secret_scanning_alert_status: ${{ steps.check-secret-scanning-alerts.outputs.secret_scanning_alert_status }}
72+
steps:
73+
- name: Check for secret scanning alerts
74+
id: check-secret-scanning-alerts
75+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
76+
with:
77+
github-token: ${{ secrets.GH_PAT }}
78+
script: |
79+
async function checkAlerts() {
80+
const owner = '${{ github.repository_owner }}';
81+
const repo = '${{ github.event.repository.name }}';
82+
83+
const secretScanningAlerts = await github.rest.secretScanning.listAlertsForRepo({
84+
owner,
85+
repo,
86+
});
87+
const activeSecretScanningAlerts = secretScanningAlerts.data.filter(alert => alert.state === 'open');
88+
core.setOutput('secret_scanning_alert_status', activeSecretScanningAlerts.length > 0 ? '1': '0');
89+
}
90+
await checkAlerts();
91+
92+
put-metric-data:
93+
runs-on: ubuntu-latest
94+
needs: [check-code-scanning-alerts, check-dependabot-alerts, check-secret-scanning-alerts]
95+
steps:
96+
- name: Configure AWS Credentials
97+
uses: aws-actions/configure-aws-credentials@12e3392609eaaceb7ae6191b3f54bbcb85b5002b
98+
with:
99+
role-to-assume: ${{ secrets.MONITORING_ROLE_ARN }}
100+
aws-region: us-west-2
101+
- name: Put Code Scanning Alert Metric Data
102+
run: |
103+
if [ "${{ needs.check-code-scanning-alerts.outputs.code_scanning_alert_status }}" == "1" ]; then
104+
aws cloudwatch put-metric-data --metric-name CodeScanningAlert --namespace SecurityMonitoringMetrics --value 1 --unit Count --dimensions ProjectName=sagemaker-python-sdk
105+
else
106+
aws cloudwatch put-metric-data --metric-name CodeScanningAlert --namespace SecurityMonitoringMetrics --value 0 --unit Count --dimensions ProjectName=sagemaker-python-sdk
107+
fi
108+
- name: Put Dependabot Alert Metric Data
109+
run: |
110+
if [ "${{ needs.check-dependabot-alerts.outputs.dependabot_alert_status }}" == "1" ]; then
111+
aws cloudwatch put-metric-data --metric-name DependabotAlert --namespace SecurityMonitoringMetrics --value 1 --unit Count --dimensions ProjectName=sagemaker-python-sdk
112+
else
113+
aws cloudwatch put-metric-data --metric-name DependabotAlert --namespace SecurityMonitoringMetrics --value 0 --unit Count --dimensions ProjectName=sagemaker-python-sdk
114+
fi
115+
- name: Put Secret Scanning Alert Metric Data
116+
run: |
117+
if [ "${{ needs.check-secret-scanning-alerts.outputs.secret_scanning_alert_status }}" == "1" ]; then
118+
aws cloudwatch put-metric-data --metric-name SecretScanningAlert --namespace SecurityMonitoringMetrics --value 1 --unit Count --dimensions ProjectName=sagemaker-python-sdk
119+
else
120+
aws cloudwatch put-metric-data --metric-name SecretScanningAlert --namespace SecurityMonitoringMetrics --value 0 --unit Count --dimensions ProjectName=sagemaker-python-sdk
121+
fi

‎CHANGELOG.md

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,89 @@
11
# Changelog
22

3+
## v2.228.0 (2024-08-06)
4+
5+
### Features
6+
7+
* triton v24.05
8+
9+
### Bug Fixes and Other Changes
10+
11+
* chore: telemetry for deployment configs
12+
* censoring sensitive values from being logged
13+
* update image_uri_configs 08-05-2024 07:17:38 PST
14+
* enable uncompressed model artifacts upload to S3 for SAGEMAKER_ENDPOINT overwrite for TGI, TEI, MMS model servers
15+
* ModelReference deployment for Alt Configs models
16+
* Add optional typecheck for nullable parameters
17+
* Update package metadata
18+
* release TEI 1.4.0
19+
20+
## v2.227.0 (2024-07-30)
21+
22+
### Features
23+
24+
* added code scanning through CodeQL
25+
26+
### Bug Fixes and Other Changes
27+
28+
* Fixed cpu isntance type for the estimator register test
29+
* update image_uri_configs 07-29-2024 11:28:28 PST
30+
* avoid AccessDenied error for a while on SageMaker Studio wtih do…
31+
* SMP PT 2.3 Fix
32+
* chore: pin framework version in serverless inference tests
33+
* image uri in TGI 2.2.0 image
34+
* explicitly access enum member values to avoid Python version related regression
35+
* chore: add huggingface TGI 2.2.0 config
36+
* update image_uri_configs 07-22-2024 11:53:54 PST
37+
* update image_uri_configs 07-17-2024 07:17:38 PST
38+
* update image_uri_configs 07-16-2024 07:17:45 PST
39+
* add support for new regions
40+
41+
## v2.226.1 (2024-07-17)
42+
43+
## v2.226.0 (2024-07-12)
44+
45+
### Features
46+
47+
* Curated hub improvements
48+
* InferenceSpec support for MMS and testing
49+
50+
### Bug Fixes and Other Changes
51+
52+
* ModelBuilder not passing HF_TOKEN to model.
53+
* update image_uri_configs 07-10-2024 07:18:04 PST
54+
55+
## v2.225.0 (2024-07-10)
56+
57+
### Features
58+
59+
* model optimization
60+
61+
### Bug Fixes and Other Changes
62+
63+
* fix integ test
64+
* update uris for v1.1.1
65+
* update image_uri_configs 07-04-2024 07:17:24 PST
66+
67+
## v2.224.4 (2024-07-04)
68+
69+
### Bug Fixes and Other Changes
70+
71+
* allow for inf spec and server override to be passed
72+
73+
## v2.224.3 (2024-07-03)
74+
75+
### Bug Fixes and Other Changes
76+
77+
* Upgrade local dependencies
78+
* Improve docstrings for estimator tags
79+
80+
## v2.224.2 (2024-06-27)
81+
82+
### Bug Fixes and Other Changes
83+
84+
* Update DJLModel class for latest container releases
85+
* list_models() for python3.8
86+
387
## v2.224.1 (2024-06-21)
488

589
### Bug Fixes and Other Changes

‎MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ recursive-include requirements *
88
include VERSION
99
include LICENSE.txt
1010
include README.rst
11+
include hatch_build.py
1112

1213
prune tests
1314

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.224.2.dev0
1+
2.228.1.dev0

‎doc/frameworks/djl/sagemaker.djl_inference.rst

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,15 @@ DJL Classes
55
DJLModel
66
---------------------------
77

8-
.. autoclass:: sagemaker.djl_inference.model.DJLModel
9-
:members:
10-
:undoc-members:
11-
:show-inheritance:
12-
13-
DeepSpeedModel
14-
---------------------------
15-
16-
.. autoclass:: sagemaker.djl_inference.model.DeepSpeedModel
17-
:members:
18-
:undoc-members:
19-
:show-inheritance:
20-
21-
HuggingFaceAccelerateModel
22-
---------------------------
23-
24-
.. autoclass:: sagemaker.djl_inference.model.HuggingFaceAccelerateModel
25-
:members:
26-
:undoc-members:
27-
:show-inheritance:
28-
29-
FasterTransformerModel
30-
---------------------------
31-
32-
.. autoclass:: sagemaker.djl_inference.model.FasterTransformerModel
8+
.. autoclass:: sagemaker.djl_inference.DJLModel
339
:members:
3410
:undoc-members:
3511
:show-inheritance:
3612

3713
DJLPredictor
3814
---------------------------
3915

40-
.. autoclass:: sagemaker.djl_inference.model.DJLPredictor
16+
.. autoclass:: sagemaker.djl_inference.DJLPredictor
4117
:members:
4218
:undoc-members:
4319
:show-inheritance:

0 commit comments

Comments
 (0)