@@ -806,34 +806,8 @@ void testResponseObjectJsonSchema() throws IOException {
806806
807807 val prompt = new OrchestrationPrompt (Message .system ("You are a language translator." ));
808808
809- final var result = client .chatCompletion (prompt , configWithTemplate );
810-
811- final var response = result .getOriginalResponse ();
812- assertThat (response .getRequestId ()).isEqualTo ("0759f249-a261-4cb7-99d5-ea6eae2c141c" );
813- final var messageList = result .getAllMessages ();
814-
815- assertThat (((TextItem ) messageList .get (0 ).content ().items ().get (0 )).text ())
816- .isEqualTo ("Whats 'apple' in German?" );
817- assertThat (messageList .get (0 ).role ()).isEqualTo ("user" );
818- assertThat (((TextItem ) messageList .get (1 ).content ().items ().get (0 )).text ())
819- .isEqualTo ("You are a language translator." );
820- assertThat (messageList .get (1 ).role ()).isEqualTo ("system" );
821- assertThat (((TextItem ) messageList .get (2 ).content ().items ().get (0 )).text ())
822- .isEqualTo ("{\" translation\" :\" Apfel\" ,\" language\" :\" German\" }" );
823- assertThat (messageList .get (2 ).role ()).isEqualTo ("assistant" );
824-
825- var llm = (LLMModuleResultSynchronous ) response .getModuleResults ().getLlm ();
826- assertThat (llm ).isNotNull ();
827- var choices = llm .getChoices ();
828- assertThat (choices .get (0 ).getIndex ()).isZero ();
829- assertThat (choices .get (0 ).getMessage ().getContent ())
830- .isEqualTo ("{\" translation\" :\" Apfel\" ,\" language\" :\" German\" }" );
831- assertThat (choices .get (0 ).getMessage ().getRole ()).isEqualTo ("assistant" );
832- assertThat (choices .get (0 ).getIndex ()).isZero ();
833- assertThat (choices .get (0 ).getMessage ().getContent ())
834- .isEqualTo ("{\" translation\" :\" Apfel\" ,\" language\" :\" German\" }" );
835- assertThat (choices .get (0 ).getMessage ().getRole ()).isEqualTo ("assistant" );
836- assertThat (choices .get (0 ).getFinishReason ()).isEqualTo ("stop" );
809+ final var message = client .chatCompletion (prompt , configWithTemplate ).getContent ();
810+ assertThat (message ).isEqualTo ("{\" translation\" :\" Apfel\" ,\" language\" :\" German\" }" );
837811
838812 try (var requestInputStream = fileLoader .apply ("jsonSchemaRequest.json" )) {
839813 final String request = new String (requestInputStream .readAllBytes ());
@@ -866,36 +840,8 @@ void testResponseObjectJsonObject() throws IOException {
866840 Message .system (
867841 "You are a language translator. Answer using the following JSON format: {\" language\" : ..., \" translation\" : ...}" ));
868842
869- final var result = client .chatCompletion (prompt , configWithTemplate );
870-
871- final var response = result .getOriginalResponse ();
872- assertThat (response .getRequestId ()).isEqualTo ("f353a729-3391-4cec-bbf9-7ab39d34ebc1" );
873- final var messageList = result .getAllMessages ();
874-
875- assertThat (((TextItem ) messageList .get (0 ).content ().items ().get (0 )).text ())
876- .isEqualTo ("What is 'apple' in German?" );
877- assertThat (messageList .get (0 ).role ()).isEqualTo ("user" );
878- assertThat (((TextItem ) messageList .get (1 ).content ().items ().get (0 )).text ())
879- .isEqualTo (
880- "You are a language translator. Answer using the following JSON format: {\" language\" : ..., \" translation\" : ...}" );
881- assertThat (messageList .get (1 ).role ()).isEqualTo ("system" );
882- assertThat (((TextItem ) messageList .get (2 ).content ().items ().get (0 )).text ())
883- .isEqualTo ("{\" language\" : \" German\" , \" translation\" : \" Apfel\" }" );
884- assertThat (messageList .get (2 ).role ()).isEqualTo ("assistant" );
885-
886- var llm = (LLMModuleResultSynchronous ) response .getModuleResults ().getLlm ();
887- assertThat (llm ).isNotNull ();
888- var choices = llm .getChoices ();
889- assertThat (choices .get (0 ).getIndex ()).isZero ();
890- assertThat (choices .get (0 ).getMessage ().getContent ())
891- .isEqualTo ("{\" language\" : \" German\" , \" translation\" : \" Apfel\" }" );
892- assertThat (choices .get (0 ).getMessage ().getRole ()).isEqualTo ("assistant" );
893- assertThat (choices .get (0 ).getFinishReason ()).isEqualTo ("stop" );
894- assertThat (choices .get (0 ).getIndex ()).isZero ();
895- assertThat (choices .get (0 ).getMessage ().getContent ())
896- .isEqualTo ("{\" language\" : \" German\" , \" translation\" : \" Apfel\" }" );
897- assertThat (choices .get (0 ).getMessage ().getRole ()).isEqualTo ("assistant" );
898- assertThat (choices .get (0 ).getFinishReason ()).isEqualTo ("stop" );
843+ final var message = client .chatCompletion (prompt , configWithTemplate ).getContent ();
844+ assertThat (message ).isEqualTo ("{\" language\" : \" German\" , \" translation\" : \" Apfel\" }" );
899845
900846 try (var requestInputStream = fileLoader .apply ("jsonObjectRequest.json" )) {
901847 final String request = new String (requestInputStream .readAllBytes ());
@@ -925,37 +871,10 @@ void testResponseObjectText() throws IOException {
925871 new OrchestrationPrompt (
926872 Message .system ("You are a language translator. Answer using JSON." ));
927873
928- final var result = client .chatCompletion (prompt , configWithTemplate );
929-
930- final var response = result .getOriginalResponse ();
931- assertThat (response .getRequestId ()).isEqualTo ("2fe5cbeb-4cdc-4a62-8d0b-29bbd8acde07" );
932- final var messageList = result .getAllMessages ();
933-
934- assertThat (((TextItem ) messageList .get (0 ).content ().items ().get (0 )).text ())
935- .isEqualTo ("What is 'apple' in German?" );
936- assertThat (messageList .get (0 ).role ()).isEqualTo ("user" );
937- assertThat (((TextItem ) messageList .get (1 ).content ().items ().get (0 )).text ())
938- .isEqualTo ("You are a language translator. Answer using JSON." );
939- assertThat (messageList .get (1 ).role ()).isEqualTo ("system" );
940- assertThat (((TextItem ) messageList .get (2 ).content ().items ().get (0 )).text ())
874+ final var message = client .chatCompletion (prompt , configWithTemplate ).getContent ();
875+ assertThat (message )
941876 .isEqualTo (
942877 "```json\n {\n \" word\" : \" apple\" ,\n \" translation\" : \" Apfel\" ,\n \" language\" : \" German\" \n }\n ```" );
943- assertThat (messageList .get (2 ).role ()).isEqualTo ("assistant" );
944-
945- var llm = (LLMModuleResultSynchronous ) response .getModuleResults ().getLlm ();
946- assertThat (llm ).isNotNull ();
947- var choices = llm .getChoices ();
948- assertThat (choices .get (0 ).getIndex ()).isZero ();
949- assertThat (choices .get (0 ).getMessage ().getContent ())
950- .isEqualTo (
951- "```json\n {\n \" word\" : \" apple\" ,\n \" translation\" : \" Apfel\" ,\n \" language\" : \" German\" \n }\n ```" );
952- assertThat (choices .get (0 ).getMessage ().getRole ()).isEqualTo ("assistant" );
953- assertThat (choices .get (0 ).getFinishReason ()).isEqualTo ("stop" );
954- assertThat (choices .get (0 ).getMessage ().getContent ())
955- .isEqualTo (
956- "```json\n {\n \" word\" : \" apple\" ,\n \" translation\" : \" Apfel\" ,\n \" language\" : \" German\" \n }\n ```" );
957- assertThat (choices .get (0 ).getMessage ().getRole ()).isEqualTo ("assistant" );
958- assertThat (choices .get (0 ).getFinishReason ()).isEqualTo ("stop" );
959878
960879 try (var requestInputStream = fileLoader .apply ("responseFormatTextRequest.json" )) {
961880 final String request = new String (requestInputStream .readAllBytes ());
0 commit comments