feat: Development

izihawa · Feb 18, 2024 · 68ec070 · 68ec070
1 parent 6a12829
commit 68ec070
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/bin/main.rs b/bin/main.rs
@@ -71,9 +71,10 @@ struct TablesCreateRequest {
 #[derive(Deserialize)]
 struct TablesImportRequest {
     ticket: String,
-    download_policy: Option<DownloadPolicy>,
     storage: String,
     #[serde(default)]
+    download_policy: Option<DownloadPolicy>,
+    #[serde(default)]
     sinks: Vec<String>,
     #[serde(default = "return_true")]
     keep_blob: bool,
@@ -311,10 +312,10 @@ async fn tables_import(
         .tables_import(
             &table,
             &tables_import_request.ticket,
+            &tables_import_request.storage,
             tables_import_request
                 .download_policy
                 .unwrap_or_else(|| DownloadPolicy::EverythingExcept(vec![])),
-            &tables_import_request.storage,
             tables_import_request.sinks,
             tables_import_request.keep_blob,
         )

diff --git a/src/iroh_node.rs b/src/iroh_node.rs
@@ -257,8 +257,8 @@ impl IrohNode {
         &mut self,
         table_name: &str,
         table_ticket: &str,
-        download_policy: DownloadPolicy,
         storage_name: &str,
+        download_policy: DownloadPolicy,
         sinks: Vec<String>,
         keep_blob: bool,
     ) -> Result<NamespaceId> {

diff --git a/trident-py/pyproject.toml b/trident-py/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "izihawa-trident-client"
-version = "1.0.11"
+version = "1.0.12"
 description = ""
 authors = ["Pasha Podolsky <[email protected]>"]
 readme = "README.md"

diff --git a/trident-py/trident/client.py b/trident-py/trident/client.py
@@ -38,8 +38,8 @@ async def tables_import(
         self,
         table: str,
         ticket: str,
+        storage: str,
         download_policy: dict | None = None,
-        storage: str = "default",
         sinks: tuple | list = tuple(),
         keep_blob: bool = True,
     ) -> bytes:
@@ -48,8 +48,8 @@ async def tables_import(
             url,
             json={
                 'ticket': ticket,
-                'download_policy': download_policy,
                 'storage': storage,
+                'download_policy': download_policy,
                 'sinks': sinks,
                 'keep_blob': keep_blob,
             },