diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9dd266a..07c8cd3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: if: always() uses: actions/upload-artifact@v2 with: - name: Unit test coverage (Python ${{ matrix.python-version }}) + name: Unit test coverage (Python ${{ matrix.python-version }} - ${{ matrix.operating-system }}) path: "*.xml" sonar: diff --git a/.vscode/settings.json b/.vscode/settings.json index 634cc9d..f681bc4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ "botocore", "Convolutional", "datatable", + "deduplicated", "displaylogo", "downsample", "fastapi", diff --git a/src/great_ai/__init__.py b/great_ai/__init__.py similarity index 100% rename from src/great_ai/__init__.py rename to great_ai/__init__.py diff --git a/src/__main__.py b/great_ai/__main__.py similarity index 95% rename from src/__main__.py rename to great_ai/__main__.py index ef5ea20..0e573cd 100644 --- a/src/__main__.py +++ b/great_ai/__main__.py @@ -8,20 +8,19 @@ from threading import Event from typing import Optional import uvicorn +from parse_arguments import parse_arguments from uvicorn._subprocess import get_subprocess from uvicorn.config import LOGGING_CONFIG, Config from uvicorn.supervisors.basereload import BaseReload from watchdog.events import FileSystemEvent, PatternMatchingEventHandler from watchdog.observers import Observer +from great_ai.constants import SERVER_NAME +from great_ai.context import _is_in_production_mode +from great_ai.deploy import GreatAI +from great_ai.exceptions import ArgumentValidationError, MissingArgumentError from great_ai.utilities import get_logger -from .great_ai.constants import SERVER_NAME -from .great_ai.context import _is_in_production_mode -from .great_ai.deploy import GreatAI -from .great_ai.exceptions import ArgumentValidationError, MissingArgumentError -from .parse_arguments import parse_arguments - logger = get_logger(SERVER_NAME) diff --git a/src/great_ai/constants.py b/great_ai/constants.py similarity index 93% rename from src/great_ai/constants.py rename to great_ai/constants.py index d9078d0..725768d 100644 --- a/src/great_ai/constants.py +++ b/great_ai/constants.py @@ -1,5 +1,4 @@ -from great_ai.large_file import LargeFileMongo, LargeFileS3 - +from .large_file import LargeFileMongo, LargeFileS3 from .persistence.mongodb_driver import MongodbDriver ENV_VAR_KEY = "ENVIRONMENT" diff --git a/src/great_ai/context.py b/great_ai/context.py similarity index 98% rename from src/great_ai/context.py rename to great_ai/context.py index b382209..3f076d6 100644 --- a/src/great_ai/context.py +++ b/great_ai/context.py @@ -6,9 +6,6 @@ from typing import Any, Dict, Optional, Type, cast from pydantic import BaseModel -from great_ai.large_file import LargeFileBase, LargeFileLocal -from great_ai.utilities import get_logger - from .constants import ( DEFAULT_LARGE_FILE_CONFIG_PATHS, DEFAULT_TRACING_DATABASE_CONFIG_PATHS, @@ -17,7 +14,9 @@ from .constants import ( PRODUCTION_KEY, SE4ML_WEBSITE, ) +from .large_file import LargeFileBase, LargeFileLocal from .persistence import ParallelTinyDbDriver, TracingDatabaseDriver +from .utilities import get_logger class Context(BaseModel): diff --git a/src/great_ai/deploy/__init__.py b/great_ai/deploy/__init__.py similarity index 100% rename from src/great_ai/deploy/__init__.py rename to great_ai/deploy/__init__.py diff --git a/src/great_ai/deploy/great_ai.py b/great_ai/deploy/great_ai.py similarity index 99% rename from src/great_ai/deploy/great_ai.py rename to great_ai/deploy/great_ai.py index b2306b4..813bd48 100644 --- a/src/great_ai/deploy/great_ai.py +++ b/great_ai/deploy/great_ai.py @@ -16,8 +16,6 @@ from typing import ( from fastapi import APIRouter, FastAPI, status from pydantic import BaseModel, create_model -from great_ai.utilities import parallel_map - from ..constants import DASHBOARD_PATH from ..context import get_context from ..helper import ( @@ -29,6 +27,7 @@ from ..helper import ( from ..models import model_versions from ..parameters import automatically_decorate_parameters from ..tracing.tracing_context import TracingContext +from ..utilities import parallel_map from ..views import ApiMetadata, CacheStatistics, HealthCheckResponse, Trace from .routes import ( bootstrap_docs_endpoints, diff --git a/src/great_ai/deploy/routes/__init__.py b/great_ai/deploy/routes/__init__.py similarity index 100% rename from src/great_ai/deploy/routes/__init__.py rename to great_ai/deploy/routes/__init__.py diff --git a/src/great_ai/deploy/routes/bootstrap_dashboard.py b/great_ai/deploy/routes/bootstrap_dashboard.py similarity index 100% rename from src/great_ai/deploy/routes/bootstrap_dashboard.py rename to great_ai/deploy/routes/bootstrap_dashboard.py diff --git a/src/great_ai/deploy/routes/bootstrap_docs_endpoints.py b/great_ai/deploy/routes/bootstrap_docs_endpoints.py similarity index 100% rename from src/great_ai/deploy/routes/bootstrap_docs_endpoints.py rename to great_ai/deploy/routes/bootstrap_docs_endpoints.py diff --git a/src/great_ai/deploy/routes/bootstrap_feedback_endpoints.py b/great_ai/deploy/routes/bootstrap_feedback_endpoints.py similarity index 100% rename from src/great_ai/deploy/routes/bootstrap_feedback_endpoints.py rename to great_ai/deploy/routes/bootstrap_feedback_endpoints.py diff --git a/src/great_ai/deploy/routes/bootstrap_trace_endpoints.py b/great_ai/deploy/routes/bootstrap_trace_endpoints.py similarity index 100% rename from src/great_ai/deploy/routes/bootstrap_trace_endpoints.py rename to great_ai/deploy/routes/bootstrap_trace_endpoints.py diff --git a/src/great_ai/deploy/routes/dashboard/__init__.py b/great_ai/deploy/routes/dashboard/__init__.py similarity index 100% rename from src/great_ai/deploy/routes/dashboard/__init__.py rename to great_ai/deploy/routes/dashboard/__init__.py diff --git a/src/__init__.py b/great_ai/deploy/routes/dashboard/assets/__init__.py similarity index 100% rename from src/__init__.py rename to great_ai/deploy/routes/dashboard/assets/__init__.py diff --git a/src/great_ai/deploy/routes/dashboard/assets/github.png b/great_ai/deploy/routes/dashboard/assets/github.png similarity index 100% rename from src/great_ai/deploy/routes/dashboard/assets/github.png rename to great_ai/deploy/routes/dashboard/assets/github.png diff --git a/src/great_ai/deploy/routes/dashboard/assets/index.css b/great_ai/deploy/routes/dashboard/assets/index.css similarity index 100% rename from src/great_ai/deploy/routes/dashboard/assets/index.css rename to great_ai/deploy/routes/dashboard/assets/index.css diff --git a/src/great_ai/deploy/routes/dashboard/create_dash_app.py b/great_ai/deploy/routes/dashboard/create_dash_app.py similarity index 99% rename from src/great_ai/deploy/routes/dashboard/create_dash_app.py rename to great_ai/deploy/routes/dashboard/create_dash_app.py index 438f3e6..54803dc 100644 --- a/src/great_ai/deploy/routes/dashboard/create_dash_app.py +++ b/great_ai/deploy/routes/dashboard/create_dash_app.py @@ -8,11 +8,10 @@ from dash import Dash, dcc, html from dash.dependencies import Input, Output from flask import Flask -from great_ai.utilities import unique - from ....constants import DASHBOARD_PATH, ONLINE_TAG_NAME from ....context import get_context from ....helper import freeze, snake_case_to_text, text_to_hex_color +from ....utilities import unique from ....views import SortBy, Trace from .get_description import get_description from .get_filter_from_datatable import get_filter_from_datatable diff --git a/src/great_ai/deploy/routes/dashboard/get_description.py b/great_ai/deploy/routes/dashboard/get_description.py similarity index 100% rename from src/great_ai/deploy/routes/dashboard/get_description.py rename to great_ai/deploy/routes/dashboard/get_description.py diff --git a/src/great_ai/deploy/routes/dashboard/get_filter_from_datatable.py b/great_ai/deploy/routes/dashboard/get_filter_from_datatable.py similarity index 100% rename from src/great_ai/deploy/routes/dashboard/get_filter_from_datatable.py rename to great_ai/deploy/routes/dashboard/get_filter_from_datatable.py diff --git a/src/great_ai/deploy/routes/dashboard/get_footer.py b/great_ai/deploy/routes/dashboard/get_footer.py similarity index 100% rename from src/great_ai/deploy/routes/dashboard/get_footer.py rename to great_ai/deploy/routes/dashboard/get_footer.py diff --git a/src/great_ai/deploy/routes/dashboard/get_traces_table.py b/great_ai/deploy/routes/dashboard/get_traces_table.py similarity index 100% rename from src/great_ai/deploy/routes/dashboard/get_traces_table.py rename to great_ai/deploy/routes/dashboard/get_traces_table.py diff --git a/src/great_ai/exceptions/__init__.py b/great_ai/exceptions/__init__.py similarity index 100% rename from src/great_ai/exceptions/__init__.py rename to great_ai/exceptions/__init__.py diff --git a/src/great_ai/exceptions/argument_validation_error.py b/great_ai/exceptions/argument_validation_error.py similarity index 100% rename from src/great_ai/exceptions/argument_validation_error.py rename to great_ai/exceptions/argument_validation_error.py diff --git a/src/great_ai/exceptions/missing_argument_error.py b/great_ai/exceptions/missing_argument_error.py similarity index 100% rename from src/great_ai/exceptions/missing_argument_error.py rename to great_ai/exceptions/missing_argument_error.py diff --git a/src/great_ai/exceptions/wrong_decorator_order_error.py b/great_ai/exceptions/wrong_decorator_order_error.py similarity index 100% rename from src/great_ai/exceptions/wrong_decorator_order_error.py rename to great_ai/exceptions/wrong_decorator_order_error.py diff --git a/src/great_ai/helper/__init__.py b/great_ai/helper/__init__.py similarity index 100% rename from src/great_ai/helper/__init__.py rename to great_ai/helper/__init__.py diff --git a/src/great_ai/helper/assert_function_is_not_finalised.py b/great_ai/helper/assert_function_is_not_finalised.py similarity index 100% rename from src/great_ai/helper/assert_function_is_not_finalised.py rename to great_ai/helper/assert_function_is_not_finalised.py diff --git a/src/great_ai/helper/freeze_arguments.py b/great_ai/helper/freeze_arguments.py similarity index 100% rename from src/great_ai/helper/freeze_arguments.py rename to great_ai/helper/freeze_arguments.py diff --git a/src/great_ai/helper/get_arguments.py b/great_ai/helper/get_arguments.py similarity index 100% rename from src/great_ai/helper/get_arguments.py rename to great_ai/helper/get_arguments.py diff --git a/src/great_ai/helper/get_function_metadata_store.py b/great_ai/helper/get_function_metadata_store.py similarity index 100% rename from src/great_ai/helper/get_function_metadata_store.py rename to great_ai/helper/get_function_metadata_store.py diff --git a/src/great_ai/helper/hashable_base_model.py b/great_ai/helper/hashable_base_model.py similarity index 100% rename from src/great_ai/helper/hashable_base_model.py rename to great_ai/helper/hashable_base_model.py diff --git a/src/great_ai/helper/snake_case_to_text.py b/great_ai/helper/snake_case_to_text.py similarity index 100% rename from src/great_ai/helper/snake_case_to_text.py rename to great_ai/helper/snake_case_to_text.py diff --git a/src/great_ai/helper/strip_lines.py b/great_ai/helper/strip_lines.py similarity index 100% rename from src/great_ai/helper/strip_lines.py rename to great_ai/helper/strip_lines.py diff --git a/src/great_ai/helper/text_to_hex_color.py b/great_ai/helper/text_to_hex_color.py similarity index 100% rename from src/great_ai/helper/text_to_hex_color.py rename to great_ai/helper/text_to_hex_color.py diff --git a/src/great_ai/helper/use_http_exceptions.py b/great_ai/helper/use_http_exceptions.py similarity index 100% rename from src/great_ai/helper/use_http_exceptions.py rename to great_ai/helper/use_http_exceptions.py diff --git a/src/great_ai/large_file/__init__.py b/great_ai/large_file/__init__.py similarity index 100% rename from src/great_ai/large_file/__init__.py rename to great_ai/large_file/__init__.py diff --git a/src/great_ai/large_file/__main__.py b/great_ai/large_file/__main__.py similarity index 91% rename from src/great_ai/large_file/__main__.py rename to great_ai/large_file/__main__.py index 4e16274..576f781 100644 --- a/src/great_ai/large_file/__main__.py +++ b/great_ai/large_file/__main__.py @@ -4,14 +4,8 @@ from argparse import Namespace from pathlib import Path from typing import Mapping, Type -from great_ai.large_file import ( - LargeFileBase, - LargeFileLocal, - LargeFileMongo, - LargeFileS3, -) -from great_ai.utilities import get_logger - +from ..utilities import get_logger +from .large_file import LargeFileBase, LargeFileLocal, LargeFileMongo, LargeFileS3 from .parse_arguments import parse_arguments logger = get_logger("large_file") diff --git a/src/great_ai/large_file/helper/__init__.py b/great_ai/large_file/helper/__init__.py similarity index 100% rename from src/great_ai/large_file/helper/__init__.py rename to great_ai/large_file/helper/__init__.py diff --git a/src/great_ai/large_file/helper/bytes_to_megabytes.py b/great_ai/large_file/helper/bytes_to_megabytes.py similarity index 100% rename from src/great_ai/large_file/helper/bytes_to_megabytes.py rename to great_ai/large_file/helper/bytes_to_megabytes.py diff --git a/src/great_ai/large_file/helper/human_readable_to_byte.py b/great_ai/large_file/helper/human_readable_to_byte.py similarity index 100% rename from src/great_ai/large_file/helper/human_readable_to_byte.py rename to great_ai/large_file/helper/human_readable_to_byte.py diff --git a/src/great_ai/large_file/helper/progress_bar.py b/great_ai/large_file/helper/progress_bar.py similarity index 100% rename from src/great_ai/large_file/helper/progress_bar.py rename to great_ai/large_file/helper/progress_bar.py diff --git a/src/great_ai/large_file/large_file/__init__.py b/great_ai/large_file/large_file/__init__.py similarity index 100% rename from src/great_ai/large_file/large_file/__init__.py rename to great_ai/large_file/large_file/__init__.py diff --git a/src/great_ai/large_file/large_file/large_file_base.py b/great_ai/large_file/large_file/large_file_base.py similarity index 100% rename from src/great_ai/large_file/large_file/large_file_base.py rename to great_ai/large_file/large_file/large_file_base.py diff --git a/src/great_ai/large_file/large_file/large_file_local.py b/great_ai/large_file/large_file/large_file_local.py similarity index 97% rename from src/great_ai/large_file/large_file/large_file_local.py rename to great_ai/large_file/large_file/large_file_local.py index aa2eef6..6b31762 100644 --- a/src/great_ai/large_file/large_file/large_file_local.py +++ b/great_ai/large_file/large_file/large_file_local.py @@ -1,8 +1,7 @@ from pathlib import Path from typing import Any, List, Optional -from great_ai.utilities import get_logger - +from ...utilities import get_logger from ..models import DataInstance from .large_file_base import LargeFileBase diff --git a/src/great_ai/large_file/large_file/large_file_mongo.py b/great_ai/large_file/large_file/large_file_mongo.py similarity index 98% rename from src/great_ai/large_file/large_file/large_file_mongo.py rename to great_ai/large_file/large_file/large_file_mongo.py index b6feac5..60a1601 100644 --- a/src/great_ai/large_file/large_file/large_file_mongo.py +++ b/great_ai/large_file/large_file/large_file_mongo.py @@ -6,8 +6,7 @@ from typing import Any, List, Mapping from gridfs import DEFAULT_CHUNK_SIZE, Database, GridFSBucket from pymongo import MongoClient -from great_ai.utilities import get_logger - +from ...utilities import get_logger from ..helper import DownloadProgressBar, UploadProgressBar from ..models import DataInstance from .large_file_base import LargeFileBase diff --git a/src/great_ai/large_file/large_file/large_file_s3.py b/great_ai/large_file/large_file/large_file_s3.py similarity index 99% rename from src/great_ai/large_file/large_file/large_file_s3.py rename to great_ai/large_file/large_file/large_file_s3.py index 3c80ec0..a8c8005 100644 --- a/src/great_ai/large_file/large_file/large_file_s3.py +++ b/great_ai/large_file/large_file/large_file_s3.py @@ -4,8 +4,7 @@ from typing import Any, List, Mapping, Optional import boto3 -from great_ai.utilities import get_logger - +from ...utilities import get_logger from ..helper import DownloadProgressBar, UploadProgressBar from ..models import DataInstance from .large_file_base import LargeFileBase diff --git a/src/great_ai/large_file/models/__init__.py b/great_ai/large_file/models/__init__.py similarity index 100% rename from src/great_ai/large_file/models/__init__.py rename to great_ai/large_file/models/__init__.py diff --git a/src/great_ai/large_file/models/data_instance.py b/great_ai/large_file/models/data_instance.py similarity index 100% rename from src/great_ai/large_file/models/data_instance.py rename to great_ai/large_file/models/data_instance.py diff --git a/src/great_ai/large_file/parse_arguments.py b/great_ai/large_file/parse_arguments.py similarity index 100% rename from src/great_ai/large_file/parse_arguments.py rename to great_ai/large_file/parse_arguments.py diff --git a/src/great_ai/models/__init__.py b/great_ai/models/__init__.py similarity index 100% rename from src/great_ai/models/__init__.py rename to great_ai/models/__init__.py diff --git a/src/great_ai/models/save_model.py b/great_ai/models/save_model.py similarity index 100% rename from src/great_ai/models/save_model.py rename to great_ai/models/save_model.py diff --git a/src/great_ai/models/use_model.py b/great_ai/models/use_model.py similarity index 100% rename from src/great_ai/models/use_model.py rename to great_ai/models/use_model.py diff --git a/src/great_ai/output_views/__init__.py b/great_ai/output_views/__init__.py similarity index 100% rename from src/great_ai/output_views/__init__.py rename to great_ai/output_views/__init__.py diff --git a/src/great_ai/output_views/classification_output.py b/great_ai/output_views/classification_output.py similarity index 100% rename from src/great_ai/output_views/classification_output.py rename to great_ai/output_views/classification_output.py diff --git a/src/great_ai/output_views/multi_label_classification_output.py b/great_ai/output_views/multi_label_classification_output.py similarity index 100% rename from src/great_ai/output_views/multi_label_classification_output.py rename to great_ai/output_views/multi_label_classification_output.py diff --git a/src/great_ai/output_views/regression_output.py b/great_ai/output_views/regression_output.py similarity index 100% rename from src/great_ai/output_views/regression_output.py rename to great_ai/output_views/regression_output.py diff --git a/src/great_ai/output_views/sequence_labeling_output.py b/great_ai/output_views/sequence_labeling_output.py similarity index 100% rename from src/great_ai/output_views/sequence_labeling_output.py rename to great_ai/output_views/sequence_labeling_output.py diff --git a/src/great_ai/parameters/__init__.py b/great_ai/parameters/__init__.py similarity index 100% rename from src/great_ai/parameters/__init__.py rename to great_ai/parameters/__init__.py diff --git a/src/great_ai/parameters/automatically_decorate_parameters.py b/great_ai/parameters/automatically_decorate_parameters.py similarity index 100% rename from src/great_ai/parameters/automatically_decorate_parameters.py rename to great_ai/parameters/automatically_decorate_parameters.py diff --git a/src/great_ai/parameters/log_metric.py b/great_ai/parameters/log_metric.py similarity index 100% rename from src/great_ai/parameters/log_metric.py rename to great_ai/parameters/log_metric.py diff --git a/src/great_ai/parameters/parameter.py b/great_ai/parameters/parameter.py similarity index 100% rename from src/great_ai/parameters/parameter.py rename to great_ai/parameters/parameter.py diff --git a/src/parse_arguments.py b/great_ai/parse_arguments.py similarity index 100% rename from src/parse_arguments.py rename to great_ai/parse_arguments.py diff --git a/src/great_ai/persistence/__init__.py b/great_ai/persistence/__init__.py similarity index 100% rename from src/great_ai/persistence/__init__.py rename to great_ai/persistence/__init__.py diff --git a/src/great_ai/persistence/mongodb_driver.py b/great_ai/persistence/mongodb_driver.py similarity index 100% rename from src/great_ai/persistence/mongodb_driver.py rename to great_ai/persistence/mongodb_driver.py diff --git a/src/great_ai/persistence/parallel_tinydb_driver.py b/great_ai/persistence/parallel_tinydb_driver.py similarity index 100% rename from src/great_ai/persistence/parallel_tinydb_driver.py rename to great_ai/persistence/parallel_tinydb_driver.py diff --git a/src/great_ai/persistence/tracing_database_driver.py b/great_ai/persistence/tracing_database_driver.py similarity index 97% rename from src/great_ai/persistence/tracing_database_driver.py rename to great_ai/persistence/tracing_database_driver.py index 0a7e06c..17cccfc 100644 --- a/src/great_ai/persistence/tracing_database_driver.py +++ b/great_ai/persistence/tracing_database_driver.py @@ -3,8 +3,7 @@ from datetime import datetime from pathlib import Path from typing import List, Optional, Sequence, Tuple, Union -from great_ai.utilities import ConfigFile - +from ..utilities import ConfigFile from ..views import Filter, SortBy, Trace diff --git a/src/great_ai/remote/__init__.py b/great_ai/remote/__init__.py similarity index 100% rename from src/great_ai/remote/__init__.py rename to great_ai/remote/__init__.py diff --git a/src/great_ai/remote/call_remote_great_ai.py b/great_ai/remote/call_remote_great_ai.py similarity index 100% rename from src/great_ai/remote/call_remote_great_ai.py rename to great_ai/remote/call_remote_great_ai.py diff --git a/src/great_ai/remote/call_remote_great_ai_async.py b/great_ai/remote/call_remote_great_ai_async.py similarity index 100% rename from src/great_ai/remote/call_remote_great_ai_async.py rename to great_ai/remote/call_remote_great_ai_async.py diff --git a/src/great_ai/remote/http_client.py b/great_ai/remote/http_client.py similarity index 100% rename from src/great_ai/remote/http_client.py rename to great_ai/remote/http_client.py diff --git a/src/great_ai/remote/remote_call_error.py b/great_ai/remote/remote_call_error.py similarity index 100% rename from src/great_ai/remote/remote_call_error.py rename to great_ai/remote/remote_call_error.py diff --git a/src/great_ai/tracing/__init__.py b/great_ai/tracing/__init__.py similarity index 100% rename from src/great_ai/tracing/__init__.py rename to great_ai/tracing/__init__.py diff --git a/src/great_ai/tracing/add_ground_truth.py b/great_ai/tracing/add_ground_truth.py similarity index 100% rename from src/great_ai/tracing/add_ground_truth.py rename to great_ai/tracing/add_ground_truth.py diff --git a/src/great_ai/tracing/delete_ground_truth.py b/great_ai/tracing/delete_ground_truth.py similarity index 100% rename from src/great_ai/tracing/delete_ground_truth.py rename to great_ai/tracing/delete_ground_truth.py diff --git a/src/great_ai/tracing/query_ground_truth.py b/great_ai/tracing/query_ground_truth.py similarity index 100% rename from src/great_ai/tracing/query_ground_truth.py rename to great_ai/tracing/query_ground_truth.py diff --git a/src/great_ai/tracing/tracing_context.py b/great_ai/tracing/tracing_context.py similarity index 100% rename from src/great_ai/tracing/tracing_context.py rename to great_ai/tracing/tracing_context.py diff --git a/src/great_ai/utilities/__init__.py b/great_ai/utilities/__init__.py similarity index 100% rename from src/great_ai/utilities/__init__.py rename to great_ai/utilities/__init__.py diff --git a/src/great_ai/utilities/chunk.py b/great_ai/utilities/chunk.py similarity index 100% rename from src/great_ai/utilities/chunk.py rename to great_ai/utilities/chunk.py diff --git a/src/great_ai/utilities/clean.py b/great_ai/utilities/clean.py similarity index 100% rename from src/great_ai/utilities/clean.py rename to great_ai/utilities/clean.py diff --git a/src/great_ai/utilities/config_file/__init__.py b/great_ai/utilities/config_file/__init__.py similarity index 100% rename from src/great_ai/utilities/config_file/__init__.py rename to great_ai/utilities/config_file/__init__.py diff --git a/src/great_ai/utilities/config_file/config_file.py b/great_ai/utilities/config_file/config_file.py similarity index 100% rename from src/great_ai/utilities/config_file/config_file.py rename to great_ai/utilities/config_file/config_file.py diff --git a/src/great_ai/utilities/config_file/parse_error.py b/great_ai/utilities/config_file/parse_error.py similarity index 100% rename from src/great_ai/utilities/config_file/parse_error.py rename to great_ai/utilities/config_file/parse_error.py diff --git a/src/great_ai/utilities/config_file/pattern.py b/great_ai/utilities/config_file/pattern.py similarity index 100% rename from src/great_ai/utilities/config_file/pattern.py rename to great_ai/utilities/config_file/pattern.py diff --git a/src/great_ai/utilities/data/__init__.py b/great_ai/utilities/data/__init__.py similarity index 100% rename from src/great_ai/utilities/data/__init__.py rename to great_ai/utilities/data/__init__.py diff --git a/src/great_ai/utilities/data/american_spellings.py b/great_ai/utilities/data/american_spellings.py similarity index 100% rename from src/great_ai/utilities/data/american_spellings.py rename to great_ai/utilities/data/american_spellings.py diff --git a/src/great_ai/utilities/data/punctuations.py b/great_ai/utilities/data/punctuations.py similarity index 100% rename from src/great_ai/utilities/data/punctuations.py rename to great_ai/utilities/data/punctuations.py diff --git a/src/great_ai/utilities/evaluate_ranking/__init__.py b/great_ai/utilities/evaluate_ranking/__init__.py similarity index 100% rename from src/great_ai/utilities/evaluate_ranking/__init__.py rename to great_ai/utilities/evaluate_ranking/__init__.py diff --git a/src/great_ai/utilities/evaluate_ranking/draw_f1_iso_lines.py b/great_ai/utilities/evaluate_ranking/draw_f1_iso_lines.py similarity index 100% rename from src/great_ai/utilities/evaluate_ranking/draw_f1_iso_lines.py rename to great_ai/utilities/evaluate_ranking/draw_f1_iso_lines.py diff --git a/src/great_ai/utilities/evaluate_ranking/evaluate_ranking.py b/great_ai/utilities/evaluate_ranking/evaluate_ranking.py similarity index 100% rename from src/great_ai/utilities/evaluate_ranking/evaluate_ranking.py rename to great_ai/utilities/evaluate_ranking/evaluate_ranking.py diff --git a/src/great_ai/deploy/routes/dashboard/assets/__init__.py b/great_ai/utilities/external/__init__.py similarity index 100% rename from src/great_ai/deploy/routes/dashboard/assets/__init__.py rename to great_ai/utilities/external/__init__.py diff --git a/src/great_ai/utilities/external/pylatexenc/README.md b/great_ai/utilities/external/pylatexenc/README.md similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/README.md rename to great_ai/utilities/external/pylatexenc/README.md diff --git a/src/great_ai/utilities/external/pylatexenc/__init__.py b/great_ai/utilities/external/pylatexenc/__init__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/__init__.py rename to great_ai/utilities/external/pylatexenc/__init__.py diff --git a/src/great_ai/utilities/external/pylatexenc/_util.py b/great_ai/utilities/external/pylatexenc/_util.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/_util.py rename to great_ai/utilities/external/pylatexenc/_util.py diff --git a/src/great_ai/utilities/external/pylatexenc/latex2text/__init__.py b/great_ai/utilities/external/pylatexenc/latex2text/__init__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latex2text/__init__.py rename to great_ai/utilities/external/pylatexenc/latex2text/__init__.py diff --git a/src/great_ai/utilities/external/pylatexenc/latex2text/__main__.py b/great_ai/utilities/external/pylatexenc/latex2text/__main__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latex2text/__main__.py rename to great_ai/utilities/external/pylatexenc/latex2text/__main__.py diff --git a/src/great_ai/utilities/external/pylatexenc/latex2text/_defaultspecs.py b/great_ai/utilities/external/pylatexenc/latex2text/_defaultspecs.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latex2text/_defaultspecs.py rename to great_ai/utilities/external/pylatexenc/latex2text/_defaultspecs.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexencode/__init__.py b/great_ai/utilities/external/pylatexenc/latexencode/__init__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexencode/__init__.py rename to great_ai/utilities/external/pylatexenc/latexencode/__init__.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexencode/__main__.py b/great_ai/utilities/external/pylatexenc/latexencode/__main__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexencode/__main__.py rename to great_ai/utilities/external/pylatexenc/latexencode/__main__.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py b/great_ai/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py rename to great_ai/utilities/external/pylatexenc/latexencode/_partial_latex_encoder.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap.py b/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap.py rename to great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py b/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py rename to great_ai/utilities/external/pylatexenc/latexencode/_uni2latexmap_xml.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py b/great_ai/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py rename to great_ai/utilities/external/pylatexenc/latexencode/_unicode_to_latex_encoder.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexwalker/__init__.py b/great_ai/utilities/external/pylatexenc/latexwalker/__init__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexwalker/__init__.py rename to great_ai/utilities/external/pylatexenc/latexwalker/__init__.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexwalker/__main__.py b/great_ai/utilities/external/pylatexenc/latexwalker/__main__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexwalker/__main__.py rename to great_ai/utilities/external/pylatexenc/latexwalker/__main__.py diff --git a/src/great_ai/utilities/external/pylatexenc/latexwalker/_defaultspecs.py b/great_ai/utilities/external/pylatexenc/latexwalker/_defaultspecs.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/latexwalker/_defaultspecs.py rename to great_ai/utilities/external/pylatexenc/latexwalker/_defaultspecs.py diff --git a/src/great_ai/utilities/external/pylatexenc/macrospec/__init__.py b/great_ai/utilities/external/pylatexenc/macrospec/__init__.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/macrospec/__init__.py rename to great_ai/utilities/external/pylatexenc/macrospec/__init__.py diff --git a/src/great_ai/utilities/external/pylatexenc/macrospec/_argparsers.py b/great_ai/utilities/external/pylatexenc/macrospec/_argparsers.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/macrospec/_argparsers.py rename to great_ai/utilities/external/pylatexenc/macrospec/_argparsers.py diff --git a/src/great_ai/utilities/external/pylatexenc/version.py b/great_ai/utilities/external/pylatexenc/version.py similarity index 100% rename from src/great_ai/utilities/external/pylatexenc/version.py rename to great_ai/utilities/external/pylatexenc/version.py diff --git a/src/great_ai/utilities/get_sentences.py b/great_ai/utilities/get_sentences.py similarity index 100% rename from src/great_ai/utilities/get_sentences.py rename to great_ai/utilities/get_sentences.py diff --git a/src/great_ai/utilities/language/__init__.py b/great_ai/utilities/language/__init__.py similarity index 100% rename from src/great_ai/utilities/language/__init__.py rename to great_ai/utilities/language/__init__.py diff --git a/src/great_ai/utilities/language/english_name_of_language.py b/great_ai/utilities/language/english_name_of_language.py similarity index 100% rename from src/great_ai/utilities/language/english_name_of_language.py rename to great_ai/utilities/language/english_name_of_language.py diff --git a/src/great_ai/utilities/language/is_english.py b/great_ai/utilities/language/is_english.py similarity index 100% rename from src/great_ai/utilities/language/is_english.py rename to great_ai/utilities/language/is_english.py diff --git a/src/great_ai/utilities/language/predict_language.py b/great_ai/utilities/language/predict_language.py similarity index 100% rename from src/great_ai/utilities/language/predict_language.py rename to great_ai/utilities/language/predict_language.py diff --git a/src/great_ai/utilities/logger/__init__.py b/great_ai/utilities/logger/__init__.py similarity index 100% rename from src/great_ai/utilities/logger/__init__.py rename to great_ai/utilities/logger/__init__.py diff --git a/src/great_ai/utilities/logger/colors.py b/great_ai/utilities/logger/colors.py similarity index 100% rename from src/great_ai/utilities/logger/colors.py rename to great_ai/utilities/logger/colors.py diff --git a/src/great_ai/utilities/logger/custom_formatter.py b/great_ai/utilities/logger/custom_formatter.py similarity index 100% rename from src/great_ai/utilities/logger/custom_formatter.py rename to great_ai/utilities/logger/custom_formatter.py diff --git a/src/great_ai/utilities/logger/get_logger.py b/great_ai/utilities/logger/get_logger.py similarity index 100% rename from src/great_ai/utilities/logger/get_logger.py rename to great_ai/utilities/logger/get_logger.py diff --git a/src/great_ai/utilities/match_names/__init__.py b/great_ai/utilities/match_names/__init__.py similarity index 100% rename from src/great_ai/utilities/match_names/__init__.py rename to great_ai/utilities/match_names/__init__.py diff --git a/src/great_ai/utilities/match_names/config.py b/great_ai/utilities/match_names/config.py similarity index 100% rename from src/great_ai/utilities/match_names/config.py rename to great_ai/utilities/match_names/config.py diff --git a/src/great_ai/utilities/match_names/match_names.py b/great_ai/utilities/match_names/match_names.py similarity index 100% rename from src/great_ai/utilities/match_names/match_names.py rename to great_ai/utilities/match_names/match_names.py diff --git a/src/great_ai/utilities/match_names/name_parts.py b/great_ai/utilities/match_names/name_parts.py similarity index 100% rename from src/great_ai/utilities/match_names/name_parts.py rename to great_ai/utilities/match_names/name_parts.py diff --git a/src/great_ai/utilities/parallel_map/__init__.py b/great_ai/utilities/parallel_map/__init__.py similarity index 100% rename from src/great_ai/utilities/parallel_map/__init__.py rename to great_ai/utilities/parallel_map/__init__.py diff --git a/src/great_ai/utilities/parallel_map/get_config.py b/great_ai/utilities/parallel_map/get_config.py similarity index 100% rename from src/great_ai/utilities/parallel_map/get_config.py rename to great_ai/utilities/parallel_map/get_config.py diff --git a/src/great_ai/utilities/parallel_map/manage_communication.py b/great_ai/utilities/parallel_map/manage_communication.py similarity index 100% rename from src/great_ai/utilities/parallel_map/manage_communication.py rename to great_ai/utilities/parallel_map/manage_communication.py diff --git a/src/great_ai/utilities/parallel_map/manage_serial.py b/great_ai/utilities/parallel_map/manage_serial.py similarity index 100% rename from src/great_ai/utilities/parallel_map/manage_serial.py rename to great_ai/utilities/parallel_map/manage_serial.py diff --git a/src/great_ai/utilities/parallel_map/mapper_function.py b/great_ai/utilities/parallel_map/mapper_function.py similarity index 100% rename from src/great_ai/utilities/parallel_map/mapper_function.py rename to great_ai/utilities/parallel_map/mapper_function.py diff --git a/src/great_ai/utilities/parallel_map/parallel_map.py b/great_ai/utilities/parallel_map/parallel_map.py similarity index 100% rename from src/great_ai/utilities/parallel_map/parallel_map.py rename to great_ai/utilities/parallel_map/parallel_map.py diff --git a/src/great_ai/utilities/parallel_map/parallel_map_configuration.py b/great_ai/utilities/parallel_map/parallel_map_configuration.py similarity index 100% rename from src/great_ai/utilities/parallel_map/parallel_map_configuration.py rename to great_ai/utilities/parallel_map/parallel_map_configuration.py diff --git a/src/great_ai/utilities/parallel_map/threaded_parallel_map.py b/great_ai/utilities/parallel_map/threaded_parallel_map.py similarity index 100% rename from src/great_ai/utilities/parallel_map/threaded_parallel_map.py rename to great_ai/utilities/parallel_map/threaded_parallel_map.py diff --git a/src/great_ai/utilities/parallel_map/worker_exception.py b/great_ai/utilities/parallel_map/worker_exception.py similarity index 100% rename from src/great_ai/utilities/parallel_map/worker_exception.py rename to great_ai/utilities/parallel_map/worker_exception.py diff --git a/src/great_ai/utilities/unchunk.py b/great_ai/utilities/unchunk.py similarity index 100% rename from src/great_ai/utilities/unchunk.py rename to great_ai/utilities/unchunk.py diff --git a/src/great_ai/utilities/unique.py b/great_ai/utilities/unique.py similarity index 100% rename from src/great_ai/utilities/unique.py rename to great_ai/utilities/unique.py diff --git a/src/great_ai/views/__init__.py b/great_ai/views/__init__.py similarity index 100% rename from src/great_ai/views/__init__.py rename to great_ai/views/__init__.py diff --git a/src/great_ai/views/api_metadata.py b/great_ai/views/api_metadata.py similarity index 100% rename from src/great_ai/views/api_metadata.py rename to great_ai/views/api_metadata.py diff --git a/src/great_ai/views/cache_statistics.py b/great_ai/views/cache_statistics.py similarity index 100% rename from src/great_ai/views/cache_statistics.py rename to great_ai/views/cache_statistics.py diff --git a/src/great_ai/views/evaluation_feedback_request.py b/great_ai/views/evaluation_feedback_request.py similarity index 100% rename from src/great_ai/views/evaluation_feedback_request.py rename to great_ai/views/evaluation_feedback_request.py diff --git a/src/great_ai/views/filter.py b/great_ai/views/filter.py similarity index 100% rename from src/great_ai/views/filter.py rename to great_ai/views/filter.py diff --git a/src/great_ai/views/function_metadata.py b/great_ai/views/function_metadata.py similarity index 100% rename from src/great_ai/views/function_metadata.py rename to great_ai/views/function_metadata.py diff --git a/src/great_ai/views/health_check_response.py b/great_ai/views/health_check_response.py similarity index 100% rename from src/great_ai/views/health_check_response.py rename to great_ai/views/health_check_response.py diff --git a/src/great_ai/views/model.py b/great_ai/views/model.py similarity index 100% rename from src/great_ai/views/model.py rename to great_ai/views/model.py diff --git a/src/great_ai/views/operators.py b/great_ai/views/operators.py similarity index 100% rename from src/great_ai/views/operators.py rename to great_ai/views/operators.py diff --git a/src/great_ai/views/query.py b/great_ai/views/query.py similarity index 100% rename from src/great_ai/views/query.py rename to great_ai/views/query.py diff --git a/src/great_ai/views/sort_by.py b/great_ai/views/sort_by.py similarity index 100% rename from src/great_ai/views/sort_by.py rename to great_ai/views/sort_by.py diff --git a/src/great_ai/views/trace.py b/great_ai/views/trace.py similarity index 100% rename from src/great_ai/views/trace.py rename to great_ai/views/trace.py diff --git a/src/great_ai/utilities/external/__init__.py b/src/great_ai/utilities/external/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/great_ai/test_basic_starters.py b/tests/great_ai/test_basic_starters.py index 817d28e..f42e97c 100644 --- a/tests/great_ai/test_basic_starters.py +++ b/tests/great_ai/test_basic_starters.py @@ -3,7 +3,7 @@ from functools import lru_cache import pytest -from src.great_ai import ( +from great_ai import ( ArgumentValidationError, GreatAI, WrongDecoratorOrderError, diff --git a/tests/large_file/test_human_readable_to_byte.py b/tests/large_file/test_human_readable_to_byte.py index cc0e995..dadb63d 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.great_ai.large_file.helper import human_readable_to_byte +from 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 4b1c32d..cd7dcad 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.great_ai.large_file import LargeFileS3 +from 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 2a80579..a89a9fa 100644 --- a/tests/utilities/test_chunk.py +++ b/tests/utilities/test_chunk.py @@ -2,7 +2,7 @@ import unittest import pytest -from src.great_ai.utilities import chunk +from great_ai.utilities import chunk class TestChunk(unittest.TestCase): diff --git a/tests/utilities/test_clean.py b/tests/utilities/test_clean.py index 500cada..95cda01 100644 --- a/tests/utilities/test_clean.py +++ b/tests/utilities/test_clean.py @@ -1,6 +1,6 @@ import unittest -from src.great_ai.utilities import clean +from 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 5b55843..859a25a 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.great_ai.utilities import ConfigFile +from 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 60d8226..97d8343 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.great_ai.utilities import evaluate_ranking +from 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 7d864f3..f1bdc5e 100644 --- a/tests/utilities/test_get_sentences.py +++ b/tests/utilities/test_get_sentences.py @@ -1,6 +1,6 @@ import unittest -from src.great_ai.utilities import get_sentences +from 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 7aabac1..9d26441 100644 --- a/tests/utilities/test_language.py +++ b/tests/utilities/test_language.py @@ -1,10 +1,6 @@ import unittest -from src.great_ai.utilities import ( - english_name_of_language, - is_english, - predict_language, -) +from 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 5ee8d39..bd66ac0 100644 --- a/tests/utilities/test_match_names.py +++ b/tests/utilities/test_match_names.py @@ -1,6 +1,6 @@ import unittest -from src.great_ai.utilities import match_names +from 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 7900d60..4a98bf1 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.great_ai.utilities import WorkerException, parallel_map +from 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 d421e90..841544b 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.great_ai.utilities import WorkerException, threaded_parallel_map +from 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 e2204db..0e2bc52 100644 --- a/tests/utilities/test_unique.py +++ b/tests/utilities/test_unique.py @@ -1,6 +1,6 @@ import unittest -from src.great_ai.utilities import unique +from great_ai.utilities import unique original = [ ("a", 1),