UI Initial Model Management Changes

Author: estohlmann

.eslintrc.json

@@ -1,37 +1,41 @@
 {
-  "env": {
-    "node": true
-  },
   "parser": "@typescript-eslint/parser",
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
   "parserOptions": {
-    "ecmaVersion": 2020,
+    "ecmaVersion": 12,
     "sourceType": "module"
   },
-  "plugins": ["@typescript-eslint", "import"],
+  "plugins": ["@stylistic", "@typescript-eslint"],
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:react-hooks/recommended"],
   "rules": {
-    "max-len": [
+    "eqeqeq": ["error", "smart"],
+    "@stylistic/indent": "error",
+    "@stylistic/quotes": ["error", "single"],
+    "@stylistic/arrow-parens": "error",
+    "@stylistic/arrow-spacing": "error",
+    "@stylistic/brace-style": "error",
+    "@stylistic/computed-property-spacing": ["error", "never"],
+    "@stylistic/jsx-quotes": ["error", "prefer-single"],
+    "@stylistic/keyword-spacing": [
       "error",
       {
-        "code": 120,
-        "ignoreComments": false,
-        "ignoreStrings": false,
-        "ignoreTemplateLiterals": false,
-        "ignoreRegExpLiterals": false,
-        "ignoreUrls": false
+        "before": true
       }
     ],
-    "@typescript-eslint/no-explicit-any": "warn",
-    "import/order": [
-      "error",
-      {
-        "newlines-between": "always",
-        "groups": ["builtin", "external", "internal", ["parent", "sibling", "index"]],
-        "alphabetize": {
-          "order": "asc",
-          "caseInsensitive": true
-        }
-      }
-    ]
+    "@stylistic/semi": "error",
+    "@stylistic/space-before-function-paren": "error",
+    "@stylistic/space-infix-ops": "error",
+    "@stylistic/space-unary-ops": "error",
+    "@typescript-eslint/no-unused-vars": "error",
+    "@typescript-eslint/ban-types": "off",
+    "@typescript-eslint/consistent-type-definitions": ["error", "type"],
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "error",
+    "react/prop-types": "off"
+  },
+  "env": {
+    "browser": true,
+    "es2021": true
   }
 }

.gitignore

@@ -23,6 +23,7 @@ cdk.context.json
 .vscode
 .venv
 .DS_Store
+*.iml
 
 # Coverage Statistic Folders
 coverage

.pre-commit-config.yaml

@@ -48,20 +48,6 @@ repos:
       args: ['--skip=*.git*,*cdk.out*,*venv*,*mypy_cache*,*package-lock*,*node_modules*,*dist/*,*poetry.lock*,*coverage*', "-L=xdescribe"]
       pass_filenames: false
 
-- repo: https://github.com/pre-commit/mirrors-prettier
-  rev: 'v3.0.3'
-  hooks:
-    - id: prettier
-      name: prettier-md
-      files: .*\.(ya?ml|json|md)$
-      exclude: ^node_modules/|config.yaml|^dist/
-
-    - id: prettier
-      name: prettier-ts
-      args: [--write, --config, .prettierrc]
-      files: \.(ts|tsx)$
-      exclude: ^node_modules/|^dist/
-
 - repo: https://github.com/pycqa/isort
   rev: 5.12.0
   hooks:

README.md

@@ -26,7 +26,7 @@ LISA accelerates the use of generative AI applications by providing scalable, lo
 LISA was inspired by another AWS open source project [aws-genai-llm-chatbot](https://github.com/aws-samples/aws-genai-llm-chatbot) and deploys LLMs using the [text-generation-inference](https://github.com/huggingface/text-generation-inference/tree/main) container from HuggingFace. LISA is different from it's inspiration in a few ways:
 
 1.  LISA is designed to operate in Amazon Dedicated Cloud (ADC) partitions.
-2.  LISA is designed to be composable so we've separated the the underlying LLM serving capability, this repository contains, LISA-Serve and the chat frontend, LISA-Chat, which are deployable as separate stacks.
+2.  LISA is designed to be composable so we've separated the underlying LLM serving capability, this repository contains, LISA-Serve and the chat frontend, LISA-Chat, which are deployable as separate stacks.
 3.  LISA is designed to support the OpenAI specification, so anywhere you can use the OpenAI API in your applications, you can insert LISA in its place.
 
 ## Deprecation Notes
@@ -488,7 +488,9 @@ Create `lib/user-interface/react/public/env.js` file with the following contents
 window.env = {
   AUTHORITY: '<Your IdP URL here>',
   CLIENT_ID: '<Your IdP Client Id Here>',
-  "CUSTOM_SCOPES":[<add your optional list of custom scopes to pull groups from your IdP here>],
+  JWT_GROUPS_PROP: '<The full path (period delimited) to the property for the groups that a user is a member of in the JWT token. For Cognito: cognito:groups>',
+  ADMIN_GROUP: '<The admin group you would like LISA to check the JWT token for>',
+  CUSTOM_SCOPES:[<add your optional list of custom scopes to pull groups from your IdP here>],
   // Alternatively you can set this to be your REST api elb endpoint
   RESTAPI_URI: 'http://localhost:8080/',
   RESTAPI_VERSION: 'v2',

bin/lisa.ts

@@ -35,57 +35,57 @@ let configEnv = configFile.env || 'dev';
 
 // Select configuration environment
 if (process.env.ENV) {
-  configEnv = process.env.ENV;
+    configEnv = process.env.ENV;
 }
 const configData = configFile[configEnv];
 if (!configData) {
-  throw new Error(`Configuration for environment "${configEnv}" not found.`);
+    throw new Error(`Configuration for environment "${configEnv}" not found.`);
 }
 
 // Other command line argument overrides
 type EnvMapping = [string, keyof Config];
 const mappings: EnvMapping[] = [
-  ['PROFILE', 'profile'],
-  ['DEPLOYMENT_NAME', 'deploymentName'],
-  ['ACCOUNT_NUMBER', 'accountNumber'],
-  ['REGION', 'region'],
+    ['PROFILE', 'profile'],
+    ['DEPLOYMENT_NAME', 'deploymentName'],
+    ['ACCOUNT_NUMBER', 'accountNumber'],
+    ['REGION', 'region'],
 ];
 mappings.forEach(([envVar, configVar]) => {
-  const envValue = process.env[envVar];
-  if (envValue) {
-    (configData as any)[configVar] = envValue;
-  }
+    const envValue = process.env[envVar];
+    if (envValue) {
+        (configData as any)[configVar] = envValue;
+    }
 });
 
 // Validate and parse configuration
 let config: Config;
 try {
-  config = ConfigSchema.parse(configData);
+    config = ConfigSchema.parse(configData);
 } catch (error) {
-  if (error instanceof Error) {
-    console.error('Error parsing the configuration:', error.message);
-  } else {
-    console.error('An unexpected error occurred:', error);
-  }
-  process.exit(1);
+    if (error instanceof Error) {
+        console.error('Error parsing the configuration:', error.message);
+    } else {
+        console.error('An unexpected error occurred:', error);
+    }
+    process.exit(1);
 }
 
 // Define environment
 const env: cdk.Environment = {
-  account: config.accountNumber,
-  region: config.region,
+    account: config.accountNumber,
+    region: config.region,
 };
 
 // Application
 const app = new cdk.App();
 // Run CDK-nag on app if specified
 if (config.runCdkNag) {
-  Aspects.of(app).add(new AwsSolutionsChecks({ reports: true, verbose: true }));
+    Aspects.of(app).add(new AwsSolutionsChecks({ reports: true, verbose: true }));
 }
 
 new LisaServeApplicationStage(app, config.deploymentStage, {
-  env: env,
-  config: config,
+    env: env,
+    config: config,
 });
 
 app.synth();

jest.config.js

@@ -14,12 +14,13 @@
   limitations under the License.
 */
 
+// eslint-disable-next-line no-undef
 module.exports = {
-  testEnvironment: 'node',
-  roots: ['<rootDir>/test'],
-  testMatch: ['**/*.test.ts'],
-  transform: {
-    '^.+\\.tsx?$': 'ts-jest'
-  },
-  collectCoverage: true,
+    testEnvironment: 'node',
+    roots: ['<rootDir>/test'],
+    testMatch: ['**/*.test.ts'],
+    transform: {
+        '^.+\\.tsx?$': 'ts-jest'
+    },
+    collectCoverage: true,
 };

lambda/authorizer/lambda_functions.py

@@ -16,7 +16,7 @@
 import logging
 import os
 import ssl
-from typing import Any, Dict, Union
+from typing import Any, Dict
 
 import create_env_variables  # noqa: F401
 import jwt
@@ -51,7 +51,7 @@ def lambda_handler(event: Dict[str, Any], context) -> Dict[str, Any]:  # type: i
     if jwt_data := id_token_is_valid(id_token=id_token, client_id=client_id, authority=authority):
         is_admin_user = is_admin(jwt_data, admin_group, jwt_groups_property)
         allow_policy = generate_policy(effect="Allow", resource=event["methodArn"], username=jwt_data["sub"])
-        allow_policy["context"] = {"username": jwt_data["sub"]}  # type: ignore [index]
+        allow_policy["context"] = {"username": jwt_data["sub"]}
 
         if requested_resource.startswith("/models") and not is_admin_user:
             username = jwt_data.get("sub", "user")
@@ -78,11 +78,11 @@ def generate_policy(*, effect: str, resource: str, username: str = "username") -
     return policy
 
 
-def id_token_is_valid(*, id_token: str, client_id: str, authority: str) -> Union[Dict[str, Any], bool]:
+def id_token_is_valid(*, id_token: str, client_id: str, authority: str) -> Dict[str, Any] | None:
     """Check whether an ID token is valid and return decoded data."""
     if not jwt.algorithms.has_crypto:
         logger.error("No crypto support for JWT, please install the cryptography dependency")
-        return False
+        return None
     logger.info(f"{authority}/.well-known/openid-configuration")
 
     # Here we will point to the sponsor bundle if available, defined in the create_env_variables import above
@@ -94,7 +94,7 @@ def id_token_is_valid(*, id_token: str, client_id: str, authority: str) -> Union
     )
     if resp.status_code != 200:
         logger.error("Could not get OIDC metadata: %s", resp.content)
-        return False
+        return None
 
     oidc_metadata = resp.json()
     try:
@@ -121,10 +121,10 @@ def id_token_is_valid(*, id_token: str, client_id: str, authority: str) -> Union
         return data
     except jwt.exceptions.PyJWTError as e:
         logger.exception(e)
-        return False
+        return None
 
 
-def is_admin(jwt_data: dict[str, Any], admin_group: str, jwt_groups_property: str):
+def is_admin(jwt_data: dict[str, Any], admin_group: str, jwt_groups_property: str) -> bool:
     """Check if the user is an admin."""
     props = jwt_groups_property.split(".")
     current_node = jwt_data

lambda/models/lambda_functions.py

@@ -46,16 +46,16 @@
 )
 
 
-@app.post(path="", include_in_schema=False)
-@app.post(path="/")
+@app.post(path="", include_in_schema=False)  # type: ignore
+@app.post(path="/")  # type: ignore
 async def create_model(model: CreateModelRequest) -> CreateModelResponse:
     """Endpoint to create a model."""
     # TODO add service to create model
     return CreateModelResponse(ModelId=model.ModelId, ModelName=model.ModelName, Status=ModelStatus.CREATING)
 
 
-@app.get(path="", include_in_schema=False)
-@app.get(path="/")
+@app.get(path="", include_in_schema=False)  # type: ignore
+@app.get(path="/")  # type: ignore
 async def list_models() -> list[ListModelResponse]:
     """Endpoint to list models."""
     # TODO add service to list models
@@ -81,7 +81,7 @@ async def list_models() -> list[ListModelResponse]:
     ]
 
 
-@app.get(path="/{model_id}")
+@app.get(path="/{model_id}")  # type: ignore
 async def get_model(
     model_id: Annotated[str, Path(title="The name of the model to get")],
 ) -> DescribeModelResponse:
@@ -90,7 +90,7 @@ async def get_model(
     return DescribeModelResponse.DUMMY(model_id, model_id)
 
 
-@app.put(path="/{model_id}")
+@app.put(path="/{model_id}")  # type: ignore
 async def put_model(
     model_id: Annotated[str, Path(title="The name of the model to update")], model: UpdateModelRequest
 ) -> DescribeModelResponse:
@@ -100,7 +100,7 @@ async def put_model(
     return DescribeModelResponse(**model.model_dump())
 
 
-@app.put(path="/{model_id}/start")
+@app.put(path="/{model_id}/start")  # type: ignore
 async def start_model(model_id: Annotated[str, Path(title="The name of the model to start")]) -> ListModelResponse:
     """Endpoint to start a model."""
     # TODO add service to update model
@@ -115,7 +115,7 @@ async def start_model(model_id: Annotated[str, Path(title="The name of the model
     )
 
 
-@app.put(path="/{model_id}/stop")
+@app.put(path="/{model_id}/stop")  # type: ignore
 async def stop_model(model_id: Annotated[str, Path(title="The name of the model to stop")]) -> ListModelResponse:
     """Endpoint to stop a model."""
     # TODO add service to update model
@@ -130,7 +130,7 @@ async def stop_model(model_id: Annotated[str, Path(title="The name of the model
     )
 
 
-@app.delete(path="/{model_id}")
+@app.delete(path="/{model_id}")  # type: ignore
 async def delete_model(
     model_id: Annotated[str, Path(title="The name of the model to delete")],
 ) -> DeleteModelResponse: