[SIS-xxx] upgrading abstracto version

adapting to new python rest api structure

.env

@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
 VERSION=1.4.46
-ABSTRACTO_VERSION=1.5.27
+ABSTRACTO_VERSION=1.5.28

deployment/helm/sissi/templates/private-rest-api-deployment.yaml

@@ -31,9 +31,9 @@ spec:
           image: "{{ .Values.privateRestApi.repository }}/{{ .Values.privateRestApi.image }}:{{ .Values.privateRestApi.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.privateRestApi.pullPolicy }}
           env:
-            - name: SISSI_HOST
+            - name: BACKEND_HOST
               value: "{{ include "sissi.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local"
-            - name: SISSI_PORT
+            - name: BACKEND_PORT
               value: "{{ .Values.service.port }}"
           ports:
             - name: {{ .Values.privateRestApi.service.name }}

deployment/helm/sissi/templates/rest-api-deployment.yaml

@@ -31,9 +31,9 @@ spec:
           image: "{{ .Values.restApi.repository }}/{{ .Values.restApi.image }}:{{ .Values.restApi.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.restApi.pullPolicy }}
           env:
-            - name: SISSI_HOST
+            - name: BACKEND_HOST
               value: "{{ include "sissi.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local"
-            - name: SISSI_PORT
+            - name: BACKEND_PORT
               value: "{{ .Values.service.port }}"
           ports:
             - name: {{ .Values.restApi.service.name }}

deployment/helm/sissi/values.yaml

@@ -90,7 +90,7 @@ templateDeployment:
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.5.27
+  tag: 1.5.28
 templateDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always
@@ -101,7 +101,7 @@ dbConfigDeployment:
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.5.27
+  tag: 1.5.28
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/sissi
   pullPolicy: Always

deployment/image-packaging/src/main/docker/rest-api/Dockerfile

@@ -3,7 +3,11 @@ ARG SISSI_REGISTRY_PREFIX
 ARG VERSION
 ARG ABSTRACTO_VERSION
 FROM ${SISSI_REGISTRY_PREFIX}sissi-debra-rest-api:${VERSION:-latest} AS debra-api
+FROM ${REGISTRY_PREFIX}abstracto-rest-api-experience:${ABSTRACTO_VERSION:-latest} AS experience-api
+FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api
 
 
 FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest}
-COPY --from=debra-api /python /python
+COPY --from=debra-api /python /python
+COPY --from=core-api /python /python
+COPY --from=experience-api /python /python

docker-compose.yml

@@ -24,6 +24,8 @@ services:
         VERSION: ${VERSION}
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
     image: ${REGISTRY_PREFIX}sissi-rest-api:${VERSION:-latest}
+    depends_on:
+      - debra-rest-api
   private-rest-api-packaging:
     build:
       context: deployment/image-packaging/src/main/docker/private-rest-api
@@ -33,6 +35,8 @@ services:
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
         VERSION: ${VERSION}
     image: ${REGISTRY_PREFIX}sissi-private-rest-api:${VERSION:-latest}
+    depends_on:
+      - image-gen-api
   db-data:
     build:
       context: deployment/image-packaging/src/main/docker/db-data

pom.xml

@@ -18,7 +18,7 @@
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.27</abstracto.version>
+        <abstracto.version>1.5.28</abstracto.version>
         <abstracto.templates.version>1.4.35</abstracto.templates.version>
         <apache-jena.version>4.9.0</apache-jena.version>
         <rssreader.version>3.5.0</rssreader.version>

python/modules/debra-rest-api/python/endpoints/debra.py

@@ -11,12 +11,12 @@ from datetime import timezone, datetime
 import pytz
 
 
-sissi_host = os.getenv('SISSI_HOST')
-sissi_port = os.getenv('SISSI_PORT')
-latest_donations_url = f'http://{sissi_host}:{sissi_port}/debra/latestDonations'
-highest_donations_url = f'http://{sissi_host}:{sissi_port}/debra/highestDonations'
-campaign_info_url = f'http://{sissi_host}:{sissi_port}/debra/campaignInfo'
-endless_stream_info_url = f'http://{sissi_host}:{sissi_port}/stream/endlessStream'
+backend_host = os.getenv('BACKEND_HOST')
+backend_port = os.getenv('BACKEND_PORT')
+latest_donations_url = f'http://{backend_host}:{backend_port}/debra/latestDonations'
+highest_donations_url = f'http://{backend_host}:{backend_port}/debra/highestDonations'
+campaign_info_url = f'http://{backend_host}:{backend_port}/debra/campaignInfo'
+endless_stream_info_url = f'http://{backend_host}:{backend_port}/stream/endlessStream'
 
 
 class DonationImageGenerationParameters: