Updates to uri

Author: ashley-o0o

frontend/src/concepts/connectionTypes/utils.ts

@@ -169,23 +169,27 @@ const modelServingCompatibleTypesMetadata: Record<
     resource: string;
     envVars: string[];
     managedType?: string;
+    protocol: string;
   }
 > = {
   [ModelServingCompatibleTypes.S3ObjectStorage]: {
     name: ModelServingCompatibleTypes.S3ObjectStorage,
     resource: 's3',
     envVars: S3ConnectionTypeKeys,
     managedType: 's3',
+    protocol: 's3',
   },
   [ModelServingCompatibleTypes.URI]: {
     name: ModelServingCompatibleTypes.URI,
     resource: 'uri-v1',
     envVars: URIConnectionTypeKeys,
+    protocol: 'uri',
   },
   [ModelServingCompatibleTypes.OCI]: {
     name: ModelServingCompatibleTypes.OCI,
     resource: 'oci-v1',
     envVars: OCIConnectionTypeKeys,
+    protocol: 'oci',
   },
 };
 
@@ -211,7 +215,7 @@ export const isModelServingCompatible = (
       }
     }
 
-    const { managedType } = modelServingCompatibleTypesMetadata[type];
+    const { managedType, protocol } = modelServingCompatibleTypesMetadata[type];
     if (
       managedType &&
       !(
@@ -222,6 +226,12 @@ export const isModelServingCompatible = (
       return false;
     }
 
+    const connectionProtocol =
+      input.metadata.annotations['opendatahub.io/connection-type-protocol'];
+    if (connectionProtocol && connectionProtocol !== protocol) {
+      return false;
+    }
+
     return modelServingCompatibleTypesMetadata[type].envVars.every((envVar) =>
       Object.keys(input.data || input.stringData || []).includes(envVar),
     );

frontend/src/pages/projects/screens/detail/connections/ManageConnectionsModal.tsx

@@ -100,7 +100,7 @@ export const ManageConnectionModal: React.FC<Props> = ({
   );
   const protocolType = selectedConnectionType
     ? getConnectionProtocolType(selectedConnectionType)
-    : 'uri';
+    : undefined;
 
   const { changeSelectionType } = usePersistentData({
     setConnectionValues,
@@ -184,7 +184,7 @@ export const ManageConnectionModal: React.FC<Props> = ({
             );
             assembledConnection.metadata.annotations = {
               ...assembledConnection.metadata.annotations,
-              'opendatahub.io/connection-type-protocol': protocolType,
+              ...(protocolType && { 'opendatahub.io/connection-type-protocol': protocolType }),
             };
 
             onSubmit(assembledConnection)

packages/model-serving/src/components/deploymentWizard/fields/ModelLocationInputFields.tsx

@@ -50,7 +50,7 @@ export const useModelLocationData = (
     existingData,
   );
   const [connectionTypes, connectionTypesLoaded] = useWatchConnectionTypes(true);
-  const [connections, connectionsLoaded] = useServingConnections(projectName, true, true);
+  const [connections, connectionsLoaded] = useServingConnections(projectName, true, false);
 
   const [isStableState, setIsStableState] = React.useState(
     connectionTypesLoaded && connectionsLoaded,