fix bean parser and tests

Author: tzolov

spring-ai-core/src/main/java/org/springframework/ai/parser/BeanOutputParser.java

@@ -97,19 +97,33 @@ private void generateSchema() {
 	public T parse(String text) {
 		try {
 			// If the response is a JSON Schema, extract the properties and use them as
-			// the
-			// response.
-			Map<String, Object> map = this.objectMapper.readValue(text, Map.class);
-			if (map.containsKey("$schema")) {
-				text = this.objectMapper.writeValueAsString(map.get("properties"));
-			}
+			// the response.
+			text = this.jsonSchemaToInstance(text);
 			return (T) this.objectMapper.readValue(text, this.clazz);
 		}
 		catch (JsonProcessingException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
+	/**
+	 * If the response is a JSON Schema, extract the properties and use them as the
+	 * response.
+	 * @param text
+	 * @return
+	 */
+	private String jsonSchemaToInstance(String text) {
+		try {
+			Map<String, Object> map = this.objectMapper.readValue(text, Map.class);
+			if (map.containsKey("$schema")) {
+				return this.objectMapper.writeValueAsString(map.get("properties"));
+			}
+		}
+		catch (Exception e) {
+		}
+		return text;
+	}
+
 	/**
 	 * Configures and returns an object mapper for JSON operations.
 	 * @return Configured object mapper.

spring-ai-core/src/test/java/org/springframework/ai/parser/BeanOutputParserTest.java

@@ -69,6 +69,7 @@ public void shouldReturnFormatContainingResponseInstructionsAndJsonSchema() {
 					"""
 							Your response should be in JSON format.
 							Do not include any explanations, only provide a RFC8259 compliant JSON response following this format without deviation.
+							Do not include markdown code blocks in your response.
 							Here is the JSON Schema instance your output must adhere to:
 							```{
 							  "$schema" : "https://json-schema.org/draft/2020-12/schema",