From 20173fc237a943c595aac1ff498f3a3c820ccf19 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 15 Aug 2024 16:07:10 +0300 Subject: [PATCH 1/3] Bump version from 2.63.1 to 2.63.2 --- build/npm/v2-jf/package-lock.json | 2 +- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package-lock.json | 2 +- build/npm/v2/package.json | 2 +- utils/cliutils/cli_consts.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index 186796422..6544dd3b9 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.63.1", + "version": "2.63.2", "lockfileVersion": 1 } diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index 082d5f065..2f3be48f9 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.63.1", + "version": "2.63.2", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index ea81ddf85..7d1b9a45c 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2", - "version": "2.63.1", + "version": "2.63.2", "lockfileVersion": 2 } diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index 9c32a931c..cd2d09680 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.63.1", + "version": "2.63.2", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/utils/cliutils/cli_consts.go b/utils/cliutils/cli_consts.go index 9f68f4e72..d67fca539 100644 --- a/utils/cliutils/cli_consts.go +++ b/utils/cliutils/cli_consts.go @@ -4,7 +4,7 @@ import "time" const ( // General CLI constants - CliVersion = "2.63.1" + CliVersion = "2.63.2" ClientAgent = "jfrog-cli-go" // CLI base commands constants: From 8151f3efb2347b2885663fad7f3df8dd937b245d Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 21 Aug 2024 18:27:02 +0300 Subject: [PATCH 2/3] metadata Signed-off-by: Michael Sverdlov --- general/ai/cli.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/general/ai/cli.go b/general/ai/cli.go index 0898563e5..2fc0f9fc2 100644 --- a/general/ai/cli.go +++ b/general/ai/cli.go @@ -3,6 +3,7 @@ package ai import ( "bufio" "bytes" + "encoding/json" "errors" "fmt" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" @@ -29,13 +30,6 @@ type QuestionBody struct { Question string `json:"question"` } -type FeedbackBody struct { - QuestionBody - LlmAnswer string `json:"llm_answer"` - IsAccurate bool `json:"is_accurate"` - ExpectedAnswer string `json:"expected_answer"` -} - func HowCmd(c *cli.Context) error { if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil { return err @@ -70,15 +64,20 @@ func HowCmd(c *cli.Context) error { } func askQuestion(question string) (response string, err error) { + questionBody := QuestionBody{Question: question} + contentBytes, err := json.Marshal(questionBody) + if errorutils.CheckError(err) != nil { + return + } client, err := httpclient.ClientBuilder().Build() if errorutils.CheckError(err) != nil { return } - req, err := http.NewRequest(http.MethodPost, cliAiAskApiPath, bytes.NewBufferString(question)) + req, err := http.NewRequest(http.MethodPost, cliAiAskApiPath, bytes.NewBuffer(contentBytes)) if errorutils.CheckError(err) != nil { return } - req.Header.Set("Content-Type", "text/plain") + req.Header.Set("Content-Type", "application/json") req.Header.Set(apiHeader, "true") log.Debug(fmt.Sprintf("Sending HTTP %s request to: %s", req.Method, req.URL)) resp, err := client.GetClient().Do(req) From 5db063ea5319dd22a543f453b366d0c8e537f082 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 21 Aug 2024 18:30:01 +0300 Subject: [PATCH 3/3] metadata Signed-off-by: Michael Sverdlov --- general/ai/cli.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/general/ai/cli.go b/general/ai/cli.go index 2fc0f9fc2..e2bfb9a37 100644 --- a/general/ai/cli.go +++ b/general/ai/cli.go @@ -64,8 +64,7 @@ func HowCmd(c *cli.Context) error { } func askQuestion(question string) (response string, err error) { - questionBody := QuestionBody{Question: question} - contentBytes, err := json.Marshal(questionBody) + contentBytes, err := json.Marshal(QuestionBody{Question: question}) if errorutils.CheckError(err) != nil { return }