Fixed int to float conversion in csv parser.

docker/compose/slycat-compose/requirements.txt

@@ -9,8 +9,8 @@ configparser
 future
 routes
 scipy
-sklearn
-npTDMS
+scikit-learn
+npTDMS==1.6.0
 pandas
 pysmb
 natsort

packages/slycat/pandas_util.py

@@ -10,7 +10,8 @@
 # common csv parsing code used by both slycat-web-server and slycat-web-client
 # does not call slycat.web.server directly, instead returns any error messages
 # error messages are returned as a list of {'type': 'warning', 'message': 'message'}
-def parse_file(file):
+# use file_name = True to pass a file name instead of a string with file contents
+def parse_file(file, file_name=False):
     """
     parses out a csv file into numpy array by column (data), the dimension meta data(dimensions),
     and sets attributes (attributes)
@@ -29,7 +30,10 @@ def parse_file(file):
 
     # load input file as pandas dataframe
     try:
-        df = pd.read_csv(StringIO(file))
+        if file_name:
+            df = pd.read_csv(file)
+        else:
+            df = pd.read_csv(StringIO(file))
 
     # return empty values if couldn't read file
     except Exception as e:
@@ -59,7 +63,7 @@ def parse_file(file):
         if df[header].dtype == "object":
             data.append(df[header].values.astype('unicode'))
         else:
-            data.append(df[header].values)
+            data.append(df[header].values.astype(float))
 
     # check for empty headers (pandas replaced them with 'Unnamed: <Column #>')
     empty_headers = []

web-client/slycat/pandas_util.py

@@ -10,8 +10,7 @@
 # common csv parsing code used by both slycat-web-server and slycat-web-client
 # does not call slycat.web.server directly, instead returns any error messages
 # error messages are returned as a list of {'type': 'warning', 'message': 'message'}
-# use file_name=True if you are passing an actual file name, rather than a string
-# containing the file data
+# use file_name = True to pass a file name instead of a string with file contents
 def parse_file(file, file_name=False):
     """
     parses out a csv file into numpy array by column (data), the dimension meta data(dimensions),
@@ -64,8 +63,8 @@ def parse_file(file, file_name=False):
         if df[header].dtype == "object":
             data.append(df[header].values.astype('unicode'))
         else:
-            data.append(df[header].values)
-
+            data.append(df[header].values.astype(float))
+            
     # check for empty headers (pandas replaced them with 'Unnamed: <Column #>')
     empty_headers = []
     headers = df.columns.values

web-client/slycat/web/client/ps_csv.py

@@ -84,12 +84,7 @@ def upload_model (arguments, attributes, dimensions, data, progress=True):
 
   # Upload each column into the array.
   for index in range(len(column_names)):
-
-    # make sure float are actually floats
-    if column_types[index] == 'float64':
-      values = [np.asarray(data[index]).astype(float)]
-    else:
-      values = [np.asarray(data[index])]
+    values = [np.asarray(data[index])]
 
     # push to server
     connection.put_model_arrayset_data(mid, "data-table", "0/%s/..." % index, values)