amapy 1.0.2__tar.gz → 1.1.0.dev4__tar.gz

{amapy-1.0.2 → amapy-1.1.0.dev4}/PKG-INFO

@@ -1,22 +1,21 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: amapy
-Version: 1.0.2
+Version: 1.1.0.dev4
 Summary: The client side tool for ama project.
 Author-email: Swarup Mahanti <swarup.mahanti@roche.com>
 Maintainer-email: Swarup Mahanti <swarup.mahanti@roche.com>
 License: Copyright (c) 2024 Roche Diagnostics Computation Science & Informatics
-Requires-Python: <3.11,>=3.10
+Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: amapy-contents==1.0.1
-Requires-Dist: amapy-core==1.0.2
-Requires-Dist: amapy-db==1.0.2
-Requires-Dist: amapy-pluggy==1.0.1
-Requires-Dist: amapy-plugin-gcr==1.0.1
-Requires-Dist: amapy-plugin-gcs==1.0.1
-Requires-Dist: amapy-plugin-posix==1.0.1
-Requires-Dist: amapy-plugin-s3==1.0.2
-Requires-Dist: amapy-utils==1.0.2
-Requires-Dist: markupsafe==2.1.*
+Requires-Dist: amapy-contents==1.1.0
+Requires-Dist: amapy-core==1.1.0
+Requires-Dist: amapy-db==1.1.0
+Requires-Dist: amapy-pluggy==1.1.0
+Requires-Dist: amapy-plugin-gcr==1.1.0
+Requires-Dist: amapy-plugin-gcs==1.1.0
+Requires-Dist: amapy-plugin-posix==1.1.0
+Requires-Dist: amapy-plugin-s3==1.1.0
+Requires-Dist: amapy-utils==1.1.0
 
 # amapy
 

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/app.py

@@ -14,5 +14,5 @@ def run():
     get_parser(mode=ACTIVE_CONFIG_MODE).run(sys.argv[1:])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     run()

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/alias_actions/alias_add.py

@@ -16,7 +16,7 @@ class AddAlias(CliAction):
         with api.environment():
             api.add_alias(args.target)
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self) -> list[CliOption]:
         return [
             CliOption(
                 dest="target",

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/alias_actions/alias_help.py

@@ -1,4 +1,4 @@
-from amapy.commands import CliAction, CliOption
+from amapy.commands import CliAction
 from amapy_utils.common.user_commands import UserCommands
 
 
@@ -13,5 +13,5 @@ class AliasHelp(CliAction):
         msg += f"{UserCommands().alias_info()}\n"
         self.user_log.message(msg)
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self):
         return []

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/alias_actions/alias_info.py

@@ -1,4 +1,4 @@
-from amapy.commands import CliAction, CliOption
+from amapy.commands import CliAction
 from amapy_core.api.repo_api import AssetAPI
 
 
@@ -11,5 +11,5 @@ class AliasInfo(CliAction):
         with api.environment():
             api.list_alias()
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self):
         return []

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/alias_actions/alias_remove.py

@@ -1,4 +1,4 @@
-from amapy.commands import CliAction, CliOption
+from amapy.commands import CliAction
 from amapy_core.api.repo_api import AssetAPI
 
 
@@ -11,5 +11,5 @@ class RemoveAlias(CliAction):
         with api.environment():
             api.remove_alias()
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self):
         return []

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/alias_actions/alias_set.py

@@ -8,13 +8,13 @@ class SetAlias(CliAction):
 
     def run(self, args):
         if not args.alias:
-            self.user_log.error("missing the alias")
+            self.user_log.error("missing required parameter <alias>")
             return
         api = AssetAPI(self.repo).add
         with api.environment():
             api.add_alias(args.alias)
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self) -> list[CliOption]:
         return [
             CliOption(
                 dest="alias",

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/asset_actions/add.py

@@ -24,7 +24,7 @@ class AddToAsset(CliAction):
             if args.credentials:
                 os.unsetenv("ASSET_CREDENTIALS")
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self) -> list[CliOption]:
         return [
             CliOption(
                 dest="target",
@@ -68,5 +68,5 @@ class AddToAsset(CliAction):
                 is_boolean=True,
                 short_name="f",
                 full_name="force"
-            ),
+            )
         ]

amapy-1.1.0.dev4/amapy/commands/asset_actions/commit.py

@@ -0,0 +1,25 @@
+from amapy.commands import CliAction, CliOption
+from amapy_core.api.repo_api import AssetAPI
+
+
+class CommitMessage(CliAction):
+    name = "commit"
+    help_msg = "commit message for the changes"
+
+    def run(self, args):
+        if args.message:
+            api = AssetAPI(self.repo).add
+            with api.environment():
+                api.add_commit_message(message=args.message)
+        else:
+            self.user_log.message("missing commit message, please use asset commit -m <message text>")
+
+    def get_options(self) -> list[CliOption]:
+        return [
+            CliOption(
+                dest="message",
+                help_msg="commit message",
+                short_name="m",
+                full_name="message"
+            )
+        ]

amapy-1.1.0.dev4/amapy/commands/asset_actions/diff.py

@@ -0,0 +1,42 @@
+from amapy.commands import CliAction, CliOption
+from amapy_core.api.repo_api import AssetAPI
+
+
+class AssetDiff(CliAction):
+    name = "diff"
+    help_msg = "Displays the differences between two versions of an asset"
+
+    def run(self, args):
+        api = AssetAPI(self.repo).diff
+        with api.environment():
+            api.diff(file=args.file, src_ver=args.src_ver, dst_ver=args.dst_ver, html=args.html)
+
+    def get_options(self) -> list[CliOption]:
+        return [
+            CliOption(
+                dest="src_ver",
+                short_name="s",
+                full_name="src",
+                help_msg="src version",
+                n_args="?",
+            ),
+            CliOption(
+                dest="dst_ver",
+                short_name="d",
+                full_name="dst",
+                help_msg="dst version",
+                n_args="?",
+            ),
+            CliOption(
+                dest="file",
+                short_name="f",
+                full_name="file",
+                help_msg="file path",
+                n_args="?",
+            ),
+            CliOption(
+                dest="html",
+                help_msg="if true diff is shown as html",
+                is_boolean=True
+            )
+        ]

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/asset_actions/discard.py

@@ -18,7 +18,7 @@ class AssetDiscard(CliAction):
             else:
                 self.user_log.message("invalid command")
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self) -> list[CliOption]:
         return [
             CliOption(
                 dest="all",

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/asset_actions/tests/test_asset_cmds.py

@@ -26,32 +26,32 @@ def test_asset_actions():
         CloneAsset()
     )
 
-    args = parser.parse_args(["add", "myfile.txt"])
+    args, _ = parser.parse_args(["add", "myfile.txt"])
     assert args.group == "add" and args.target == ["myfile.txt"]
 
-    args = parser.parse_args(["remove", "myfile.txt", "1.log"])
+    args, _ = parser.parse_args(["remove", "myfile.txt", "1.log"])
     assert args.group == "remove" and args.target == ["myfile.txt", "1.log"]
 
-    args = parser.parse_args(["init"])
+    args, _ = parser.parse_args(["init"])
     assert args.group == "init"
 
-    args = parser.parse_args(["init", "genetics"])
+    args, _ = parser.parse_args(["init", "genetics"])
     assert args.group == "init" and args.class_name == "genetics"
 
-    args = parser.parse_args(["upload"])
+    args, _ = parser.parse_args(["upload"])
     assert args.group == "upload" and not args.message
 
-    args = parser.parse_args(["upload", "-m", "first commit"])
+    args, _ = parser.parse_args(["upload", "-m", "first commit"])
     assert args.group == "upload" and args.message == "first commit"
 
-    args = parser.parse_args(["upload", "--message", "second commit"])
+    args, _ = parser.parse_args(["upload", "--message", "second commit"])
     assert args.group == "upload" and args.message == "second commit"
 
-    args = parser.parse_args(["download"])
+    args, _ = parser.parse_args(["download"])
     assert args.group == "download"
 
-    args = parser.parse_args(["info", "--hash"])
+    args, _ = parser.parse_args(["info", "--hash"])
     assert args.group == "info"
 
-    args = parser.parse_args(["clone", "model_visualizations/1"])
+    args, _ = parser.parse_args(["clone", "model_visualizations/1"])
     assert args.group == "clone"

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/asset_actions/update.py

@@ -14,7 +14,7 @@ class UpdateAsset(CliAction):
             else:
                 api.update_objects(args.target, prompt_user=(not args.yes))
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self) -> list[CliOption]:
         return [
             CliOption(
                 dest="all",

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/asset_class_actions/list.py

@@ -1,5 +1,3 @@
-import cached_property
-
 from amapy.commands import CliAction
 from amapy_core.api.store_api.list import ListAPI
 
@@ -16,7 +14,3 @@ class ListAssetClass(CliAction):
 
     def get_options(self):
         return []
-
-    @cached_property.cached_property
-    def api(self):
-        return ListAPI(store=self.asset_store, repo=self.repo)

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/cli_option.py

@@ -11,7 +11,7 @@ class CliOption:
     default: list = None
     positional: bool = False
     is_boolean: bool = False
-    bool_action: str = 'store_true'
+    bool_action: str = "store_true"
 
     def __post_init__(self):
         self.default = self.default or []

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/cmd_group.py

@@ -36,8 +36,8 @@ class CommandGroup(BaseAction):
                                               description=self.description,
                                               formatter_class=parent.formatter_class,
                                               )
-        cmd_sub_parser = group_parser.add_subparsers(metavar='actions',
-                                                     dest='action')
+        cmd_sub_parser = group_parser.add_subparsers(metavar="actions",
+                                                     dest="action")
         for action in self.actions.values():
             action.add_parser(sub_parsers=cmd_sub_parser)
 

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/parser.py

@@ -7,7 +7,7 @@ from amapy_utils.utils.log_utils import LoggingMixin
 class DefaultHelpParser(ArgumentParser):
 
     def error(self, message):
-        sys.stderr.write('error in command: %s\n' % message)
+        sys.stderr.write("error in command: %s\n" % message)
         self.print_help()
         sys.exit(2)
 
@@ -40,7 +40,7 @@ class DefaultHelpParser(ArgumentParser):
 class NewLineFormatter(RawTextHelpFormatter):
     def _split_lines(self, text: str, width):
         # print(f"splitting lines: {text}")
-        if text.endswith('\n'):
+        if text.endswith("\n"):
             return text[2:].splitlines()
         return super()._split_lines(text, width=width)
 
@@ -60,10 +60,10 @@ class CommandParser(LoggingMixin):
             description=self.user_log.colorize("Asset Manager Command Line Tool",
                                                color=self.user_log.colors.cyan),
             formatter_class=NewLineFormatter,
-            epilog=self.user_log.colorize('Command Line tool for interacting with assets',
+            epilog=self.user_log.colorize("Command Line tool for interacting with assets",
                                           color=self.user_log.colors.cyan)
         )
-        sub_parsers = self.parser.add_subparsers(metavar='groups', dest='group')
+        sub_parsers = self.parser.add_subparsers(metavar="groups", dest="group")
         sub_parsers.required = True
         self.sub_parsers = sub_parsers
 

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/commands/refs_actions/ref_add.py

@@ -32,7 +32,7 @@ class AddRef(CliAction):
             self.user_log.message(UserCommands().inputs_add())
             self.user_log.message(UserCommands().inputs_add_remote())
 
-    def get_options(self) -> [CliOption]:
+    def get_options(self) -> list[CliOption]:
         return [
             CliOption(
                 dest="input_asset",

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy/python_api/artifact.py

@@ -187,14 +187,14 @@ class Artifact:
     @property
     def is_temp(self) -> bool:
         """Returns True if the asset is temporary."""
-        return self.info.get('asset').get('cloning') == (False, "temp_asset")
+        return self.info.get("asset").get("cloning") == (False, "temp_asset")
 
     @cached_property
     def inputs(self) -> ArtifactInputs:
         from amapy import ArtifactInputs
         return ArtifactInputs(artifact=self)
 
-    def sanitize_targets(self, targets: [str], copy_to_asset: bool = False) -> [str]:
+    def sanitize_targets(self, targets: list[str], copy_to_asset: bool = False) -> list[str]:
         """
         Checks if the target files are within the asset directory, if not, then copies the files to the asset directory
         based on the force flag and returns the sanitized list of targets.
@@ -214,7 +214,7 @@ class Artifact:
             filtered_targets.append(target)
         return filtered_targets
 
-    def add(self, targets: [str], proxy: bool = False, copy_to_asset: bool = False, force: bool = False):
+    def add(self, targets: list[str], proxy: bool = False, copy_to_asset: bool = False, force: bool = False):
         """Adds files and directories to the asset.
 
         Parameters
@@ -242,7 +242,7 @@ class Artifact:
             with ch_dir(self.path):
                 api.add_files(targets=sanitized_targets, prompt_user=False, proxy=proxy, force=force)
 
-    def add_remote(self, targets: [str], credentials: str = None):
+    def add_remote(self, targets: list[str], credentials: str = None):
         """Adds remote files to the asset.
 
         Parameters
@@ -608,7 +608,7 @@ class Artifact:
         # Custom key function to sort by integer id and then version
         def sort_key(name):
             # Split the string by '/' and extract parts
-            parts = name.split('/')
+            parts = name.split("/")
             return parts[0], int(parts[1]), tuple(map(int, parts[2].split(".")))
 
         # Sort the existing assets by the custom key function

amapy-1.1.0.dev4/amapy/python_api/tests/test_artifact.py

@@ -0,0 +1,81 @@
+import os
+import tempfile
+
+import pytest
+
+from amapy.python_api.artifact import Artifact, File
+from amapy_utils.common import exceptions
+
+
+def test_fixtures(asset_root, repo, asset, store):
+    """Verify that all conftest fixtures are created properly."""
+    assert asset_root and os.path.isdir(asset_root)
+    assert repo is not None
+    assert asset is not None
+    assert store is not None
+
+
+def test_init():
+    # Should raise exception if path is missing or None
+    with pytest.raises(Exception) as e:
+        Artifact(path=None)
+    assert e.type == exceptions.AssetException
+
+    # also raise exception if not a valid repo
+    temp_dir = tempfile.mkdtemp()
+    try:
+        with pytest.raises(Exception) as e:
+            Artifact(path=temp_dir)
+        assert e.type == exceptions.NotAssetRepoError
+    finally:
+        os.rmdir(temp_dir)
+
+
+def test_info(asset):
+    artifact = Artifact(path=asset.repo.fs_path)
+    info = artifact.info
+    info_keys = ["asset", "objects"]
+    for key in info_keys:
+        assert key in info
+
+    # objects
+    object_keys = ["linked_path", "path", "size", "cloned"]
+    for item in info.get("objects"):
+        for key in object_keys:
+            assert key in item
+
+
+def test_versions(asset):
+    artifact = Artifact(path=asset.repo.fs_path)
+    versions = artifact.versions
+    assert versions is None  # local asset
+
+
+def test_history(asset):
+    artifact = Artifact(path=asset.repo.fs_path)
+    history = artifact.history
+    assert history is None  # local asset
+
+
+def test_status(asset):
+    artifact = Artifact(path=asset.repo.fs_path)
+    status = artifact.status
+    status_keys = ["staged_changes", "unstaged_changes", "untracked_changes"]
+    for key in status_keys:
+        assert key in status
+
+
+def test_files(asset):
+    artifact = Artifact(path=asset.repo.fs_path)
+    files = artifact.files
+    for item in files.values():
+        assert isinstance(item, File)
+
+
+def test_read_file(asset):
+    artifact = Artifact(path=asset.repo.fs_path)
+    files = artifact.files
+    for item in files.values():
+        with item.open() as f:
+            file_contents = f.read()
+            assert file_contents is not None

amapy-1.1.0.dev4/amapy/python_api/tests/test_klass.py

@@ -0,0 +1,20 @@
+from unittest.mock import patch
+
+from amapy.python_api.klass import Klass
+
+
+def test_list(store):
+    with patch("amapy.python_api.klass.AssetStore.shared", return_value=store):
+        klass = Klass()
+        class_list = klass.list()
+        assert class_list and type(class_list) is dict
+
+
+def test_info(store):
+    with patch("amapy.python_api.klass.AssetStore.shared", return_value=store):
+        klass = Klass()
+        class_info = klass.info(class_name="test_class")
+        assert type(class_info) is dict
+        expected = ["name", "id", "created_at", "created_by", "class_type", "project"]
+        for key in expected:
+            assert key in class_info

amapy-1.1.0.dev4/amapy/python_api/tests/test_project.py

@@ -0,0 +1,27 @@
+from unittest.mock import patch
+
+from amapy.python_api.project import Project
+from amapy_core.configs.app_settings import AppSettings
+
+
+def test_list(test_environment):
+    settings = AppSettings.shared()
+    settings.data = AppSettings.validate(data=test_environment)
+    with patch("amapy_core.api.settings_api.AppSettings.shared", return_value=settings):
+        project_list = Project().list()
+        assert len(project_list) == len(test_environment.get("projects"))
+        expected_keys = ["name", "id", "description", "remote_url", "is_active"]
+        for project in project_list:
+            for key in expected_keys:
+                assert key in project
+
+
+def test_active_project(test_environment):
+    settings = AppSettings.shared()
+    settings.data = AppSettings.validate(data=test_environment)
+    with patch("amapy_core.api.settings_api.AppSettings.shared", return_value=settings):
+        active_project = Project().active
+        assert isinstance(active_project, dict)
+        expected_keys = ["name", "id", "description", "remote_url", "is_active"]
+        for key in expected_keys:
+            assert key in active_project

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy.egg-info/PKG-INFO

@@ -1,22 +1,21 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: amapy
-Version: 1.0.2
+Version: 1.1.0.dev4
 Summary: The client side tool for ama project.
 Author-email: Swarup Mahanti <swarup.mahanti@roche.com>
 Maintainer-email: Swarup Mahanti <swarup.mahanti@roche.com>
 License: Copyright (c) 2024 Roche Diagnostics Computation Science & Informatics
-Requires-Python: <3.11,>=3.10
+Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: amapy-contents==1.0.1
-Requires-Dist: amapy-core==1.0.2
-Requires-Dist: amapy-db==1.0.2
-Requires-Dist: amapy-pluggy==1.0.1
-Requires-Dist: amapy-plugin-gcr==1.0.1
-Requires-Dist: amapy-plugin-gcs==1.0.1
-Requires-Dist: amapy-plugin-posix==1.0.1
-Requires-Dist: amapy-plugin-s3==1.0.2
-Requires-Dist: amapy-utils==1.0.2
-Requires-Dist: markupsafe==2.1.*
+Requires-Dist: amapy-contents==1.1.0
+Requires-Dist: amapy-core==1.1.0
+Requires-Dist: amapy-db==1.1.0
+Requires-Dist: amapy-pluggy==1.1.0
+Requires-Dist: amapy-plugin-gcr==1.1.0
+Requires-Dist: amapy-plugin-gcs==1.1.0
+Requires-Dist: amapy-plugin-posix==1.1.0
+Requires-Dist: amapy-plugin-s3==1.1.0
+Requires-Dist: amapy-utils==1.1.0
 
 # amapy
 

{amapy-1.0.2 → amapy-1.1.0.dev4}/amapy.egg-info/SOURCES.txt

@@ -113,7 +113,6 @@ amapy/python_api/project.py
 amapy/python_api/store.py
 amapy/python_api/tests/__init__.py
 amapy/python_api/tests/test_artifact.py
-amapy/python_api/tests/test_auth.py
 amapy/python_api/tests/test_file.py
 amapy/python_api/tests/test_klass.py
 amapy/python_api/tests/test_project.py

amapy-1.1.0.dev4/amapy.egg-info/requires.txt

@@ -0,0 +1,9 @@
+amapy-contents==1.1.0
+amapy-core==1.1.0
+amapy-db==1.1.0
+amapy-pluggy==1.1.0
+amapy-plugin-gcr==1.1.0
+amapy-plugin-gcs==1.1.0
+amapy-plugin-posix==1.1.0
+amapy-plugin-s3==1.1.0
+amapy-utils==1.1.0

{amapy-1.0.2 → amapy-1.1.0.dev4}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=68.0.0,<69.0.0"]
+requires = ["setuptools>=74.0.0,<=80.10.2"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "amapy"
-version = "1.0.2"
+version = "1.1.0.dev4"
 description = "The client side tool for ama project."
 readme = "README.md"
 authors = [
@@ -14,18 +14,17 @@ maintainers = [
     { name = "Swarup Mahanti", email = "swarup.mahanti@roche.com" }
 ]
 license = { text = "Copyright (c) 2024 Roche Diagnostics Computation Science & Informatics" }
-requires-python = ">=3.10,<3.11"  # "==3.10.*"
+requires-python = ">=3.12,<3.13"  # "==3.12.*"
 dependencies = [
-    "amapy-contents==1.0.1",
-    "amapy-core==1.0.2",
-    "amapy-db==1.0.2",
-    "amapy-pluggy==1.0.1",
-    "amapy-plugin-gcr==1.0.1",
-    "amapy-plugin-gcs==1.0.1",
-    "amapy-plugin-posix==1.0.1",
-    "amapy-plugin-s3==1.0.2",
-    "amapy-utils==1.0.2",
-    "markupsafe==2.1.*",
+    "amapy-contents==1.1.0",
+    "amapy-core==1.1.0",
+    "amapy-db==1.1.0",
+    "amapy-pluggy==1.1.0",
+    "amapy-plugin-gcr==1.1.0",
+    "amapy-plugin-gcs==1.1.0",
+    "amapy-plugin-posix==1.1.0",
+    "amapy-plugin-s3==1.1.0",
+    "amapy-utils==1.1.0"
 ]
 
 [tool.setuptools.packages.find]

amapy-1.0.2/amapy/commands/asset_actions/commit.py

@@ -1,28 +0,0 @@
-import cached_property
-
-from amapy.commands import CliAction, CliOption
-from amapy_core.api.repo_api import AssetAPI, AddAPI
-
-
-class CommitMessage(CliAction):
-    name = "commit"
-    help_msg = "commit message for the changes"
-
-    @cached_property.cached_property
-    def api(self) -> AddAPI:
-        return AssetAPI(self.repo).add
-
-    def run(self, args):
-        if args.message:
-            self.api.add_commit_message(message=args.message)
-        else:
-            self.user_log.message("missing commit message, please use asset commit -m <message text>")
-
-    def get_options(self):
-        return [
-            CliOption(dest="message",
-                      help_msg="commit message",
-                      short_name="m",
-                      full_name="message"
-                      )
-        ]