v1.2.5.1 gpt-4 possible

This commit is contained in:
bossanyit 2023-04-29 18:00:59 +02:00
parent f61603d1ac
commit 9d4fff4e53
5 changed files with 22 additions and 6 deletions

11
Dockerfile Normal file
View File

@ -0,0 +1,11 @@
FROM openjdk:18
RUN mkdir diet4you
RUN mkdir diet4you/data
RUN mkdir diet4you/data/db
COPY update*.sql ./diet4you/data/db/
RUN cd diet4you
COPY aitrainer_server.jar ./diet4you/
WORKDIR /diet4you
ENV PORT=8843
EXPOSE 8843

View File

@ -48,7 +48,7 @@ dependencies {
implementation("jakarta.mail:jakarta.mail-api:2.1.1") implementation("jakarta.mail:jakarta.mail-api:2.1.1")
implementation("org.eclipse.angus:angus-mail:2.0.1") implementation("org.eclipse.angus:angus-mail:2.0.1")
implementation ("com.aallam.openai:openai-client:3.0.0") implementation ("com.aallam.openai:openai-client:3.2.2")
implementation("io.ktor:ktor-client-java:2.2.3") implementation("io.ktor:ktor-client-java:2.2.3")
runtimeOnly("mysql:mysql-connector-java") runtimeOnly("mysql:mysql-connector-java")

1
build_api_test Normal file
View File

@ -0,0 +1 @@
docker build --no-cache -t diet4you_api_test -f Dockerfile .

View File

@ -24,7 +24,6 @@ class OpenAIController() {
} }
runBlocking { runBlocking {
result = deferred.await() result = deferred.await()
//println("Result: $result" )
} }
return result return result
} }

View File

@ -36,6 +36,7 @@ class OpenAIService(@Value("\${openai.key}") private val openaiKey: String, priv
/* models: /* models:
gpt-3.5-turbo chat/completion gpt-3.5-turbo chat/completion
gpt-4-0314 chat/completion
text-davinci-003 completion text-davinci-003 completion
*/ */
@ -79,10 +80,10 @@ class OpenAIService(@Value("\${openai.key}") private val openaiKey: String, priv
lengthQuestion += message.content.length lengthQuestion += message.content.length
} }
val realModelName = "gpt-3.5-turbo" var realModelName = "gpt-3.5-turbo"
/*if ( modelName != null) { if ( modelName != null) {
realModelName = modelName realModelName = modelName
}*/ }
var realTemperature = 0.1 var realTemperature = 0.1
if ( temperature != null ) { if ( temperature != null ) {
realTemperature = temperature realTemperature = temperature
@ -90,11 +91,15 @@ class OpenAIService(@Value("\${openai.key}") private val openaiKey: String, priv
if (openAI == null) { if (openAI == null) {
connect(realModelName) connect(realModelName)
} }
var tokens = 4096
if (realModelName.contains("gpt-4")) {
tokens = 8192
}
println("OpenAI Chat Last Question: $lastQuestion") println("OpenAI Chat Last Question: $lastQuestion")
val completionRequest = ChatCompletionRequest( val completionRequest = ChatCompletionRequest(
model = ModelId(realModelName), model = ModelId(realModelName),
messages = messages, messages = messages,
maxTokens = 4096 - lengthQuestion, maxTokens = tokens - lengthQuestion,
temperature = realTemperature, temperature = realTemperature,
) )
val completion: ChatCompletion = openAI!!.chatCompletion(completionRequest) val completion: ChatCompletion = openAI!!.chatCompletion(completionRequest)