syft-rds 0.1.1.dev2__tar.gz → 0.1.1.dev3__tar.gz

{syft_rds-0.1.1.dev2 → syft_rds-0.1.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syft-rds
-Version: 0.1.1.dev2
+Version: 0.1.1.dev3
 Summary: Doing remote data science with SyftBox
 License-File: LICENSE
 Requires-Python: >=3.9
@@ -12,9 +12,9 @@ Requires-Dist: nh3>=0.2.21
 Requires-Dist: pydantic[email]>=2.10.4
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=13.9.4
-Requires-Dist: syft-core==0.2.3
-Requires-Dist: syft-event==0.2.1
-Requires-Dist: syft-rpc==0.2.0
+Requires-Dist: syft-core==0.2.7
+Requires-Dist: syft-event==0.2.3
+Requires-Dist: syft-rpc==0.2.2
 Requires-Dist: typer>=0.12.5
 Requires-Dist: typing-extensions>=4.12.2
 Description-Content-Type: text/markdown

{syft_rds-0.1.1.dev2 → syft_rds-0.1.1.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "syft-rds"
-version = "0.1.1-dev.2"
+version = "0.1.1-dev.3"
 description = "Doing remote data science with SyftBox"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -8,9 +8,9 @@ dependencies = [
   "loguru>=0.7.3",
   "pydantic[email]>=2.10.4",
   "rich>=13.9.4",
-  "syft-core==0.2.3",
-  "syft-event==0.2.1",
-  "syft-rpc==0.2.0",
+  "syft-core==0.2.7",
+  "syft-event==0.2.3",
+  "syft-rpc==0.2.2",
   "typing-extensions>=4.12.2",
   "pyyaml>=6.0.2",
   "typer>=0.12.5",
@@ -35,15 +35,15 @@ dev-dependencies = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.hatch.build.targets.wheel]
-packages = ["src/syft_rds"]
-only-include = ["src", "pyproject.toml", "README.md"]
-exclude = ["src/**/__pycache__"]
-
 [tool.hatch.build.targets.sdist]
 only-include = ["src", "pyproject.toml", "README.md"]
 exclude = ["src/**/__pycache__"]
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/syft_rds"]
+only-include = ["src/syft_rds"]  # no need for pyproject.toml and README.md for wheel
+exclude = ["src/syft_rds/**/__pycache__"]
+
 [project.scripts]
 syft-rds = "syft_rds.cli:app"
 

{syft_rds-0.1.1.dev2 → syft_rds-0.1.1.dev3}/src/syft_rds/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.1-dev.2"
+__version__ = "0.1.1-dev.3"
 
 from syft_rds.utils.paths import RDS_NOTEBOOKS_PATH, RDS_REPO_PATH  # noqa
 from syft_rds.jupyter_utils.display import display  # noqa

{syft_rds-0.1.1.dev2 → syft_rds-0.1.1.dev3}/src/syft_rds/client/local_stores/dataset.py

@@ -265,9 +265,12 @@ class DatasetFilesManager:
         return self.copy_directory(path, private_dataset_dir)
 
     def copy_description_file_to_public_syftbox_dir(
-        self, dataset_name: str, description_path: Union[str, Path]
-    ) -> Path:
+        self, dataset_name: str, description_path: Union[str, Path, None]
+    ) -> Path | None:
         """Copy description file to the public SyftBox directory."""
+        if not description_path:
+            return
+
         public_dataset_dir: Path = self._path_manager.get_local_public_dataset_dir(
             dataset_name
         )
@@ -498,9 +501,30 @@ class DatasetLocalStore(CRUDLocalStore[Dataset, DatasetCreate, DatasetUpdate]):
         """
         return super().get_all(request)
 
-    def update(self, item: DatasetUpdate) -> Dataset:
-        """Not implemented for Dataset."""
-        raise NotImplementedError("Not implemented for Dataset")
+    def update(self, update_item: DatasetUpdate) -> Dataset:
+        """
+        Update an existing dataset.
+
+        Args:
+            update_dataset: The dataset update data
+
+        Returns:
+            The updated dataset
+
+        Raises:
+            RuntimeError: If update fails
+        """
+        try:
+            existing_dataset = self.store.get_by_uid(update_item.uid)
+            if existing_dataset is None:
+                raise ValueError(f"Dataset with uid {update_item.uid} not found")
+
+            updated_dataset = existing_dataset.apply_update(update_item)
+            return self.store.update(updated_dataset.uid, updated_dataset)
+        except Exception as e:
+            raise RuntimeError(
+                f"Failed to update dataset with uid {update_item.uid}: {str(e)}"
+            )
 
     def get(self, request: GetOneRequest) -> Dataset:
         """

{syft_rds-0.1.1.dev2 → syft_rds-0.1.1.dev3}/src/syft_rds/client/rds_clients/dataset.py

@@ -55,4 +55,4 @@ class DatasetRDSClient(RDSClientModule[Dataset]):
 
     @ensure_is_admin
     def update(self, dataset_update: DatasetUpdate) -> Dataset:
-        raise NotImplementedError("Dataset update is not supported yet")
+        return self.local_store.dataset.update(dataset_update)

{syft_rds-0.1.1.dev2 → syft_rds-0.1.1.dev3}/src/syft_rds/models/models.py

@@ -331,7 +331,7 @@ class Dataset(ItemBase):
         return self.get_private_path()
 
     @property
-    def readme_path(self) -> Path:
+    def readme_path(self) -> Path | None:
         return self.get_readme_path()
 
     def get_mock_path(self) -> Path:
@@ -357,20 +357,24 @@ class Dataset(ItemBase):
             )
         return private_path
 
-    def get_readme_path(self) -> Path:
+    def get_readme_path(self) -> Path | None:
         """
         Will always raise FileNotFoundError for non-admin since the
         private path will never by synced
         """
+        if not self.readme:
+            return None
         readme_path: Path = self.readme.to_local_path(
             datasites_path=self._syftbox_client.datasites
         )
         if not readme_path.exists():
-            raise FileNotFoundError(f"Readme file not found at {readme_path}")
+            return None
         return readme_path
 
     def get_description(self) -> str:
         # read the description .md file
+        if not self.readme:
+            return ""
         with open(self.get_readme_path()) as f:
             return f.read()
 
@@ -390,10 +394,17 @@ class Dataset(ItemBase):
         except FileNotFoundError:
             pass
 
+        # Only include display paths that are not None
+        display_paths = []
+        if self.mock_path is not None:
+            display_paths.append("mock_path")
+        if self.readme_path is not None:
+            display_paths.append("readme_path")
+
         description = create_html_repr(
             obj=self,
             fields=field_to_include,
-            display_paths=["mock_path", "readme_path"],
+            display_paths=display_paths,
         )
 
         display(HTML(description))
@@ -425,7 +436,11 @@ class DatasetCreate(ItemBaseCreate[Dataset]):
 
 
 class DatasetUpdate(ItemBaseUpdate[Dataset]):
-    pass
+    summary: Optional[str] = None
+    auto_approval: Optional[list[str]] = Field(
+        default_factory=list,
+        description="List of datasites whose jobs will be automatically approved.",
+    )
 
 
 class GetOneRequest(BaseModel):

{syft_rds-0.1.1.dev2 → syft_rds-0.1.1.dev3}/src/syft_rds/store/store.py

@@ -9,10 +9,11 @@ from pydantic import TypeAdapter
 from syft_rds.models.base import ItemBase
 
 PERMS = """
-- path: '**'
-  permissions:
-  - read
-  user: '*'
+rules:
+- pattern: '**'
+  access:
+    read:
+    - '*'
 """
 
 T = TypeVar("T", bound=ItemBase)
@@ -23,7 +24,7 @@ def ensure_store_exists(func):
     def wrapper(self: "YAMLStore", *args, **kwargs):
         if not self.item_type_dir.exists():
             self.item_type_dir.mkdir(parents=True, exist_ok=True)
-            perms_file = self.item_type_dir.parent / "syftperm.yaml"
+            perms_file = self.item_type_dir.parent / "syft.pub.yaml"
             perms_file.write_text(PERMS)  # TODO create more restrictive permissions
         return func(self, *args, **kwargs)