Merge branch 'master' into 7635-add-exemplars-to-prometheus-metrics

Author: bisgaard-itis

.env-devel

@@ -119,7 +119,6 @@ DIRECTOR_V2_LOGLEVEL=INFO
 DIRECTOR_V2_NODE_PORTS_STORAGE_AUTH=null
 DIRECTOR_V2_PORT=8000
 DIRECTOR_V2_PROFILING=1
-DIRECTOR_V2_PUBLIC_API_BASE_URL=http://127.0.0.1:8006
 DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS=[]
 DIRECTOR_V2_DOCKER_HUB_REGISTRY=null
 DYNAMIC_SIDECAR_ENABLE_VOLUME_LIMITS=False

.eslintignore

@@ -2,10 +2,13 @@
 
 from _common import as_query
 from fastapi import APIRouter, Depends, status
+from fastapi_pagination import Page
 from models_library.api_schemas_webserver.computations import (
     ComputationGet,
     ComputationPathParams,
+    ComputationRunPathParams,
     ComputationRunRestGet,
+    ComputationRunWithFiltersListQueryParams,
     ComputationStart,
     ComputationStarted,
     ComputationTaskRestGet,
@@ -65,16 +68,26 @@ async def stop_computation(_path: Annotated[ComputationPathParams, Depends()]):
 
 @router.get(
     "/computations/-/iterations/latest",
-    response_model=Envelope[list[ComputationRunRestGet]],
+    response_model=Page[ComputationRunRestGet],
 )
 async def list_computations_latest_iteration(
+    _query: Annotated[as_query(ComputationRunWithFiltersListQueryParams), Depends()],
+): ...
+
+
+@router.get(
+    "/computations/{project_id}/iterations",
+    response_model=Page[ComputationRunRestGet],
+)
+async def list_computation_iterations(
     _query: Annotated[as_query(ComputationRunListQueryParams), Depends()],
+    _path: Annotated[ComputationRunPathParams, Depends()],
 ): ...
 
 
 @router.get(
     "/computations/{project_id}/iterations/latest/tasks",
-    response_model=Envelope[list[ComputationTaskRestGet]],
+    response_model=Page[ComputationTaskRestGet],
 )
 async def list_computations_latest_iteration_tasks(
     _query: Annotated[as_query(ComputationTaskListQueryParams), Depends()],

api/specs/web-server/_computations.py

@@ -0,0 +1,6 @@
+module.exports = {
+  ignores: [
+    "services/static-webserver/client/source/resource/",
+    "services/static-webserver/client/source-output/",
+  ]
+};

eslint.config.js

@@ -1,8 +1,8 @@
 aio-pika==9.5.5
     # via -r requirements/../../../packages/service-library/requirements/_base.in
-aioboto3==14.1.0
+aioboto3==14.3.0
     # via -r requirements/_base.in
-aiobotocore==2.21.1
+aiobotocore==2.22.0
     # via aioboto3
 aiocache==0.12.3
     # via
@@ -57,9 +57,9 @@ attrs==25.1.0
     #   aiohttp
     #   jsonschema
     #   referencing
-boto3==1.37.1
+boto3==1.37.3
     # via aiobotocore
-botocore==1.37.1
+botocore==1.37.3
     # via
     #   aiobotocore
     #   boto3

packages/aws-library/requirements/_base.txt

@@ -20,12 +20,12 @@ aws-xray-sdk==2.14.0
     # via moto
 blinker==1.9.0
     # via flask
-boto3==1.37.1
+boto3==1.37.3
     # via
     #   -c requirements/_base.txt
     #   aws-sam-translator
     #   moto
-botocore==1.37.1
+botocore==1.37.3
     # via
     #   -c requirements/_base.txt
     #   aws-xray-sdk

packages/aws-library/requirements/_test.txt

@@ -0,0 +1,9 @@
+import ipaddress
+
+
+def is_ip_address(host: str) -> bool:
+    try:
+        ipaddress.ip_address(host)
+        return True
+    except ValueError:
+        return False

packages/common-library/src/common_library/network.py

@@ -0,0 +1,19 @@
+import pytest
+from common_library.network import is_ip_address
+
+
+@pytest.mark.parametrize(
+    "host, expected",
+    [
+        ("127.0.0.1", True),
+        ("::1", True),
+        ("192.168.1.1", True),
+        ("2001:0db8:85a3:0000:0000:8a2e:0370:7334", True),
+        ("256.256.256.256", False),
+        ("invalid_host", False),
+        ("", False),
+        ("1234:5678:9abc:def0:1234:5678:9abc:defg", False),
+    ],
+)
+def test_is_ip_address(host: str, expected: bool):
+    assert is_ip_address(host) == expected

packages/common-library/src/common_library/test_network.py

@@ -1,9 +1,10 @@
 from datetime import datetime
-from typing import Annotated, Any, NamedTuple
+from typing import Any, NamedTuple
 
+from models_library.services_types import ServiceRunID
 from pydantic import (
+    AnyUrl,
     BaseModel,
-    BeforeValidator,
     ConfigDict,
     PositiveInt,
 )
@@ -62,20 +63,16 @@ class ComputationRunRpcGetPage(NamedTuple):
     total: PositiveInt
 
 
-def _none_to_zero_float_pre_validator(value: Any):
-    if value is None:
-        return 0.0
-    return value
-
-
 class ComputationTaskRpcGet(BaseModel):
     project_uuid: ProjectID
     node_id: NodeID
     state: RunningState
-    progress: Annotated[float, BeforeValidator(_none_to_zero_float_pre_validator)]
+    progress: float
     image: dict[str, Any]
     started_at: datetime | None
     ended_at: datetime | None
+    log_download_link: AnyUrl | None
+    service_run_id: ServiceRunID
 
     model_config = ConfigDict(
         json_schema_extra={
@@ -92,6 +89,8 @@ class ComputationTaskRpcGet(BaseModel):
                     },
                     "started_at": "2023-01-11 13:11:47.293595",
                     "ended_at": "2023-01-11 13:11:47.293595",
+                    "log_download_link": "https://example.com/logs",
+                    "service_run_id": "comp_1_12e0c8b2-bad6-40fb-9948-8dec4f65d4d9_1",
                 }
             ]
         }

packages/models-library/src/models_library/api_schemas_directorv2/comp_runs.py

@@ -44,6 +44,10 @@ class ComputationCreate(BaseModel):
         Field(description="if True the computation pipeline will start right away"),
     ] = False
     product_name: Annotated[str, Field()]
+    product_api_base_url: Annotated[
+        AnyHttpUrl,
+        Field(description="Base url of the product"),
+    ]
     subgraph: Annotated[
         list[NodeID] | None,
         Field(