Skip to content

Commit d281337

Browse files
committed
fix after merge
1 parent 9de7612 commit d281337

File tree

6 files changed

+6
-14
lines changed

6 files changed

+6
-14
lines changed

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/AnthropicService.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.cequence.openaiscala.anthropic.service
22

33
import akka.NotUsed
44
import akka.stream.scaladsl.Source
5-
import io.cequence.openaiscala.anthropic.domain.{Content, Message}
5+
import io.cequence.openaiscala.anthropic.domain.Message
66
import io.cequence.openaiscala.anthropic.domain.response.{
77
ContentBlockDelta,
88
CreateMessageResponse
@@ -32,7 +32,6 @@ trait AnthropicService extends CloseableService with AnthropicServiceConsts {
3232
* <a href="https://docs.anthropic.com/claude/reference/messages_post">Anthropic Doc</a>
3333
*/
3434
def createMessage(
35-
system: Option[Content],
3635
messages: Seq[Message],
3736
settings: AnthropicCreateMessageSettings = DefaultSettings.CreateMessage
3837
): Future[CreateMessageResponse]

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/impl/AnthropicServiceImpl.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import akka.stream.scaladsl.Source
55
import io.cequence.openaiscala.OpenAIScalaClientException
66
import io.cequence.openaiscala.anthropic.JsonFormats
77
import io.cequence.openaiscala.anthropic.domain.Message.{SystemMessage, SystemMessageContent}
8-
import io.cequence.openaiscala.anthropic.domain.{Message => AnthropicMessage}
98
import io.cequence.openaiscala.anthropic.domain.response.{
109
ContentBlockDelta,
1110
CreateMessageResponse
@@ -35,7 +34,6 @@ private[service] trait AnthropicServiceImpl extends Anthropic {
3534
private val logger = LoggerFactory.getLogger("AnthropicServiceImpl")
3635

3736
override def createMessage(
38-
system: Option[Content],
3937
messages: Seq[Message],
4038
settings: AnthropicCreateMessageSettings
4139
): Future[CreateMessageResponse] =

anthropic-client/src/main/scala/io/cequence/openaiscala/anthropic/service/impl/package.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import io.cequence.openaiscala.domain.response.{
2222
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
2323
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettingsOps.RichCreateChatCompletionSettings
2424
import io.cequence.openaiscala.domain.{
25-
AssistantMessage,
2625
ChatRole,
2726
MessageSpec,
2827
SystemMessage,
@@ -209,7 +208,7 @@ package object impl extends AnthropicServiceConsts {
209208
usage = None
210209
)
211210

212-
def toOpenAIAssistantMessage(content: ContentBlocks): AssistantMessage = {
211+
def toOpenAIAssistantMessage(content: ContentBlocks): OpenAIAssistantMessage = {
213212
val textContents = content.blocks.collect { case ContentBlockBase(TextBlock(text), _) =>
214213
text
215214
} // TODO
@@ -218,7 +217,7 @@ package object impl extends AnthropicServiceConsts {
218217
throw new IllegalArgumentException("No text content found in the response")
219218
}
220219
val singleTextContent = concatenateMessages(textContents)
221-
AssistantMessage(singleTextContent, name = None)
220+
OpenAIAssistantMessage(singleTextContent, name = None)
222221
}
223222

224223
private def concatenateMessages(messageContent: Seq[String]): String =

openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateMessage.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.cequence.openaiscala.examples.nonopenai
22

33
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
66
import io.cequence.openaiscala.anthropic.domain.Message.UserMessage
77
import io.cequence.openaiscala.anthropic.domain.response.CreateMessageResponse
88
import io.cequence.openaiscala.anthropic.domain.settings.AnthropicCreateMessageSettings
@@ -17,13 +17,11 @@ object AnthropicCreateMessage extends ExampleBase[AnthropicService] {
1717

1818
override protected val service: AnthropicService = AnthropicServiceFactory(withCache = true)
1919

20-
val systemMessage: Content = SingleString("You are a helpful assistant.")
2120
val messages: Seq[Message] = Seq(UserMessage("What is the weather like in Norway?"))
2221

2322
override protected def run: Future[_] =
2423
service
2524
.createMessage(
26-
Some(systemMessage),
2725
messages,
2826
settings = AnthropicCreateMessageSettings(
2927
model = NonOpenAIModelId.claude_3_haiku_20240307,

openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateMessageWithImage.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ object AnthropicCreateMessageWithImage extends ExampleBase[AnthropicService] {
3838
override protected def run: Future[_] =
3939
service
4040
.createMessage(
41-
system = None,
4241
messages,
4342
settings = AnthropicCreateMessageSettings(
4443
model = NonOpenAIModelId.claude_3_opus_20240229,

openai-examples/src/main/scala/io/cequence/openaiscala/examples/nonopenai/AnthropicCreateMessageWithPdf.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.cequence.openaiscala.examples.nonopenai
22

33
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
55
import io.cequence.openaiscala.anthropic.domain.Message
66
import io.cequence.openaiscala.anthropic.domain.Message.{SystemMessage, UserMessageContent}
77
import io.cequence.openaiscala.anthropic.domain.response.CreateMessageResponse
@@ -37,7 +37,6 @@ object AnthropicCreateMessageWithPdf extends ExampleBase[AnthropicService] {
3737
override protected def run: Future[_] =
3838
service
3939
.createMessage(
40-
system = None,
4140
messages,
4241
settings = AnthropicCreateMessageSettings(
4342
model =

0 commit comments

Comments
 (0)