Skip to content
13 changes: 7 additions & 6 deletions application/nlq/business/vector_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,13 @@ def create_vector_embedding_with_bedrock(cls, text):
@classmethod
def create_vector_embedding_with_sagemaker(cls, text):
try:
model_kwargs = {}
model_kwargs["batch_size"] = 12
model_kwargs["max_length"] = 512
model_kwargs["return_type"] = "dense"
body = json.dumps({"inputs": [text], **model_kwargs})
embeddings = invoke_model_sagemaker_endpoint(SAGEMAKER_ENDPOINT_EMBEDDING, body)
body = json.dumps(
{
"inputs": text,
"is_query": True
}
)
embeddings = invoke_model_sagemaker_endpoint(SAGEMAKER_ENDPOINT_EMBEDDING, body, model_type="embedding")
return embeddings
except Exception as e:
logger.error(f'create_vector_embedding_with_sagemaker is error {e}')
Expand Down
15 changes: 8 additions & 7 deletions application/utils/llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,14 +570,15 @@ def create_vector_embedding_with_bedrock(text, index_name):


def create_vector_embedding_with_sagemaker(endpoint_name, text, index_name):
model_kwargs = {}
model_kwargs["batch_size"] = 12
model_kwargs["max_length"] = 512
model_kwargs["return_type"] = "dense"
body = json.dumps({"inputs": [text], **model_kwargs})
body = json.dumps(
{
"inputs": text,
"is_query": True
}
)
response = invoke_model_sagemaker_endpoint(endpoint_name, body, model_type="embedding")
embeddings = response["sentence_embeddings"]
return {"_index": index_name, "text": text, "vector_field": embeddings["dense_vecs"][0]}
embeddings = response[0]
return {"_index": index_name, "text": text, "vector_field": embeddings}


def generate_suggested_question(prompt_map, search_box, model_id=None):
Expand Down
2 changes: 1 addition & 1 deletion report-front-end/src/common/api/API.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export async function query(props: {
return;
}
const result = await response.json();
console.log(result);
console.log("response: ", result);
props.setLoading(false);
props.setMessageHistory((history: ChatBotHistoryItem[]) => {
return [...history, {
Expand Down
8 changes: 5 additions & 3 deletions report-front-end/src/common/api/WebSocket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ export function createWssClient(
const {sendJsonMessage}
// eslint-disable-next-line react-hooks/rules-of-hooks
= useWebSocket(socketUrl, {
onOpen: () => console.log('opened'),
onOpen: (openMessage) => console.log('websocket connection opened, ', openMessage),
onClose: (closeMessage) => console.error('websocket connection closed, ', closeMessage),
onError: (errorMessage) => console.error('websocket connection error, ', errorMessage),
//Will attempt to reconnect on all close events, such as server shutting down
shouldReconnect: () => true,
onMessage: (message) => handleWebSocketMessage(message)
});

const handleWebSocketMessage = (message: MessageEvent) => {
console.log(message.data);
console.log("Received WebSocketMessage: ", message.data);
const messageJson = JSON.parse(message.data);
if (messageJson.content_type === "state") {
setStatusMessage((historyMessage) =>
Expand Down Expand Up @@ -72,6 +74,6 @@ export function queryWithWS(props: {
session_id: Global.sessionId,
user_id: props.userId
};
console.log("param: ", param);
console.log("Send WebSocketMessage: ", param);
props.sendMessage(param);
}
1 change: 0 additions & 1 deletion report-front-end/src/common/helpers/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const userReducer = (state = initialState, action: UserAction) => {
return { ...state, queryConfig: action.state };
default:
localStorage.setItem(LOCALSTORAGE_KEY, JSON.stringify({ ...state }));
console.log("initial state: ", { ...state });
return { ...state };
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export function useNavigationPanelState(): [
);

const onChange = (state: Partial<NavigationPanelState>) => {
console.log(state);
setCurrentState(Storage.setNavigationPanelState(state));
};

Expand Down
31 changes: 26 additions & 5 deletions report-front-end/src/components/chatbot-panel/chat-message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import {
Box,
ColumnLayout,
Container,
ExpandableSection, Header,
ExpandableSection,
Header,
Icon,
LineChart, Modal,
LineChart,
Modal,
Pagination,
PieChart,
SpaceBetween,
Expand Down Expand Up @@ -340,8 +342,8 @@ const DataTable = (props: { distributions: []; header: [] }) => {
>
Open
</Button>
}
>
}>
<TextContent><strong>{"Total Number (" + props.distributions.length + ")"}</strong></TextContent>
</Header>
}
items={items}
Expand All @@ -353,11 +355,30 @@ const DataTable = (props: { distributions: []; header: [] }) => {
filteringPlaceholder="Search"
/>
}
/* preferences={
<CollectionPreferences
title="Preferences"
confirmLabel="Confirm"
cancelLabel="Cancel"
preferences={{
pageSize: 5,
}}
pageSizePreference={{
title: "Page size",
options: [
{ value: 5, label: "5 resources" },
{ value: 10, label: "10 resources" },
{ value: 20, label: "20 resources" },
{ value: 30, label: "30 resources" }
]
}}
/>
}*/
/>
<Modal
onDismiss={() => setVisible(false)}
visible={visible}
header="Table"
header={"Table (" + props.distributions.length + ")"}
footer={
<Box float="right">
<Button
Expand Down
2 changes: 1 addition & 1 deletion source/model/internlm/code/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
exllamav2==0.0.14
torch==2.1.2
torch==2.2.0
sentencepiece==0.1.99
accelerate==0.25.0
bitsandbytes==0.41.1
Expand Down
4 changes: 4 additions & 0 deletions source/resources/lib/ecs/ecs-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ export class ECSStack extends cdk.Stack {
containerStreamlit.addEnvironment('AOS_INDEX_AGENT', 'uba_agent');
// containerStreamlit.addEnvironment('SAGEMAKER_EMBEDDING_REGION', cdk.Aws.REGION);
// containerStreamlit.addEnvironment('SAGEMAKER_SQL_REGION', cdk.Aws.REGION);
// containerStreamlit.addEnvironment('SAGEMAKER_ENDPOINT_EMBEDDING', '');
// containerStreamlit.addEnvironment('SAGEMAKER_ENDPOINT_SQL', '');
containerStreamlit.addEnvironment('BEDROCK_REGION', cdk.Aws.REGION);
containerStreamlit.addEnvironment('RDS_REGION_NAME', cdk.Aws.REGION);
containerStreamlit.addEnvironment('AWS_DEFAULT_REGION', cdk.Aws.REGION);
Expand Down Expand Up @@ -246,6 +248,8 @@ export class ECSStack extends cdk.Stack {
containerAPI.addEnvironment('AOS_INDEX_AGENT', 'uba_agent');
// containerAPI.addEnvironment('SAGEMAKER_EMBEDDING_REGION', cdk.Aws.REGION);
// containerAPI.addEnvironment('SAGEMAKER_SQL_REGION', cdk.Aws.REGION);
// containerAPI.addEnvironment('SAGEMAKER_ENDPOINT_EMBEDDING', '');
// containerAPI.addEnvironment('SAGEMAKER_ENDPOINT_SQL', '');
containerAPI.addEnvironment('BEDROCK_REGION', cdk.Aws.REGION);
containerAPI.addEnvironment('RDS_REGION_NAME', cdk.Aws.REGION);
containerAPI.addEnvironment('AWS_DEFAULT_REGION', cdk.Aws.REGION);
Expand Down