Skip to content

Commit 952f793

Browse files
daniel-butler-irldaniel-butler-irl
committed
change required and add swappable
1 parent e8e94ea commit 952f793

File tree

1 file changed

+129
-120
lines changed

1 file changed

+129
-120
lines changed

‎ibm_catalog.json

Lines changed: 129 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -193,27 +193,6 @@
193193
}
194194
]
195195
},
196-
{
197-
"name": "deploy-arch-ibm-watson-discovery",
198-
"id": "0f616276-a8a4-4399-bcbf-d3129f30295e",
199-
"version": ">=v1.1.1",
200-
"flavors": [
201-
"standard"
202-
],
203-
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
204-
"optional": true,
205-
"on_by_default": true,
206-
"input_mapping": [
207-
{
208-
"dependency_input": "region",
209-
"version_input": "watson_discovery_region"
210-
},
211-
{
212-
"dependency_output": "id",
213-
"version_input": "watson_discovery_instance_id"
214-
}
215-
]
216-
},
217196
{
218197
"name": "deploy-arch-ibm-watsonx-ai",
219198
"id": "85b7c3d8-c947-408c-896c-52b375ceb1c0",
@@ -239,23 +218,6 @@
239218
}
240219
]
241220
},
242-
{
243-
"name": "deploy-arch-ibm-icd-elasticsearch",
244-
"id": "7ee5876d-6e30-49d1-be25-259a442085e8",
245-
"version": ">=1.25.16",
246-
"flavors": [
247-
"standard"
248-
],
249-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
250-
"optional": true,
251-
"on_by_default": true,
252-
"input_mapping": [
253-
{
254-
"dependency_output": "crn",
255-
"version_input": "elastic_instance_crn"
256-
}
257-
]
258-
},
259221
{
260222
"name": "Testing_Retrieval_Augmented_Generation_Pattern_dev",
261223
"catalog_id": "f64499c8-eb50-4985-bf91-29f9e605a433",
@@ -361,6 +323,49 @@
361323
}
362324
],
363325
"dependency_version_2": true,
326+
"swappable_dependencies": [
327+
{
328+
"name": "Database",
329+
"default_dependency": "deploy-arch-ibm-watson-discovery",
330+
"optional": false,
331+
"dependencies": [
332+
{
333+
"name": "Testing_Gen_AI",
334+
"id": "4460375e-8a34-46fc-9f06-0eb60e7d4f8c",
335+
"version": ">=1.2.0",
336+
"flavors": [
337+
"Basic-dda0"
338+
],
339+
"catalog_id": "f64499c8-eb50-4985-bf91-29f9e605a433",
340+
"optional": false,
341+
"on_by_default": false,
342+
"input_mapping": [
343+
{
344+
"dependency_output": "elasticsearch_crn",
345+
"version_input": "existing_elasticsearch_instance_crn"
346+
}
347+
]
348+
},
349+
{
350+
"name": "deploy-arch-ibm-watson-discovery",
351+
"id": "0f616276-a8a4-4399-bcbf-d3129f30295e",
352+
"version": ">=v1.1.1",
353+
"flavors": [
354+
"standard"
355+
],
356+
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
357+
"optional": false,
358+
"on_by_default": false,
359+
"input_mapping": [
360+
{
361+
"dependency_output": "id",
362+
"version_input": "existing_discovery_instance"
363+
}
364+
]
365+
}
366+
]
367+
}
368+
],
364369
"configuration": [
365370
{
366371
"key": "prefix",
@@ -608,47 +613,47 @@
608613
],
609614
"architecture": {
610615
"features": [
611-
{
612-
"title": " ",
613-
"description": "Enables:"
614-
},
615-
{
616-
"title": "1. Red Hat OpenShift cluster for microservices workloads",
617-
"description": " "
618-
},
619-
{
620-
"title": "2. Elasticsearch Platinum for building and storing sparse vectors, dense vector indexes or keyword search indexes",
621-
"description": " "
622-
},
623-
{
624-
"title": "i. watsonx.ai use of Elasticsearch ELSER2 vector index for RAG",
625-
"description": " "
626-
},
627-
{
628-
"title": "ii. watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG",
629-
"description": " "
630-
},
631-
{
632-
"title": "3. watsonx.ai in-memory vector store for RAG trial and exploration",
633-
"description": " "
634-
},
635-
{
636-
"title": "4. watsonx.ai UI to upload documents",
637-
"description": " "
638-
},
639-
{
640-
"title": "5. watsonx.ai Prompt Lab for inferencing and Prompt Templates",
641-
"description": " "
642-
},
643-
{
644-
"title": "6. watsonx Assistant Conversational Search with embedded LLM",
645-
"description": " "
646-
},
647-
{
648-
"title": "7. Build your own data processing, ingestion pipeline and indexes",
649-
"description": " "
650-
}
651-
],
616+
{
617+
"title": " ",
618+
"description": "Enables:"
619+
},
620+
{
621+
"title": "1. Red Hat OpenShift cluster for microservices workloads",
622+
"description": " "
623+
},
624+
{
625+
"title": "2. Elasticsearch Platinum for building and storing sparse vectors, dense vector indexes or keyword search indexes",
626+
"description": " "
627+
},
628+
{
629+
"title": "i. watsonx.ai use of Elasticsearch ELSER2 vector index for RAG",
630+
"description": " "
631+
},
632+
{
633+
"title": "ii. watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG",
634+
"description": " "
635+
},
636+
{
637+
"title": "3. watsonx.ai in-memory vector store for RAG trial and exploration",
638+
"description": " "
639+
},
640+
{
641+
"title": "4. watsonx.ai UI to upload documents",
642+
"description": " "
643+
},
644+
{
645+
"title": "5. watsonx.ai Prompt Lab for inferencing and Prompt Templates",
646+
"description": " "
647+
},
648+
{
649+
"title": "6. watsonx Assistant Conversational Search with embedded LLM",
650+
"description": " "
651+
},
652+
{
653+
"title": "7. Build your own data processing, ingestion pipeline and indexes",
654+
"description": " "
655+
}
656+
],
652657
"diagrams": [
653658
{
654659
"diagram": {
@@ -679,7 +684,7 @@
679684
"standard"
680685
],
681686
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
682-
"optional": true,
687+
"optional": false,
683688
"on_by_default": true,
684689
"input_mapping": [
685690
{
@@ -692,27 +697,6 @@
692697
}
693698
]
694699
},
695-
{
696-
"name": "deploy-arch-ibm-watson-discovery",
697-
"id": "0f616276-a8a4-4399-bcbf-d3129f30295e",
698-
"version": ">=v1.1.1",
699-
"flavors": [
700-
"standard"
701-
],
702-
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
703-
"optional": true,
704-
"on_by_default": true,
705-
"input_mapping": [
706-
{
707-
"dependency_input": "region",
708-
"version_input": "watson_discovery_region"
709-
},
710-
{
711-
"dependency_output": "id",
712-
"version_input": "watson_discovery_instance_id"
713-
}
714-
]
715-
},
716700
{
717701
"name": "deploy-arch-ibm-watsonx-ai",
718702
"id": "85b7c3d8-c947-408c-896c-52b375ceb1c0",
@@ -738,23 +722,6 @@
738722
}
739723
]
740724
},
741-
{
742-
"name": "deploy-arch-ibm-icd-elasticsearch",
743-
"id": "7ee5876d-6e30-49d1-be25-259a442085e8",
744-
"version": ">=1.25.16",
745-
"flavors": [
746-
"standard"
747-
],
748-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
749-
"optional": true,
750-
"on_by_default": true,
751-
"input_mapping": [
752-
{
753-
"dependency_output": "crn",
754-
"version_input": "elastic_instance_crn"
755-
}
756-
]
757-
},
758725
{
759726
"name": "Testing_Retrieval_Augmented_Generation_Pattern_dev",
760727
"catalog_id": "f64499c8-eb50-4985-bf91-29f9e605a433",
@@ -998,9 +965,51 @@
998965
"description": "The ID for the Watson Discovery project for the sample RAG application."
999966
}
1000967
],
1001-
"install_type": "extension"
968+
"swappable_dependencies": [
969+
{
970+
"name": "Database",
971+
"default_dependency": "deploy-arch-ibm-watson-discovery",
972+
"optional": false,
973+
"dependencies": [
974+
{
975+
"name": "Testing_Gen_AI",
976+
"id": "4460375e-8a34-46fc-9f06-0eb60e7d4f8c",
977+
"version": ">=1.2.0",
978+
"flavors": [
979+
"Basic-dda0"
980+
],
981+
"catalog_id": "f64499c8-eb50-4985-bf91-29f9e605a433",
982+
"optional": false,
983+
"on_by_default": false,
984+
"input_mapping": [
985+
{
986+
"dependency_output": "elasticsearch_crn",
987+
"version_input": "existing_elasticsearch_instance_crn"
988+
}
989+
]
990+
},
991+
{
992+
"name": "deploy-arch-ibm-watson-discovery",
993+
"id": "0f616276-a8a4-4399-bcbf-d3129f30295e",
994+
"version": ">=v1.1.1",
995+
"flavors": [
996+
"standard"
997+
],
998+
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
999+
"optional": false,
1000+
"on_by_default": false,
1001+
"input_mapping": [
1002+
{
1003+
"dependency_output": "id",
1004+
"version_input": "existing_discovery_instance"
1005+
}
1006+
]
1007+
}
1008+
]
1009+
}
1010+
]
10021011
}
10031012
]
10041013
}
10051014
]
1006-
}
1015+
}

0 commit comments

Comments
 (0)