diff --git a/ammico/test/test_utils.py b/ammico/test/test_utils.py index a74d88c5..6af9d5d6 100644 --- a/ammico/test/test_utils.py +++ b/ammico/test/test_utils.py @@ -36,3 +36,22 @@ def test_dump_df(get_path): df = ut.dump_df(outdict) out_df = pd.read_csv(get_path + "example_dump_df.csv", index_col=[0]) pd.testing.assert_frame_equal(df, out_df) + + +def test_is_interactive(): + assert ut.is_interactive + + +def test_get_color_table(): + colors = ut.get_color_table() + assert colors["Pink"] == { + "ColorName": [ + "Pink", + "LightPink", + "HotPink", + "DeepPink", + "PaleVioletRed", + "MediumVioletRed", + ], + "HEX": ["#FFC0CB", "#FFB6C1", "#FF69B4", "#FF1493", "#DB7093", "#C71585"], + } diff --git a/ammico/utils.py b/ammico/utils.py index 4bfaaa9b..3aaf430a 100644 --- a/ammico/utils.py +++ b/ammico/utils.py @@ -2,6 +2,10 @@ import os from pandas import DataFrame, read_csv import pooch +import importlib_resources + + +pkg = importlib_resources.files("ammico") class DownloadResource: @@ -110,8 +114,9 @@ def is_interactive(): def get_color_table(): + path_tables = pkg / "data" / "Color_tables.csv" df_colors = read_csv( - os.path.join(os.path.dirname(__file__), "data", "Color_tables.csv"), + path_tables, delimiter=";", dtype=str, encoding="UTF-8", diff --git a/pyproject.toml b/pyproject.toml index 89fbed97..ce98a199 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "ammico" -version = "0.0.1" +version = "0.1.0" description = "AI Media and Misinformation Content Analysis Tool" readme = "README.md" maintainers = [ @@ -31,6 +31,7 @@ dependencies = [ "google-cloud-vision", "grpcio", "importlib_metadata", + "importlib_resources", "ipython", "jupyter_dash", "matplotlib", @@ -71,7 +72,6 @@ documentation = "https://ssciwr.github.io/AMMICO/build/html/index.html" packages = ["ammico"] [tool.setuptools.package-data] -# Include any png files found in the "data" subdirectory of "ammico" -"ammico.data" = ["*.png"] -mypkg = [ "*.csv"] +# Include any png and csv files found in the "data" subdirectory of "ammico" +"ammico.data" = ["*.png", "*.csv"]