File tree Expand file tree Collapse file tree 6 files changed +6
-14
lines changed
anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service
openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai Expand file tree Collapse file tree 6 files changed +6
-14
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ package io.cequence.openaiscala.anthropic.service
2
2
3
3
import akka .NotUsed
4
4
import akka .stream .scaladsl .Source
5
- import io .cequence .openaiscala .anthropic .domain .{ Content , Message }
5
+ import io .cequence .openaiscala .anthropic .domain .Message
6
6
import io .cequence .openaiscala .anthropic .domain .response .{
7
7
ContentBlockDelta ,
8
8
CreateMessageResponse
@@ -32,7 +32,6 @@ trait AnthropicService extends CloseableService with AnthropicServiceConsts {
32
32
* <a href="https://docs.anthropic.com/claude/reference/messages_post">Anthropic Doc</a>
33
33
*/
34
34
def createMessage (
35
- system : Option [Content ],
36
35
messages : Seq [Message ],
37
36
settings : AnthropicCreateMessageSettings = DefaultSettings .CreateMessage
38
37
): Future [CreateMessageResponse ]
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ import akka.stream.scaladsl.Source
5
5
import io .cequence .openaiscala .OpenAIScalaClientException
6
6
import io .cequence .openaiscala .anthropic .JsonFormats
7
7
import io .cequence .openaiscala .anthropic .domain .Message .{SystemMessage , SystemMessageContent }
8
- import io .cequence .openaiscala .anthropic .domain .{Message => AnthropicMessage }
9
8
import io .cequence .openaiscala .anthropic .domain .response .{
10
9
ContentBlockDelta ,
11
10
CreateMessageResponse
@@ -35,7 +34,6 @@ private[service] trait AnthropicServiceImpl extends Anthropic {
35
34
private val logger = LoggerFactory .getLogger(" AnthropicServiceImpl" )
36
35
37
36
override def createMessage (
38
- system : Option [Content ],
39
37
messages : Seq [Message ],
40
38
settings : AnthropicCreateMessageSettings
41
39
): Future [CreateMessageResponse ] =
Original file line number Diff line number Diff line change @@ -22,7 +22,6 @@ import io.cequence.openaiscala.domain.response.{
22
22
import io .cequence .openaiscala .domain .settings .CreateChatCompletionSettings
23
23
import io .cequence .openaiscala .domain .settings .CreateChatCompletionSettingsOps .RichCreateChatCompletionSettings
24
24
import io .cequence .openaiscala .domain .{
25
- AssistantMessage ,
26
25
ChatRole ,
27
26
MessageSpec ,
28
27
SystemMessage ,
@@ -209,7 +208,7 @@ package object impl extends AnthropicServiceConsts {
209
208
usage = None
210
209
)
211
210
212
- def toOpenAIAssistantMessage (content : ContentBlocks ): AssistantMessage = {
211
+ def toOpenAIAssistantMessage (content : ContentBlocks ): OpenAIAssistantMessage = {
213
212
val textContents = content.blocks.collect { case ContentBlockBase (TextBlock (text), _) =>
214
213
text
215
214
} // TODO
@@ -218,7 +217,7 @@ package object impl extends AnthropicServiceConsts {
218
217
throw new IllegalArgumentException (" No text content found in the response" )
219
218
}
220
219
val singleTextContent = concatenateMessages(textContents)
221
- AssistantMessage (singleTextContent, name = None )
220
+ OpenAIAssistantMessage (singleTextContent, name = None )
222
221
}
223
222
224
223
private def concatenateMessages (messageContent : Seq [String ]): String =
Original file line number Diff line number Diff line change 1
1
package io .cequence .openaiscala .examples .nonopenai
2
2
3
3
import io .cequence .openaiscala .anthropic .domain .Content .ContentBlock .TextBlock
4
- import io .cequence .openaiscala .anthropic .domain .Content .{ ContentBlockBase , SingleString }
5
- import io .cequence .openaiscala .anthropic .domain .{ Content , Message }
4
+ import io .cequence .openaiscala .anthropic .domain .Content .ContentBlockBase
5
+ import io .cequence .openaiscala .anthropic .domain .Message
6
6
import io .cequence .openaiscala .anthropic .domain .Message .UserMessage
7
7
import io .cequence .openaiscala .anthropic .domain .response .CreateMessageResponse
8
8
import io .cequence .openaiscala .anthropic .domain .settings .AnthropicCreateMessageSettings
@@ -17,13 +17,11 @@ object AnthropicCreateMessage extends ExampleBase[AnthropicService] {
17
17
18
18
override protected val service : AnthropicService = AnthropicServiceFactory (withCache = true )
19
19
20
- val systemMessage : Content = SingleString (" You are a helpful assistant." )
21
20
val messages : Seq [Message ] = Seq (UserMessage (" What is the weather like in Norway?" ))
22
21
23
22
override protected def run : Future [_] =
24
23
service
25
24
.createMessage(
26
- Some (systemMessage),
27
25
messages,
28
26
settings = AnthropicCreateMessageSettings (
29
27
model = NonOpenAIModelId .claude_3_haiku_20240307,
Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ object AnthropicCreateMessageWithImage extends ExampleBase[AnthropicService] {
38
38
override protected def run : Future [_] =
39
39
service
40
40
.createMessage(
41
- system = None ,
42
41
messages,
43
42
settings = AnthropicCreateMessageSettings (
44
43
model = NonOpenAIModelId .claude_3_opus_20240229,
Original file line number Diff line number Diff line change 1
1
package io .cequence .openaiscala .examples .nonopenai
2
2
3
3
import io .cequence .openaiscala .anthropic .domain .Content .ContentBlock .{MediaBlock , TextBlock }
4
- import io .cequence .openaiscala .anthropic .domain .Content .{ ContentBlockBase , SingleString }
4
+ import io .cequence .openaiscala .anthropic .domain .Content .ContentBlockBase
5
5
import io .cequence .openaiscala .anthropic .domain .Message
6
6
import io .cequence .openaiscala .anthropic .domain .Message .{SystemMessage , UserMessageContent }
7
7
import io .cequence .openaiscala .anthropic .domain .response .CreateMessageResponse
@@ -37,7 +37,6 @@ object AnthropicCreateMessageWithPdf extends ExampleBase[AnthropicService] {
37
37
override protected def run : Future [_] =
38
38
service
39
39
.createMessage(
40
- system = None ,
41
40
messages,
42
41
settings = AnthropicCreateMessageSettings (
43
42
model =
You can’t perform that action at this time.
0 commit comments