Remove deprecated methods from Media · spring-projects/spring-ai@228ef10 (original) (raw)

`@@ -17,7 +17,7 @@

`

17

17

`package org.springframework.ai.openai.chat;

`

18

18

``

19

19

`import java.io.IOException;

`

20

``

`-

import java.net.URL;

`

``

20

`+

import java.net.URI;

`

21

21

`import java.util.ArrayList;

`

22

22

`import java.util.Arrays;

`

23

23

`import java.util.List;

`

49

49

`import org.springframework.ai.chat.metadata.Usage;

`

50

50

`import org.springframework.ai.chat.model.ChatResponse;

`

51

51

`import org.springframework.ai.chat.model.Generation;

`

52

``

`-

import org.springframework.ai.model.tool.DefaultToolCallingManager;

`

53

``

`-

import org.springframework.ai.model.tool.ToolCallingChatOptions;

`

54

``

`-

import org.springframework.ai.model.tool.ToolCallingManager;

`

55

``

`-

import org.springframework.ai.model.tool.ToolExecutionResult;

`

56

``

`-

import org.springframework.ai.tool.ToolCallbacks;

`

57

``

`-

import org.springframework.ai.tool.annotation.Tool;

`

58

52

`import org.springframework.ai.chat.prompt.ChatOptions;

`

59

53

`import org.springframework.ai.chat.prompt.Prompt;

`

60

54

`import org.springframework.ai.chat.prompt.PromptTemplate;

`

`@@ -63,6 +57,10 @@

`

63

57

`import org.springframework.ai.converter.BeanOutputConverter;

`

64

58

`import org.springframework.ai.converter.ListOutputConverter;

`

65

59

`import org.springframework.ai.converter.MapOutputConverter;

`

``

60

`+

import org.springframework.ai.model.tool.DefaultToolCallingManager;

`

``

61

`+

import org.springframework.ai.model.tool.ToolCallingChatOptions;

`

``

62

`+

import org.springframework.ai.model.tool.ToolCallingManager;

`

``

63

`+

import org.springframework.ai.model.tool.ToolExecutionResult;

`

66

64

`import org.springframework.ai.openai.OpenAiChatOptions;

`

67

65

`import org.springframework.ai.openai.OpenAiTestConfiguration;

`

68

66

`import org.springframework.ai.openai.api.OpenAiApi;

`

`@@ -71,6 +69,8 @@

`

71

69

`import org.springframework.ai.openai.api.OpenAiApi.ChatCompletionRequest.AudioParameters.Voice;

`

72

70

`import org.springframework.ai.openai.api.tool.MockWeatherService;

`

73

71

`import org.springframework.ai.openai.testutils.AbstractIT;

`

``

72

`+

import org.springframework.ai.tool.ToolCallbacks;

`

``

73

`+

import org.springframework.ai.tool.annotation.Tool;

`

74

74

`import org.springframework.ai.tool.function.FunctionToolCallback;

`

75

75

`import org.springframework.beans.factory.annotation.Value;

`

76

76

`import org.springframework.boot.test.context.SpringBootTest;

`

`@@ -491,7 +491,7 @@ void multiModalityImageUrl(String modelName) throws IOException {

`

491

491

` .text("Explain what do you see on this picture?")

`

492

492

` .media(List.of(Media.builder()

`

493

493

` .mimeType(MimeTypeUtils.IMAGE_PNG)

`

494

``

`-

.data(new URL("https://docs.spring.io/spring-ai/reference/_images/multimodal.test.png"))

`

``

494

`+

.data(URI.create("https://docs.spring.io/spring-ai/reference/_images/multimodal.test.png"))

`

495

495

` .build()))

`

496

496

` .build();

`

497

497

``

`@@ -510,7 +510,7 @@ void streamingMultiModalityImageUrl() throws IOException {

`

510

510

` .text("Explain what do you see on this picture?")

`

511

511

` .media(List.of(Media.builder()

`

512

512

` .mimeType(MimeTypeUtils.IMAGE_PNG)

`

513

``

`-

.data(new URL("https://docs.spring.io/spring-ai/reference/_images/multimodal.test.png"))

`

``

513

`+

.data(URI.create("https://docs.spring.io/spring-ai/reference/_images/multimodal.test.png"))

`

514

514

` .build()))

`

515

515

` .build();

`

516

516

``