move files and athena folders

moj-analytical-services · May 20, 2024 · 11a1c7b · 11a1c7b
1 parent 6a5c981
commit 11a1c7b
Show file tree

Hide file tree

Showing 51 changed files with 10 additions and 13 deletions.
diff --git a/splink/internals/athena/__init__.py b/splink/internals/athena/__init__.py
diff --git a/splink/internals/athena/athena_helpers/__init__.py b/splink/internals/athena/athena_helpers/__init__.py
diff --git a/...thena/athena_helpers/athena_transforms.py → ...thena/athena_helpers/athena_transforms.py b/...thena/athena_helpers/athena_transforms.py → ...thena/athena_helpers/athena_transforms.py
diff --git a/splink/athena/athena_helpers/athena_utils.py → ...als/athena/athena_helpers/athena_utils.py b/splink/athena/athena_helpers/athena_utils.py → ...als/athena/athena_helpers/athena_utils.py
diff --git a/splink/athena/linker.py → splink/internals/athena/linker.py b/splink/athena/linker.py → splink/internals/athena/linker.py
diff --git 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
@@ -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
diff --git a/splink/databricks/enable_splink.py → splink/internals/databricks/enable_splink.py b/splink/databricks/enable_splink.py → splink/internals/databricks/enable_splink.py
diff --git a/splink/files/DEPENDENCY_LICENSES.txt → ...k/internals/files/DEPENDENCY_LICENSES.txt b/splink/files/DEPENDENCY_LICENSES.txt → ...k/internals/files/DEPENDENCY_LICENSES.txt
diff --git a/splink/files/chart_defs/accuracy_chart.json → ...nals/files/chart_defs/accuracy_chart.json b/splink/files/chart_defs/accuracy_chart.json → ...nals/files/chart_defs/accuracy_chart.json
diff --git a/.../blocking_rule_generated_comparisons.json → .../blocking_rule_generated_comparisons.json b/.../blocking_rule_generated_comparisons.json → .../blocking_rule_generated_comparisons.json
diff --git a/...es/chart_defs/comparator_score_chart.json → ...es/chart_defs/comparator_score_chart.json b/...es/chart_defs/comparator_score_chart.json → ...es/chart_defs/comparator_score_chart.json
diff --git a/...efs/comparator_score_threshold_chart.json → ...efs/comparator_score_threshold_chart.json b/...efs/comparator_score_threshold_chart.json → ...efs/comparator_score_threshold_chart.json
diff --git a/splink/files/chart_defs/completeness.json → ...ernals/files/chart_defs/completeness.json b/splink/files/chart_defs/completeness.json → ...ernals/files/chart_defs/completeness.json
diff --git a/...s/m_u_parameters_interactive_history.json → ...s/m_u_parameters_interactive_history.json b/...s/m_u_parameters_interactive_history.json → ...s/m_u_parameters_interactive_history.json
diff --git a/...es/chart_defs/match_weight_histogram.json → ...es/chart_defs/match_weight_histogram.json b/...es/chart_defs/match_weight_histogram.json → ...es/chart_defs/match_weight_histogram.json
diff --git a/...fs/match_weights_interactive_history.json → ...fs/match_weights_interactive_history.json b/...fs/match_weights_interactive_history.json → ...fs/match_weights_interactive_history.json
diff --git a/...s/chart_defs/match_weights_waterfall.json → ...s/chart_defs/match_weights_waterfall.json b/...s/chart_defs/match_weights_waterfall.json → ...s/chart_defs/match_weights_waterfall.json
diff --git a/splink/files/chart_defs/missingness.json → ...ternals/files/chart_defs/missingness.json b/splink/files/chart_defs/missingness.json → ...ternals/files/chart_defs/missingness.json
diff --git a/..._defs/parameter_estimate_comparisons.json → ..._defs/parameter_estimate_comparisons.json b/..._defs/parameter_estimate_comparisons.json → ..._defs/parameter_estimate_comparisons.json
diff --git a/...iles/chart_defs/phonetic_match_chart.json → ...iles/chart_defs/phonetic_match_chart.json b/...iles/chart_defs/phonetic_match_chart.json → ...iles/chart_defs/phonetic_match_chart.json
diff --git a/...nk/files/chart_defs/precision_recall.json → ...ls/files/chart_defs/precision_recall.json b/...nk/files/chart_defs/precision_recall.json → ...ls/files/chart_defs/precision_recall.json
diff --git a/...y_two_random_records_match_iteration.json → ...y_two_random_records_match_iteration.json b/...y_two_random_records_match_iteration.json → ...y_two_random_records_match_iteration.json
diff --git a/splink/files/chart_defs/profile_data.json → ...ernals/files/chart_defs/profile_data.json b/splink/files/chart_defs/profile_data.json → ...ernals/files/chart_defs/profile_data.json
diff --git a/splink/files/chart_defs/roc.json → splink/internals/files/chart_defs/roc.json b/splink/files/chart_defs/roc.json → splink/internals/files/chart_defs/roc.json
diff --git a/...files/chart_defs/tf_adjustment_chart.json → ...files/chart_defs/tf_adjustment_chart.json b/...files/chart_defs/tf_adjustment_chart.json → ...files/chart_defs/tf_adjustment_chart.json
diff --git a/.../chart_defs/threshold_selection_tool.json → .../chart_defs/threshold_selection_tool.json b/.../chart_defs/threshold_selection_tool.json → .../chart_defs/threshold_selection_tool.json
diff --git a/...les/chart_defs/unlinkables_chart_def.json → ...les/chart_defs/unlinkables_chart_def.json b/...les/chart_defs/unlinkables_chart_def.json → ...les/chart_defs/unlinkables_chart_def.json
diff --git a/splink/files/external_js/[email protected] → splink/internals/files/external_js/[email protected] b/splink/files/external_js/[email protected] → splink/internals/files/external_js/[email protected]
diff --git a/splink/files/external_js/[email protected] → ...ternals/files/external_js/[email protected] b/splink/files/external_js/[email protected] → ...ternals/files/external_js/[email protected]
diff --git a/splink/files/external_js/[email protected] → ...rnals/files/external_js/[email protected] b/splink/files/external_js/[email protected] → ...rnals/files/external_js/[email protected]
diff --git a/splink/files/external_js/[email protected] → ...ternals/files/external_js/[email protected] b/splink/files/external_js/[email protected] → ...ternals/files/external_js/[email protected]
diff --git a/splink/files/external_js/[email protected] → ...k/internals/files/external_js/[email protected] b/splink/files/external_js/[email protected] → ...k/internals/files/external_js/[email protected]
diff --git a/splink/files/labelling_tool/slt.js → splink/internals/files/labelling_tool/slt.js b/splink/files/labelling_tool/slt.js → splink/internals/files/labelling_tool/slt.js
diff --git a/splink/files/labelling_tool/template.j2 → ...nternals/files/labelling_tool/template.j2 b/splink/files/labelling_tool/template.j2 → ...nternals/files/labelling_tool/template.j2
diff --git a/splink/files/settings_jsonschema.json → .../internals/files/settings_jsonschema.json b/splink/files/settings_jsonschema.json → .../internals/files/settings_jsonschema.json
diff --git a/...rs/scala-udf-similarity-0.1.0_classic.jar → ...rs/scala-udf-similarity-0.1.0_classic.jar b/...rs/scala-udf-similarity-0.1.0_classic.jar → ...rs/scala-udf-similarity-0.1.0_classic.jar
diff --git a/...s/scala-udf-similarity-0.1.0_spark3.3.jar → ...s/scala-udf-similarity-0.1.0_spark3.3.jar b/...s/scala-udf-similarity-0.1.0_spark3.3.jar → ...s/scala-udf-similarity-0.1.0_spark3.3.jar
diff --git a/...s/scala-udf-similarity-0.1.1_spark3.x.jar → ...s/scala-udf-similarity-0.1.1_spark3.x.jar b/...s/scala-udf-similarity-0.1.1_spark3.x.jar → ...s/scala-udf-similarity-0.1.1_spark3.x.jar
diff --git a/...splink_cluster_studio/cluster_template.j2 → ...splink_cluster_studio/cluster_template.j2 b/...splink_cluster_studio/cluster_template.j2 → ...splink_cluster_studio/cluster_template.j2
diff --git a/...nk/files/splink_cluster_studio/custom.css → ...ls/files/splink_cluster_studio/custom.css b/...nk/files/splink_cluster_studio/custom.css → ...ls/files/splink_cluster_studio/custom.css
diff --git a/...files/splink_comparison_viewer/custom.css → ...files/splink_comparison_viewer/custom.css b/...files/splink_comparison_viewer/custom.css → ...files/splink_comparison_viewer/custom.css
diff --git a/...iles/splink_comparison_viewer/template.j2 → ...iles/splink_comparison_viewer/template.j2 b/...iles/splink_comparison_viewer/template.j2 → ...iles/splink_comparison_viewer/template.j2
diff --git a/...iles/splink_vis_utils/splink_vis_utils.js → ...iles/splink_vis_utils/splink_vis_utils.js b/...iles/splink_vis_utils/splink_vis_utils.js → ...iles/splink_vis_utils/splink_vis_utils.js
diff --git a/...iles/templates/single_chart_template.html → ...iles/templates/single_chart_template.html b/...iles/templates/single_chart_template.html → ...iles/templates/single_chart_template.html
diff --git 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/[email protected]"),
-        "stdlib": read_resource("../files/external_js/[email protected]"),
+        "slt": read_resource("files/labelling_tool/slt.js"),
+        "d3": read_resource("files/external_js/[email protected]"),
+        "stdlib": read_resource("files/external_js/[email protected]"),
         "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
@@ -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
@@ -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
@@ -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
@@ -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,