IEBH-353: Sync with the latest changes (#9)

Author: vmoshynskyi

.env.example

@@ -1,9 +1,3 @@
-# Credentials for vault and whether to use it or not
-CONFIG_CENTER_ENABLED= # example: true
-VAULT_URL=             # example: http://vault.vault:8200
-VAULT_CRT=             # example: ca.crt
-VAULT_TOKEN=           # eample: token
-
 # The following contains defaults that can be overridden:
 #APP_NAME=bff-web
 #HOST=0.0.0.0

.github/workflows/hdc-pipeline.yml

@@ -0,0 +1,37 @@
+name: HDC ci/cd pipeline
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  run_tests_hdc:
+    uses: PilotDataPlatform/pilot-hdc-ci-tools/.github/workflows/run_tests.yml@main
+    with:
+      min_coverage_percent: 60
+      docker_login: true
+    secrets: inherit
+
+  build_and_publish_hdc:
+    needs: [run_tests_hdc]
+    uses: PilotDataPlatform/pilot-hdc-ci-tools/.github/workflows/build_and_publish.yml@main
+    with:
+      matrix_config: '["bff"]'
+      service_name: 'bff-web'
+    secrets: inherit
+
+  deploy_hdc:
+    needs: [build_and_publish_hdc]
+    uses: PilotDataPlatform/pilot-hdc-ci-tools/.github/workflows/trigger_deployment.yml@main
+    with:
+      hdc_service_name: 'bff'
+    secrets: inherit

.pre-commit-config.yaml

@@ -67,15 +67,15 @@ repos:
           '--max-line-length=120',
         ]
 
-#  - repo: https://github.com/PyCQA/docformatter
-#    rev: v1.7.5
-#    hooks:
-#      - id: docformatter
-#        args: [
-#          '--wrap-summaries=120',
-#          '--wrap-descriptions=120',
-#          '--in-place',
-#        ]
+  - repo: https://github.com/PyCQA/docformatter
+    rev: v1.7.7
+    hooks:
+      - id: docformatter
+        args: [
+          '--wrap-summaries=120',
+          '--wrap-descriptions=120',
+          '--in-place',
+        ]
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.5.5

Jenkinsfile

@@ -4,6 +4,8 @@
 # Version 3.0 (the "License") available at https://www.gnu.org/licenses/agpl-3.0.en.html.
 # You may not use this file except in compliance with the License.
 
+from typing import Annotated
+
 import httpx
 from fastapi import APIRouter
 from fastapi import Depends
@@ -19,6 +21,7 @@
 from models.bridge import AddVisits
 from models.bridge import AddVisitsResponse
 from models.bridge import GetRecentVisits
+from services.bridge import BridgeService
 from services.bridge import get_bridge_service
 
 router = APIRouter(tags=['Bridge'])
@@ -30,17 +33,17 @@ class Bridge:
     current_identity: CurrentUser = Depends(jwt_required)
 
     @router.post('/visits', summary='Compute one visit to the user from JWT', response_model=AddVisitsResponse)
-    async def add_visit(self, data: AddVisits):
-        bridge_service = await get_bridge_service()
+    async def add_visit(self, bridge_service: Annotated[BridgeService, Depends(get_bridge_service)], data: AddVisits):
         username = self.current_identity['username']
         response = AddVisitsResponse(result='success', code=EAPIResponseCode.success.value)
 
         await bridge_service.add_visit(data.entity, data.code, username)
         return JSONResponse(content=response.dict(), status_code=response.code)
 
     @router.get('/visits', summary='get JWT user last visits')
-    async def get_visit(self, params: GetRecentVisits = Depends()):
-        bridge_service = await get_bridge_service()
+    async def get_visit(
+        self, bridge_service: Annotated[BridgeService, Depends(get_bridge_service)], params: GetRecentVisits = Depends()
+    ):
         username = self.current_identity['username']
         entity = params.entity
         last_codes = await bridge_service.get_visits(params.entity, username, params.last)

api/api_bridge.py

@@ -5,7 +5,6 @@
 # You may not use this file except in compliance with the License.
 
 from typing import Any
-from typing import Dict
 
 from common.project.project_client import ProjectObject
 from fastapi import APIRouter
@@ -204,13 +203,13 @@ async def keycloak_user_role_update(operation: str, user_email: str, role: str,
 
 
 def send_email_user(
-    user: Dict[str, Any],
+    user: dict[str, Any],
     project: ProjectObject,
     username: str,
     role: str,
     title: str,
     template: str,
-    current_identity: Dict[str, Any],
+    current_identity: dict[str, Any],
 ) -> None:
     try:
         email = user['email']

api/api_container/api_container_user.py

@@ -40,6 +40,7 @@ class ActivityLogs:
     )
     async def get(self, dataset_code: str, request: Request) -> JSONResponse:
         """Fetch activity logs of a dataset."""
+
         _res = APIResponse()
         logger.info(f'Call API for fetching logs for dataset: {dataset_code}')
 

api/api_dataset/api_activity_logs.py

@@ -13,6 +13,7 @@
 from httpx import AsyncClient
 
 from app.auth import jwt_required
+from app.components.request.context import RequestContextDependency
 from app.components.user.models import CurrentUser
 from app.logger import logger
 from config import ConfigClass
@@ -85,14 +86,12 @@ class DownloadPre:
         summary='pre-download for dataset',
         dependencies=[Depends(DatasetPermission())],
     )
-    async def get(self, dataset_id: str, request: Request):
+    async def get(self, dataset_id: str, request: Request, request_context: RequestContextDependency):
         api_response = APIResponse()
         try:
-            response = requests.get(
+            response = await request_context.client.get(
                 ConfigClass.DATASET_SERVICE + f'dataset/{dataset_id}/download/pre',
                 params=request.query_params,
-                headers=request.headers,
-                timeout=ConfigClass.SERVICE_CLIENT_TIMEOUT,
             )
         except Exception as e:
             logger.info(f'Error calling dataset service: {e}')