From 37b4eb4343bcb3f6d97842df499544191c882856 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 21 May 2023 00:56:47 -0700 Subject: [PATCH] Added default max token for ChatGPT --- .circleci/config.yml | 6 +++--- build.gradle | 17 ++++++++++++----- .../net/thauvin/erik/mobibot/modules/ChatGpt.kt | 3 ++- version.properties | 6 +++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 67e6618..140179a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,11 +39,11 @@ jobs: <<: *defaults_gradle - build_gradle_jdk20: + build_gradle_jdk19: <<: *defaults docker: - - image: cimg/openjdk:20.0 + - image: cimg/openjdk:19.0 <<: *defaults_gradle @@ -52,4 +52,4 @@ workflows: gradle: jobs: - build_gradle_jdk17 - - build_gradle_jdk20 + - build_gradle_jdk19 diff --git a/build.gradle b/build.gradle index e3d5453..31ec925 100644 --- a/build.gradle +++ b/build.gradle @@ -193,19 +193,26 @@ incrementBuildMeta { } } +koverReport { + defaults { + xml { + onCheck = true + } + html { + onCheck = true + } + } +} + sonarqube { properties { property('sonar.organization', 'ethauvin-github') property('sonar.projectKey', 'ethauvin_mobibot') property('sonar.host.url', 'https://sonarcloud.io') - property('sonar.coverage.jacoco.xmlReportPaths', "${project.buildDir}/reports/kover/xml/report.xml") + property('sonar.coverage.jacoco.xmlReportPaths', "${project.buildDir}/reports/kover/report.xml") } } -tasks.sonar { - dependsOn 'koverReport' -} - tasks.register('copyToDeploy', Copy) { from('properties', jar) into deployDir diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt.kt index 3647b31..c1f660e 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt.kt @@ -55,7 +55,8 @@ class ChatGpt : AbstractModule() { override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) { if (args.isNotBlank()) { try { - val answer = chat(args.trim(), properties[API_KEY_PROP], properties[MAX_TOKENS_PROP]!!.toInt()) + val answer = chat(args.trim(), properties[API_KEY_PROP], + properties.getOrDefault(MAX_TOKENS_PROP, "1024").toInt()) if (answer.isNotBlank()) { event.sendMessage(WordUtils.wrap(answer, 400)) } else { diff --git a/version.properties b/version.properties index b4770f6..654c604 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Sun May 21 00:12:53 PDT 2023 -version.buildmeta=1078 +#Sun May 21 00:52:16 PDT 2023 +version.buildmeta=1085 version.major=0 version.minor=8 version.patch=0 version.prerelease=rc version.project=mobibot -version.semver=0.8.0-rc+1078 +version.semver=0.8.0-rc+1085