-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Scala direct syntax DSL #66
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e10d121
WIP
nomisRev 4a50c1f
Compiling
nomisRev a628967
Use AIScope.fromCore
nomisRev 52bddb2
Merge remote-tracking branch 'origin/main' into scala-direct-dsl
nomisRev d0cc204
Fix LLMModel companion object values
nomisRev f9ec579
spotlessApply
nomisRev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,8 +60,11 @@ inline fun <A> ai(noinline block: suspend AIScope.() -> A): AI<A> = block | |
* | ||
* This operator is **terminal** meaning it runs and completes the _chain_ of `AI` actions. | ||
*/ | ||
suspend inline fun <A> AI<A>.getOrElse(crossinline orElse: suspend (AIError) -> A): A = | ||
AIScope(this) { orElse(it) } | ||
|
||
@OptIn(ExperimentalTime::class) | ||
suspend inline fun <reified A> AI<A>.getOrElse(crossinline orElse: suspend (AIError) -> A): A = | ||
suspend fun <A> AIScope(block: suspend AIScope.() -> A, orElse: suspend (AIError) -> A): A = | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We needed a way to construct |
||
recover({ | ||
resourceScope { | ||
val openAIConfig = OpenAIConfig() | ||
|
@@ -70,7 +73,7 @@ suspend inline fun <reified A> AI<A>.getOrElse(crossinline orElse: suspend (AIEr | |
val embeddings = OpenAIEmbeddings(openAIConfig, openAiClient, logger) | ||
val vectorStore = LocalVectorStore(embeddings) | ||
val scope = AIScope(openAiClient, vectorStore, embeddings, logger, this, this@recover) | ||
invoke(scope) | ||
block(scope) | ||
} | ||
}) { | ||
orElse(it) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
package com.xebia.functional.auto | ||
|
||
import com.xebia.functional.loom.LoomAdapter | ||
import com.xebia.functional.xef.auto.AIScope as KtAIScope | ||
import com.xebia.functional.xef.auto.AIException | ||
import com.xebia.functional.xef.auto.AIKt | ||
import com.xebia.functional.xef.AIError | ||
import com.xebia.functional.xef.agents.Agent as KtAgent | ||
import com.xebia.functional.xef.agents.ParameterlessAgent | ||
import com.xebia.functional.xef.llm.openai.LLMModel | ||
|
||
//def example(using AIScope): String = | ||
// prompt[String]("What is your name?") | ||
|
||
//val example: AIScope ?=> String = | ||
// prompt[String]("What is your name?") | ||
|
||
object AI: | ||
|
||
def apply[A](block: AIScope ?=> A): A = | ||
LoomAdapter.apply { (cont) => | ||
AIKt.AIScope[A]( | ||
{ (coreAIScope, cont) => | ||
given AIScope = AIScope.fromCore(coreAIScope) | ||
block | ||
}, | ||
(e: AIError, cont) => throw AIException(e.getReason), | ||
cont | ||
) | ||
} | ||
|
||
end AI | ||
|
||
final case class AIScope(kt: KtAIScope): | ||
def agent[A](agent: ParameterlessAgent[List[String]], scope: AIScope ?=> A): A = ??? | ||
|
||
def agent[A](agents: List[ParameterlessAgent[List[String]]], scope: AIScope ?=> A): A = ??? | ||
|
||
// TODO: Design signature for Scala3 w/ Json parser (with support for generating Json Schema)? | ||
def prompt[A]( | ||
prompt: String, | ||
maxAttempts: Int = 5, | ||
llmMode: LLMModel = LLMModel.getGPT_3_5_TURBO | ||
): A = ??? | ||
|
||
private object AIScope: | ||
def fromCore(coreAIScope: KtAIScope): AIScope = new AIScope(coreAIScope) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We weren't using
reified
here.