Skip to content

Commit 08b3a2e

Browse files
authored
Release v3.3.2 into Main
2 parents 1e4aba6 + 14580e2 commit 08b3a2e

17 files changed

+65
-24
lines changed

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# v3.3.2
2+
## Bug Fixes
3+
- Resolved issue where invalid schema import was causing create model api calls to fail
4+
- Resolved issue where RAG citations weren't being populated in metadata for non-streaming requests
5+
- Resolved issue where managing in-memory file context wouldn't display success notification and close the modal
6+
7+
## Acknowledgements
8+
* @bedanley
9+
* @estohlmann
10+
* @dustins
11+
12+
**Full Changelog**: https://github.com/awslabs/LISA/compare/v3.3.1...v3.3.2
13+
114
# v3.3.1
215
## Bug Fixes
316
- Resolved issue where AWS partition was hardcoded in RAG Pipeline

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.1
1+
3.3.2

ecs_model_deployer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "",
55
"main": "index.js",
66
"scripts": {
7-
"build": "tsc && cp package.json ./dist && cp ./src/cdk*json ./dist/ && cd ./dist && npm i --omit dev",
7+
"build": "tsc && cp package.json ./dist && cp ./src/cdk*json ./dist/ && cp ../VERSION ./dist && cd ./dist && npm i --omit dev",
88
"clean": "rm -rf ./dist/",
99
"test": "echo \"Error: no test specified\" && exit 1"
1010
},

ecs_model_deployer/src/lib/app.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { AddPermissionBoundary } from '@cdklabs/cdk-enterprise-iac';
1818
import { Aspects, App } from 'aws-cdk-lib';
1919
import { LisaModelStack, LisaModelStackProps } from './lisa_model_stack';
2020

21-
import { ConfigFile, ConfigSchema } from './schema';
21+
import { ConfigFile, ConfigSchema } from './ecs-schema';
2222

2323
export const app = new App();
2424

ecs_model_deployer/src/lib/ecs-model.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { Construct } from 'constructs';
2222

2323
import { ECSCluster } from './ecsCluster';
2424
import { getModelIdentifier } from './utils';
25-
import { BaseProps, Config, Ec2Metadata, EcsSourceType, ModelConfig } from './schema';
25+
import { BaseProps, Config, Ec2Metadata, EcsSourceType, ModelConfig } from './ecs-schema';
2626
import { StringParameter } from 'aws-cdk-lib/aws-ssm';
2727

2828
// This is the amount of memory to buffer (or subtract off) from the total instance memory, if we don't include this,

ecs_model_deployer/src/lib/schema.ts ecs_model_deployer/src/lib/ecs-schema.ts

+26-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
import * as cdk from 'aws-cdk-lib';
1919
import { AmiHardwareType } from 'aws-cdk-lib/aws-ecs';
2020
import { z } from 'zod';
21-
import { SecurityGroupConfigSchema } from '../../../lib/schema';
21+
import path from 'path';
22+
import fs from 'fs';
2223

23-
const VERSION: string = '2.0.1';
24+
const HERE: string = path.resolve(__dirname);
25+
const VERSION_PATH: string = path.resolve(HERE, '..', 'VERSION');
26+
export const VERSION: string = fs.readFileSync(VERSION_PATH, 'utf8').trim();
2427

2528
const REMOVAL_POLICIES: Record<string, cdk.RemovalPolicy> = {
2629
destroy: cdk.RemovalPolicy.DESTROY,
@@ -538,6 +541,27 @@ const PypiConfigSchema = z.object({
538541
trustedHost: z.string().optional().default(''),
539542
});
540543

544+
/**
545+
* Configuration schema for Security Group imports.
546+
* These values are none/small/all, meaning a user can import any number of these or none of these.
547+
*
548+
* @property {string} modelSecurityGroupId - Security Group ID.
549+
* @property {string} restAlbSecurityGroupId - Security Group ID
550+
* @property {string} lambdaSecurityGroupId - Security Group ID
551+
* @property {string} liteLlmDbSecurityGroupId - Security Group ID.
552+
* @property {string} openSearchSecurityGroupId - Security Group ID.
553+
* @property {string} pgVectorSecurityGroupId - Security Group ID.
554+
*/
555+
export const SecurityGroupConfigSchema = z.object({
556+
modelSecurityGroupId: z.string().startsWith('sg-'),
557+
restAlbSecurityGroupId: z.string().startsWith('sg-'),
558+
lambdaSecurityGroupId: z.string().startsWith('sg-'),
559+
liteLlmDbSecurityGroupId: z.string().startsWith('sg-'),
560+
openSearchSecurityGroupId: z.string().startsWith('sg-').optional(),
561+
pgVectorSecurityGroupId: z.string().startsWith('sg-').optional(),
562+
})
563+
.describe('Security Group Overrides used across stacks.');
564+
541565
/**
542566
* Raw application configuration schema.
543567
*

ecs_model_deployer/src/lib/ecsCluster.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ import { StringParameter } from 'aws-cdk-lib/aws-ssm';
4343
import { Construct } from 'constructs';
4444

4545
import { createCdkId } from './utils';
46-
import { BaseProps, Ec2Metadata, EcsSourceType } from './schema';
47-
import { ECSConfig } from './schema';
46+
import { BaseProps, ECSConfig, Ec2Metadata, EcsSourceType } from './ecs-schema';
4847

4948
/**
5049
* Properties for the ECSCluster Construct.

ecs_model_deployer/src/lib/lisa_model_stack.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { Vpc, SecurityGroup, Subnet, SubnetSelection } from 'aws-cdk-lib/aws-ec2
2121
import { Construct } from 'constructs';
2222
import { EcsModel } from './ecs-model';
2323

24-
import { Config, ModelConfig } from './schema';
24+
import { Config, ModelConfig } from './ecs-schema';
2525

2626
export type LisaModelStackProps = {
2727
vpcId: string;

ecs_model_deployer/src/lib/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
limitations under the License.
1515
*/
1616

17-
import { ModelConfig } from './schema';
17+
import { ModelConfig } from './ecs-schema';
1818

1919
/**
2020
* Creates a unique CDK ID using configuration data. The CDK ID is used to uniquely identify resources in the AWS

lib/schema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { z } from 'zod';
2626

2727
const HERE: string = path.resolve(__dirname);
2828
const VERSION_PATH: string = path.resolve(HERE, '..', 'VERSION');
29-
const VERSION: string = fs.readFileSync(VERSION_PATH, 'utf8').trim();
29+
export const VERSION: string = fs.readFileSync(VERSION_PATH, 'utf8').trim();
3030

3131
const REMOVAL_POLICIES: Record<string, cdk.RemovalPolicy> = {
3232
destroy: cdk.RemovalPolicy.DESTROY,

lib/user-interface/react/package-lock.json

+7-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/user-interface/react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "lisa-web",
33
"private": true,
4-
"version": "3.3.1",
4+
"version": "3.3.2",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

lib/user-interface/react/src/components/chatbot/Chat.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ export default function Chat ({ sessionId }) {
434434
new LisaChatMessage({
435435
type: 'ai',
436436
content: result,
437-
metadata: metadata,
437+
metadata: useRag ? { ...metadata, ...prev.history[prev.history.length - 1].metadata } : metadata,
438438
}),
439439
),
440440
}));

lib/user-interface/react/src/components/chatbot/FileUploadModals.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ export function ContextUploadModal ({
110110
<SpaceBetween direction='horizontal' size='xs'>
111111
<Button
112112
onClick={async () => {
113-
await handleUpload(selectedFiles, handleError, processFile, [FileTypes.TEXT], 10240);
113+
const successfulUploads = await handleUpload(selectedFiles, handleError, processFile, [FileTypes.TEXT], 10240);
114+
if (successfulUploads.length > 0) {
115+
notificationService.generateNotification(`Successfully added file(s) to context ${successfulUploads.join(', ')}`, StatusTypes.SUCCESS);
116+
setShowContextUploadModal(false);
117+
}
114118
}}
115119
disabled={selectedFiles.length === 0}
116120
>

lisa-sdk/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "lisapy"
3-
version = "3.3.1"
3+
version = "3.3.2"
44
description = "A simple SDK to help you interact with LISA. LISA is an LLM hosting solution for AWS dedicated clouds or ADCs."
55
authors = ["Steve Goley <[email protected]>"]
66
readme = "README.md"

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lisa",
3-
"version": "3.3.1",
3+
"version": "3.3.2",
44
"bin": {
55
"lisa": "bin/lisa.js"
66
},

0 commit comments

Comments
 (0)