diff --git a/splink/internals/athena/__init__.py b/splink/internals/athena/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/splink/internals/athena/athena_helpers/__init__.py b/splink/internals/athena/athena_helpers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/splink/athena/athena_helpers/athena_transforms.py b/splink/internals/athena/athena_helpers/athena_transforms.py similarity index 100% rename from splink/athena/athena_helpers/athena_transforms.py rename to splink/internals/athena/athena_helpers/athena_transforms.py diff --git a/splink/athena/athena_helpers/athena_utils.py b/splink/internals/athena/athena_helpers/athena_utils.py similarity index 100% rename from splink/athena/athena_helpers/athena_utils.py rename to splink/internals/athena/athena_helpers/athena_utils.py diff --git a/splink/athena/linker.py b/splink/internals/athena/linker.py similarity index 100% rename from splink/athena/linker.py rename to splink/internals/athena/linker.py diff --git a/splink/internals/charts.py b/splink/internals/charts.py index c4582d9069..f90798e1f6 100644 --- a/splink/internals/charts.py +++ b/splink/internals/charts.py @@ -84,7 +84,7 @@ def save_offline_chart( if type(chart_dict).__name__ == "VegaliteNoValidate": chart_dict = chart_dict.spec - template = read_resource("../files/templates/single_chart_template.html") + template = read_resource("files/templates/single_chart_template.html") fmt_dict = _load_external_libs() diff --git a/splink/internals/cluster_studio.py b/splink/internals/cluster_studio.py index 05791b61e0..7607d8a452 100644 --- a/splink/internals/cluster_studio.py +++ b/splink/internals/cluster_studio.py @@ -376,7 +376,7 @@ def render_splink_cluster_studio_html( edges_recs = df_edges_as_records(linker, df_predicted_edges, df_nodes) # Render template with cluster, nodes and edges - template_path = "../files/splink_cluster_studio/cluster_template.j2" + template_path = "files/splink_cluster_studio/cluster_template.j2" template = Template(read_resource(template_path)) template_data: dict[str, Any] = { diff --git a/splink/internals/databricks/__init__.py b/splink/internals/databricks/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/splink/databricks/enable_splink.py b/splink/internals/databricks/enable_splink.py similarity index 100% rename from splink/databricks/enable_splink.py rename to splink/internals/databricks/enable_splink.py diff --git a/splink/files/DEPENDENCY_LICENSES.txt b/splink/internals/files/DEPENDENCY_LICENSES.txt similarity index 100% rename from splink/files/DEPENDENCY_LICENSES.txt rename to splink/internals/files/DEPENDENCY_LICENSES.txt diff --git a/splink/files/chart_defs/accuracy_chart.json b/splink/internals/files/chart_defs/accuracy_chart.json similarity index 100% rename from splink/files/chart_defs/accuracy_chart.json rename to splink/internals/files/chart_defs/accuracy_chart.json diff --git a/splink/files/chart_defs/blocking_rule_generated_comparisons.json b/splink/internals/files/chart_defs/blocking_rule_generated_comparisons.json similarity index 100% rename from splink/files/chart_defs/blocking_rule_generated_comparisons.json rename to splink/internals/files/chart_defs/blocking_rule_generated_comparisons.json diff --git a/splink/files/chart_defs/comparator_score_chart.json b/splink/internals/files/chart_defs/comparator_score_chart.json similarity index 100% rename from splink/files/chart_defs/comparator_score_chart.json rename to splink/internals/files/chart_defs/comparator_score_chart.json diff --git a/splink/files/chart_defs/comparator_score_threshold_chart.json b/splink/internals/files/chart_defs/comparator_score_threshold_chart.json similarity index 100% rename from splink/files/chart_defs/comparator_score_threshold_chart.json rename to splink/internals/files/chart_defs/comparator_score_threshold_chart.json diff --git a/splink/files/chart_defs/completeness.json b/splink/internals/files/chart_defs/completeness.json similarity index 100% rename from splink/files/chart_defs/completeness.json rename to splink/internals/files/chart_defs/completeness.json diff --git a/splink/files/chart_defs/m_u_parameters_interactive_history.json b/splink/internals/files/chart_defs/m_u_parameters_interactive_history.json similarity index 100% rename from splink/files/chart_defs/m_u_parameters_interactive_history.json rename to splink/internals/files/chart_defs/m_u_parameters_interactive_history.json diff --git a/splink/files/chart_defs/match_weight_histogram.json b/splink/internals/files/chart_defs/match_weight_histogram.json similarity index 100% rename from splink/files/chart_defs/match_weight_histogram.json rename to splink/internals/files/chart_defs/match_weight_histogram.json diff --git a/splink/files/chart_defs/match_weights_interactive_history.json b/splink/internals/files/chart_defs/match_weights_interactive_history.json similarity index 100% rename from splink/files/chart_defs/match_weights_interactive_history.json rename to splink/internals/files/chart_defs/match_weights_interactive_history.json diff --git a/splink/files/chart_defs/match_weights_waterfall.json b/splink/internals/files/chart_defs/match_weights_waterfall.json similarity index 100% rename from splink/files/chart_defs/match_weights_waterfall.json rename to splink/internals/files/chart_defs/match_weights_waterfall.json diff --git a/splink/files/chart_defs/missingness.json b/splink/internals/files/chart_defs/missingness.json similarity index 100% rename from splink/files/chart_defs/missingness.json rename to splink/internals/files/chart_defs/missingness.json diff --git a/splink/files/chart_defs/parameter_estimate_comparisons.json b/splink/internals/files/chart_defs/parameter_estimate_comparisons.json similarity index 100% rename from splink/files/chart_defs/parameter_estimate_comparisons.json rename to splink/internals/files/chart_defs/parameter_estimate_comparisons.json diff --git a/splink/files/chart_defs/phonetic_match_chart.json b/splink/internals/files/chart_defs/phonetic_match_chart.json similarity index 100% rename from splink/files/chart_defs/phonetic_match_chart.json rename to splink/internals/files/chart_defs/phonetic_match_chart.json diff --git a/splink/files/chart_defs/precision_recall.json b/splink/internals/files/chart_defs/precision_recall.json similarity index 100% rename from splink/files/chart_defs/precision_recall.json rename to splink/internals/files/chart_defs/precision_recall.json diff --git a/splink/files/chart_defs/probability_two_random_records_match_iteration.json b/splink/internals/files/chart_defs/probability_two_random_records_match_iteration.json similarity index 100% rename from splink/files/chart_defs/probability_two_random_records_match_iteration.json rename to splink/internals/files/chart_defs/probability_two_random_records_match_iteration.json diff --git a/splink/files/chart_defs/profile_data.json b/splink/internals/files/chart_defs/profile_data.json similarity index 100% rename from splink/files/chart_defs/profile_data.json rename to splink/internals/files/chart_defs/profile_data.json diff --git a/splink/files/chart_defs/roc.json b/splink/internals/files/chart_defs/roc.json similarity index 100% rename from splink/files/chart_defs/roc.json rename to splink/internals/files/chart_defs/roc.json diff --git a/splink/files/chart_defs/tf_adjustment_chart.json b/splink/internals/files/chart_defs/tf_adjustment_chart.json similarity index 100% rename from splink/files/chart_defs/tf_adjustment_chart.json rename to splink/internals/files/chart_defs/tf_adjustment_chart.json diff --git a/splink/files/chart_defs/threshold_selection_tool.json b/splink/internals/files/chart_defs/threshold_selection_tool.json similarity index 100% rename from splink/files/chart_defs/threshold_selection_tool.json rename to splink/internals/files/chart_defs/threshold_selection_tool.json diff --git a/splink/files/chart_defs/unlinkables_chart_def.json b/splink/internals/files/chart_defs/unlinkables_chart_def.json similarity index 100% rename from splink/files/chart_defs/unlinkables_chart_def.json rename to splink/internals/files/chart_defs/unlinkables_chart_def.json diff --git a/splink/files/external_js/d3@7.8.5 b/splink/internals/files/external_js/d3@7.8.5 similarity index 100% rename from splink/files/external_js/d3@7.8.5 rename to splink/internals/files/external_js/d3@7.8.5 diff --git a/splink/files/external_js/stdlib.js@5.8.3 b/splink/internals/files/external_js/stdlib.js@5.8.3 similarity index 100% rename from splink/files/external_js/stdlib.js@5.8.3 rename to splink/internals/files/external_js/stdlib.js@5.8.3 diff --git a/splink/files/external_js/vega-embed@6.20.2 b/splink/internals/files/external_js/vega-embed@6.20.2 similarity index 100% rename from splink/files/external_js/vega-embed@6.20.2 rename to splink/internals/files/external_js/vega-embed@6.20.2 diff --git a/splink/files/external_js/vega-lite@5.2.0 b/splink/internals/files/external_js/vega-lite@5.2.0 similarity index 100% rename from splink/files/external_js/vega-lite@5.2.0 rename to splink/internals/files/external_js/vega-lite@5.2.0 diff --git a/splink/files/external_js/vega@5.21.0 b/splink/internals/files/external_js/vega@5.21.0 similarity index 100% rename from splink/files/external_js/vega@5.21.0 rename to splink/internals/files/external_js/vega@5.21.0 diff --git a/splink/files/labelling_tool/slt.js b/splink/internals/files/labelling_tool/slt.js similarity index 100% rename from splink/files/labelling_tool/slt.js rename to splink/internals/files/labelling_tool/slt.js diff --git a/splink/files/labelling_tool/template.j2 b/splink/internals/files/labelling_tool/template.j2 similarity index 100% rename from splink/files/labelling_tool/template.j2 rename to splink/internals/files/labelling_tool/template.j2 diff --git a/splink/files/settings_jsonschema.json b/splink/internals/files/settings_jsonschema.json similarity index 100% rename from splink/files/settings_jsonschema.json rename to splink/internals/files/settings_jsonschema.json diff --git a/splink/files/spark_jars/scala-udf-similarity-0.1.0_classic.jar b/splink/internals/files/spark_jars/scala-udf-similarity-0.1.0_classic.jar similarity index 100% rename from splink/files/spark_jars/scala-udf-similarity-0.1.0_classic.jar rename to splink/internals/files/spark_jars/scala-udf-similarity-0.1.0_classic.jar diff --git a/splink/files/spark_jars/scala-udf-similarity-0.1.0_spark3.3.jar b/splink/internals/files/spark_jars/scala-udf-similarity-0.1.0_spark3.3.jar similarity index 100% rename from splink/files/spark_jars/scala-udf-similarity-0.1.0_spark3.3.jar rename to splink/internals/files/spark_jars/scala-udf-similarity-0.1.0_spark3.3.jar diff --git a/splink/files/spark_jars/scala-udf-similarity-0.1.1_spark3.x.jar b/splink/internals/files/spark_jars/scala-udf-similarity-0.1.1_spark3.x.jar similarity index 100% rename from splink/files/spark_jars/scala-udf-similarity-0.1.1_spark3.x.jar rename to splink/internals/files/spark_jars/scala-udf-similarity-0.1.1_spark3.x.jar diff --git a/splink/files/splink_cluster_studio/cluster_template.j2 b/splink/internals/files/splink_cluster_studio/cluster_template.j2 similarity index 100% rename from splink/files/splink_cluster_studio/cluster_template.j2 rename to splink/internals/files/splink_cluster_studio/cluster_template.j2 diff --git a/splink/files/splink_cluster_studio/custom.css b/splink/internals/files/splink_cluster_studio/custom.css similarity index 100% rename from splink/files/splink_cluster_studio/custom.css rename to splink/internals/files/splink_cluster_studio/custom.css diff --git a/splink/files/splink_comparison_viewer/custom.css b/splink/internals/files/splink_comparison_viewer/custom.css similarity index 100% rename from splink/files/splink_comparison_viewer/custom.css rename to splink/internals/files/splink_comparison_viewer/custom.css diff --git a/splink/files/splink_comparison_viewer/template.j2 b/splink/internals/files/splink_comparison_viewer/template.j2 similarity index 100% rename from splink/files/splink_comparison_viewer/template.j2 rename to splink/internals/files/splink_comparison_viewer/template.j2 diff --git a/splink/files/splink_vis_utils/splink_vis_utils.js b/splink/internals/files/splink_vis_utils/splink_vis_utils.js similarity index 100% rename from splink/files/splink_vis_utils/splink_vis_utils.js rename to splink/internals/files/splink_vis_utils/splink_vis_utils.js diff --git a/splink/files/templates/single_chart_template.html b/splink/internals/files/templates/single_chart_template.html similarity index 100% rename from splink/files/templates/single_chart_template.html rename to splink/internals/files/templates/single_chart_template.html diff --git a/splink/internals/labelling_tool.py b/splink/internals/labelling_tool.py index e1cab15d85..b0f4c84bd5 100644 --- a/splink/internals/labelling_tool.py +++ b/splink/internals/labelling_tool.py @@ -88,13 +88,13 @@ def render_labelling_tool_html( comparisons_recs = comparisons_recs.to_dict(orient="records") # Render template with cluster, nodes and edges - template_path = "../files/labelling_tool/template.j2" + template_path = "files/labelling_tool/template.j2" template = Template(read_resource(template_path)) template_data = { - "slt": read_resource("../files/labelling_tool/slt.js"), - "d3": read_resource("../files/external_js/d3@7.8.5"), - "stdlib": read_resource("../files/external_js/stdlib.js@5.8.3"), + "slt": read_resource("files/labelling_tool/slt.js"), + "d3": read_resource("files/external_js/d3@7.8.5"), + "stdlib": read_resource("files/external_js/stdlib.js@5.8.3"), "pairwise_comparison_data": json.dumps(comparisons_recs, cls=EverythingEncoder), "splink_settings_data": json.dumps(settings, cls=EverythingEncoder), "view_in_jupyter": view_in_jupyter, diff --git a/splink/internals/spark/database_api.py b/splink/internals/spark/database_api.py index c4ba1e5735..711b2ec771 100644 --- a/splink/internals/spark/database_api.py +++ b/splink/internals/spark/database_api.py @@ -9,7 +9,7 @@ from pyspark.sql.dataframe import DataFrame as spark_df from pyspark.sql.utils import AnalysisException -from splink.databricks.enable_splink import enable_splink +from splink.internals.databricks.enable_splink import enable_splink from splink.internals.database_api import AcceptableInputTableType, DatabaseAPI from splink.internals.dialects import ( SparkDialect, diff --git a/splink/internals/splink_comparison_viewer.py b/splink/internals/splink_comparison_viewer.py index 4073aee0a5..c6feace98a 100644 --- a/splink/internals/splink_comparison_viewer.py +++ b/splink/internals/splink_comparison_viewer.py @@ -121,7 +121,7 @@ def render_splink_comparison_viewer_html( # rather than bundling the whole thing into the html bundle_observable_notebook = True - template_path = "../files/splink_comparison_viewer/template.j2" + template_path = "files/splink_comparison_viewer/template.j2" template = Template(read_resource(template_path)) template_data: dict[str, Any] = { diff --git a/splink/internals/validate_jsonschema.py b/splink/internals/validate_jsonschema.py index 3fc3c43c67..721fc9bc43 100644 --- a/splink/internals/validate_jsonschema.py +++ b/splink/internals/validate_jsonschema.py @@ -12,7 +12,7 @@ @lru_cache() def get_schema(): - path = "../files/settings_jsonschema.json" + path = "files/settings_jsonschema.json" return json.loads(read_resource(path)) diff --git a/tests/test_sql_transform.py b/tests/test_sql_transform.py index b155bd4932..73cbb81a13 100644 --- a/tests/test_sql_transform.py +++ b/tests/test_sql_transform.py @@ -1,10 +1,7 @@ import sqlglot -from splink.athena.athena_helpers.athena_transforms import cast_concat_as_varchar +from splink.internals.athena.athena_helpers.athena_transforms import cast_concat_as_varchar from splink.internals.input_column import InputColumn -from splink.internals.spark.spark_helpers.custom_spark_dialect import ( - Dialect, # noqa 401 -) from splink.internals.sql_transform import ( move_l_r_table_prefix_to_column_suffix, sqlglot_transform_sql,