Merge branch 'main' of https://github.com/gizatechxyz/osiris

osiris/app.py

@@ -1,11 +1,7 @@
 import os
 
 import numpy as np
-<<<<<<< Updated upstream
-import polars as pl
-=======
 import pandas as pd
->>>>>>> Stashed changes
 import typer
 
 from osiris.cairo.data_converter.data_converter import convert_to_cairo
@@ -17,21 +13,17 @@
 
 app = typer.Typer()
 
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
 def check_file_format(file_path):
     _, file_extension = os.path.splitext(file_path)
 
-    if file_extension in ['.csv']:
-        return 'CSV'
-    elif file_extension in ['.parquet']:
-        return 'Parquet'
-    elif file_extension in ['.npy']:
-        return 'NumPy'
+    if file_extension == '.csv':
+        return InputFormat.CSV
+    elif file_extension == '.parquet':
+        return InputFormat.PARQUET
+    elif file_extension == '.npy':
+        return InputFormat.NUMPY
     else:
-        return 'Unknown'
+        return InputFormat.UNKNOWN
 
 
 def load_data(input_file: str):
@@ -49,13 +41,13 @@ def load_data(input_file: str):
     input_format = check_file_format(input_file)
     match input_format:
         case InputFormat.CSV:
-            return pl.read_csv(input_file)
+            return pd.read_csv(input_file, header=None)
         case InputFormat.PARQUET:
-            return pl.read_parquet(input_file)
+            return pd.read_parquet(input_file)
         case InputFormat.NUMPY:
             return np.load(input_file)
         case _:
-            raise ValueError(f"Unsupported input format: {input_format}")
+            raise ValueError(f"Unsupported input format: {input_format.value}")
 
 
 def convert_to_numpy(data):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "giza-osiris"
-version = "0.2.0"
+version = "0.2.1"
 description = "Osiris is a Python library designed for efficient data conversion and management, primarily transforming data into Cairo programs"
 authors = ["Fran Algaba <[email protected]>"]
 readme = "README.md"

tests/data/simple_tensor.csv

@@ -0,0 +1,2 @@
+1,2
+3,4

tests/test_convert_to_numpy.py

@@ -0,0 +1,25 @@
+from osiris.app import convert_to_numpy, load_data
+from osiris.dtypes.input_output_formats import InputFormat
+
+import numpy as np
+
+
+def test_convert_to_numpy_from_csv():
+    data = load_data("tests/data/simple_tensor.csv")
+    numpy_array = convert_to_numpy(data)
+    assert np.array_equal(numpy_array, np.array(
+        [[1, 2], [3, 4]], dtype=np.uint32))
+
+
+def test_convert_to_numpy_from_parquet():
+    data = load_data("tests/data/simple_tensor.parquet")
+    numpy_array = convert_to_numpy(data)
+    assert np.array_equal(numpy_array, np.array(
+        [[1, 2], [3, 4]], dtype=np.uint32))
+
+
+def test_convert_to_numpy_from_npy():
+    data = load_data("tests/data/simple_tensor.npy")
+    numpy_array = convert_to_numpy(data)
+    assert np.array_equal(numpy_array, np.array(
+        [[1, 2], [3, 4]], dtype=np.uint32))