From 0c6fe4f85cb76c9dee05df7076c1519e883af7f1 Mon Sep 17 00:00:00 2001 From: Yulong Ruan Date: Tue, 28 May 2024 11:19:51 +0800 Subject: [PATCH] update prompt and removed unused codes Signed-off-by: Yulong Ruan --- .../vis_type_vega/public/text_to_vega.ts | 3 ++ src/plugins/vis_type_vega/server/plugin.ts | 42 ------------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/src/plugins/vis_type_vega/public/text_to_vega.ts b/src/plugins/vis_type_vega/public/text_to_vega.ts index 81063a06451a..0ee2b502ce49 100644 --- a/src/plugins/vis_type_vega/public/text_to_vega.ts +++ b/src/plugins/vis_type_vega/public/text_to_vega.ts @@ -20,6 +20,9 @@ ${ppl} The user's instruction is: ${input} when a field has a dot(.), you should escape the dot if the field is a single field. For example, if the field is "user.name", but the data is {"user.name": "John"}, the field should be escaped. But it should not be escaped if the data is {"user": {"name": "John"}} + +If mark.type = point and shape.field is a field of the data, the definition of the shape should be inside the root "encoding" object, NOT in the "mark" object, for example, {"encoding": {"shape": {"field": "field_name"}}} + Just return the chart specification json based on Vega-Lite format. Just reply with the json based Vega-Lite object, do not include any other content in the reply. `; diff --git a/src/plugins/vis_type_vega/server/plugin.ts b/src/plugins/vis_type_vega/server/plugin.ts index c27757c644ba..0c4f065caca3 100644 --- a/src/plugins/vis_type_vega/server/plugin.ts +++ b/src/plugins/vis_type_vega/server/plugin.ts @@ -44,46 +44,6 @@ import { } from './vega_visualization_client_wrapper'; import { setDataSourceEnabled } from './services'; -const invokeText2Vega = async ( - prompt: string, - modelId = 'anthropic.claude-3-sonnet-20240229-v1:0' - // modelId = 'anthropic.claude-3-haiku-20240307-v1:0' -) => { - // Create a new Bedrock Runtime client instance. - const client = new BedrockRuntimeClient({ - region: 'us-east-1', - credentials: { - accessKeyId: process.env.ACCESS_KEY_ID ?? '', - secretAccessKey: process.env.SECRET_ACCESS_KEY ?? '', - }, - }); - - // Prepare the payload for the model. - const payload = { - anthropic_version: 'bedrock-2023-05-31', - max_tokens: 4000, - temperature: 0.0, - messages: [ - { - role: 'user', - content: [{ type: 'text', text: prompt }], - }, - ], - }; - - // Invoke Claude with the payload and wait for the response. - const command = new InvokeModelCommand({ - contentType: 'application/json', - body: JSON.stringify(payload), - modelId, - }); - const apiResponse = await client.send(command); - - const decodedResponseBody = new TextDecoder().decode(apiResponse.body); - const responseBody = JSON.parse(decodedResponseBody); - return responseBody.content[0].text as string; -}; - export class VisTypeVegaPlugin implements Plugin { private readonly config: ConfigObservable; @@ -117,8 +77,6 @@ export class VisTypeVegaPlugin implements Plugin { - // const result = await invokeText2Vega(req.body.query); - // return res.ok({ body: result }); const result = await context.core.opensearch.client.asCurrentUser.transport.request({ method: 'POST', path: '/_plugins/_ml/models/_yV0hY8B8ef_5QXJp6Xd/_predict',