Skip to content

Commit

Permalink
```diff
Browse files Browse the repository at this point in the history 
--- a/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt
+++ b/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt
@@ -21,7 +21,7 @@
             task("displayAIPrompt") {
                 group = "school-ai"
                 description = "Dislpay on console AI prompt assistant"
-                doFirst {
+                doLast {
                     createOpenAIChatModel(
                         apiKey = project.apiKey,
                         model = "gpt-3.5-turbo"

```

```diff
--- a/buildSrc/src/main/kotlin/school/ai/AssistantManager.kt
+++ b/buildSrc/src/main/kotlin/school/ai/AssistantManager.kt
@@ -22,20 +22,20 @@
 object AssistantManager {
     val logger = LoggerFactory.getLogger(AssistantPlugin::class.java)

-    val Project.apiKey: String
+    private val Project.apiKey: String
         get() = Properties().apply {
             "$projectDir/private.properties"
                 .let(::File)
                 .inputStream()
                 .use(::load)
         }["OPENAI_API_KEY"] as String
-
+
     val userName = System.getProperty("user.name")
     val assistantName = "E-3PO"

     fun createOpenAIChatModel(
-        apiKey: String,
+        apiKey: String = Project.apiKey,
         model: String = "gpt-3.5-turbo"
     ): Chat<ChatCompletionRequest, ChatCompletionChunk, ChatCompletion> =
         chat {

```
  • Loading branch information
@cheroliv
cheroliv committed Sep 25, 2024
1 parent 288972f commit ba4edfe
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 90 deletions.
16 changes: 11 additions & 5 deletions buildSrc/src/main/kotlin/school/ai/AssistantManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,19 @@ import java.io.File
import java.time.Duration
import java.util.*
import kotlin.coroutines.resume
import org.slf4j.LoggerFactory


object AssistantManager {
val logger = LoggerFactory.getLogger(AssistantPlugin::class.java)

val Project.apiKey: String
get() = Properties().apply {
"$projectDir/private.properties"
.let(::File)
.inputStream()
.use(::load)
}["OPENAI_API_KEY"] as String

val userName = System.getProperty("user.name")
val assistantName = "E-3PO"
Expand Down Expand Up @@ -72,9 +83,4 @@ object AssistantManager {
})
}
}

val Project.apiKey: String
get() = Properties().apply {
"$projectDir/private.properties".let(::File).inputStream().use(::load)
}["OPENAI_API_KEY"] as String
}
130 changes: 45 additions & 85 deletions buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,113 +16,73 @@ class AssistantPlugin : Plugin<Project> {

override fun apply(project: Project) {
project.run {
task("helloOllamaMistral") {
task("displayAIPrompt") {
group = "school-ai"
description = "Display the ollama mistral chatgpt prompt request."
doFirst {
createOllamaChatModel(model = "mistral")
.run { generate(userMessage).let(::println) }
}
description = "Dislpay on console AI prompt assistant"
doFirst { userMessage.let(::println) }
}

task("helloOllamaStreamMistral") {
task("displayOpenAIKey") {
group = "school-ai"
description = "Display the ollama mistral chatgpt stream prompt request."
doFirst {
runBlocking {
createOllamaStreamingChatModel("mistral").run {
when (val answer = generateStreamingResponse(this, userMessage)) {
is Right ->
"Complete response received: \n${answer.value.content().text()}".run(::println)

is Left ->
"Error during response generation: \n${answer.value}".run(::println)
}
}
}
}
description = "Display the open ai api keys stored in private.properties"
doFirst { "apiKey : ${project.apiKey}".let(::println) }
}




task("helloOllamaPhi") {
task("helloOpenAi") {
group = "school-ai"
description = "Display the ollama phi3.5 chatgpt prompt request."
description = "Display the open ai chatgpt hello prompt request."
doFirst {
createOllamaChatModel(model = "phi3.5:latest")
.run { generate(userMessage).let(::println) }
OpenAiChatModel
.withApiKey(apiKey)
.generate("Say 'Hello World'")
.run(::println)
}
}

task("helloOllamaStreamPhi") {
group = "school-ai"
description = "Display the ollama phi3.5 chatgpt stream prompt request."
doFirst {
runBlocking {
createOllamaStreamingChatModel("phi3.5:latest").run {
when (val answer = generateStreamingResponse(this, userMessage)) {
is Right ->
"Complete response received: \n${answer.value.content().text()}".run(::println)

is Left ->
"Error during response generation: \n${answer.value}".run(::println)
}
}
// Generic function for chat model tasks
fun createChatTask(taskName: String, model: String) {
task(taskName) {
group = "school-ai"
description = "Display the Ollama $model chatgpt prompt request."
doFirst {
createOllamaChatModel(model = model)
.run { generate(userMessage).let(::println) }
}
}
}

task("helloOllamaSmollM") {
group = "school-ai"
description = "Display the ollama mistral chatgpt prompt request."
doFirst {
createOllamaChatModel()
.run { generate(userMessage).let(::println) }
}
}

task("helloOllamaStreamSmollM") {
group = "school-ai"
description = "Display the ollama mistral chatgpt stream prompt request."
doFirst {
runBlocking {
createOllamaStreamingChatModel().run {
when (val answer = generateStreamingResponse(this, userMessage)) {
is Right ->
"Complete response received: \n${answer.value.content().text()}".run(::println)

is Left ->
"Error during response generation: \n${answer.value}".run(::println)
// Generic function for streaming chat model tasks
fun createStreamingChatTask(taskName: String, model: String) {
task(taskName) {
group = "school-ai"
description = "Display the Ollama $model chatgpt stream prompt request."
doFirst {
runBlocking {
createOllamaStreamingChatModel(model).run {
when (val answer = generateStreamingResponse(this, userMessage)) {
is Right -> "Complete response received:\n${
answer.value.content().text()
}".run(::println)

is Left -> "Error during response generation:\n${answer.value}".run(::println)
}
}
}
}
}
}


task("displayAIPrompt") {
group = "school-ai"
description = "Dislpay on console AI prompt assistant"
doFirst { userMessage.let(::println) }
}

task("displayOpenAIKey") {
group = "school-ai"
description = "Display the open ai api keys stored in private.properties"
doFirst { "apiKey : ${project.apiKey}".let(::println) }
}

task("helloOpenAi") {
group = "school-ai"
description = "Display the open ai chatgpt hello prompt request."
doFirst {
OpenAiChatModel
.withApiKey(apiKey)
.generate("Say 'Hello World'")
.run(::println)
}
// Creating tasks for each model
mapOf(
"llama3.1:latest" to "Llama3",
"mistral" to "Mistral",
"phi3.5:latest" to "Phi",
"smollm:135m" to "SmollM",
).forEach { model ->
createChatTask("helloOllama${model.value}", model.key)
createStreamingChatTask("helloOllamaStream${model.value}", model.key)
}
}
}
}
}

0 comments on commit ba4edfe

Please sign in to comment.