|
14 | 14 | import org.elasticsearch.inference.TaskType; |
15 | 15 |
|
16 | 16 | import java.io.IOException; |
17 | | -import java.util.ArrayList; |
18 | 17 | import java.util.List; |
19 | 18 | import java.util.Map; |
20 | 19 |
|
21 | 20 | import static org.elasticsearch.xpack.inference.InferenceBaseRestTest.assertStatusOkOrCreated; |
| 21 | +import static org.hamcrest.Matchers.containsInAnyOrder; |
22 | 22 | import static org.hamcrest.Matchers.equalTo; |
23 | 23 |
|
24 | 24 | public class InferenceGetServicesIT extends BaseMockEISAuthServerTest { |
25 | 25 |
|
26 | | - @SuppressWarnings("unchecked") |
27 | 26 | public void testGetServicesWithoutTaskType() throws IOException { |
28 | 27 | List<Object> services = getAllServices(); |
29 | | - assertThat(services.size(), equalTo(21)); |
30 | | - |
31 | | - String[] providers = new String[services.size()]; |
32 | | - for (int i = 0; i < services.size(); i++) { |
33 | | - Map<String, Object> serviceConfig = (Map<String, Object>) services.get(i); |
34 | | - providers[i] = (String) serviceConfig.get("service"); |
35 | | - } |
36 | | - |
37 | | - assertArrayEquals( |
38 | | - List.of( |
39 | | - "alibabacloud-ai-search", |
40 | | - "amazonbedrock", |
41 | | - "anthropic", |
42 | | - "azureaistudio", |
43 | | - "azureopenai", |
44 | | - "cohere", |
45 | | - "deepseek", |
46 | | - "elastic", |
47 | | - "elasticsearch", |
48 | | - "googleaistudio", |
49 | | - "googlevertexai", |
50 | | - "hugging_face", |
51 | | - "jinaai", |
52 | | - "mistral", |
53 | | - "openai", |
54 | | - "streaming_completion_test_service", |
55 | | - "test_reranking_service", |
56 | | - "test_service", |
57 | | - "text_embedding_test_service", |
58 | | - "voyageai", |
59 | | - "watsonxai" |
60 | | - ).toArray(), |
61 | | - providers |
| 28 | + assertThat(services.size(), equalTo(22)); |
| 29 | + |
| 30 | + var providers = providers(services); |
| 31 | + |
| 32 | + assertThat( |
| 33 | + providers, |
| 34 | + containsInAnyOrder( |
| 35 | + List.of( |
| 36 | + "alibabacloud-ai-search", |
| 37 | + "amazonbedrock", |
| 38 | + "anthropic", |
| 39 | + "azureaistudio", |
| 40 | + "azureopenai", |
| 41 | + "cohere", |
| 42 | + "deepseek", |
| 43 | + "elastic", |
| 44 | + "elasticsearch", |
| 45 | + "googleaistudio", |
| 46 | + "googlevertexai", |
| 47 | + "hugging_face", |
| 48 | + "jinaai", |
| 49 | + "mistral", |
| 50 | + "openai", |
| 51 | + "streaming_completion_test_service", |
| 52 | + "test_reranking_service", |
| 53 | + "test_service", |
| 54 | + "text_embedding_test_service", |
| 55 | + "voyageai", |
| 56 | + "watsonxai", |
| 57 | + "sagemaker" |
| 58 | + ).toArray() |
| 59 | + ) |
62 | 60 | ); |
63 | 61 | } |
64 | 62 |
|
65 | 63 | @SuppressWarnings("unchecked") |
| 64 | + private Iterable<String> providers(List<Object> services) { |
| 65 | + return services.stream().map(service -> { |
| 66 | + var serviceConfig = (Map<String, Object>) service; |
| 67 | + return (String) serviceConfig.get("service"); |
| 68 | + }).toList(); |
| 69 | + } |
| 70 | + |
66 | 71 | public void testGetServicesWithTextEmbeddingTaskType() throws IOException { |
67 | 72 | List<Object> services = getServices(TaskType.TEXT_EMBEDDING); |
68 | | - assertThat(services.size(), equalTo(15)); |
69 | | - |
70 | | - String[] providers = new String[services.size()]; |
71 | | - for (int i = 0; i < services.size(); i++) { |
72 | | - Map<String, Object> serviceConfig = (Map<String, Object>) services.get(i); |
73 | | - providers[i] = (String) serviceConfig.get("service"); |
74 | | - } |
75 | | - |
76 | | - assertArrayEquals( |
77 | | - List.of( |
78 | | - "alibabacloud-ai-search", |
79 | | - "amazonbedrock", |
80 | | - "azureaistudio", |
81 | | - "azureopenai", |
82 | | - "cohere", |
83 | | - "elasticsearch", |
84 | | - "googleaistudio", |
85 | | - "googlevertexai", |
86 | | - "hugging_face", |
87 | | - "jinaai", |
88 | | - "mistral", |
89 | | - "openai", |
90 | | - "text_embedding_test_service", |
91 | | - "voyageai", |
92 | | - "watsonxai" |
93 | | - ).toArray(), |
94 | | - providers |
| 73 | + assertThat(services.size(), equalTo(16)); |
| 74 | + |
| 75 | + var providers = providers(services); |
| 76 | + |
| 77 | + assertThat( |
| 78 | + providers, |
| 79 | + containsInAnyOrder( |
| 80 | + List.of( |
| 81 | + "alibabacloud-ai-search", |
| 82 | + "amazonbedrock", |
| 83 | + "azureaistudio", |
| 84 | + "azureopenai", |
| 85 | + "cohere", |
| 86 | + "elasticsearch", |
| 87 | + "googleaistudio", |
| 88 | + "googlevertexai", |
| 89 | + "hugging_face", |
| 90 | + "jinaai", |
| 91 | + "mistral", |
| 92 | + "openai", |
| 93 | + "text_embedding_test_service", |
| 94 | + "voyageai", |
| 95 | + "watsonxai", |
| 96 | + "sagemaker" |
| 97 | + ).toArray() |
| 98 | + ) |
95 | 99 | ); |
96 | 100 | } |
97 | 101 |
|
98 | | - @SuppressWarnings("unchecked") |
99 | 102 | public void testGetServicesWithRerankTaskType() throws IOException { |
100 | 103 | List<Object> services = getServices(TaskType.RERANK); |
101 | 104 | assertThat(services.size(), equalTo(7)); |
102 | 105 |
|
103 | | - String[] providers = new String[services.size()]; |
104 | | - for (int i = 0; i < services.size(); i++) { |
105 | | - Map<String, Object> serviceConfig = (Map<String, Object>) services.get(i); |
106 | | - providers[i] = (String) serviceConfig.get("service"); |
107 | | - } |
108 | | - |
109 | | - assertArrayEquals( |
110 | | - List.of("alibabacloud-ai-search", "cohere", "elasticsearch", "googlevertexai", "jinaai", "test_reranking_service", "voyageai") |
111 | | - .toArray(), |
112 | | - providers |
| 106 | + var providers = providers(services); |
| 107 | + |
| 108 | + assertThat( |
| 109 | + providers, |
| 110 | + containsInAnyOrder( |
| 111 | + List.of( |
| 112 | + "alibabacloud-ai-search", |
| 113 | + "cohere", |
| 114 | + "elasticsearch", |
| 115 | + "googlevertexai", |
| 116 | + "jinaai", |
| 117 | + "test_reranking_service", |
| 118 | + "voyageai" |
| 119 | + ).toArray() |
| 120 | + ) |
113 | 121 | ); |
114 | 122 | } |
115 | 123 |
|
116 | | - @SuppressWarnings("unchecked") |
117 | 124 | public void testGetServicesWithCompletionTaskType() throws IOException { |
118 | 125 | List<Object> services = getServices(TaskType.COMPLETION); |
119 | 126 | assertThat(services.size(), equalTo(10)); |
120 | 127 |
|
121 | | - String[] providers = new String[services.size()]; |
122 | | - for (int i = 0; i < services.size(); i++) { |
123 | | - Map<String, Object> serviceConfig = (Map<String, Object>) services.get(i); |
124 | | - providers[i] = (String) serviceConfig.get("service"); |
125 | | - } |
126 | | - |
127 | | - var providerList = new ArrayList<>( |
128 | | - List.of( |
129 | | - "alibabacloud-ai-search", |
130 | | - "amazonbedrock", |
131 | | - "anthropic", |
132 | | - "azureaistudio", |
133 | | - "azureopenai", |
134 | | - "cohere", |
135 | | - "deepseek", |
136 | | - "googleaistudio", |
137 | | - "openai", |
138 | | - "streaming_completion_test_service" |
| 128 | + var providers = providers(services); |
| 129 | + |
| 130 | + assertThat( |
| 131 | + providers, |
| 132 | + containsInAnyOrder( |
| 133 | + List.of( |
| 134 | + "alibabacloud-ai-search", |
| 135 | + "amazonbedrock", |
| 136 | + "anthropic", |
| 137 | + "azureaistudio", |
| 138 | + "azureopenai", |
| 139 | + "cohere", |
| 140 | + "deepseek", |
| 141 | + "googleaistudio", |
| 142 | + "openai", |
| 143 | + "streaming_completion_test_service" |
| 144 | + ).toArray() |
139 | 145 | ) |
140 | 146 | ); |
141 | | - |
142 | | - assertArrayEquals(providers, providerList.toArray()); |
143 | 147 | } |
144 | 148 |
|
145 | | - @SuppressWarnings("unchecked") |
146 | 149 | public void testGetServicesWithChatCompletionTaskType() throws IOException { |
147 | 150 | List<Object> services = getServices(TaskType.CHAT_COMPLETION); |
148 | 151 | assertThat(services.size(), equalTo(4)); |
149 | 152 |
|
150 | | - String[] providers = new String[services.size()]; |
151 | | - for (int i = 0; i < services.size(); i++) { |
152 | | - Map<String, Object> serviceConfig = (Map<String, Object>) services.get(i); |
153 | | - providers[i] = (String) serviceConfig.get("service"); |
154 | | - } |
| 153 | + var providers = providers(services); |
155 | 154 |
|
156 | | - assertArrayEquals(List.of("deepseek", "elastic", "openai", "streaming_completion_test_service").toArray(), providers); |
| 155 | + assertThat(providers, containsInAnyOrder(List.of("deepseek", "elastic", "openai", "streaming_completion_test_service").toArray())); |
157 | 156 | } |
158 | 157 |
|
159 | | - @SuppressWarnings("unchecked") |
160 | 158 | public void testGetServicesWithSparseEmbeddingTaskType() throws IOException { |
161 | 159 | List<Object> services = getServices(TaskType.SPARSE_EMBEDDING); |
162 | 160 | assertThat(services.size(), equalTo(6)); |
163 | 161 |
|
164 | | - String[] providers = new String[services.size()]; |
165 | | - for (int i = 0; i < services.size(); i++) { |
166 | | - Map<String, Object> serviceConfig = (Map<String, Object>) services.get(i); |
167 | | - providers[i] = (String) serviceConfig.get("service"); |
168 | | - } |
169 | | - |
170 | | - assertArrayEquals( |
171 | | - List.of( |
172 | | - "alibabacloud-ai-search", |
173 | | - "elastic", |
174 | | - "elasticsearch", |
175 | | - "hugging_face", |
176 | | - "streaming_completion_test_service", |
177 | | - "test_service" |
178 | | - ).toArray(), |
179 | | - providers |
| 162 | + var providers = providers(services); |
| 163 | + |
| 164 | + assertThat( |
| 165 | + providers, |
| 166 | + containsInAnyOrder( |
| 167 | + List.of( |
| 168 | + "alibabacloud-ai-search", |
| 169 | + "elastic", |
| 170 | + "elasticsearch", |
| 171 | + "hugging_face", |
| 172 | + "streaming_completion_test_service", |
| 173 | + "test_service" |
| 174 | + ).toArray() |
| 175 | + ) |
180 | 176 | ); |
181 | 177 | } |
182 | 178 |
|
|
0 commit comments