Merge branch 'master' into mai/follow-up-error-handling

Author: pcrespov

services/invitations/src/simcore_service_invitations/cli.py

@@ -1,5 +1,6 @@
 import getpass
 import logging
+import os
 
 import typer
 from cryptography.fernet import Fernet
@@ -14,7 +15,6 @@
     print_as_envfile,
 )
 
-from . import web_server
 from ._meta import PROJECT_NAME, __version__
 from .core.settings import ApplicationSettings, MinimalApplicationSettings
 from .services.invitations import (
@@ -50,7 +50,7 @@ def generate_key(
         export INVITATIONS_SECRET_KEY=$(invitations-maker generate-key)
     """
     assert ctx  # nosec
-    print(Fernet.generate_key().decode())  # noqa: T201
+    typer.echo(Fernet.generate_key().decode())
 
 
 @main.command()
@@ -106,6 +106,10 @@ def invite(
         None,
         help=InvitationInputs.model_fields["trial_account_days"].description,
     ),
+    extra_credits_in_usd: int = typer.Option(
+        None,
+        help=InvitationInputs.model_fields["extra_credits_in_usd"].description,
+    ),
     product: str = typer.Option(
         None,
         help=InvitationInputs.model_fields["product"].description,
@@ -119,7 +123,7 @@ def invite(
         issuer=issuer,
         guest=TypeAdapter(EmailStr).validate_python(email),
         trial_account_days=trial_account_days,
-        extra_credits_in_usd=None,
+        extra_credits_in_usd=extra_credits_in_usd,
         product=product,
     )
 
@@ -129,7 +133,7 @@ def invite(
         base_url=settings.INVITATIONS_OSPARC_URL,
         default_product=settings.INVITATIONS_DEFAULT_PRODUCT,
     )
-    print(invitation_link)  # noqa: T201
+    typer.echo(invitation_link)
 
 
 @main.command()
@@ -149,18 +153,8 @@ def extract(ctx: typer.Context, invitation_url: str):
         )
         assert invitation.product is not None  # nosec
 
-        print(invitation.model_dump_json(indent=1))  # noqa: T201
-
-    except (InvalidInvitationCodeError, ValidationError):
-        _err_console.print("[bold red]Invalid code[/bold red]")
-
+        typer.echo(invitation.model_dump_json(indent=1))
 
-@main.command()
-def serve(
-    ctx: typer.Context,
-    *,
-    reload: bool = False,
-):
-    """Starts server with http API"""
-    assert ctx  # nosec
-    web_server.start(log_level="info", reload=reload)
+    except (InvalidInvitationCodeError, ValidationError) as err:
+        typer.secho("Invalid code", fg=typer.colors.RED, bold=True, err=True)
+        raise typer.Exit(os.EX_DATAERR) from err

services/invitations/tests/unit/api/test_api_invitations.py

@@ -40,6 +40,7 @@ def test_create_invitation(
     assert invitation.issuer == invitation_input.issuer
     assert invitation.guest == invitation_input.guest
     assert invitation.trial_account_days == invitation_input.trial_account_days
+    assert invitation.extra_credits_in_usd == invitation_input.extra_credits_in_usd
 
     # checks issue with `//` reported in https://github.com/ITISFoundation/osparc-simcore/issues/7055
     assert invitation.invitation_url
@@ -61,6 +62,7 @@ def test_check_invitation(
             "issuer": invitation_data.issuer,
             "guest": invitation_data.guest,
             "trial_account_days": invitation_data.trial_account_days,
+            "extra_credits_in_usd": invitation_data.extra_credits_in_usd,
         },
         auth=basic_auth,
     )
@@ -85,6 +87,7 @@ def test_check_invitation(
     assert invitation.issuer == invitation_data.issuer
     assert invitation.guest == invitation_data.guest
     assert invitation.trial_account_days == invitation_data.trial_account_days
+    assert invitation.extra_credits_in_usd == invitation_data.extra_credits_in_usd
 
 
 def test_check_valid_invitation(

services/invitations/tests/unit/conftest.py

@@ -10,6 +10,7 @@
 from cryptography.fernet import Fernet
 from faker import Faker
 from models_library.products import ProductName
+from pydantic import PositiveInt, TypeAdapter
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_invitations.services.invitations import InvitationInputs
@@ -85,6 +86,11 @@ def is_trial_account(request: pytest.FixtureRequest) -> bool:
     return request.param
 
 
+@pytest.fixture
+def extra_credits_in_usd(is_trial_account: bool) -> PositiveInt | None:
+    return TypeAdapter(PositiveInt).validate_python(123) if is_trial_account else None
+
+
 @pytest.fixture
 def default_product() -> ProductName:
     return "s4llite"
@@ -98,7 +104,10 @@ def product(request: pytest.FixtureRequest) -> ProductName | None:
 
 @pytest.fixture
 def invitation_data(
-    is_trial_account: bool, faker: Faker, product: ProductName | None
+    is_trial_account: bool,
+    faker: Faker,
+    product: ProductName | None,
+    extra_credits_in_usd: PositiveInt | None,
 ) -> InvitationInputs:
     # first version
     kwargs = {
@@ -110,4 +119,7 @@ def invitation_data(
     if product:
         kwargs["product"] = product
 
+    if extra_credits_in_usd is not None:
+        kwargs["extra_credits_in_usd"] = extra_credits_in_usd
+
     return InvitationInputs.model_validate(kwargs)

services/invitations/tests/unit/test_cli.py

@@ -45,19 +45,24 @@ def test_invite_user_and_check_invitation(
         "INVITATIONS_DEFAULT_PRODUCT": default_product,
     }
 
-    expected = {
+    expected_invitation = {
         **invitation_data.model_dump(exclude={"product"}),
         "product": environs["INVITATIONS_DEFAULT_PRODUCT"],
     }
 
     # invitations-maker invite [email protected] --issuer=me --trial-account-days=3
-    trial_account = ""
+    other_options = ""
     if invitation_data.trial_account_days:
-        trial_account = f"--trial-account-days={invitation_data.trial_account_days}"
+        other_options = f"--trial-account-days={invitation_data.trial_account_days}"
+
+    if invitation_data.extra_credits_in_usd:
+        other_options += (
+            f" --extra-credits-in-usd={invitation_data.extra_credits_in_usd}"
+        )
 
     result = cli_runner.invoke(
         main,
-        f"invite {invitation_data.guest} --issuer={invitation_data.issuer} {trial_account}",
+        f"invite {invitation_data.guest} --issuer={invitation_data.issuer} {other_options}",
         env=environs,
     )
     assert result.exit_code == os.EX_OK, result.output
@@ -73,7 +78,7 @@ def test_invite_user_and_check_invitation(
     )
     assert result.exit_code == os.EX_OK, result.output
     assert (
-        expected
+        expected_invitation
         == TypeAdapter(InvitationInputs).validate_json(result.stdout).model_dump()
     )
 
@@ -99,3 +104,24 @@ def test_list_settings(cli_runner: CliRunner, app_environment: EnvVarsDict):
     print(result.output)
     settings = ApplicationSettings.model_validate_json(result.output)
     assert settings == ApplicationSettings.create_from_envs()
+
+
+def test_extract_invalid_invitation_code(
+    cli_runner: CliRunner, faker: Faker, app_environment: EnvVarsDict
+):
+    """Test that extract command handles invalid invitation codes properly"""
+    # Create an invalid invitation URL
+    invalid_invitation_url = f"{faker.url()}#invitation=invalid_code_123"
+
+    # Run extract command with invalid invitation URL
+    result = cli_runner.invoke(
+        main,
+        f'extract "{invalid_invitation_url}"',
+        env=app_environment,
+    )
+
+    # Verify command exits with correct error code
+    assert result.exit_code == os.EX_DATAERR
+
+    # Verify error message is displayed via stderr
+    assert "Invalid code" in result.stdout

services/invitations/tests/unit/test_core_settings.py

@@ -42,3 +42,5 @@ def test_valid_application_settings(app_environment: EnvVarsDict):
     assert settings
 
     assert settings == ApplicationSettings.create_from_envs()
+
+    assert settings.LOG_LEVEL == "INFO"

services/static-webserver/client/source/class/osparc/conversation/AddMessage.js

@@ -23,24 +23,27 @@ qx.Class.define("osparc.conversation.AddMessage", {
     * @param studyData {Object} serialized Study Data
     * @param conversationId {String} Conversation Id
     */
-  construct: function(studyData, conversationId = null) {
+  construct: function(studyData, conversationId = null, message = null) {
     this.base(arguments);
 
     this.__studyData = studyData;
     this.__conversationId = conversationId;
+    this.__message = message;
 
     this._setLayout(new qx.ui.layout.VBox(5));
 
     this.__buildLayout();
   },
 
   events: {
-    "commentAdded": "qx.event.type.Event"
+    "commentAdded": "qx.event.type.Data",
+    "messageEdited": "qx.event.type.Data",
   },
 
   members: {
     __studyData: null,
     __conversationId: null,
+    __message: null,
 
     _createChildControlImpl: function(id) {
       let control;
@@ -120,13 +123,22 @@ qx.Class.define("osparc.conversation.AddMessage", {
 
     __buildLayout: function() {
       this.getChildControl("thumbnail");
-      this.getChildControl("comment-field");
+      const commentField = this.getChildControl("comment-field");
 
       const addMessageButton = this.getChildControl("add-comment-button");
-      addMessageButton.addListener("execute", () => this.__addComment());
+      if (this.__message) {
+        // edit mode
+        addMessageButton.setLabel(this.tr("Edit message"));
+        addMessageButton.addListener("execute", () => this.__editComment());
+
+        commentField.setText(this.__message["content"]);
+      } else {
+        // new message
+        addMessageButton.addListener("execute", () => this.__addComment());
 
-      const notifyUserButton = this.getChildControl("notify-user-button");
-      notifyUserButton.addListener("execute", () => this.__notifyUserTapped());
+        const notifyUserButton = this.getChildControl("notify-user-button");
+        notifyUserButton.addListener("execute", () => this.__notifyUserTapped());
+      }
     },
 
     __addComment: function() {
@@ -211,13 +223,24 @@ qx.Class.define("osparc.conversation.AddMessage", {
 
     __postMessage: function() {
       const commentField = this.getChildControl("comment-field");
-      const comment = commentField.getChildControl("text-area").getValue();
-      if (comment) {
-        osparc.study.Conversations.addMessage(this.__studyData["uuid"], this.__conversationId, comment)
+      const content = commentField.getChildControl("text-area").getValue();
+      if (content) {
+        osparc.study.Conversations.addMessage(this.__studyData["uuid"], this.__conversationId, content)
           .then(data => {
             this.fireDataEvent("commentAdded", data);
             commentField.getChildControl("text-area").setValue("");
-            osparc.FlashMessenger.logAs(this.tr("Message added"), "INFO");
+          });
+      }
+    },
+
+    __editComment: function() {
+      const commentField = this.getChildControl("comment-field");
+      const content = commentField.getChildControl("text-area").getValue();
+      if (content) {
+        osparc.study.Conversations.editMessage(this.__studyData["uuid"], this.__conversationId, this.__message["messageId"], content)
+          .then(data => {
+            this.fireDataEvent("messageEdited", data);
+            commentField.getChildControl("text-area").setValue("");
           });
       }
     },

services/static-webserver/client/source/class/osparc/conversation/Conversation.js

@@ -195,6 +195,8 @@ qx.Class.define("osparc.conversation.Conversation", {
       this.__getNextRequest()
         .then(resp => {
           const messages = resp["data"];
+          // it's not provided by the backend
+          messages.forEach(message => message["studyId"] = this.__studyData["uuid"]);
           this.__addMessages(messages);
           this.__nextRequestParams = resp["_links"]["next"];
           if (this.__nextRequestParams === null) {
@@ -236,7 +238,9 @@ qx.Class.define("osparc.conversation.Conversation", {
         let control = null;
         switch (message["type"]) {
           case "MESSAGE":
-            control = new osparc.conversation.MessageUI(message);
+            control = new osparc.conversation.MessageUI(message, this.__studyData);
+            control.addListener("messageEdited", () => this.fetchMessages());
+            control.addListener("messageDeleted", () => this.fetchMessages());
             break;
           case "NOTIFICATION":
             control = new osparc.conversation.NotificationUI(message);