Merge remote-tracking branch 'upstream/master' into pr-osparc-dy-sidecar-ports-migrate

Author: Andrei Neagu

.env-devel

@@ -141,12 +141,14 @@ DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=adminadmin
 FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
 
 WEBSERVER_LICENSES={}
+WEBSERVER_FOGBUGZ={}
 LICENSES_ITIS_VIP_SYNCER_ENABLED=false
 LICENSES_ITIS_VIP_SYNCER_PERIODICITY=1D00:00:00
 LICENSES_ITIS_VIP_API_URL=https://replace-with-itis-api/{category}
 LICENSES_ITIS_VIP_CATEGORIES='{"HumanWholeBody": "Humans", "HumanBodyRegion": "Humans (Region)", "AnimalWholeBody": "Animal"}'
 LICENSES_SPEAG_PHANTOMS_API_URL=https://replace-with-speag-api/{category}
 LICENSES_SPEAG_PHANTOMS_CATEGORIES='{"ComputationalPhantom": "Phantom of the Opera"}'
+LONG_RUNNING_TASKS_NAMESPACE_SUFFIX=development
 
 # Can use 'docker run -it itisfoundation/invitations:latest simcore-service-invitations generate-dotenv --auto-password'
 INVITATIONS_DEFAULT_PRODUCT=osparc

.github/actions/setup-simcore-env/action.yml

@@ -10,7 +10,7 @@ inputs:
   uv-version:
     description: 'UV version to use'
     required: false
-    default: '0.7.x'
+    default: '0.8.x'
 
   cache-dependency-glob:
     description: 'Glob pattern for cache dependency files'

.github/workflows/ci-testing-deploy.yml

@@ -1057,7 +1057,7 @@ jobs:
   unit-test-dynamic-sidecar:
     needs: changes
     if: ${{ needs.changes.outputs.dynamic-sidecar == 'true' || github.event_name == 'push' || github.event.inputs.force_all_builds == 'true' }}
-    timeout-minutes: 18 # if this timeout gets too small, then split the tests
+    timeout-minutes: 19 # if this timeout gets too small, then split the tests
     name: "[unit] dynamic-sidecar"
     runs-on: ${{ matrix.os }}
     strategy:
@@ -1252,7 +1252,7 @@ jobs:
   unit-test-service-library:
     needs: changes
     if: ${{ needs.changes.outputs.service-library == 'true' || github.event_name == 'push' || github.event.inputs.force_all_builds == 'true' }}
-    timeout-minutes: 18 # if this timeout gets too small, then split the tests
+    timeout-minutes: 20 # if this timeout gets too small, then split the tests
     name: "[unit] service-library"
     runs-on: ${{ matrix.os }}
     strategy:

Makefile

@@ -89,7 +89,31 @@ export DOCKER_REGISTRY  ?= itisfoundation
 
 MAKEFILES_WITH_OPENAPI_SPECS := $(shell find . -mindepth 2 -type f -name 'Makefile' -not -path '*/.*' -exec grep -l '^openapi-specs:' {} \; | xargs realpath)
 
+# WSL 2 tricks
+define _check_wsl_mirroring
+$(shell \
+    if [ "$(IS_WSL2)" = "WSL2" ]; then \
+        win_user=$$(powershell.exe '$$env:UserName' | tr -d '\r' | tail -n 1 | xargs); \
+        config_path="/mnt/c/Users/$$win_user/.wslconfig"; \
+        if [ -f "$$config_path" ] && grep -q "networkingMode.*=.*mirrored" "$$config_path" 2>/dev/null; then \
+            echo "true"; \
+        else \
+            echo "false"; \
+        fi; \
+    else \
+        echo "false"; \
+    fi \
+)
+endef
+
+WSL_MIRRORED := $(_check_wsl_mirroring)
+
+
+ifeq ($(WSL_MIRRORED),true)
+get_my_ip := 127.0.0.1
+else
 get_my_ip := $(shell (hostname --all-ip-addresses || hostname -i) 2>/dev/null | cut --delimiter=" " --fields=1)
+endif
 
 # NOTE: this is only for WSL2 as the WSL2 subsystem IP is changing on each reboot
 ifeq ($(IS_WSL2),WSL2)
@@ -683,7 +707,7 @@ local-registry: .env ## creates a local docker registry and configure simcore to
 							--publish 5000:5000 \
 							--volume $(LOCAL_REGISTRY_VOLUME):/var/lib/registry \
 							--name $(LOCAL_REGISTRY_HOSTNAME) \
-							registry:2)
+							registry:3)
 
 	# WARNING: environment file .env is now setup to use local registry on port 5000 without any security (take care!)...
 	@echo REGISTRY_AUTH=False >> .env

api/specs/web-server/_conversations.py

@@ -0,0 +1,149 @@
+"""Helper script to automatically generate OAS
+
+This OAS are the source of truth
+"""
+
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+
+
+from typing import Annotated
+
+from _common import as_query
+from fastapi import APIRouter, Depends, status
+from models_library.api_schemas_webserver.conversations import (
+    ConversationMessagePatch,
+    ConversationMessageRestGet,
+    ConversationPatch,
+    ConversationRestGet,
+)
+from models_library.generics import Envelope
+from models_library.rest_pagination import Page
+from simcore_service_webserver._meta import API_VTAG
+from simcore_service_webserver.conversations._controller._common import (
+    ConversationPathParams,
+)
+from simcore_service_webserver.conversations._controller._conversations_messages_rest import (
+    _ConversationMessageCreateBodyParams,
+    _ConversationMessagePathParams,
+    _ListConversationMessageQueryParams,
+)
+from simcore_service_webserver.conversations._controller._conversations_rest import (
+    _ConversationsCreateBodyParams,
+    _ListConversationsQueryParams,
+)
+
+router = APIRouter(
+    prefix=f"/{API_VTAG}",
+    tags=[
+        "conversations",
+    ],
+)
+
+
+#
+# API entrypoints CONVERSATIONS
+#
+
+
+@router.post(
+    "/conversations",
+    response_model=Envelope[ConversationRestGet],
+    status_code=status.HTTP_201_CREATED,
+)
+async def create_conversation(
+    _body: _ConversationsCreateBodyParams,
+): ...
+
+
+@router.get(
+    "/conversations",
+    response_model=Page[ConversationRestGet],
+)
+async def list_conversations(
+    _query: Annotated[_ListConversationsQueryParams, Depends()],
+): ...
+
+
+@router.patch(
+    "/conversations/{conversation_id}",
+    response_model=Envelope[ConversationRestGet],
+)
+async def update_conversation(
+    _params: Annotated[ConversationPathParams, Depends()],
+    _body: ConversationPatch,
+): ...
+
+
+@router.delete(
+    "/conversations/{conversation_id}",
+    status_code=status.HTTP_204_NO_CONTENT,
+)
+async def delete_conversation(
+    _params: Annotated[ConversationPathParams, Depends()],
+): ...
+
+
+@router.get(
+    "/conversations/{conversation_id}",
+    response_model=Envelope[ConversationRestGet],
+)
+async def get_conversation(
+    _params: Annotated[ConversationPathParams, Depends()],
+): ...
+
+
+#
+# API entrypoints CONVERSATION MESSAGES
+#
+
+
+@router.post(
+    "/conversations/{conversation_id}/messages",
+    response_model=Envelope[ConversationMessageRestGet],
+    status_code=status.HTTP_201_CREATED,
+)
+async def create_conversation_message(
+    _params: Annotated[ConversationPathParams, Depends()],
+    _body: _ConversationMessageCreateBodyParams,
+): ...
+
+
+@router.get(
+    "/conversations/{conversation_id}/messages",
+    response_model=Page[ConversationMessageRestGet],
+)
+async def list_conversation_messages(
+    _params: Annotated[ConversationPathParams, Depends()],
+    _query: Annotated[as_query(_ListConversationMessageQueryParams), Depends()],
+): ...
+
+
+@router.put(
+    "/conversations/{conversation_id}/messages/{message_id}",
+    response_model=Envelope[ConversationMessageRestGet],
+)
+async def update_conversation_message(
+    _params: Annotated[_ConversationMessagePathParams, Depends()],
+    _body: ConversationMessagePatch,
+): ...
+
+
+@router.delete(
+    "/conversations/{conversation_id}/messages/{message_id}",
+    status_code=status.HTTP_204_NO_CONTENT,
+)
+async def delete_conversation_message(
+    _params: Annotated[_ConversationMessagePathParams, Depends()],
+): ...
+
+
+@router.get(
+    "/conversations/{conversation_id}/messages/{message_id}",
+    response_model=Envelope[ConversationMessageRestGet],
+)
+async def get_conversation_message(
+    _params: Annotated[_ConversationMessagePathParams, Depends()],
+): ...

api/specs/web-server/_functions.py

@@ -10,12 +10,18 @@
 from _common import as_query
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.functions import (
+    FunctionGroupAccessRightsGet,
+    FunctionGroupAccessRightsUpdate,
     FunctionToRegister,
     RegisteredFunctionGet,
     RegisteredFunctionUpdate,
 )
 from models_library.generics import Envelope
+from models_library.groups import GroupID
 from simcore_service_webserver._meta import API_VTAG
+from simcore_service_webserver.functions._controller._functions_rest import (
+    FunctionGroupPathParams,
+)
 from simcore_service_webserver.functions._controller._functions_rest_schemas import (
     FunctionGetQueryParams,
     FunctionPathParams,
@@ -75,3 +81,33 @@ async def update_function(
 async def delete_function(
     _path: Annotated[FunctionPathParams, Depends()],
 ): ...
+
+
+@router.get(
+    "/functions/{function_id}/groups",
+    response_model=Envelope[dict[GroupID, FunctionGroupAccessRightsGet]],
+)
+async def get_function_groups(
+    _path: Annotated[FunctionPathParams, Depends()],
+): ...
+
+
+@router.put(
+    "/functions/{function_id}/groups/{group_id}",
+    summary="Create or update a Function Group",
+    response_model=Envelope[FunctionGroupAccessRightsGet],
+)
+async def create_or_update_function_group(
+    _path: Annotated[FunctionGroupPathParams, Depends()],
+    _body: FunctionGroupAccessRightsUpdate,
+): ...
+
+
+@router.delete(
+    "/functions/{function_id}/groups/{group_id}",
+    summary="Delete a Function Group",
+    status_code=status.HTTP_204_NO_CONTENT,
+)
+async def delete_function_group(
+    _path: Annotated[FunctionGroupPathParams, Depends()],
+): ...

api/specs/web-server/_long_running_tasks.py

@@ -32,44 +32,40 @@
 @router.get(
     "/tasks",
     response_model=Envelope[list[TaskGet]],
-    name="list_tasks",
-    description="Lists all long running tasks",
     responses=_export_data_responses,
 )
-def get_async_jobs(): ...
+def get_async_jobs():
+    """Lists all long running tasks"""
 
 
 @router.get(
     "/tasks/{task_id}",
     response_model=Envelope[TaskStatus],
-    name="get_task_status",
-    description="Retrieves the status of a task",
     responses=_export_data_responses,
 )
 def get_async_job_status(
     _path_params: Annotated[_PathParam, Depends()],
-): ...
+):
+    """Retrieves the status of a task"""
 
 
 @router.delete(
     "/tasks/{task_id}",
-    name="cancel_and_delete_task",
-    description="Cancels and deletes a task",
     responses=_export_data_responses,
     status_code=status.HTTP_204_NO_CONTENT,
 )
 def cancel_async_job(
     _path_params: Annotated[_PathParam, Depends()],
-): ...
+):
+    """Cancels and removes a task"""
 
 
 @router.get(
     "/tasks/{task_id}/result",
     response_model=Any,
-    name="get_task_result",
-    description="Retrieves the result of a task",
     responses=_export_data_responses,
 )
 def get_async_job_result(
     _path_params: Annotated[_PathParam, Depends()],
-): ...
+):
+    """Retrieves the result of a task"""

api/specs/web-server/_long_running_tasks_legacy.py

@@ -42,11 +42,11 @@ async def get_task_status(
 
 @router.delete(
     "/{task_id}",
-    name="cancel_and_delete_task",
-    description="Cancels and deletes a task",
+    name="remove_task",
+    description="Cancels and removes a task",
     status_code=status.HTTP_204_NO_CONTENT,
 )
-async def cancel_and_delete_task(
+async def remove_task(
     _path_params: Annotated[_PathParam, Depends()],
 ): ...
 

api/specs/web-server/_projects_conversations.py

@@ -12,7 +12,7 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, status
-from models_library.api_schemas_webserver.projects_conversations import (
+from models_library.api_schemas_webserver.conversations import (
     ConversationMessageRestGet,
     ConversationRestGet,
 )

api/specs/web-server/openapi.py

@@ -21,6 +21,7 @@
         # core ---
         "_auth",
         "_auth_api_keys",
+        "_conversations",
         "_groups",
         "_tags",
         "_tags_groups",  # after _tags