Merge branch 'dev' into data_asset_id_before_upload

OpenMined · Jun 13, 2023 · fb6ec59 · fb6ec59
2 parents 425e5d2 + e300d97
commit fb6ec59
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/packages/hagrid/.bumpversion.cfg b/packages/hagrid/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.22
+current_version = 0.3.23
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/packages/hagrid/hagrid/manifest_template.yml b/packages/hagrid/hagrid/manifest_template.yml
@@ -1,9 +1,9 @@
 manifestVersion: 0.1
-hagrid_version: 0.3.22
+hagrid_version: 0.3.23
 syft_version: 0.8.1-beta.9
 dockerTag: 0.8.1-beta.9
 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
-hash: 8b98a07e66d193a7233cd4120681c1da016f4dde
+hash: 4f368cc221587646758417acc5144b894bd7f545
 target_dir: ~/.hagrid/PySyft/
 files:
   grid:

diff --git a/packages/hagrid/hagrid/version.py b/packages/hagrid/hagrid/version.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # HAGrid Version
-__version__ = "0.3.22"
+__version__ = "0.3.23"
 
 if __name__ == "__main__":
     print(__version__)
diff --git a/packages/hagrid/setup.py b/packages/hagrid/setup.py
@@ -5,7 +5,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-__version__ = "0.3.22"
+__version__ = "0.3.23"
 
 DATA_FILES = {"img": ["hagrid/img/*.png"], "hagrid": ["*.yml"]}
 

diff --git a/packages/syft/src/syft/service/request/request.py b/packages/syft/src/syft/service/request/request.py
@@ -140,7 +140,7 @@ class Request(SyftObject):
     requesting_user_verify_key: SyftVerifyKey
     approving_user_verify_key: Optional[SyftVerifyKey]
     request_time: DateTime
-    approval_time: Optional[DateTime]
+    updated_at: Optional[DateTime]
     node_uid: UID
     request_hash: str
     changes: List[Change]
@@ -153,7 +153,7 @@ class Request(SyftObject):
     __attr_unique__ = ["request_hash"]
     __attr_repr_cols__ = [
         "request_time",
-        "approval_time",
+        "updated_at",
         "status",
         "changes",
         "requesting_user_verify_key",
@@ -206,6 +206,7 @@ def apply(self, context: AuthedServiceContext) -> Result[SyftSuccess, SyftError]
             change_status.applied = True
             self.history.append(change_status)
 
+        self.updated_at = DateTime.now()
         self.save(context=context)
         return Ok(SyftSuccess(message=f"Request {self.id} changes applied"))
 

diff --git a/scripts/hagrid_hash b/scripts/hagrid_hash
@@ -1 +1 @@
-6577900561723bd3f4401b407d045a4d
+860b29f72139c1cbaa9ea43bdb02b8b9