Merge branch 'main' into panw-prisma-airs-plugin

Author: jroberts2600

src/handlers/handlerUtils.ts

@@ -230,6 +230,7 @@ export function convertHooksShorthand(
     hooksObject.checks = Object.keys(hook).map((key) => ({
       id: key.includes('.') ? key : `default.${key}`,
       parameters: hook[key],
+      is_enabled: hook[key].is_enabled,
     }));
 
     return hooksObject;

src/providers/bedrock/api.ts

@@ -196,22 +196,23 @@ const BedrockAPIConfig: BedrockAPIConfigInterface = {
       return `/model-invocation-job/${batchId}/stop`;
     }
     const { model, stream } = gatewayRequestBody;
+    const uriEncodedModel = encodeURIComponent(decodeURIComponent(model ?? ''));
     if (!model && !BEDROCK_NO_MODEL_ENDPOINTS.includes(fn as endpointStrings)) {
       throw new GatewayError('Model is required');
     }
     let mappedFn: string = fn;
     if (stream) {
       mappedFn = `stream-${fn}`;
     }
-    let endpoint = `/model/${model}/invoke`;
-    let streamEndpoint = `/model/${model}/invoke-with-response-stream`;
+    let endpoint = `/model/${uriEncodedModel}/invoke`;
+    let streamEndpoint = `/model/${uriEncodedModel}/invoke-with-response-stream`;
     if (
       (mappedFn === 'chatComplete' || mappedFn === 'stream-chatComplete') &&
       model &&
       !bedrockInvokeModels.includes(model)
     ) {
-      endpoint = `/model/${model}/converse`;
-      streamEndpoint = `/model/${model}/converse-stream`;
+      endpoint = `/model/${uriEncodedModel}/converse`;
+      streamEndpoint = `/model/${uriEncodedModel}/converse-stream`;
     }
 
     const jobIdIndex = fn === 'cancelFinetune' ? -2 : -1;