Merge pull request #14 from oracle-devrel/no-model-listing

fix model Id from setenv, instead of dropdow selector

Author: WSPluta

.gitignore

@@ -6,7 +6,6 @@
 # Icon must end with two \r
 Icon
 
-
 # Thumbnails
 ._*
 
@@ -75,4 +74,5 @@ build/
 !**/src/test/**/build/
 .idea
 bin/
-dist/
+dist/
+application-local.yaml

backend/src/main/java/dev/victormartin/oci/genai/backend/backend/PromptController.java

@@ -8,6 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.simp.annotation.SendToUser;
@@ -20,6 +21,9 @@
 public class PromptController {
 	Logger logger = LoggerFactory.getLogger(PromptController.class);
 
+	@Value("${genai.model_id}")
+	private String hardcodedModelId;
+
 	@Autowired
 	private final InteractionRepository interactionRepository;
 
@@ -35,17 +39,18 @@ public PromptController(InteractionRepository interactionRepository, OCIGenAISer
 	@SendToUser("/queue/answer")
 	public Answer handlePrompt(Prompt prompt) {
 		String promptEscaped = HtmlUtils.htmlEscape(prompt.content());
-		logger.info("Prompt " + promptEscaped + " received, on model " + prompt.modelId());
+		logger.info("Prompt " + promptEscaped + " received, on model " + prompt.modelId() + " but using hardcoded one" +
+				" " + hardcodedModelId);
 		Interaction interaction = new Interaction();
 		interaction.setConversationId(prompt.conversationId());
 		interaction.setDatetimeRequest(new Date());
-		interaction.setModelId(prompt.modelId());
+		interaction.setModelId(hardcodedModelId);
 		interaction.setRequest(promptEscaped);
 		Interaction saved = interactionRepository.save(interaction);
 		try {
 			if (prompt.content() == null || prompt.content().length()< 1) { throw  new InvalidPromptRequest(); }
-			if (prompt.modelId() == null || !prompt.modelId().startsWith("ocid1.generativeaimodel.")) { throw  new InvalidPromptRequest(); }
-			String responseFromGenAI = genAI.request(promptEscaped, prompt.modelId());
+//			if (prompt.modelId() == null || !prompt.modelId().startsWith("ocid1.generativeaimodel.")) { throw  new InvalidPromptRequest(); }
+			String responseFromGenAI = genAI.request(promptEscaped, hardcodedModelId);
 			saved.setDatetimeResponse(new Date());
 			saved.setResponse(responseFromGenAI);
 			interactionRepository.save(saved);

scripts/lib/oci.mjs

@@ -369,13 +369,12 @@ export async function getLatestGenAIModels(
       vendor: vendor,
     });
 
-    const filteredByCapatility = activeCohereModels.filter(
-      ({ capabilities }) => {
-        if (capabilities.length !== 1) return false;
-        if (capabilities[0] !== capability) return false;
-        return true;
-      }
-    );
+    const filteredByCapatility = activeCohereModels.filter((model) => {
+      const { capabilities } = model;
+      if (capabilities.length !== 1) return false;
+      if (capabilities[0] !== capability) return false;
+      return true;
+    });
 
     const latestVersion = max(filteredByCapatility, (item) =>
       parseFloat(item.version)

web/src/Chat.jsx

@@ -27,28 +27,28 @@ function Chat() {
   const [updateModels, setUpdateModels] = useState(true);
   const { subscribe, unsubscribe, send, isConnected } = useStomp();
 
-  useEffect(() => {
-    const fecthModels = async () => {
-      try {
-        const response = await fetch("/api/genai/models");
-        const data = await response.json();
-        setModels(
-          data.filter(
-            ({ capabilities }) =>
-              capabilities.length === 1 &&
-              capabilities.includes("TEXT_GENERATION")
-          )
-        );
-      } catch (error) {
-        setErrorMessage("Error fetching Generative AI Models from Backend");
-      }
-    };
+  // useEffect(() => {
+  //   const fecthModels = async () => {
+  //     try {
+  //       const response = await fetch("/api/genai/models");
+  //       const data = await response.json();
+  //       setModels(
+  //         data.filter(
+  //           ({ capabilities }) =>
+  //             capabilities.length === 1 &&
+  //             capabilities.includes("TEXT_GENERATION")
+  //         )
+  //       );
+  //     } catch (error) {
+  //       setErrorMessage("Error fetching Generative AI Models from Backend");
+  //     }
+  //   };
 
-    if (updateModels) {
-      setUpdateModels(false);
-      fecthModels();
-    }
-  }, [updateModels]);
+  //   if (updateModels) {
+  //     setUpdateModels(false);
+  //     fecthModels();
+  //   }
+  // }, [updateModels]);
 
   useEffect(() => {
     let timeoutId;
@@ -90,7 +90,11 @@ function Chat() {
 
   useEffect(() => {
     if (isConnected && promptValue.length) {
-      send("/genai/prompt", { conversationId, content: promptValue, modelId });
+      send("/genai/prompt", {
+        conversationId,
+        content: promptValue,
+        modelId: "notapply",
+      });
       setWaiting(true);
       setPromptValue("");
     }
@@ -99,7 +103,7 @@ function Chat() {
 
   return (
     <Box>
-      <FormControl fullWidth>
+      {/* <FormControl fullWidth>
         <InputLabel id="model-label">Model</InputLabel>
         <Select
           labelId="model-label"
@@ -116,7 +120,7 @@ function Chat() {
             ))}
         </Select>
       </FormControl>
-      <Divider style={{ margin: "1rem" }} />
+      <Divider style={{ margin: "1rem" }} /> */}
       <Conversation>{conversation}</Conversation>
       {waiting && <CircularProgress style={{ padding: "1rem" }} />}
       <PromptInput