Remove frictionless read method

Author: risenW

danfojs/src/index.js

@@ -3,7 +3,7 @@ import NDframe from "./core/generic";
 export { Series } from "./core/series";
 export { DataFrame } from "./core/frame";
 export { to_datetime } from "./core/timeseries";
-export { read_csv, read_json, read_excel, read } from "./io/reader";
+export { read_csv, read_json, read_excel } from "./io/reader";
 export { merge } from "./core/merge";
 export { concat } from "./core/concat";
 export { LabelEncoder, OneHotEncoder } from "./preprocessing/encodings";
@@ -14,5 +14,6 @@ export { Configs } from "./config/config";
 export { NDframe };
 export { Str } from "./core/strings";
 export { Utils } from "./core/utils";
+export * as tf from "@tensorflow/tfjs";
 
-export const _version = "0.2.3";
+export const _version = "0.2.2";

danfojs/src/io/reader.js

@@ -1,8 +1,6 @@
-import { data } from "@tensorflow/tfjs";
+import * as tf from "@tensorflow/tfjs";
 import fetch from "node-fetch";
 import XLSX from "xlsx";
-import { open, Dataset, isDataset } from "frictionless.js";
-import toArray from "stream-to-array";
 import { Utils } from "../core/utils";
 import { DataFrame } from "../core/frame";
 
@@ -32,7 +30,7 @@ export const read_csv = async (source, chunk) => {
   }
 
   let data = [];
-  const csvDataset = data.csv(source);
+  const csvDataset = tf.data.csv(source);
   const column_names = await csvDataset.columnNames();
   const sample = csvDataset.take(chunk);
   await sample.forEachAsync((row) => data.push(Object.values(row)));
@@ -155,64 +153,3 @@ export const read_excel = async (kwargs) => {
     throw new Error(err);
   }
 };
-
-/**
- * Opens a file using frictionless.js specification.
- * @param {string} pathOrDescriptor A path to the file/resources. It can be a local file,
- * a URL to a tabular data (CSV, EXCEL) or Datahub.io Data Resource.
- * Data comes with extra properties and specification conforming to the Frictionless Data standards.
- * @param {object} configs { data_num (Defaults => 0): The specific dataset to load, when reading data from a datapackage.json,
- *                          header (Defaults => true): Whether the dataset contains header or not.
- *                          }
- * @returns {DataFrame} Danfo DataFrame/Series
- */
-export const read = async (
-  path_or_descriptor,
-  configs = { data_num: 0, header: true }
-) => {
-  let data_num = configs["data_num"];
-  let header = configs["header"];
-  let rows, file;
-
-  if (isDataset(path_or_descriptor)) {
-    console.log(
-      "datapackage.json found. Loading Dataset package from Datahub.io"
-    );
-    const dataset = await Dataset.load(path_or_descriptor);
-    file = dataset.resources[data_num];
-    //TODO: toArray does not work in browser env, so this feature breaks when build for the web.
-    // To fix this, we need a function to convert stream into text
-    rows = await toArray(await file.rows());
-  } else {
-    try {
-      file = open(path_or_descriptor);
-      rows = await toArray(await file.rows());
-    } catch (error) {
-      console.log(error);
-    }
-  }
-
-  if ([ "csv", "xls", "xlsx" ].includes(await file.descriptor.format)) {
-    if (header) {
-      let df = new DataFrame(rows.slice(1), { columns: rows[0] });
-      return df;
-    } else {
-      let df = new DataFrame(rows);
-      return df;
-    }
-  } else {
-    let df = new DataFrame(rows);
-    return df;
-  }
-};
-
-// /**
-//  * Reads a Database into DataFrame
-//  *
-//  * @param {source} URL or local file path to retreive JSON file.
-//  * @returns {Promise} DataFrame structure of parsed CSV data
-//  */
-// export const read_sql = async (source) => {
-
-//     return "TODO"
-// }