Merge pull request #87 from machow/feat-driver-table-type

Feat driver table type

Author: machow

pins/drivers.py

@@ -13,6 +13,7 @@
 
 
 UNSAFE_TYPES = frozenset(["joblib"])
+REQUIRES_SINGLE_FILE = frozenset(["csv", "joblib", "file"])
 
 
 def load_data(
@@ -44,21 +45,35 @@ def load_data(
 
     # Check that only a single file name was given
     fnames = [meta.file] if isinstance(meta.file, str) else meta.file
-    if len(fnames) > 1:
+    if len(fnames) > 1 and type in REQUIRES_SINGLE_FILE:
         raise ValueError("Cannot load data when more than 1 file")
 
-    # TODO: currently only can load a single file
-    target_fname = fnames[0]
+    # file path creation ------------------------------------------------------
+
+    if type == "table":
+        # this type contains an rds and csv files named data.{ext}, so we match
+        # R pins behavior and hardcode the name
+        target_fname = "data.csv"
+    else:
+        target_fname = fnames[0]
+
     if path_to_version is not None:
         path_to_file = f"{path_to_version}/{target_fname}"
     else:
         path_to_file = target_fname
 
+    # type handling -----------------------------------------------------------
+
     if meta.type == "csv":
         import pandas as pd
 
         return pd.read_csv(fs.open(path_to_file))
 
+    elif meta.type == "table":
+        import pandas as pd
+
+        return pd.read_csv(fs.open(path_to_file))
+
     elif meta.type == "joblib":
         import joblib
 

pins/tests/pins-old-types/a-table/v/data.csv

@@ -0,0 +1,3 @@
+"a","b"
+1,"x"
+2,"y"

pins/tests/pins-old-types/a-table/v/data.rds

@@ -0,0 +1,9 @@
+path:
+- data.csv
+- data.rds
+type: table
+rows: 2
+cols: 2
+columns:
+  a: integer
+  b: character

pins/tests/pins-old-types/a-table/v/data.txt

@@ -0,0 +1,13 @@
+cache = tempfile()
+board_register_local(cache = cache)
+
+some_df = data.frame(a = 1:2, b = c("x","y"))
+pin(some_df, name="a-table")
+
+# note that pin automatically changes _ to -
+# TODO: for now manually copying into pins/tests/pins-old-types
+# Note that a trivial version name, v, is used to check the reading behavior
+# since pins v0 does not save versions
+# >>> mkdir pins/tests/pins-old-types/a-table/v/
+# >>> cp -r <path_to_pin> pins/tests/pins-old-types/a-table/v/
+fs::path(cache, "a-table")