Update/add models for RemoteData and RemoteStashCompressedData (#6844)

pydantic models merged with PR #6255 and commit 958bfd0 missed two classes. 

This commit Update/add models for `RemoteData` and `RemoteStashCompressedData`

Author: edan-bainglass

src/aiida/orm/nodes/data/remote/stash/compress.py

@@ -12,7 +12,7 @@
 
 from aiida.common.datastructures import StashMode
 from aiida.common.lang import type_check
-from aiida.orm.fields import add_field
+from aiida.common.pydantic import MetadataField
 
 from .base import RemoteStashData
 
@@ -24,23 +24,16 @@ class RemoteStashCompressedData(RemoteStashData):
 
     _storable = True
 
-    __qb_fields__ = [
-        add_field(
-            'target_basepath',
-            dtype=str,
-            doc='The the target basepath',
-        ),
-        add_field(
-            'source_list',
-            dtype=List[str],
-            doc='The list of source files that were stashed',
-        ),
-        add_field(
-            'dereference',
-            dtype=bool,
-            doc='The format of the compression used when stashed',
-        ),
-    ]
+    class Model(RemoteStashData.Model):
+        target_basepath: str = MetadataField(
+            description='The the target basepath',
+        )
+        source_list: List[str] = MetadataField(
+            description='The list of source files that were stashed',
+        )
+        dereference: bool = MetadataField(
+            description='The format of the compression used when stashed',
+        )
 
     def __init__(
         self,

tests/orm/models/test_models.py

@@ -8,6 +8,7 @@
 import pytest
 from pydantic import BaseModel
 
+from aiida.common.datastructures import StashMode
 from aiida.orm import AuthInfo, Comment, Computer, Group, Log, User
 from aiida.orm.nodes.data import (
     ArrayData,
@@ -22,6 +23,8 @@
     JsonableData,
     List,
     RemoteData,
+    RemoteStashCompressedData,
+    RemoteStashData,
     SinglefileData,
     Str,
     StructureData,
@@ -50,6 +53,8 @@
     Str,
     StructureData,
     RemoteData,
+    RemoteStashData,
+    RemoteStashCompressedData,
 )
 
 
@@ -137,7 +142,16 @@ def required_arguments(request, default_user, aiida_localhost, tmp_path):
     if request.param is StructureData:
         return StructureData, {'cell': [[1, 0, 0], [0, 1, 0], [0, 0, 1]]}
     if request.param is RemoteData:
-        return RemoteData, {'remote_path': '/some/path', 'computer': aiida_localhost}
+        return RemoteData, {'remote_path': '/some/path'}
+    if request.param is RemoteStashData:
+        return RemoteStashData, {'stash_mode': StashMode.COMPRESS_TAR}
+    if request.param is RemoteStashCompressedData:
+        return RemoteStashCompressedData, {
+            'stash_mode': StashMode.COMPRESS_TAR,
+            'target_basepath': '/some/path',
+            'source_list': ['/some/file'],
+            'dereference': True,
+        }
 
     raise NotImplementedError()
 

tests/orm/test_fields/fields_aiida.data.core.remote.stash.compress.RemoteStashCompressedData.yml

@@ -2,6 +2,7 @@ attributes: QbDictField('attributes', dtype=typing.Optional[typing.Dict[str, typ
   is_attribute=False, is_subscriptable=True)
 computer: QbNumericField('computer', dtype=typing.Optional[int], is_attribute=False)
 ctime: QbNumericField('ctime', dtype=typing.Optional[datetime.datetime], is_attribute=False)
+dereference: QbField('dereference', dtype=<class 'bool'>, is_attribute=True)
 description: QbStrField('description', dtype=typing.Optional[str], is_attribute=False)
 extras: QbDictField('extras', dtype=typing.Optional[typing.Dict[str, typing.Any]],
   is_attribute=False, is_subscriptable=True)
@@ -15,6 +16,8 @@ repository_content: QbDictField('repository_content', dtype=typing.Optional[dict
 repository_metadata: QbDictField('repository_metadata', dtype=typing.Optional[typing.Dict[str,
   typing.Any]], is_attribute=False)
 source: QbDictField('source', dtype=typing.Optional[dict], is_attribute=True, is_subscriptable=True)
+source_list: QbArrayField('source_list', dtype=typing.List[str], is_attribute=True)
 stash_mode: QbField('stash_mode', dtype=<enum 'StashMode'>, is_attribute=True)
+target_basepath: QbStrField('target_basepath', dtype=<class 'str'>, is_attribute=True)
 user: QbNumericField('user', dtype=typing.Optional[int], is_attribute=False)
 uuid: QbStrField('uuid', dtype=typing.Optional[str], is_attribute=False)