From 3cf28379e8e07c7655e555057ffceb6cd8aefdac Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Mon, 4 Jul 2022 18:54:32 +0200 Subject: [PATCH] Move folders --- src/__main__.py | 2 +- src/great_ai/constants.py | 2 +- src/great_ai/context.py | 4 ++-- src/great_ai/deploy/great_ai.py | 2 +- .../deploy/routes/dashboard/create_dash_app.py | 2 +- src/{ => great_ai}/large_file/__init__.py | 0 src/{ => great_ai}/large_file/__main__.py | 9 +++++++-- .../large_file/helper/__init__.py | 0 .../large_file/helper/bytes_to_megabytes.py | 0 .../large_file/helper/human_readable_to_byte.py | 0 .../large_file/helper/progress_bar.py | 0 .../large_file/large_file/__init__.py | 0 .../large_file/large_file/large_file_base.py | 2 +- .../large_file/large_file/large_file_local.py | 2 +- .../large_file/large_file/large_file_mongo.py | 2 +- .../large_file/large_file/large_file_s3.py | 2 +- .../large_file/models/__init__.py | 0 .../large_file/models/data_instance.py | 0 .../large_file/parse_arguments.py | 0 .../persistence/tracing_database_driver.py | 2 +- src/great_ai/remote/call_remote_great_ai.py | 2 +- src/{ => great_ai}/utilities/__init__.py | 0 src/{ => great_ai}/utilities/chunk.py | 0 src/{ => great_ai}/utilities/clean.py | 0 .../utilities/config_file/__init__.py | 0 .../utilities/config_file/config_file.py | 0 .../utilities/config_file/parse_error.py | 0 .../utilities/config_file/pattern.py | 0 src/{ => great_ai}/utilities/data/__init__.py | 0 .../utilities/data/american_spellings.py | 0 .../utilities/data/punctuations.py | 0 .../utilities/evaluate_ranking/__init__.py | 0 .../evaluate_ranking/draw_f1_iso_lines.py | 0 .../evaluate_ranking/evaluate_ranking.py | 0 .../utilities/external/__init__.py | 0 .../utilities/external/pylatexenc/README.md | 0 .../utilities/external/pylatexenc/__init__.py | 0 .../utilities/external/pylatexenc/_util.py | 0 .../external/pylatexenc/latex2text/__init__.py | 0 .../external/pylatexenc/latex2text/__main__.py | 0 .../pylatexenc/latex2text/_defaultspecs.py | 0 .../external/pylatexenc/latexencode/__init__.py | 0 .../external/pylatexenc/latexencode/__main__.py | 0 .../latexencode/_partial_latex_encoder.py | 0 .../pylatexenc/latexencode/_uni2latexmap.py | 0 .../pylatexenc/latexencode/_uni2latexmap_xml.py | 0 .../latexencode/_unicode_to_latex_encoder.py | 0 .../external/pylatexenc/latexwalker/__init__.py | 0 .../external/pylatexenc/latexwalker/__main__.py | 0 .../pylatexenc/latexwalker/_defaultspecs.py | 0 .../external/pylatexenc/macrospec/__init__.py | 0 .../pylatexenc/macrospec/_argparsers.py | 0 .../utilities/external/pylatexenc/version.py | 0 src/{ => great_ai}/utilities/get_sentences.py | 0 .../utilities/language/__init__.py | 0 .../language/english_name_of_language.py | 0 .../utilities/language/is_english.py | 0 .../utilities/language/predict_language.py | 0 src/{ => great_ai}/utilities/logger/__init__.py | 0 src/{ => great_ai}/utilities/logger/colors.py | 0 .../utilities/logger/custom_formatter.py | 0 .../utilities/logger/get_logger.py | 0 .../utilities/match_names/__init__.py | 0 .../utilities/match_names/config.py | 0 .../utilities/match_names/match_names.py | 0 .../utilities/match_names/name_parts.py | 0 .../utilities/parallel_map/__init__.py | 0 .../utilities/parallel_map/get_config.py | 0 .../parallel_map/manage_communication.py | 0 .../utilities/parallel_map/manage_serial.py | 0 .../utilities/parallel_map/mapper_function.py | 0 .../utilities/parallel_map/parallel_map.py | 0 .../parallel_map/parallel_map_configuration.py | 0 .../parallel_map/threaded_parallel_map.py | 0 .../utilities/parallel_map/worker_exception.py | 0 src/{ => great_ai}/utilities/unchunk.py | 0 src/{ => great_ai}/utilities/unique.py | 17 ++++++++++++----- tests/large_file/test_human_readable_to_byte.py | 2 +- tests/large_file/test_large_file.py | 2 +- tests/utilities/test_chunk.py | 2 +- tests/utilities/test_clean.py | 2 +- tests/utilities/test_config_file.py | 2 +- tests/utilities/test_evaluate_ranking.py | 2 +- tests/utilities/test_get_sentences.py | 2 +- tests/utilities/test_language.py | 6 +++++- tests/utilities/test_match_names.py | 2 +- tests/utilities/test_parallel_map.py | 2 +- tests/utilities/test_threaded_parallel_map.py | 2 +- tests/utilities/test_unique.py | 2 +- 89 files changed, 47 insertions(+), 31 deletions(-) rename src/{ => great_ai}/large_file/__init__.py (100%) rename src/{ => great_ai}/large_file/__main__.py (92%) rename src/{ => great_ai}/large_file/helper/__init__.py (100%) rename src/{ => great_ai}/large_file/helper/bytes_to_megabytes.py (100%) rename src/{ => great_ai}/large_file/helper/human_readable_to_byte.py (100%) rename src/{ => great_ai}/large_file/helper/progress_bar.py (100%) rename src/{ => great_ai}/large_file/large_file/__init__.py (100%) rename src/{ => great_ai}/large_file/large_file/large_file_base.py (99%) rename src/{ => great_ai}/large_file/large_file/large_file_local.py (97%) rename src/{ => great_ai}/large_file/large_file/large_file_mongo.py (98%) rename src/{ => great_ai}/large_file/large_file/large_file_s3.py (99%) rename src/{ => great_ai}/large_file/models/__init__.py (100%) rename src/{ => great_ai}/large_file/models/data_instance.py (100%) rename src/{ => great_ai}/large_file/parse_arguments.py (100%) rename src/{ => great_ai}/utilities/__init__.py (100%) rename src/{ => great_ai}/utilities/chunk.py (100%) rename src/{ => great_ai}/utilities/clean.py (100%) rename src/{ => great_ai}/utilities/config_file/__init__.py (100%) rename src/{ => great_ai}/utilities/config_file/config_file.py (100%) rename src/{ => great_ai}/utilities/config_file/parse_error.py (100%) rename src/{ => great_ai}/utilities/config_file/pattern.py (100%) rename src/{ => great_ai}/utilities/data/__init__.py (100%) rename src/{ => great_ai}/utilities/data/american_spellings.py (100%) rename src/{ => great_ai}/utilities/data/punctuations.py (100%) rename src/{ => great_ai}/utilities/evaluate_ranking/__init__.py (100%) rename src/{ => great_ai}/utilities/evaluate_ranking/draw_f1_iso_lines.py (100%) rename src/{ => great_ai}/utilities/evaluate_ranking/evaluate_ranking.py (100%) rename src/{ => great_ai}/utilities/external/__init__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/README.md (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/__init__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/_util.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latex2text/__init__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latex2text/__main__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latex2text/_defaultspecs.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexencode/__init__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexencode/__main__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexencode/_uni2latexmap.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexwalker/__init__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexwalker/__main__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/latexwalker/_defaultspecs.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/macrospec/__init__.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/macrospec/_argparsers.py (100%) rename src/{ => great_ai}/utilities/external/pylatexenc/version.py (100%) rename src/{ => great_ai}/utilities/get_sentences.py (100%) rename src/{ => great_ai}/utilities/language/__init__.py (100%) rename src/{ => great_ai}/utilities/language/english_name_of_language.py (100%) rename src/{ => great_ai}/utilities/language/is_english.py (100%) rename src/{ => great_ai}/utilities/language/predict_language.py (100%) rename src/{ => great_ai}/utilities/logger/__init__.py (100%) rename src/{ => great_ai}/utilities/logger/colors.py (100%) rename src/{ => great_ai}/utilities/logger/custom_formatter.py (100%) rename src/{ => great_ai}/utilities/logger/get_logger.py (100%) rename src/{ => great_ai}/utilities/match_names/__init__.py (100%) rename src/{ => great_ai}/utilities/match_names/config.py (100%) rename src/{ => great_ai}/utilities/match_names/match_names.py (100%) rename src/{ => great_ai}/utilities/match_names/name_parts.py (100%) rename src/{ => great_ai}/utilities/parallel_map/__init__.py (100%) rename src/{ => great_ai}/utilities/parallel_map/get_config.py (100%) rename src/{ => great_ai}/utilities/parallel_map/manage_communication.py (100%) rename src/{ => great_ai}/utilities/parallel_map/manage_serial.py (100%) rename src/{ => great_ai}/utilities/parallel_map/mapper_function.py (100%) rename src/{ => great_ai}/utilities/parallel_map/parallel_map.py (100%) rename src/{ => great_ai}/utilities/parallel_map/parallel_map_configuration.py (100%) rename src/{ => great_ai}/utilities/parallel_map/threaded_parallel_map.py (100%) rename src/{ => great_ai}/utilities/parallel_map/worker_exception.py (100%) rename src/{ => great_ai}/utilities/unchunk.py (100%) rename src/{ => great_ai}/utilities/unique.py (62%) diff --git a/src/__main__.py b/src/__main__.py index a406903..ef5ea20 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -14,7 +14,7 @@ from uvicorn.supervisors.basereload import BaseReload from watchdog.events import FileSystemEvent, PatternMatchingEventHandler from watchdog.observers import Observer -from utilities import get_logger +from great_ai.utilities import get_logger from .great_ai.constants import SERVER_NAME from .great_ai.context import _is_in_production_mode diff --git a/src/great_ai/constants.py b/src/great_ai/constants.py index 6959826..d9078d0 100644 --- a/src/great_ai/constants.py +++ b/src/great_ai/constants.py @@ -1,4 +1,4 @@ -from large_file import LargeFileMongo, LargeFileS3 +from great_ai.large_file import LargeFileMongo, LargeFileS3 from .persistence.mongodb_driver import MongodbDriver diff --git a/src/great_ai/context.py b/src/great_ai/context.py index 2aad9c0..b382209 100644 --- a/src/great_ai/context.py +++ b/src/great_ai/context.py @@ -6,8 +6,8 @@ from typing import Any, Dict, Optional, Type, cast from pydantic import BaseModel -from large_file import LargeFileBase, LargeFileLocal -from utilities import get_logger +from great_ai.large_file import LargeFileBase, LargeFileLocal +from great_ai.utilities import get_logger from .constants import ( DEFAULT_LARGE_FILE_CONFIG_PATHS, diff --git a/src/great_ai/deploy/great_ai.py b/src/great_ai/deploy/great_ai.py index a5c8181..b2306b4 100644 --- a/src/great_ai/deploy/great_ai.py +++ b/src/great_ai/deploy/great_ai.py @@ -16,7 +16,7 @@ from typing import ( from fastapi import APIRouter, FastAPI, status from pydantic import BaseModel, create_model -from utilities import parallel_map +from great_ai.utilities import parallel_map from ..constants import DASHBOARD_PATH from ..context import get_context diff --git a/src/great_ai/deploy/routes/dashboard/create_dash_app.py b/src/great_ai/deploy/routes/dashboard/create_dash_app.py index fe5b70c..438f3e6 100644 --- a/src/great_ai/deploy/routes/dashboard/create_dash_app.py +++ b/src/great_ai/deploy/routes/dashboard/create_dash_app.py @@ -8,7 +8,7 @@ from dash import Dash, dcc, html from dash.dependencies import Input, Output from flask import Flask -from utilities import unique +from great_ai.utilities import unique from ....constants import DASHBOARD_PATH, ONLINE_TAG_NAME from ....context import get_context diff --git a/src/large_file/__init__.py b/src/great_ai/large_file/__init__.py similarity index 100% rename from src/large_file/__init__.py rename to src/great_ai/large_file/__init__.py diff --git a/src/large_file/__main__.py b/src/great_ai/large_file/__main__.py similarity index 92% rename from src/large_file/__main__.py rename to src/great_ai/large_file/__main__.py index 4182ab0..4e16274 100644 --- a/src/large_file/__main__.py +++ b/src/great_ai/large_file/__main__.py @@ -4,8 +4,13 @@ from argparse import Namespace from pathlib import Path from typing import Mapping, Type -from large_file import LargeFileBase, LargeFileLocal, LargeFileMongo, LargeFileS3 -from utilities import get_logger +from great_ai.large_file import ( + LargeFileBase, + LargeFileLocal, + LargeFileMongo, + LargeFileS3, +) +from great_ai.utilities import get_logger from .parse_arguments import parse_arguments diff --git a/src/large_file/helper/__init__.py b/src/great_ai/large_file/helper/__init__.py similarity index 100% rename from src/large_file/helper/__init__.py rename to src/great_ai/large_file/helper/__init__.py diff --git a/src/large_file/helper/bytes_to_megabytes.py b/src/great_ai/large_file/helper/bytes_to_megabytes.py similarity index 100% rename from src/large_file/helper/bytes_to_megabytes.py rename to src/great_ai/large_file/helper/bytes_to_megabytes.py diff --git a/src/large_file/helper/human_readable_to_byte.py b/src/great_ai/large_file/helper/human_readable_to_byte.py similarity index 100% rename from src/large_file/helper/human_readable_to_byte.py rename to src/great_ai/large_file/helper/human_readable_to_byte.py diff --git a/src/large_file/helper/progress_bar.py b/src/great_ai/large_file/helper/progress_bar.py similarity index 100% rename from src/large_file/helper/progress_bar.py rename to src/great_ai/large_file/helper/progress_bar.py diff --git a/src/large_file/large_file/__init__.py b/src/great_ai/large_file/large_file/__init__.py similarity index 100% rename from src/large_file/large_file/__init__.py rename to src/great_ai/large_file/large_file/__init__.py diff --git a/src/large_file/large_file/large_file_base.py b/src/great_ai/large_file/large_file/large_file_base.py similarity index 99% rename from src/large_file/large_file/large_file_base.py rename to src/great_ai/large_file/large_file/large_file_base.py index 0855104..621eef4 100644 --- a/src/large_file/large_file/large_file_base.py +++ b/src/great_ai/large_file/large_file/large_file_base.py @@ -7,7 +7,7 @@ from pathlib import Path from types import TracebackType from typing import IO, Any, List, Optional, Type, Union, cast -from utilities import ConfigFile, get_logger +from great_ai.utilities import ConfigFile, get_logger from ..helper import human_readable_to_byte from ..models import DataInstance diff --git a/src/large_file/large_file/large_file_local.py b/src/great_ai/large_file/large_file/large_file_local.py similarity index 97% rename from src/large_file/large_file/large_file_local.py rename to src/great_ai/large_file/large_file/large_file_local.py index 0930e7e..aa2eef6 100644 --- a/src/large_file/large_file/large_file_local.py +++ b/src/great_ai/large_file/large_file/large_file_local.py @@ -1,7 +1,7 @@ from pathlib import Path from typing import Any, List, Optional -from utilities import get_logger +from great_ai.utilities import get_logger from ..models import DataInstance from .large_file_base import LargeFileBase diff --git a/src/large_file/large_file/large_file_mongo.py b/src/great_ai/large_file/large_file/large_file_mongo.py similarity index 98% rename from src/large_file/large_file/large_file_mongo.py rename to src/great_ai/large_file/large_file/large_file_mongo.py index 9247f03..b6feac5 100644 --- a/src/large_file/large_file/large_file_mongo.py +++ b/src/great_ai/large_file/large_file/large_file_mongo.py @@ -6,7 +6,7 @@ from typing import Any, List, Mapping from gridfs import DEFAULT_CHUNK_SIZE, Database, GridFSBucket from pymongo import MongoClient -from utilities import get_logger +from great_ai.utilities import get_logger from ..helper import DownloadProgressBar, UploadProgressBar from ..models import DataInstance diff --git a/src/large_file/large_file/large_file_s3.py b/src/great_ai/large_file/large_file/large_file_s3.py similarity index 99% rename from src/large_file/large_file/large_file_s3.py rename to src/great_ai/large_file/large_file/large_file_s3.py index 9a05f42..3c80ec0 100644 --- a/src/large_file/large_file/large_file_s3.py +++ b/src/great_ai/large_file/large_file/large_file_s3.py @@ -4,7 +4,7 @@ from typing import Any, List, Mapping, Optional import boto3 -from utilities import get_logger +from great_ai.utilities import get_logger from ..helper import DownloadProgressBar, UploadProgressBar from ..models import DataInstance diff --git a/src/large_file/models/__init__.py b/src/great_ai/large_file/models/__init__.py similarity index 100% rename from src/large_file/models/__init__.py rename to src/great_ai/large_file/models/__init__.py diff --git a/src/large_file/models/data_instance.py b/src/great_ai/large_file/models/data_instance.py similarity index 100% rename from src/large_file/models/data_instance.py rename to src/great_ai/large_file/models/data_instance.py diff --git a/src/large_file/parse_arguments.py b/src/great_ai/large_file/parse_arguments.py similarity index 100% rename from src/large_file/parse_arguments.py rename to src/great_ai/large_file/parse_arguments.py diff --git a/src/great_ai/persistence/tracing_database_driver.py b/src/great_ai/persistence/tracing_database_driver.py index d87622d..0a7e06c 100644 --- a/src/great_ai/persistence/tracing_database_driver.py +++ b/src/great_ai/persistence/tracing_database_driver.py @@ -3,7 +3,7 @@ from datetime import datetime from pathlib import Path from typing import List, Optional, Sequence, Tuple, Union -from utilities import ConfigFile +from great_ai.utilities import ConfigFile from ..views import Filter, SortBy, Trace diff --git a/src/great_ai/remote/call_remote_great_ai.py b/src/great_ai/remote/call_remote_great_ai.py index 5fa11f1..3bd1a97 100644 --- a/src/great_ai/remote/call_remote_great_ai.py +++ b/src/great_ai/remote/call_remote_great_ai.py @@ -3,7 +3,7 @@ from typing import Any, Mapping, Optional, Type, TypeVar from pydantic import BaseModel -from utilities import get_logger +from great_ai.utilities import get_logger from ..views import Trace from .call_remote_great_ai_async import call_remote_great_ai_async diff --git a/src/utilities/__init__.py b/src/great_ai/utilities/__init__.py similarity index 100% rename from src/utilities/__init__.py rename to src/great_ai/utilities/__init__.py diff --git a/src/utilities/chunk.py b/src/great_ai/utilities/chunk.py similarity index 100% rename from src/utilities/chunk.py rename to src/great_ai/utilities/chunk.py diff --git a/src/utilities/clean.py b/src/great_ai/utilities/clean.py similarity index 100% rename from src/utilities/clean.py rename to src/great_ai/utilities/clean.py diff --git a/src/utilities/config_file/__init__.py b/src/great_ai/utilities/config_file/__init__.py similarity index 100% rename from src/utilities/config_file/__init__.py rename to src/great_ai/utilities/config_file/__init__.py diff --git a/src/utilities/config_file/config_file.py b/src/great_ai/utilities/config_file/config_file.py similarity index 100% rename from src/utilities/config_file/config_file.py rename to src/great_ai/utilities/config_file/config_file.py diff --git a/src/utilities/config_file/parse_error.py b/src/great_ai/utilities/config_file/parse_error.py similarity index 100% rename from src/utilities/config_file/parse_error.py rename to src/great_ai/utilities/config_file/parse_error.py diff --git a/src/utilities/config_file/pattern.py b/src/great_ai/utilities/config_file/pattern.py similarity index 100% rename from src/utilities/config_file/pattern.py rename to src/great_ai/utilities/config_file/pattern.py diff --git a/src/utilities/data/__init__.py b/src/great_ai/utilities/data/__init__.py similarity index 100% rename from src/utilities/data/__init__.py rename to src/great_ai/utilities/data/__init__.py diff --git a/src/utilities/data/american_spellings.py b/src/great_ai/utilities/data/american_spellings.py similarity index 100% rename from src/utilities/data/american_spellings.py rename to src/great_ai/utilities/data/american_spellings.py diff --git a/src/utilities/data/punctuations.py b/src/great_ai/utilities/data/punctuations.py similarity index 100% rename from src/utilities/data/punctuations.py rename to src/great_ai/utilities/data/punctuations.py diff --git a/src/utilities/evaluate_ranking/__init__.py b/src/great_ai/utilities/evaluate_ranking/__init__.py similarity index 100% rename from src/utilities/evaluate_ranking/__init__.py rename to src/great_ai/utilities/evaluate_ranking/__init__.py diff --git a/src/utilities/evaluate_ranking/draw_f1_iso_lines.py b/src/great_ai/utilities/evaluate_ranking/draw_f1_iso_lines.py similarity index 100% rename from src/utilities/evaluate_ranking/draw_f1_iso_lines.py rename to src/great_ai/utilities/evaluate_ranking/draw_f1_iso_lines.py diff --git a/src/utilities/evaluate_ranking/evaluate_ranking.py b/src/great_ai/utilities/evaluate_ranking/evaluate_ranking.py similarity index 100% rename from src/utilities/evaluate_ranking/evaluate_ranking.py rename to src/great_ai/utilities/evaluate_ranking/evaluate_ranking.py diff --git a/src/utilities/external/__init__.py b/src/great_ai/utilities/external/__init__.py similarity index 100% rename from src/utilities/external/__init__.py rename to src/great_ai/utilities/external/__init__.py diff --git a/src/utilities/external/pylatexenc/README.md b/src/great_ai/utilities/external/pylatexenc/README.md similarity index 100% rename from src/utilities/external/pylatexenc/README.md rename to src/great_ai/utilities/external/pylatexenc/README.md diff --git a/src/utilities/external/pylatexenc/__init__.py b/src/great_ai/utilities/external/pylatexenc/__init__.py similarity index 100% rename from src/utilities/external/pylatexenc/__init__.py rename to src/great_ai/utilities/external/pylatexenc/__init__.py diff --git a/src/utilities/external/pylatexenc/_util.py b/src/great_ai/utilities/external/pylatexenc/_util.py similarity index 100% rename from src/utilities/external/pylatexenc/_util.py rename to src/great_ai/utilities/external/pylatexenc/_util.py diff --git a/src/utilities/external/pylatexenc/latex2text/__init__.py b/src/great_ai/utilities/external/pylatexenc/latex2text/__init__.py similarity index 100% rename from src/utilities/external/pylatexenc/latex2text/__init__.py rename to src/great_ai/utilities/external/pylatexenc/latex2text/__init__.py diff --git a/src/utilities/external/pylatexenc/latex2text/__main__.py b/src/great_ai/utilities/external/pylatexenc/latex2text/__main__.py similarity index 100% rename from src/utilities/external/pylatexenc/latex2text/__main__.py rename to src/great_ai/utilities/external/pylatexenc/latex2text/__main__.py diff --git a/src/utilities/external/pylatexenc/latex2text/_defaultspecs.py b/src/great_ai/utilities/external/pylatexenc/latex2text/_defaultspecs.py similarity index 100% rename from src/utilities/external/pylatexenc/latex2text/_defaultspecs.py rename to src/great_ai/utilities/external/pylatexenc/latex2text/_defaultspecs.py diff --git a/src/utilities/external/pylatexenc/latexencode/__init__.py b/src/great_ai/utilities/external/pylatexenc/latexencode/__init__.py similarity index 100% rename from src/utilities/external/pylatexenc/latexencode/__init__.py rename to src/great_ai/utilities/external/pylatexenc/latexencode/__init__.py diff --git a/src/utilities/external/pylatexenc/latexencode/__main__.py b/src/great_ai/utilities/external/pylatexenc/latexencode/__main__.py similarity index 100% rename from src/utilities/external/pylatexenc/latexencode/__main__.py rename to src/great_ai/utilities/external/pylatexenc/latexencode/__main__.py diff --git a/src/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py b/src/great_ai/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py similarity index 100% rename from src/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py rename to src/great_ai/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py diff --git a/src/utilities/external/pylatexenc/latexencode/_uni2latexmap.py b/src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap.py similarity index 100% rename from src/utilities/external/pylatexenc/latexencode/_uni2latexmap.py rename to src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap.py diff --git a/src/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py b/src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py similarity index 100% rename from src/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py rename to src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py diff --git a/src/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py b/src/great_ai/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py similarity index 100% rename from src/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py rename to src/great_ai/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py diff --git a/src/utilities/external/pylatexenc/latexwalker/__init__.py b/src/great_ai/utilities/external/pylatexenc/latexwalker/__init__.py similarity index 100% rename from src/utilities/external/pylatexenc/latexwalker/__init__.py rename to src/great_ai/utilities/external/pylatexenc/latexwalker/__init__.py diff --git a/src/utilities/external/pylatexenc/latexwalker/__main__.py b/src/great_ai/utilities/external/pylatexenc/latexwalker/__main__.py similarity index 100% rename from src/utilities/external/pylatexenc/latexwalker/__main__.py rename to src/great_ai/utilities/external/pylatexenc/latexwalker/__main__.py diff --git a/src/utilities/external/pylatexenc/latexwalker/_defaultspecs.py b/src/great_ai/utilities/external/pylatexenc/latexwalker/_defaultspecs.py similarity index 100% rename from src/utilities/external/pylatexenc/latexwalker/_defaultspecs.py rename to src/great_ai/utilities/external/pylatexenc/latexwalker/_defaultspecs.py diff --git a/src/utilities/external/pylatexenc/macrospec/__init__.py b/src/great_ai/utilities/external/pylatexenc/macrospec/__init__.py similarity index 100% rename from src/utilities/external/pylatexenc/macrospec/__init__.py rename to src/great_ai/utilities/external/pylatexenc/macrospec/__init__.py diff --git a/src/utilities/external/pylatexenc/macrospec/_argparsers.py b/src/great_ai/utilities/external/pylatexenc/macrospec/_argparsers.py similarity index 100% rename from src/utilities/external/pylatexenc/macrospec/_argparsers.py rename to src/great_ai/utilities/external/pylatexenc/macrospec/_argparsers.py diff --git a/src/utilities/external/pylatexenc/version.py b/src/great_ai/utilities/external/pylatexenc/version.py similarity index 100% rename from src/utilities/external/pylatexenc/version.py rename to src/great_ai/utilities/external/pylatexenc/version.py diff --git a/src/utilities/get_sentences.py b/src/great_ai/utilities/get_sentences.py similarity index 100% rename from src/utilities/get_sentences.py rename to src/great_ai/utilities/get_sentences.py diff --git a/src/utilities/language/__init__.py b/src/great_ai/utilities/language/__init__.py similarity index 100% rename from src/utilities/language/__init__.py rename to src/great_ai/utilities/language/__init__.py diff --git a/src/utilities/language/english_name_of_language.py b/src/great_ai/utilities/language/english_name_of_language.py similarity index 100% rename from src/utilities/language/english_name_of_language.py rename to src/great_ai/utilities/language/english_name_of_language.py diff --git a/src/utilities/language/is_english.py b/src/great_ai/utilities/language/is_english.py similarity index 100% rename from src/utilities/language/is_english.py rename to src/great_ai/utilities/language/is_english.py diff --git a/src/utilities/language/predict_language.py b/src/great_ai/utilities/language/predict_language.py similarity index 100% rename from src/utilities/language/predict_language.py rename to src/great_ai/utilities/language/predict_language.py diff --git a/src/utilities/logger/__init__.py b/src/great_ai/utilities/logger/__init__.py similarity index 100% rename from src/utilities/logger/__init__.py rename to src/great_ai/utilities/logger/__init__.py diff --git a/src/utilities/logger/colors.py b/src/great_ai/utilities/logger/colors.py similarity index 100% rename from src/utilities/logger/colors.py rename to src/great_ai/utilities/logger/colors.py diff --git a/src/utilities/logger/custom_formatter.py b/src/great_ai/utilities/logger/custom_formatter.py similarity index 100% rename from src/utilities/logger/custom_formatter.py rename to src/great_ai/utilities/logger/custom_formatter.py diff --git a/src/utilities/logger/get_logger.py b/src/great_ai/utilities/logger/get_logger.py similarity index 100% rename from src/utilities/logger/get_logger.py rename to src/great_ai/utilities/logger/get_logger.py diff --git a/src/utilities/match_names/__init__.py b/src/great_ai/utilities/match_names/__init__.py similarity index 100% rename from src/utilities/match_names/__init__.py rename to src/great_ai/utilities/match_names/__init__.py diff --git a/src/utilities/match_names/config.py b/src/great_ai/utilities/match_names/config.py similarity index 100% rename from src/utilities/match_names/config.py rename to src/great_ai/utilities/match_names/config.py diff --git a/src/utilities/match_names/match_names.py b/src/great_ai/utilities/match_names/match_names.py similarity index 100% rename from src/utilities/match_names/match_names.py rename to src/great_ai/utilities/match_names/match_names.py diff --git a/src/utilities/match_names/name_parts.py b/src/great_ai/utilities/match_names/name_parts.py similarity index 100% rename from src/utilities/match_names/name_parts.py rename to src/great_ai/utilities/match_names/name_parts.py diff --git a/src/utilities/parallel_map/__init__.py b/src/great_ai/utilities/parallel_map/__init__.py similarity index 100% rename from src/utilities/parallel_map/__init__.py rename to src/great_ai/utilities/parallel_map/__init__.py diff --git a/src/utilities/parallel_map/get_config.py b/src/great_ai/utilities/parallel_map/get_config.py similarity index 100% rename from src/utilities/parallel_map/get_config.py rename to src/great_ai/utilities/parallel_map/get_config.py diff --git a/src/utilities/parallel_map/manage_communication.py b/src/great_ai/utilities/parallel_map/manage_communication.py similarity index 100% rename from src/utilities/parallel_map/manage_communication.py rename to src/great_ai/utilities/parallel_map/manage_communication.py diff --git a/src/utilities/parallel_map/manage_serial.py b/src/great_ai/utilities/parallel_map/manage_serial.py similarity index 100% rename from src/utilities/parallel_map/manage_serial.py rename to src/great_ai/utilities/parallel_map/manage_serial.py diff --git a/src/utilities/parallel_map/mapper_function.py b/src/great_ai/utilities/parallel_map/mapper_function.py similarity index 100% rename from src/utilities/parallel_map/mapper_function.py rename to src/great_ai/utilities/parallel_map/mapper_function.py diff --git a/src/utilities/parallel_map/parallel_map.py b/src/great_ai/utilities/parallel_map/parallel_map.py similarity index 100% rename from src/utilities/parallel_map/parallel_map.py rename to src/great_ai/utilities/parallel_map/parallel_map.py diff --git a/src/utilities/parallel_map/parallel_map_configuration.py b/src/great_ai/utilities/parallel_map/parallel_map_configuration.py similarity index 100% rename from src/utilities/parallel_map/parallel_map_configuration.py rename to src/great_ai/utilities/parallel_map/parallel_map_configuration.py diff --git a/src/utilities/parallel_map/threaded_parallel_map.py b/src/great_ai/utilities/parallel_map/threaded_parallel_map.py similarity index 100% rename from src/utilities/parallel_map/threaded_parallel_map.py rename to src/great_ai/utilities/parallel_map/threaded_parallel_map.py diff --git a/src/utilities/parallel_map/worker_exception.py b/src/great_ai/utilities/parallel_map/worker_exception.py similarity index 100% rename from src/utilities/parallel_map/worker_exception.py rename to src/great_ai/utilities/parallel_map/worker_exception.py diff --git a/src/utilities/unchunk.py b/src/great_ai/utilities/unchunk.py similarity index 100% rename from src/utilities/unchunk.py rename to src/great_ai/utilities/unchunk.py diff --git a/src/utilities/unique.py b/src/great_ai/utilities/unique.py similarity index 62% rename from src/utilities/unique.py rename to src/great_ai/utilities/unique.py index ac8a088..534133a 100644 --- a/src/utilities/unique.py +++ b/src/great_ai/utilities/unique.py @@ -1,10 +1,10 @@ -from typing import Any, Callable, Iterable, List +from typing import Any, Callable, Iterable, List, TypeVar + +T = TypeVar("T") -def unique( - values: Iterable[Any], *, key: Callable[[Any], Any] = lambda v: v -) -> List[Any]: - """Only keep first occurrences while maintaining original order. +def unique(values: Iterable[T], *, key: Callable[[T], Any] = lambda v: v) -> List[T]: + """Keep only the first occurrences while maintaining original order. The equality check used for deduplication can be overridden using the `key` argument. @@ -15,6 +15,13 @@ def unique( [{'a': 1, 'b': 2}] >>> unique([{'a': 1, 'b': 2}, {'a': 1, 'b': 3}], key=lambda v: v['b']) [{'a': 1, 'b': 2}, {'a': 1, 'b': 3}] + + Args: + values: An iterable containing your values + key: Override the identity function of the equality check. + + Returns: + A deduplicated list. """ key_values = {} diff --git a/tests/large_file/test_human_readable_to_byte.py b/tests/large_file/test_human_readable_to_byte.py index a36ab96..cc0e995 100644 --- a/tests/large_file/test_human_readable_to_byte.py +++ b/tests/large_file/test_human_readable_to_byte.py @@ -1,6 +1,6 @@ import unittest -from src.large_file.helper import human_readable_to_byte +from src.great_ai.large_file.helper import human_readable_to_byte class TestHumanReadableToByte(unittest.TestCase): diff --git a/tests/large_file/test_large_file.py b/tests/large_file/test_large_file.py index 68e4a10..4b1c32d 100644 --- a/tests/large_file/test_large_file.py +++ b/tests/large_file/test_large_file.py @@ -8,7 +8,7 @@ import boto3 PATH = Path(__file__).parent.resolve() -from src.large_file import LargeFileS3 +from src.great_ai.large_file import LargeFileS3 credentials = { "aws_region_name": "your_region_like_eu-west-2", diff --git a/tests/utilities/test_chunk.py b/tests/utilities/test_chunk.py index 1a814d5..2a80579 100644 --- a/tests/utilities/test_chunk.py +++ b/tests/utilities/test_chunk.py @@ -2,7 +2,7 @@ import unittest import pytest -from src.utilities import chunk +from src.great_ai.utilities import chunk class TestChunk(unittest.TestCase): diff --git a/tests/utilities/test_clean.py b/tests/utilities/test_clean.py index dd6595f..500cada 100644 --- a/tests/utilities/test_clean.py +++ b/tests/utilities/test_clean.py @@ -1,6 +1,6 @@ import unittest -from src.utilities import clean +from src.great_ai.utilities import clean class TestClean(unittest.TestCase): diff --git a/tests/utilities/test_config_file.py b/tests/utilities/test_config_file.py index dfa8ffd..5b55843 100644 --- a/tests/utilities/test_config_file.py +++ b/tests/utilities/test_config_file.py @@ -4,7 +4,7 @@ from pathlib import Path import pytest -from src.utilities import ConfigFile +from src.great_ai.utilities import ConfigFile DATA_PATH = Path(__file__).parent.resolve() / "data" diff --git a/tests/utilities/test_evaluate_ranking.py b/tests/utilities/test_evaluate_ranking.py index 9b54378..60d8226 100644 --- a/tests/utilities/test_evaluate_ranking.py +++ b/tests/utilities/test_evaluate_ranking.py @@ -5,7 +5,7 @@ import matplotlib matplotlib.use("Agg") # don't show a window for each test -from src.utilities import evaluate_ranking +from src.great_ai.utilities import evaluate_ranking class TestEvaluateRanking(unittest.TestCase): diff --git a/tests/utilities/test_get_sentences.py b/tests/utilities/test_get_sentences.py index f26ae0f..7d864f3 100644 --- a/tests/utilities/test_get_sentences.py +++ b/tests/utilities/test_get_sentences.py @@ -1,6 +1,6 @@ import unittest -from src.utilities import get_sentences +from src.great_ai.utilities import get_sentences class TestGetSentences(unittest.TestCase): diff --git a/tests/utilities/test_language.py b/tests/utilities/test_language.py index 67d2bd4..7aabac1 100644 --- a/tests/utilities/test_language.py +++ b/tests/utilities/test_language.py @@ -1,6 +1,10 @@ import unittest -from src.utilities import english_name_of_language, is_english, predict_language +from src.great_ai.utilities import ( + english_name_of_language, + is_english, + predict_language, +) class TestLanguage(unittest.TestCase): diff --git a/tests/utilities/test_match_names.py b/tests/utilities/test_match_names.py index 2c0c57a..5ee8d39 100644 --- a/tests/utilities/test_match_names.py +++ b/tests/utilities/test_match_names.py @@ -1,6 +1,6 @@ import unittest -from src.utilities import match_names +from src.great_ai.utilities import match_names class TestMatchNames(unittest.TestCase): diff --git a/tests/utilities/test_parallel_map.py b/tests/utilities/test_parallel_map.py index 0395fdb..7900d60 100644 --- a/tests/utilities/test_parallel_map.py +++ b/tests/utilities/test_parallel_map.py @@ -2,7 +2,7 @@ import unittest import pytest -from src.utilities import WorkerException, parallel_map +from src.great_ai.utilities import WorkerException, parallel_map COUNT = int(1e5) + 3 diff --git a/tests/utilities/test_threaded_parallel_map.py b/tests/utilities/test_threaded_parallel_map.py index 485997d..d421e90 100644 --- a/tests/utilities/test_threaded_parallel_map.py +++ b/tests/utilities/test_threaded_parallel_map.py @@ -2,7 +2,7 @@ import unittest import pytest -from src.utilities import WorkerException, threaded_parallel_map +from src.great_ai.utilities import WorkerException, threaded_parallel_map COUNT = int(1e5) + 3 diff --git a/tests/utilities/test_unique.py b/tests/utilities/test_unique.py index f1f82b8..e2204db 100644 --- a/tests/utilities/test_unique.py +++ b/tests/utilities/test_unique.py @@ -1,6 +1,6 @@ import unittest -from src.utilities import unique +from src.great_ai.utilities import unique original = [ ("a", 1),