chore: make the genai processor more lenient against the new endpoint format

java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/GenAIChatCfEnvProcessor.java

@@ -28,6 +28,7 @@
  *
  * @author Stuart Charlton
  * @author Ed King
+ * @author Gareth Evans
  **/
 public class GenAIChatCfEnvProcessor implements CfEnvProcessor {
 
@@ -36,7 +37,7 @@ public boolean accept(CfService service) {
 		boolean isGenAIService = service.existsByTagIgnoreCase("genai") || service.existsByLabelStartsWith("genai");
 		if (isGenAIService) {
 			ArrayList<String> modelCapabilities = (ArrayList<String>) service.getCredentials().getMap().get("model_capabilities");
-			return modelCapabilities.contains("chat");
+			return (modelCapabilities != null && modelCapabilities.contains("chat"));
 		}
 
 		return false;

java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/GenAIEmbeddingCfEnvProcessor.java

@@ -28,6 +28,7 @@
  *
  * @author Stuart Charlton
  * @author Ed King
+ * @author Gareth Evans
  **/
 public class GenAIEmbeddingCfEnvProcessor implements CfEnvProcessor {
 
@@ -36,7 +37,7 @@ public boolean accept(CfService service) {
 		boolean isGenAIService = service.existsByTagIgnoreCase("genai") || service.existsByLabelStartsWith("genai");
 		if (isGenAIService) {
 			ArrayList<String> modelCapabilities = (ArrayList<String>) service.getCredentials().getMap().get("model_capabilities");
-			return modelCapabilities.contains("embedding");
+			return (modelCapabilities != null && modelCapabilities.contains("embedding"));
 		}
 
 		return false;

java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/GenAIChatCfEnvProcessorTests.java

@@ -24,6 +24,7 @@
 /**
  * @author Stuart Charlton
  * @author Ed King
+ * @author Gareth Evans
  */
 public class GenAIChatCfEnvProcessorTests extends AbstractCfEnvTests {
 
@@ -48,4 +49,21 @@ public void testGenAIBootPropertiesWithChatModelCapability() {
 		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.transcription.options.model")).isNull();
 		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.speech.options.model")).isNull();
 	}
+
+	@Test
+	public void testGenAIBootPropertiesWithChatModelCapabilityEndpointFormat() {
+		String TEST_GENAI_JSON_FILE = "test-genai-endpoint-chat-model.json";
+
+		mockVcapServices(getServicesPayload(readTestDataFile(TEST_GENAI_JSON_FILE)));
+
+		assertThat(getEnvironment().getProperty("spring.ai.openai.api-key")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.chat.base-url")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.chat.api-key")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.chat.options.model")).isNull();
+
+		assertThat(getEnvironment().getProperty("spring.ai.openai.embedding.options.model")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.image.options.model")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.transcription.options.model")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.speech.options.model")).isNull();
+	}
 }

java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/GenAIEmbeddingCfEnvProcessorTests.java

@@ -24,6 +24,7 @@
 /**
  * @author Stuart Charlton
  * @author Ed King
+ * @author Gareth Evans
  */
 public class GenAIEmbeddingCfEnvProcessorTests extends AbstractCfEnvTests {
 
@@ -48,4 +49,22 @@ public void testGenAIBootPropertiesWithEmbeddingModelCapability() {
 		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.transcription.options.model")).isNull();
 		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.speech.options.model")).isNull();
 	}
+
+	@Test
+	public void testGenAIBootPropertiesWithEmbeddingModelCapabilityEndpointFormat() {
+		String TEST_GENAI_JSON_FILE = "test-genai-endpoint-embedding-model.json";
+
+		mockVcapServices(getServicesPayload(readTestDataFile(TEST_GENAI_JSON_FILE)));
+
+		assertThat(getEnvironment().getProperty("spring.ai.openai.api-key")).isNull();
+
+		assertThat(getEnvironment().getProperty("spring.ai.openai.embedding.base-url")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.embedding.api-key")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.embedding.options.model")).isNull();
+
+		assertThat(getEnvironment().getProperty("spring.ai.openai.chat.options.model")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.image.options.model")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.transcription.options.model")).isNull();
+		assertThat(getEnvironment().getProperty("spring.ai.openai.audio.speech.options.model")).isNull();
+	}
 }

java-cfenv-boot/src/test/resources/io/pivotal/cfenv/spring/boot/test-genai-endpoint-chat-model.json

@@ -0,0 +1,20 @@
+{
+    "credentials": {
+      "endpoint": {
+        "api_base": "https://genai-proxy.tpcf.io/test",
+        "api_key": "sk-KW5kiNOKDd_1dFxsAjpVa",
+        "config_url": "https://genai-proxy.tpcf.io/test/config/v1/endpoint"
+      }
+    },
+    "instance_name": "genai",
+    "label": "genai",
+    "name": "genai",
+    "plan": "meta-llama/Meta-Llama-3-8B",
+    "provider": null,
+    "syslog_drain_url": null,
+    "tags": [
+       "genai",
+       "llm"
+    ],
+    "volume_mounts": []
+}

java-cfenv-boot/src/test/resources/io/pivotal/cfenv/spring/boot/test-genai-endpoint-embedding-model.json

@@ -0,0 +1,20 @@
+{
+    "credentials": {
+      "endpoint": {
+        "api_base": "https://genai-proxy.tpcf.io/test",
+        "api_key": "sk-KW5kiNOKDd_1dFxsAjpVa",
+        "config_url": "https://genai-proxy.tpcf.io/test/config/v1/endpoint"
+      }
+    },
+    "instance_name": "genai",
+    "label": "genai",
+    "name": "genai",
+    "plan": "mixedbread-ai/mxbai-embed-large-v1",
+    "provider": null,
+    "syslog_drain_url": null,
+    "tags": [
+       "genai",
+       "llm"
+    ],
+    "volume_mounts": []
+}