From d3cb008410f887efb9fa4660ca0300ffb92fe4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20G=C5=82owacz?= Date: Wed, 8 Oct 2025 17:47:06 +0200 Subject: [PATCH 1/2] SXPR-145 Add external-resources-processing-service to ingest images from PIM data source --- config/application-cloud.properties | 1 + config/application.properties | 1 + mesh/deployment.yaml | 4 +- mesh/mesh.yaml | 37 +++++- .../2.0.13-jvm.json} | 48 +++---- .../2.0.13-jvm.json} | 12 +- .../2.0.13-jvm.json | 89 +++++++++++++ .../2.0.13-jvm.json} | 14 +- .../2.0.13-jvm.json} | 22 ++-- .../2.0.13-jvm.json} | 12 +- .../2.0.13-jvm.json} | 30 ++--- .../2.0.13-jvm.json} | 14 +- .../relay-processing-service/2.0.13-jvm.json} | 74 ++++++----- .../2.0.13-jvm.json} | 120 ++++++++++-------- .../2.0.13-jvm.json | 31 +++++ .../2.0.13-jvm.json} | 10 +- .../web-delivery-service/2.0.13-jvm.json} | 24 ++-- 17 files changed, 353 insertions(+), 190 deletions(-) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/composition-engine-processing-service/2.0.6-jvm.json => 2.0.13/composition-engine-processing-service/2.0.13-jvm.json} (67%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/data-collector-processing-service/2.0.6-jvm.json => 2.0.13/data-collector-processing-service/2.0.13-jvm.json} (64%) create mode 100644 mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/external-resources-processing-service/2.0.13-jvm.json rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/image-optimization-processing-service/2.0.6-jvm.json => 2.0.13/image-optimization-processing-service/2.0.13-jvm.json} (63%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/indexables-producer-processing-service/2.0.6-jvm.json => 2.0.13/indexables-producer-processing-service/2.0.13-jvm.json} (68%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/json-aggregator-processing-service/2.0.6-jvm.json => 2.0.13/json-aggregator-processing-service/2.0.13-jvm.json} (61%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/message-converter-processing-service/2.0.6-jvm.json => 2.0.13/message-converter-processing-service/2.0.13-jvm.json} (71%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/opensearch-delivery-service/2.0.6-jvm.json => 2.0.13/opensearch-delivery-service/2.0.13-jvm.json} (70%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/relay-processing-service/2.0.6-jvm.json => 2.0.13/relay-processing-service/2.0.13-jvm.json} (94%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/rendering-engine-processing-service/2.0.6-jvm.json => 2.0.13/rendering-engine-processing-service/2.0.13-jvm.json} (80%) create mode 100644 mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/scheduled-resource-processing-service/2.0.13-jvm.json rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/sitemap-generator-processing-service/2.0.6-jvm.json => 2.0.13/sitemap-generator-processing-service/2.0.13-jvm.json} (67%) rename mesh/services/streamx-service-metadata/streamx-blueprints/{2.0.6/web-delivery-service/2.0.6-jvm.json => 2.0.13/web-delivery-service/2.0.13-jvm.json} (66%) diff --git a/config/application-cloud.properties b/config/application-cloud.properties index 2dcca269..c9cd22f8 100644 --- a/config/application-cloud.properties +++ b/config/application-cloud.properties @@ -8,3 +8,4 @@ streamx.kubernetes.controlled-resource-definitions=${apisix.resources} streamx.default.ingestion.replicas=2 streamx.default.processing.replicas=1 streamx.default.delivery.replicas=2 +streamx.rocksdb.path=/var/lib/rocksdb diff --git a/config/application.properties b/config/application.properties index 7457dcab..ea91d1e4 100644 --- a/config/application.properties +++ b/config/application.properties @@ -3,3 +3,4 @@ streamx.accelerator.ingestion.host=ingestion.${streamx.accelerator.ip}.nip.io streamx.accelerator.web.host=web.${streamx.accelerator.ip}.nip.io streamx.ingestion.url=http://${streamx.accelerator.ingestion.host} streamx.accelerator.web.url=http://${streamx.accelerator.web.host} +streamx.rocksdb.path=/tmp diff --git a/mesh/deployment.yaml b/mesh/deployment.yaml index 585eb898..ae915b17 100644 --- a/mesh/deployment.yaml +++ b/mesh/deployment.yaml @@ -40,7 +40,7 @@ delivery: repository-volume: size: 10Gi rocksdb: - mountPath: "/var/lib/rocksdb" + mountPath: "${streamx.rocksdb.path}" size: 5Gi ingress: enabled: true @@ -111,7 +111,7 @@ delivery: stateful: true volumes: rocksdb: - mountPath: "/var/lib/rocksdb" + mountPath: "${streamx.rocksdb.path}" size: 5Gi ingress: enabled: true diff --git a/mesh/mesh.yaml b/mesh/mesh.yaml index 17192aef..a2d18470 100644 --- a/mesh/mesh.yaml +++ b/mesh/mesh.yaml @@ -1,5 +1,5 @@ defaultRegistry: ghcr.io/streamx-dev/streamx-blueprints -defaultImageTag: 2.0.7-jvm +defaultImageTag: 2.0.13-jvm sources: github: @@ -117,18 +117,43 @@ processing: configs: - "image-optimization.properties" + + blueprint-data-deps-rewriter: + image: external-resources-processing-service + incoming: + incoming-data: + topic: inboxes/data + incoming-pages: + topic: relays/fake-pages-channel + incoming-web-resources: + topic: relays/fake-web-resources + outgoing: + outgoing-data: + topic: relays/data + outgoing-assets: + topic: outboxes/assets + outgoing-pages: + topic: relays/fake-pages-channel + outgoing-web-resources: + topic: relays/fake-web-resources-channel + environment: + STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_BASE_URL_FOR_RELATIVE_PATHS: "${streamx.accelerator.web.url}" + STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_PROCESSABLE_SX_TYPES: "product/simple,product/master,category" + STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_JSON_EXTERNAL_RESOURCE_JSONPATH_SELECTORS: "$..attributes[?(@.name=='small_image' || @.name=='thumbnail')].values.*.value,$..attributes[?(@.name=='small_image' || @.name=='thumbnail')].values.*.label,$..primaryImage.url,$..gallery.*.url" + + blueprint-json-aggregator: image: json-aggregator-processing-service incoming: data: - topic: inboxes/data + topic: relays/data multivalued-data: - topic: inboxes/data + topic: relays/data outgoing: aggregated-data: topic: relays/aggregated-data aggregated-multivalued-data: - topic: inboxes/data + topic: relays/data environmentFrom: configs: - "aggregator.properties" @@ -237,7 +262,7 @@ delivery: STREAMX_BLUEPRINTS_OPENSEARCH-DELIVERY-SERVICE_MIGRATION-SCRIPT-LOCATIONS: "classpath:opensearch/service-init,file:opensearch/service-init" # Keep stores up to date when container inside a pod restarts QUASAR_MESSAGING_STORE_BACKEND: "rocksdb" - QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "/var/lib/rocksdb" + QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "${streamx.rocksdb.path}" environmentFrom: secrets: - "opensearch-secrets.properties" @@ -270,7 +295,7 @@ delivery: STREAMX_URL-INCLUDE-REPLACEMENT-PROVIDER_SSI-INCLUDE-FALLBACK-CONTENT: "" # Keep stores up to date when container inside a pod restarts QUASAR_MESSAGING_STORE_BACKEND: "rocksdb" - QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "/var/lib/rocksdb" + QUASAR_MESSAGING_STORE_ROCKSDB_PATH: "${streamx.rocksdb.path}" repositoryVolume: "/srv/www" port: 8083 components: diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/composition-engine-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/composition-engine-processing-service/2.0.13-jvm.json similarity index 67% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/composition-engine-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/composition-engine-processing-service/2.0.13-jvm.json index ddf03f2c..2564f614 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/composition-engine-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/composition-engine-processing-service/2.0.13-jvm.json @@ -1,52 +1,37 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/composition-engine-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/composition-engine-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { "name": "compositions", - "defaultSchemaId": "Composition_AVROSchema_4a3dd59dd13c43099ce84b485bf8965c5f18adf3", + "defaultSchemaId": "Composition_AVROSchema_777bc4dfb7d9f8890cea1e4ef60adf80f00cf1a9", "connector": "smallrye-pulsar" }, { "name": "layouts", - "defaultSchemaId": "Layout_AVROSchema_e30b45af5d69094e955c34a0477d2da3da0320bf", + "defaultSchemaId": "Layout_AVROSchema_8db48ade1b3935c38328733b8a41e531cc09a8cd", "connector": "smallrye-pulsar" }, { "name": "incoming-page-compose-requests", - "defaultSchemaId": "PageComposeRequest_AVROSchema_f1b67786d384de577ac5bcbca375d75c11bdc11c", + "defaultSchemaId": "PageComposeRequest_AVROSchema_4ddbe9e45593f752658beafaaf870efbbaf4e33c", "connector": "smallrye-pulsar" } ], "outgoing": [ { "name": "outgoing-page-compose-requests", - "defaultSchemaId": "PageComposeRequest_AVROSchema_f1b67786d384de577ac5bcbca375d75c11bdc11c", + "defaultSchemaId": "PageComposeRequest_AVROSchema_4ddbe9e45593f752658beafaaf870efbbaf4e33c", "connector": "smallrye-pulsar" }, { "name": "pages", - "defaultSchemaId": "Page_AVROSchema_09d27de42e84c61159a1c1f36510c9dc29f13500", + "defaultSchemaId": "Page_AVROSchema_18e8709c7e670b687b38be81b3dde84935ae3745", "connector": "smallrye-pulsar" } ], "schemas": { - "Composition_AVROSchema_4a3dd59dd13c43099ce84b485bf8965c5f18adf3": { - "type": "record", - "name": "Composition", - "namespace": "dev.streamx.blueprints.data", - "fields": [ - { - "name": "layoutKey", - "type": "string" - }, - { - "name": "content", - "type": "bytes" - } - ] - }, - "Page_AVROSchema_09d27de42e84c61159a1c1f36510c9dc29f13500": { + "Page_AVROSchema_18e8709c7e670b687b38be81b3dde84935ae3745": { "type": "record", "name": "Page", "namespace": "dev.streamx.blueprints.data", @@ -57,7 +42,7 @@ } ] }, - "Layout_AVROSchema_e30b45af5d69094e955c34a0477d2da3da0320bf": { + "Layout_AVROSchema_8db48ade1b3935c38328733b8a41e531cc09a8cd": { "type": "record", "name": "Layout", "namespace": "dev.streamx.blueprints.data", @@ -68,7 +53,7 @@ } ] }, - "PageComposeRequest_AVROSchema_f1b67786d384de577ac5bcbca375d75c11bdc11c": { + "PageComposeRequest_AVROSchema_4ddbe9e45593f752658beafaaf870efbbaf4e33c": { "type": "record", "name": "PageComposeRequest", "namespace": "dev.streamx.blueprints.composition", @@ -82,6 +67,21 @@ "type": "string" } ] + }, + "Composition_AVROSchema_777bc4dfb7d9f8890cea1e4ef60adf80f00cf1a9": { + "type": "record", + "name": "Composition", + "namespace": "dev.streamx.blueprints.data", + "fields": [ + { + "name": "layoutKey", + "type": "string" + }, + { + "name": "content", + "type": "bytes" + } + ] } } } \ No newline at end of file diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/data-collector-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/data-collector-processing-service/2.0.13-jvm.json similarity index 64% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/data-collector-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/data-collector-processing-service/2.0.13-jvm.json index 3387058a..d09c7023 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/data-collector-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/data-collector-processing-service/2.0.13-jvm.json @@ -1,27 +1,27 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/data-collector-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/data-collector-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { "name": "data", - "defaultSchemaId": "Data_AVROSchema_e8d9b0b0f0340f665d12aaabf62ea8c48c2c8c74", + "defaultSchemaId": "Data_AVROSchema_f7334b3902d61d92c614ea27ba284371d711a85c", "connector": "smallrye-pulsar" } ], "outgoing": [ { "name": "web-resources", - "defaultSchemaId": "WebResource_AVROSchema_991c586ba1901a07df5004c0a80414839e50e59a", + "defaultSchemaId": "WebResource_AVROSchema_5b356d70b4744b8fb7b60caf075559b44690e295", "connector": "smallrye-pulsar" }, { "name": "collected-data", - "defaultSchemaId": "Data_AVROSchema_e8d9b0b0f0340f665d12aaabf62ea8c48c2c8c74", + "defaultSchemaId": "Data_AVROSchema_f7334b3902d61d92c614ea27ba284371d711a85c", "connector": "smallrye-pulsar" } ], "schemas": { - "WebResource_AVROSchema_991c586ba1901a07df5004c0a80414839e50e59a": { + "WebResource_AVROSchema_5b356d70b4744b8fb7b60caf075559b44690e295": { "type": "record", "name": "WebResource", "namespace": "dev.streamx.blueprints.data", @@ -32,7 +32,7 @@ } ] }, - "Data_AVROSchema_e8d9b0b0f0340f665d12aaabf62ea8c48c2c8c74": { + "Data_AVROSchema_f7334b3902d61d92c614ea27ba284371d711a85c": { "type": "record", "name": "Data", "namespace": "dev.streamx.blueprints.data", diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/external-resources-processing-service/2.0.13-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/external-resources-processing-service/2.0.13-jvm.json new file mode 100644 index 00000000..a94d43a6 --- /dev/null +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/external-resources-processing-service/2.0.13-jvm.json @@ -0,0 +1,89 @@ +{ + "image": "ghcr.io/streamx-dev/streamx-blueprints/external-resources-processing-service:2.0.13-jvm", + "type": "processing", + "incoming": [ + { + "name": "incoming-web-resources", + "defaultSchemaId": "WebResource_AVROSchema_ce805f0dc93f73300e87cee0f8323a9aa9469251", + "connector": "smallrye-pulsar" + }, + { + "name": "incoming-pages", + "defaultSchemaId": "Page_AVROSchema_078dc3a84d247f1089e710b89f8d849e89480539", + "connector": "smallrye-pulsar" + }, + { + "name": "incoming-data", + "defaultSchemaId": "Data_AVROSchema_22f7a0b8faabdf5ffacd6067836fb77ef06511c4", + "connector": "smallrye-pulsar" + } + ], + "outgoing": [ + { + "name": "outgoing-web-resources", + "defaultSchemaId": "WebResource_AVROSchema_ce805f0dc93f73300e87cee0f8323a9aa9469251", + "connector": "smallrye-pulsar" + }, + { + "name": "outgoing-pages", + "defaultSchemaId": "Page_AVROSchema_078dc3a84d247f1089e710b89f8d849e89480539", + "connector": "smallrye-pulsar" + }, + { + "name": "outgoing-data", + "defaultSchemaId": "Data_AVROSchema_22f7a0b8faabdf5ffacd6067836fb77ef06511c4", + "connector": "smallrye-pulsar" + }, + { + "name": "outgoing-assets", + "defaultSchemaId": "Asset_AVROSchema_13cc883c8fa6d556928578e480478921789dc327", + "connector": "smallrye-pulsar" + } + ], + "schemas": { + "Data_AVROSchema_22f7a0b8faabdf5ffacd6067836fb77ef06511c4": { + "type": "record", + "name": "Data", + "namespace": "dev.streamx.blueprints.data", + "fields": [ + { + "name": "content", + "type": "bytes" + } + ] + }, + "Asset_AVROSchema_13cc883c8fa6d556928578e480478921789dc327": { + "type": "record", + "name": "Asset", + "namespace": "dev.streamx.blueprints.data", + "fields": [ + { + "name": "content", + "type": "bytes" + } + ] + }, + "WebResource_AVROSchema_ce805f0dc93f73300e87cee0f8323a9aa9469251": { + "type": "record", + "name": "WebResource", + "namespace": "dev.streamx.blueprints.data", + "fields": [ + { + "name": "content", + "type": "bytes" + } + ] + }, + "Page_AVROSchema_078dc3a84d247f1089e710b89f8d849e89480539": { + "type": "record", + "name": "Page", + "namespace": "dev.streamx.blueprints.data", + "fields": [ + { + "name": "content", + "type": "bytes" + } + ] + } + } +} \ No newline at end of file diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/image-optimization-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/image-optimization-processing-service/2.0.13-jvm.json similarity index 63% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/image-optimization-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/image-optimization-processing-service/2.0.13-jvm.json index e4ca49c1..55e1cc7b 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/image-optimization-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/image-optimization-processing-service/2.0.13-jvm.json @@ -1,32 +1,32 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/image-optimization-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/image-optimization-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { "name": "incoming-assets", - "defaultSchemaId": "Asset_AVROSchema_9c1b46923b9301541888783b43958adc4300d7a9", + "defaultSchemaId": "Asset_AVROSchema_c5ec0ea9532a206c8425e4f408e616e6770ab00e", "connector": "smallrye-pulsar" }, { "name": "incoming-pages", - "defaultSchemaId": "Page_AVROSchema_7df242c27c9c8d7857d4a788c97be58e7744d6c9", + "defaultSchemaId": "Page_AVROSchema_bf4bda261b3d2aa4c4cba247699ca235a59e86a0", "connector": "smallrye-pulsar" } ], "outgoing": [ { "name": "optimized-assets", - "defaultSchemaId": "Asset_AVROSchema_9c1b46923b9301541888783b43958adc4300d7a9", + "defaultSchemaId": "Asset_AVROSchema_c5ec0ea9532a206c8425e4f408e616e6770ab00e", "connector": "smallrye-pulsar" }, { "name": "outgoing-pages", - "defaultSchemaId": "Page_AVROSchema_7df242c27c9c8d7857d4a788c97be58e7744d6c9", + "defaultSchemaId": "Page_AVROSchema_bf4bda261b3d2aa4c4cba247699ca235a59e86a0", "connector": "smallrye-pulsar" } ], "schemas": { - "Page_AVROSchema_7df242c27c9c8d7857d4a788c97be58e7744d6c9": { + "Page_AVROSchema_bf4bda261b3d2aa4c4cba247699ca235a59e86a0": { "type": "record", "name": "Page", "namespace": "dev.streamx.blueprints.data", @@ -37,7 +37,7 @@ } ] }, - "Asset_AVROSchema_9c1b46923b9301541888783b43958adc4300d7a9": { + "Asset_AVROSchema_c5ec0ea9532a206c8425e4f408e616e6770ab00e": { "type": "record", "name": "Asset", "namespace": "dev.streamx.blueprints.data", diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/indexables-producer-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/indexables-producer-processing-service/2.0.13-jvm.json similarity index 68% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/indexables-producer-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/indexables-producer-processing-service/2.0.13-jvm.json index e740c063..f69755b4 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/indexables-producer-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/indexables-producer-processing-service/2.0.13-jvm.json @@ -1,32 +1,32 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/indexables-producer-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/indexables-producer-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { "name": "pages", - "defaultSchemaId": "Page_AVROSchema_22243973044c2459f2b7bb5777c8b2f8eefaa4f6", + "defaultSchemaId": "Page_AVROSchema_0b85afe06dc6e8dcdb59dbaa7692cee7049b0fd1", "connector": "smallrye-pulsar" }, { "name": "fragments", - "defaultSchemaId": "Fragment_AVROSchema_0c7d13dae63d42fb03026e8f8c33cd7f84eab97b", + "defaultSchemaId": "Fragment_AVROSchema_d211517bfeedd89a1afa632a71c07642583db312", "connector": "smallrye-pulsar" } ], "outgoing": [ { "name": "indexable-resources", - "defaultSchemaId": "IndexableResource_AVROSchema_f397cd3dd5ca58e83ee1f18c22aa1484892630a6", + "defaultSchemaId": "IndexableResource_AVROSchema_5f34bbaade54bf183e22803384cc2b2f035615ce", "connector": "smallrye-pulsar" }, { "name": "indexable-resource-fragments", - "defaultSchemaId": "IndexableResourceFragment_AVROSchema_7dd962f8a824d6720824f2511a8c15065baa0bda", + "defaultSchemaId": "IndexableResourceFragment_AVROSchema_4472dd6d23d08eb0f77f6b2196ab6f56172b21a2", "connector": "smallrye-pulsar" } ], "schemas": { - "Page_AVROSchema_22243973044c2459f2b7bb5777c8b2f8eefaa4f6": { + "Page_AVROSchema_0b85afe06dc6e8dcdb59dbaa7692cee7049b0fd1": { "type": "record", "name": "Page", "namespace": "dev.streamx.blueprints.data", @@ -37,9 +37,9 @@ } ] }, - "Fragment_AVROSchema_0c7d13dae63d42fb03026e8f8c33cd7f84eab97b": { + "IndexableResourceFragment_AVROSchema_4472dd6d23d08eb0f77f6b2196ab6f56172b21a2": { "type": "record", - "name": "Fragment", + "name": "IndexableResourceFragment", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -48,7 +48,7 @@ } ] }, - "IndexableResource_AVROSchema_f397cd3dd5ca58e83ee1f18c22aa1484892630a6": { + "IndexableResource_AVROSchema_5f34bbaade54bf183e22803384cc2b2f035615ce": { "type": "record", "name": "IndexableResource", "namespace": "dev.streamx.blueprints.data", @@ -67,9 +67,9 @@ } ] }, - "IndexableResourceFragment_AVROSchema_7dd962f8a824d6720824f2511a8c15065baa0bda": { + "Fragment_AVROSchema_d211517bfeedd89a1afa632a71c07642583db312": { "type": "record", - "name": "IndexableResourceFragment", + "name": "Fragment", "namespace": "dev.streamx.blueprints.data", "fields": [ { diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/json-aggregator-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/json-aggregator-processing-service/2.0.13-jvm.json similarity index 61% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/json-aggregator-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/json-aggregator-processing-service/2.0.13-jvm.json index dbe41fcd..6b6c05f1 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/json-aggregator-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/json-aggregator-processing-service/2.0.13-jvm.json @@ -1,32 +1,32 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/json-aggregator-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/json-aggregator-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { "name": "data", - "defaultSchemaId": "Data_AVROSchema_145ec9cbcc259266d058062f4b7ee5d7315b3f05", + "defaultSchemaId": "Data_AVROSchema_c342790b2299e92380a967a5dfc7de843e0f35f8", "connector": "smallrye-pulsar" }, { "name": "multivalued-data", - "defaultSchemaId": "Data_AVROSchema_145ec9cbcc259266d058062f4b7ee5d7315b3f05", + "defaultSchemaId": "Data_AVROSchema_c342790b2299e92380a967a5dfc7de843e0f35f8", "connector": "smallrye-pulsar" } ], "outgoing": [ { "name": "aggregated-data", - "defaultSchemaId": "Data_AVROSchema_145ec9cbcc259266d058062f4b7ee5d7315b3f05", + "defaultSchemaId": "Data_AVROSchema_c342790b2299e92380a967a5dfc7de843e0f35f8", "connector": "smallrye-pulsar" }, { "name": "aggregated-multivalued-data", - "defaultSchemaId": "Data_AVROSchema_145ec9cbcc259266d058062f4b7ee5d7315b3f05", + "defaultSchemaId": "Data_AVROSchema_c342790b2299e92380a967a5dfc7de843e0f35f8", "connector": "smallrye-pulsar" } ], "schemas": { - "Data_AVROSchema_145ec9cbcc259266d058062f4b7ee5d7315b3f05": { + "Data_AVROSchema_c342790b2299e92380a967a5dfc7de843e0f35f8": { "type": "record", "name": "Data", "namespace": "dev.streamx.blueprints.data", diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/message-converter-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/message-converter-processing-service/2.0.13-jvm.json similarity index 71% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/message-converter-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/message-converter-processing-service/2.0.13-jvm.json index 1fc7e14f..5249040e 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/message-converter-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/message-converter-processing-service/2.0.13-jvm.json @@ -1,45 +1,45 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/message-converter-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/message-converter-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { "name": "data", - "defaultSchemaId": "Data_AVROSchema_0a466b0b47a228c236ad571b90895299b81c3246", + "defaultSchemaId": "Data_AVROSchema_84d2bdf4b5458d32b35b579b2cbcb056f9c22930", "connector": "smallrye-pulsar" } ], "outgoing": [ { "name": "indexable-resources", - "defaultSchemaId": "IndexableResource_AVROSchema_62fa6268db074af5381ed63cb14154cadbdff2e2", + "defaultSchemaId": "IndexableResource_AVROSchema_4121875c68c4c901638e7b69ca5385ce933db9f5", "connector": "smallrye-pulsar" } ], "schemas": { - "IndexableResource_AVROSchema_62fa6268db074af5381ed63cb14154cadbdff2e2": { + "Data_AVROSchema_84d2bdf4b5458d32b35b579b2cbcb056f9c22930": { "type": "record", - "name": "IndexableResource", + "name": "Data", "namespace": "dev.streamx.blueprints.data", "fields": [ - { - "name": "fragmentKeys", - "type": { - "type": "array", - "items": "string", - "java-class": "java.util.Set" - } - }, { "name": "content", "type": "bytes" } ] }, - "Data_AVROSchema_0a466b0b47a228c236ad571b90895299b81c3246": { + "IndexableResource_AVROSchema_4121875c68c4c901638e7b69ca5385ce933db9f5": { "type": "record", - "name": "Data", + "name": "IndexableResource", "namespace": "dev.streamx.blueprints.data", "fields": [ + { + "name": "fragmentKeys", + "type": { + "type": "array", + "items": "string", + "java-class": "java.util.Set" + } + }, { "name": "content", "type": "bytes" diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/opensearch-delivery-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/opensearch-delivery-service/2.0.13-jvm.json similarity index 70% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/opensearch-delivery-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/opensearch-delivery-service/2.0.13-jvm.json index fd67a60a..db4b67a8 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/opensearch-delivery-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/opensearch-delivery-service/2.0.13-jvm.json @@ -1,20 +1,20 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/opensearch-delivery-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/opensearch-delivery-service:2.0.13-jvm", "type": "delivery", "incoming": [ { - "name": "indexable-resource-fragments", - "defaultSchemaId": "IndexableResourceFragment_AVROSchema_f5ab9c47a301da011a0285c1d0808a41c33e5233", + "name": "indexable-resources", + "defaultSchemaId": "IndexableResource_AVROSchema_e727dc072ef770560051bd2d04e667d8782bdb34", "connector": "smallrye-pulsar" }, { - "name": "indexable-resources", - "defaultSchemaId": "IndexableResource_AVROSchema_7556cc9afe5ea31d0fb744de517d8ae0af902263", + "name": "indexable-resource-fragments", + "defaultSchemaId": "IndexableResourceFragment_AVROSchema_d215490a0bfe4c0f4b397a557cb03fa9ac75a529", "connector": "smallrye-pulsar" } ], "schemas": { - "IndexableResourceFragment_AVROSchema_f5ab9c47a301da011a0285c1d0808a41c33e5233": { + "IndexableResourceFragment_AVROSchema_d215490a0bfe4c0f4b397a557cb03fa9ac75a529": { "type": "record", "name": "IndexableResourceFragment", "namespace": "dev.streamx.blueprints.data", @@ -25,7 +25,7 @@ } ] }, - "IndexableResource_AVROSchema_7556cc9afe5ea31d0fb744de517d8ae0af902263": { + "IndexableResource_AVROSchema_e727dc072ef770560051bd2d04e667d8782bdb34": { "type": "record", "name": "IndexableResource", "namespace": "dev.streamx.blueprints.data", diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/relay-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/relay-processing-service/2.0.13-jvm.json similarity index 94% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/relay-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/relay-processing-service/2.0.13-jvm.json index f05f91e7..f394751d 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/relay-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/relay-processing-service/2.0.13-jvm.json @@ -1,5 +1,5 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/relay-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/relay-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { @@ -21,11 +21,19 @@ "fields": [ { "name": "dataKeyMatchPattern", - "type": "string" + "type": [ + "null", + "string" + ], + "default": null }, { "name": "dataTypeMatchPattern", - "type": "string" + "type": [ + "null", + "string" + ], + "default": null }, { "name": "outputFormat", @@ -64,20 +72,24 @@ } ] }, - "page-schema": { + "composition-schema": { "type": "record", - "name": "Page", + "name": "Composition", "namespace": "dev.streamx.blueprints.data", "fields": [ + { + "name": "layoutKey", + "type": "string" + }, { "name": "content", "type": "bytes" } ] }, - "layout-schema": { + "data-schema": { "type": "record", - "name": "Layout", + "name": "Data", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -86,9 +98,9 @@ } ] }, - "fragment-schema": { + "page-schema": { "type": "record", - "name": "Fragment", + "name": "Page", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -97,35 +109,39 @@ } ] }, - "composition-schema": { + "asset-schema": { "type": "record", - "name": "Composition", + "name": "Asset", "namespace": "dev.streamx.blueprints.data", "fields": [ - { - "name": "layoutKey", - "type": "string" - }, { "name": "content", "type": "bytes" } ] }, - "data-schema": { + "indexable-resource-schema": { "type": "record", - "name": "Data", + "name": "IndexableResource", "namespace": "dev.streamx.blueprints.data", "fields": [ + { + "name": "fragmentKeys", + "type": { + "type": "array", + "items": "string", + "java-class": "java.util.Set" + } + }, { "name": "content", "type": "bytes" } ] }, - "asset-schema": { + "indexable-resource-fragment-schema": { "type": "record", - "name": "Asset", + "name": "IndexableResourceFragment", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -134,28 +150,20 @@ } ] }, - "indexable-resource-schema": { + "resource-schema": { "type": "record", - "name": "IndexableResource", + "name": "Resource", "namespace": "dev.streamx.blueprints.data", "fields": [ - { - "name": "fragmentKeys", - "type": { - "type": "array", - "items": "string", - "java-class": "java.util.Set" - } - }, { "name": "content", "type": "bytes" } ] }, - "indexable-resource-fragment-schema": { + "layout-schema": { "type": "record", - "name": "IndexableResourceFragment", + "name": "Layout", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -164,9 +172,9 @@ } ] }, - "resource-schema": { + "fragment-schema": { "type": "record", - "name": "Resource", + "name": "Fragment", "namespace": "dev.streamx.blueprints.data", "fields": [ { diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/rendering-engine-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/rendering-engine-processing-service/2.0.13-jvm.json similarity index 80% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/rendering-engine-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/rendering-engine-processing-service/2.0.13-jvm.json index b75d1601..9e5141ec 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/rendering-engine-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/rendering-engine-processing-service/2.0.13-jvm.json @@ -1,12 +1,7 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/rendering-engine-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/rendering-engine-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ - { - "name": "incoming-rendering-requests", - "defaultSchemaId": "RenderingRequest_AVROSchema_ab026bcc24942e49501e3a434e771f9b119438f7", - "connector": "smallrye-pulsar" - }, { "name": "rendering-contexts", "defaultSchemaId": "rendering-contexts", @@ -14,16 +9,26 @@ }, { "name": "data", - "defaultSchemaId": "Data_AVROSchema_188ddb7e32a8532588d92a9f029ffa69ba15c92a", + "defaultSchemaId": "Data_AVROSchema_2ed153a325e408d01ce4b1d417f848a330c8003a", "connector": "smallrye-pulsar" }, { "name": "renderers", - "defaultSchemaId": "Renderer_AVROSchema_857ad06b1d61cb2e017c797986d8371d7b46e588", + "defaultSchemaId": "Renderer_AVROSchema_7c8e2dca8030baf4ff49280b627d3cd5a23bfd37", + "connector": "smallrye-pulsar" + }, + { + "name": "incoming-rendering-requests", + "defaultSchemaId": "RenderingRequest_AVROSchema_fcf87243206d579fa2ad7664aa634a8cb04bc8ba", "connector": "smallrye-pulsar" } ], "outgoing": [ + { + "name": "outgoing-rendering-requests", + "defaultSchemaId": "RenderingRequest_AVROSchema_fcf87243206d579fa2ad7664aa634a8cb04bc8ba", + "connector": "smallrye-pulsar" + }, { "name": "pages", "defaultSchemaId": "pages", @@ -33,60 +38,20 @@ "name": "fragments", "defaultSchemaId": "fragments", "connector": "smallrye-pulsar" - }, - { - "name": "outgoing-rendering-requests", - "defaultSchemaId": "RenderingRequest_AVROSchema_ab026bcc24942e49501e3a434e771f9b119438f7", - "connector": "smallrye-pulsar" } ], "schemas": { - "Renderer_AVROSchema_857ad06b1d61cb2e017c797986d8371d7b46e588": { + "Data_AVROSchema_2ed153a325e408d01ce4b1d417f848a330c8003a": { "type": "record", - "name": "Renderer", + "name": "Data", "namespace": "dev.streamx.blueprints.data", "fields": [ { - "name": "template", + "name": "content", "type": "bytes" } ] }, - "RenderingRequest_AVROSchema_ab026bcc24942e49501e3a434e771f9b119438f7": { - "type": "record", - "name": "RenderingRequest", - "namespace": "dev.streamx.blueprints.rendering.engine", - "fields": [ - { - "name": "dataKey", - "type": "string" - }, - { - "name": "outputFormat", - "type": { - "type": "enum", - "name": "OutputFormat", - "namespace": "dev.streamx.blueprints.data.RenderingContext", - "symbols": [ - "PAGE", - "FRAGMENT" - ] - } - }, - { - "name": "outputKeyTemplate", - "type": "string" - }, - { - "name": "outputTypeTemplate", - "type": "string" - }, - { - "name": "rendererKey", - "type": "string" - } - ] - }, "rendering-contexts": { "type": "record", "name": "RenderingContext", @@ -94,11 +59,19 @@ "fields": [ { "name": "dataKeyMatchPattern", - "type": "string" + "type": [ + "null", + "string" + ], + "default": null }, { "name": "dataTypeMatchPattern", - "type": "string" + "type": [ + "null", + "string" + ], + "default": null }, { "name": "outputFormat", @@ -148,16 +121,51 @@ } ] }, - "Data_AVROSchema_188ddb7e32a8532588d92a9f029ffa69ba15c92a": { + "Renderer_AVROSchema_7c8e2dca8030baf4ff49280b627d3cd5a23bfd37": { "type": "record", - "name": "Data", + "name": "Renderer", "namespace": "dev.streamx.blueprints.data", "fields": [ { - "name": "content", + "name": "template", "type": "bytes" } ] + }, + "RenderingRequest_AVROSchema_fcf87243206d579fa2ad7664aa634a8cb04bc8ba": { + "type": "record", + "name": "RenderingRequest", + "namespace": "dev.streamx.blueprints.rendering.engine", + "fields": [ + { + "name": "dataKey", + "type": "string" + }, + { + "name": "outputFormat", + "type": { + "type": "enum", + "name": "OutputFormat", + "namespace": "dev.streamx.blueprints.data.RenderingContext", + "symbols": [ + "PAGE", + "FRAGMENT" + ] + } + }, + { + "name": "outputKeyTemplate", + "type": "string" + }, + { + "name": "outputTypeTemplate", + "type": "string" + }, + { + "name": "rendererKey", + "type": "string" + } + ] } } } \ No newline at end of file diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/scheduled-resource-processing-service/2.0.13-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/scheduled-resource-processing-service/2.0.13-jvm.json new file mode 100644 index 00000000..b9f0223a --- /dev/null +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/scheduled-resource-processing-service/2.0.13-jvm.json @@ -0,0 +1,31 @@ +{ + "image": "ghcr.io/streamx-dev/streamx-blueprints/scheduled-resource-processing-service:2.0.13-jvm", + "type": "processing", + "incoming": [ + { + "name": "scheduling-triggers", + "defaultSchemaId": "WebResource_AVROSchema_c5d0b0e64d67b3e065c3da5ec63b01b39444da10", + "connector": "smallrye-pulsar" + } + ], + "outgoing": [ + { + "name": "fetched-resources", + "defaultSchemaId": "WebResource_AVROSchema_c5d0b0e64d67b3e065c3da5ec63b01b39444da10", + "connector": "smallrye-pulsar" + } + ], + "schemas": { + "WebResource_AVROSchema_c5d0b0e64d67b3e065c3da5ec63b01b39444da10": { + "type": "record", + "name": "WebResource", + "namespace": "dev.streamx.blueprints.data", + "fields": [ + { + "name": "content", + "type": "bytes" + } + ] + } + } +} \ No newline at end of file diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/sitemap-generator-processing-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/sitemap-generator-processing-service/2.0.13-jvm.json similarity index 67% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/sitemap-generator-processing-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/sitemap-generator-processing-service/2.0.13-jvm.json index 2f9c1fc1..51291ddd 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/sitemap-generator-processing-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/sitemap-generator-processing-service/2.0.13-jvm.json @@ -1,22 +1,22 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/sitemap-generator-processing-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/sitemap-generator-processing-service:2.0.13-jvm", "type": "processing", "incoming": [ { "name": "incoming-pages", - "defaultSchemaId": "Page_AVROSchema_6c7f2bd1c9343bcf81bef10770438414428d196b", + "defaultSchemaId": "Page_AVROSchema_e1feb6c5df28b81ef87fa9923eb29b8ea1fea386", "connector": "smallrye-pulsar" } ], "outgoing": [ { "name": "outgoing-sitemaps", - "defaultSchemaId": "WebResource_AVROSchema_01d5cf1870c33229352153f8afb1d8e3942b20a6", + "defaultSchemaId": "WebResource_AVROSchema_60e8586352c1a9e09af115f234a95e04263a664f", "connector": "smallrye-pulsar" } ], "schemas": { - "Page_AVROSchema_6c7f2bd1c9343bcf81bef10770438414428d196b": { + "Page_AVROSchema_e1feb6c5df28b81ef87fa9923eb29b8ea1fea386": { "type": "record", "name": "Page", "namespace": "dev.streamx.blueprints.data", @@ -27,7 +27,7 @@ } ] }, - "WebResource_AVROSchema_01d5cf1870c33229352153f8afb1d8e3942b20a6": { + "WebResource_AVROSchema_60e8586352c1a9e09af115f234a95e04263a664f": { "type": "record", "name": "WebResource", "namespace": "dev.streamx.blueprints.data", diff --git a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/web-delivery-service/2.0.6-jvm.json b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/web-delivery-service/2.0.13-jvm.json similarity index 66% rename from mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/web-delivery-service/2.0.6-jvm.json rename to mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/web-delivery-service/2.0.13-jvm.json index 0e69c47a..c29abc27 100644 --- a/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.6/web-delivery-service/2.0.6-jvm.json +++ b/mesh/services/streamx-service-metadata/streamx-blueprints/2.0.13/web-delivery-service/2.0.13-jvm.json @@ -1,32 +1,32 @@ { - "image": "ghcr.io/streamx-dev/streamx-blueprints/web-delivery-service:2.0.6-jvm", + "image": "ghcr.io/streamx-dev/streamx-blueprints/web-delivery-service:2.0.13-jvm", "type": "delivery", "incoming": [ { "name": "assets", - "defaultSchemaId": "Asset_AVROSchema_6263aa75231e83b94a7e9456da9ee41630907826", + "defaultSchemaId": "Asset_AVROSchema_49822765637480c0c7f93494cca349487f8df470", "connector": "smallrye-pulsar" }, { "name": "fragments", - "defaultSchemaId": "Fragment_AVROSchema_31b3b73771d0eaa9f347d766f73eb313120682e3", + "defaultSchemaId": "Fragment_AVROSchema_d09760ec145d7211f2a335a8e2e288363bda8fde", "connector": "smallrye-pulsar" }, { "name": "pages", - "defaultSchemaId": "Page_AVROSchema_74d8daedd6d7401f28757aedf3fffa50983226ab", + "defaultSchemaId": "Page_AVROSchema_b7b8a50e12f39da10c0810e07b144c17d6e535b1", "connector": "smallrye-pulsar" }, { "name": "web-resources", - "defaultSchemaId": "WebResource_AVROSchema_e61099b67e2db7901f7a48a3b3d1cb6659a287b8", + "defaultSchemaId": "WebResource_AVROSchema_80d0d2e0397753c66ce74f6d80c837b59494945b", "connector": "smallrye-pulsar" } ], "schemas": { - "Page_AVROSchema_74d8daedd6d7401f28757aedf3fffa50983226ab": { + "Fragment_AVROSchema_d09760ec145d7211f2a335a8e2e288363bda8fde": { "type": "record", - "name": "Page", + "name": "Fragment", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -35,9 +35,9 @@ } ] }, - "WebResource_AVROSchema_e61099b67e2db7901f7a48a3b3d1cb6659a287b8": { + "Page_AVROSchema_b7b8a50e12f39da10c0810e07b144c17d6e535b1": { "type": "record", - "name": "WebResource", + "name": "Page", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -46,9 +46,9 @@ } ] }, - "Fragment_AVROSchema_31b3b73771d0eaa9f347d766f73eb313120682e3": { + "WebResource_AVROSchema_80d0d2e0397753c66ce74f6d80c837b59494945b": { "type": "record", - "name": "Fragment", + "name": "WebResource", "namespace": "dev.streamx.blueprints.data", "fields": [ { @@ -57,7 +57,7 @@ } ] }, - "Asset_AVROSchema_6263aa75231e83b94a7e9456da9ee41630907826": { + "Asset_AVROSchema_49822765637480c0c7f93494cca349487f8df470": { "type": "record", "name": "Asset", "namespace": "dev.streamx.blueprints.data", From dc2ef62584a110ac351983aad106f8a79024a613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20G=C5=82owacz?= Date: Thu, 9 Oct 2025 13:34:05 +0200 Subject: [PATCH 2/2] SXPR-145 Add external-resources-processing-service to ingest images from PIM data source * align mesh configuration for reference images according to the model --- data/catalog/products.stream | 2 +- mesh/mesh.yaml | 5 ++--- scripts/catalog/convert-products.sh | 9 +++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/data/catalog/products.stream b/data/catalog/products.stream index 144565eb..088afea6 100644 --- a/data/catalog/products.stream +++ b/data/catalog/products.stream @@ -48213,7 +48213,7 @@ "action": "publish", "eventTime": null, "properties": { - "sx:type": "data/product" + "sx:type": "data/product_with_images" }, "payload": { "dev.streamx.blueprints.data.Data": { diff --git a/mesh/mesh.yaml b/mesh/mesh.yaml index a2d18470..5b4febde 100644 --- a/mesh/mesh.yaml +++ b/mesh/mesh.yaml @@ -138,9 +138,8 @@ processing: topic: relays/fake-web-resources-channel environment: STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_BASE_URL_FOR_RELATIVE_PATHS: "${streamx.accelerator.web.url}" - STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_PROCESSABLE_SX_TYPES: "product/simple,product/master,category" - STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_JSON_EXTERNAL_RESOURCE_JSONPATH_SELECTORS: "$..attributes[?(@.name=='small_image' || @.name=='thumbnail')].values.*.value,$..attributes[?(@.name=='small_image' || @.name=='thumbnail')].values.*.label,$..primaryImage.url,$..gallery.*.url" - + STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_PROCESSABLE_SX_TYPES: "data/product_with_images" + STREAMX_BLUEPRINTS_EXTERNAL_RESOURCES_PROCESSING_SERVICE_JSON_EXTERNAL_RESOURCE_JSONPATH_SELECTORS: "$..primaryImage.url" blueprint-json-aggregator: image: json-aggregator-processing-service diff --git a/scripts/catalog/convert-products.sh b/scripts/catalog/convert-products.sh index 13229326..04725910 100755 --- a/scripts/catalog/convert-products.sh +++ b/scripts/catalog/convert-products.sh @@ -10,14 +10,19 @@ json_data=$(cat "$input_file" | sed 's/\\"/\"/g') echo "$json_data" | jq -c '.[]' | while IFS= read -r product; do id=$(echo "$product" | jq -r '.id') + sx_type="data/product"; + # Product ID:B07YBHC881 with fetch image references feature enable + if [[ "$id" == "B07YBHC881" ]]; then + sx_type="data/product_with_images"; + fi - processed_product=$(jq -n --arg kek "$id" --argjson content "$product" --arg prefix "pim:" \ + processed_product=$(jq -n --arg kek "$id" --argjson content "$product" --arg prefix "pim:" --arg sxtype "$sx_type" \ '{ "key": ($prefix + $kek), "action": "publish", "eventTime": null, "properties": { - "sx:type": "data/product" + "sx:type": ($sxtype) }, "payload": { "dev.streamx.blueprints.data.Data": {