From 1098091e253078f3d8a176ca5291cf24a08f3858 Mon Sep 17 00:00:00 2001 From: Gaurav Tarlok Kakkar Date: Tue, 6 Jun 2023 01:48:27 -0700 Subject: [PATCH] refactor: mv eva -> evadb (part 1) (#820) 1. move `eva -> evadb` to stay consistent with the package name --- .circleci/config.yml | 2 +- .coveragerc | 10 +-- .flake8 | 4 +- .gitignore | 4 + RELEASING.md | 6 +- docs/conf.py | 2 +- docs/source/contribute/index.rst | 2 +- docs/source/contribute/internals.rst | 2 +- docs/source/contribute/internals/catalog.rst | 4 +- docs/source/contribute/new_command.rst | 2 +- docs/source/contribute/release.rst | 2 +- docs/source/overview/installation.rst | 2 +- docs/source/overview/udf.rst | 2 +- docs/source/reference/api.rst | 38 ++++---- docs/source/reference/evaql.rst | 2 +- docs/source/reference/evaql/create.rst | 2 +- docs/source/reference/gpu.rst | 2 +- docs/source/reference/io.rst | 8 +- docs/source/reference/udfs/custom.rst | 6 +- docs/source/reference/udfs/openai.rst | 2 +- eva/models/__init__.py | 15 ---- {eva => evadb}/README.md | 2 +- {eva => evadb}/__init__.py | 4 +- {eva => evadb}/binder/__init__.py | 0 {eva => evadb}/binder/binder_utils.py | 20 ++--- {eva => evadb}/binder/statement_binder.py | 42 ++++----- .../binder/statement_binder_context.py | 14 +-- {eva => evadb}/catalog/__init__.py | 0 {eva => evadb}/catalog/catalog_manager.md | 0 {eva => evadb}/catalog/catalog_manager.py | 40 +++++---- {eva => evadb}/catalog/catalog_type.py | 2 +- {eva => evadb}/catalog/catalog_utils.py | 16 ++-- {eva => evadb}/catalog/models/__init__.py | 0 .../catalog/models/association_models.py | 2 +- {eva => evadb}/catalog/models/base_model.py | 4 +- .../catalog/models/column_catalog.py | 8 +- .../catalog/models/index_catalog.py | 6 +- .../catalog/models/table_catalog.py | 6 +- .../catalog/models/udf_cache_catalog.py | 6 +- {eva => evadb}/catalog/models/udf_catalog.py | 6 +- .../catalog/models/udf_cost_catalog.py | 4 +- .../catalog/models/udf_io_catalog.py | 6 +- .../catalog/models/udf_metadata_catalog.py | 4 +- {eva => evadb}/catalog/models/utils.py | 13 ++- {eva => evadb}/catalog/schema_utils.py | 6 +- {eva => evadb}/catalog/services/__init__.py | 0 .../catalog/services/base_service.py | 2 +- .../services/column_catalog_service.py | 6 +- .../catalog/services/index_catalog_service.py | 10 +-- .../catalog/services/table_catalog_service.py | 12 +-- .../services/udf_cache_catalog_service.py | 14 +-- .../catalog/services/udf_catalog_service.py | 8 +- .../services/udf_cost_catalog_service.py | 6 +- .../services/udf_io_catalog_service.py | 6 +- .../services/udf_metadata_catalog_service.py | 8 +- {eva => evadb}/catalog/sql_config.py | 0 {eva => evadb}/configuration/__init__.py | 0 .../configuration/bootstrap_environment.py | 10 +-- .../configuration/configuration_manager.py | 6 +- {eva => evadb}/configuration/constants.py | 12 +-- {eva => evadb}/constants.py | 0 {eva => evadb}/database.py | 8 +- {eva => evadb}/eva_cmd_client.py | 6 +- {eva => evadb}/eva_server.py | 2 +- eva/eva.yml => evadb/evadb.yml | 2 +- {eva => evadb}/executor/README.md | 0 {eva => evadb}/executor/__init__.py | 0 {eva => evadb}/executor/abstract_executor.py | 10 +-- .../executor/apply_and_merge_executor.py | 8 +- {eva => evadb}/executor/create_executor.py | 12 +-- .../executor/create_index_executor.py | 20 ++--- .../executor/create_mat_view_executor.py | 10 +-- .../executor/create_udf_executor.py | 24 ++--- {eva => evadb}/executor/delete_executor.py | 24 ++--- {eva => evadb}/executor/drop_executor.py | 16 ++-- {eva => evadb}/executor/drop_udf_executor.py | 10 +-- {eva => evadb}/executor/exchange_executor.py | 12 +-- {eva => evadb}/executor/execution_context.py | 6 +- {eva => evadb}/executor/executor_utils.py | 20 ++--- {eva => evadb}/executor/explain_executor.py | 10 +-- .../executor/function_scan_executor.py | 8 +- {eva => evadb}/executor/groupby_executor.py | 8 +- {eva => evadb}/executor/hash_join_executor.py | 10 +-- {eva => evadb}/executor/insert_executor.py | 12 +-- .../executor/join_build_executor.py | 8 +- .../executor/lateral_join_executor.py | 10 +-- {eva => evadb}/executor/limit_executor.py | 8 +- {eva => evadb}/executor/load_csv_executor.py | 18 ++-- {eva => evadb}/executor/load_executor.py | 12 +-- .../executor/load_multimedia_executor.py | 22 ++--- .../executor/nested_loop_join_executor.py | 10 +-- {eva => evadb}/executor/orderby_executor.py | 16 ++-- {eva => evadb}/executor/plan_executor.py | 74 ++++++++-------- {eva => evadb}/executor/pp_executor.py | 8 +- {eva => evadb}/executor/predicate_executor.py | 10 +-- {eva => evadb}/executor/project_executor.py | 10 +-- {eva => evadb}/executor/ray_utils.py | 2 +- {eva => evadb}/executor/rename_executor.py | 8 +- {eva => evadb}/executor/sample_executor.py | 8 +- {eva => evadb}/executor/seq_scan_executor.py | 10 +-- {eva => evadb}/executor/show_info_executor.py | 12 +-- {eva => evadb}/executor/storage_executor.py | 16 ++-- {eva => evadb}/executor/union_executor.py | 8 +- .../executor/vector_index_scan_executor.py | 16 ++-- {eva => evadb}/expression/__init__.py | 0 .../expression/abstract_expression.py | 0 .../expression/aggregation_expression.py | 4 +- .../expression/arithmetic_expression.py | 4 +- .../expression/comparison_expression.py | 4 +- .../expression/constant_value_expression.py | 6 +- {eva => evadb}/expression/expression_utils.py | 10 +-- .../expression/function_expression.py | 22 ++--- .../expression/logical_expression.py | 2 +- .../expression/tuple_value_expression.py | 6 +- {eva => evadb}/interfaces/__init__.py | 0 .../interfaces/relational/__init__.py | 0 {eva => evadb}/interfaces/relational/db.py | 24 ++--- .../interfaces/relational/relation.py | 18 ++-- {eva => evadb}/interfaces/relational/utils.py | 28 +++--- {eva => evadb}/models/catalog/__init__.py | 0 {eva => evadb}/models/catalog/frame_info.py | 2 +- {eva => evadb}/models/catalog/properties.py | 0 {eva => evadb}/models/server/__init__.py | 0 {eva => evadb}/models/server/response.py | 6 +- {eva => evadb}/models/storage/__init__.py | 0 {eva => evadb}/models/storage/batch.py | 8 +- {eva => evadb}/optimizer/__init__.py | 0 {eva => evadb}/optimizer/binder.py | 8 +- {eva => evadb}/optimizer/cost_model.py | 14 +-- {eva => evadb}/optimizer/group.py | 8 +- {eva => evadb}/optimizer/group_expression.py | 6 +- {eva => evadb}/optimizer/memo.py | 10 +-- {eva => evadb}/optimizer/operators.py | 24 ++--- {eva => evadb}/optimizer/optimizer_context.py | 16 ++-- .../optimizer/optimizer_task_stack.py | 2 +- {eva => evadb}/optimizer/optimizer_tasks.py | 14 +-- {eva => evadb}/optimizer/optimizer_utils.py | 28 +++--- {eva => evadb}/optimizer/plan_generator.py | 20 +++-- {eva => evadb}/optimizer/property.py | 0 {eva => evadb}/optimizer/rules/__init__.py | 0 {eva => evadb}/optimizer/rules/pattern.py | 2 +- {eva => evadb}/optimizer/rules/rules.py | 82 +++++++++--------- {eva => evadb}/optimizer/rules/rules_base.py | 4 +- .../optimizer/rules/rules_manager.py | 6 +- .../optimizer/statement_to_opr_converter.py | 40 ++++----- {eva => evadb}/parser/__init__.py | 0 {eva => evadb}/parser/alias.py | 0 .../parser/create_index_statement.py | 12 +-- .../parser/create_mat_view_statement.py | 10 +-- {eva => evadb}/parser/create_statement.py | 16 ++-- {eva => evadb}/parser/create_udf_statement.py | 6 +- {eva => evadb}/parser/delete_statement.py | 8 +- {eva => evadb}/parser/drop_statement.py | 6 +- {eva => evadb}/parser/drop_udf_statement.py | 4 +- .../eva.lark => evadb/parser/evadb.lark | 0 {eva => evadb}/parser/explain_statement.py | 4 +- {eva => evadb}/parser/insert_statement.py | 8 +- {eva => evadb}/parser/lark_parser.py | 4 +- .../parser/lark_visitor/__init__.py | 26 +++--- .../lark_visitor/_common_clauses_ids.py | 8 +- .../parser/lark_visitor/_create_statements.py | 14 +-- .../parser/lark_visitor/_delete_statement.py | 4 +- .../parser/lark_visitor/_drop_statement.py | 2 +- .../parser/lark_visitor/_explain_statement.py | 2 +- .../parser/lark_visitor/_expressions.py | 10 +-- .../parser/lark_visitor/_functions.py | 14 +-- .../parser/lark_visitor/_insert_statements.py | 6 +- .../parser/lark_visitor/_load_statement.py | 4 +- .../parser/lark_visitor/_rename_statement.py | 4 +- .../parser/lark_visitor/_select_statement.py | 4 +- .../parser/lark_visitor/_show_statements.py | 4 +- .../parser/lark_visitor/_table_sources.py | 10 +-- {eva => evadb}/parser/load_statement.py | 8 +- {eva => evadb}/parser/parser.py | 4 +- {eva => evadb}/parser/rename_statement.py | 6 +- {eva => evadb}/parser/select_statement.py | 8 +- {eva => evadb}/parser/show_statement.py | 4 +- {eva => evadb}/parser/statement.py | 2 +- {eva => evadb}/parser/table_ref.py | 10 +-- {eva => evadb}/parser/types.py | 2 +- {eva => evadb}/parser/utils.py | 8 +- {eva => evadb}/plan_nodes/__init__.py | 0 .../plan_nodes/abstract_join_plan.py | 8 +- {eva => evadb}/plan_nodes/abstract_plan.py | 2 +- .../plan_nodes/abstract_scan_plan.py | 6 +- .../plan_nodes/apply_and_merge_plan.py | 8 +- .../plan_nodes/create_index_plan.py | 12 +-- .../plan_nodes/create_mat_view_plan.py | 8 +- {eva => evadb}/plan_nodes/create_plan.py | 8 +- {eva => evadb}/plan_nodes/create_udf_plan.py | 8 +- {eva => evadb}/plan_nodes/delete_plan.py | 8 +- {eva => evadb}/plan_nodes/drop_plan.py | 6 +- {eva => evadb}/plan_nodes/drop_udf_plan.py | 4 +- {eva => evadb}/plan_nodes/exchange_plan.py | 4 +- {eva => evadb}/plan_nodes/explain_plan.py | 4 +- .../plan_nodes/function_scan_plan.py | 6 +- {eva => evadb}/plan_nodes/groupby_plan.py | 6 +- .../plan_nodes/hash_join_build_plan.py | 8 +- .../plan_nodes/hash_join_probe_plan.py | 10 +-- {eva => evadb}/plan_nodes/insert_plan.py | 8 +- .../plan_nodes/lateral_join_plan.py | 8 +- {eva => evadb}/plan_nodes/limit_plan.py | 6 +- {eva => evadb}/plan_nodes/load_data_plan.py | 8 +- .../plan_nodes/nested_loop_join_plan.py | 8 +- {eva => evadb}/plan_nodes/orderby_plan.py | 4 +- {eva => evadb}/plan_nodes/pp_plan.py | 6 +- {eva => evadb}/plan_nodes/predicate_plan.py | 6 +- {eva => evadb}/plan_nodes/project_plan.py | 6 +- {eva => evadb}/plan_nodes/rename_plan.py | 6 +- {eva => evadb}/plan_nodes/sample_plan.py | 6 +- {eva => evadb}/plan_nodes/seq_scan_plan.py | 6 +- {eva => evadb}/plan_nodes/show_info_plan.py | 6 +- {eva => evadb}/plan_nodes/storage_plan.py | 10 +-- {eva => evadb}/plan_nodes/types.py | 0 {eva => evadb}/plan_nodes/union_plan.py | 4 +- .../plan_nodes/vector_index_scan_plan.py | 10 +-- {eva => evadb}/readers/__init__.py | 0 {eva => evadb}/readers/abstract_reader.py | 6 +- {eva => evadb}/readers/csv_reader.py | 6 +- {eva => evadb}/readers/decord_reader.py | 12 +-- {eva => evadb}/readers/document/__init__.py | 0 .../readers/document/document_reader.py | 4 +- {eva => evadb}/readers/document/registry.py | 0 {eva => evadb}/readers/image/__init__.py | 0 .../readers/image/opencv_image_reader.py | 2 +- {eva => evadb}/readers/pdf_reader.py | 2 +- {eva => evadb}/server/__init__.py | 0 {eva => evadb}/server/command_handler.py | 22 ++--- {eva => evadb}/server/interpreter.py | 4 +- {eva => evadb}/server/server.py | 8 +- {eva => evadb}/storage/__init__.py | 0 .../storage/abstract_media_storage_engine.py | 14 +-- .../storage/abstract_storage_engine.py | 8 +- .../storage/document_storage_engine.py | 10 +-- .../storage/image_storage_engine.py | 10 +-- {eva => evadb}/storage/pdf_storage_engine.py | 10 +-- .../storage/sqlite_storage_engine.py | 24 ++--- {eva => evadb}/storage/storage_engine.py | 18 ++-- .../storage/video_storage_engine.py | 12 +-- {eva => evadb}/third_party/__init__.py | 0 .../third_party/huggingface/__init__.py | 0 .../third_party/huggingface/binder.py | 6 +- .../third_party/huggingface/create.py | 8 +- .../third_party/huggingface/model.py | 4 +- .../third_party/vector_stores/__init__.py | 0 .../third_party/vector_stores/faiss.py | 2 +- .../third_party/vector_stores/qdrant.py | 2 +- .../third_party/vector_stores/types.py | 0 .../third_party/vector_stores/utils.py | 12 +-- {eva => evadb}/udfs/README.md | 0 {eva => evadb}/udfs/__init__.py | 0 {eva => evadb}/udfs/abstract/__init__.py | 0 {eva => evadb}/udfs/abstract/abstract_udf.py | 0 .../udfs/abstract/hf_abstract_udf.py | 6 +- .../udfs/abstract/pytorch_abstract_udf.py | 6 +- .../udfs/abstract/tracker_abstract_udf.py | 8 +- {eva => evadb}/udfs/asl_20_actions_map.pkl | Bin {eva => evadb}/udfs/asl_action_recognition.py | 2 +- {eva => evadb}/udfs/chatgpt.py | 12 +-- {eva => evadb}/udfs/decorators/__init__.py | 0 {eva => evadb}/udfs/decorators/decorators.py | 2 +- .../decorators/io_descriptors/__init__.py | 0 .../io_descriptors/abstract_types.py | 4 +- .../decorators/io_descriptors/data_types.py | 8 +- {eva => evadb}/udfs/decorators/utils.py | 4 +- {eva => evadb}/udfs/emotion_detector.py | 2 +- {eva => evadb}/udfs/face_detector.py | 6 +- .../udfs/fastrcnn_object_detector.py | 11 ++- {eva => evadb}/udfs/feature_extractor.py | 2 +- {eva => evadb}/udfs/gpu_compatible.py | 0 {eva => evadb}/udfs/mnist_image_classifier.py | 2 +- .../udfs/mvit_action_recognition.py | 2 +- {eva => evadb}/udfs/ndarray/__init__.py | 0 {eva => evadb}/udfs/ndarray/annotate.py | 8 +- {eva => evadb}/udfs/ndarray/array_count.py | 2 +- {eva => evadb}/udfs/ndarray/crop.py | 2 +- {eva => evadb}/udfs/ndarray/fuzzy_join.py | 2 +- {eva => evadb}/udfs/ndarray/gaussian_blur.py | 8 +- .../udfs/ndarray/horizontal_flip.py | 8 +- {eva => evadb}/udfs/ndarray/open.py | 2 +- {eva => evadb}/udfs/ndarray/similarity.py | 2 +- {eva => evadb}/udfs/ndarray/to_grayscale.py | 8 +- {eva => evadb}/udfs/ndarray/vertical_flip.py | 8 +- {eva => evadb}/udfs/ocr_extractor.py | 4 +- .../udfs/saliency_feature_extractor.py | 10 +-- .../sentence_transformer_feature_extractor.py | 10 +-- {eva => evadb}/udfs/sift_feature_extractor.py | 10 +-- {eva => evadb}/udfs/trackers/__init__.py | 0 {eva => evadb}/udfs/trackers/nor_fair.py | 4 +- {eva => evadb}/udfs/tutorials/__init__.py | 0 {eva => evadb}/udfs/udf_bootstrap_queries.py | 6 +- {eva => evadb}/udfs/yolo_object_detector.py | 10 +-- {eva => evadb}/utils/__init__.py | 0 {eva => evadb}/utils/errors.py | 0 {eva => evadb}/utils/generic_utils.py | 2 +- {eva => evadb}/utils/kv_cache.py | 0 {eva => evadb}/utils/logging_manager.py | 0 {eva => evadb}/utils/math_utils.py | 0 {eva => evadb}/utils/s3_utils.py | 0 {eva => evadb}/utils/stats.py | 2 +- {eva => evadb}/version.py | 0 examples/youtube_qa/README.md | 2 +- examples/youtube_qa/youtube_qa.py | 6 +- script/data/download_dataset.sh | 2 +- script/data/download_model.sh | 2 +- script/docs/catalog_plotter.py | 4 +- script/formatting/formatter.py | 4 +- script/releasing/releaser.py | 6 +- script/test/package.sh | 4 +- script/test/test.sh | 8 +- setup.py | 8 +- test/benchmark_tests/conftest.py | 4 +- .../benchmark_tests/test_benchmark_pytorch.py | 6 +- test/binder/test_statement_binder.py | 28 +++--- test/binder/test_statement_binder_context.py | 8 +- test/catalog/models/test_models.py | 14 +-- test/catalog/test_catalog_manager.py | 52 +++++------ test/catalog/test_column_type.py | 4 +- test/executor/test_abstract_executor.py | 4 +- test/executor/test_create_udf_executor.py | 10 +-- test/executor/test_execution_context.py | 46 +++++----- test/executor/test_limit_executor.py | 16 ++-- test/executor/test_orderby_executor.py | 10 +-- test/executor/test_plan_executor.py | 54 ++++++------ test/executor/test_sample_executor.py | 8 +- test/executor/test_seq_scan_executor.py | 4 +- test/executor/utils.py | 4 +- test/expression/test_abstract_expression.py | 12 +-- test/expression/test_aggregation.py | 10 +-- test/expression/test_arithmetic.py | 10 +-- test/expression/test_comparison.py | 12 +-- test/expression/test_expression_tree.py | 16 ++-- test/expression/test_expression_utils.py | 16 ++-- test/expression/test_function_expression.py | 16 ++-- test/expression/test_logical.py | 14 +-- test/integration_tests/test_array_count.py | 4 +- .../test_create_index_executor.py | 8 +- .../test_create_table_executor.py | 8 +- .../integration_tests/test_delete_executor.py | 4 +- test/integration_tests/test_drop_executor.py | 6 +- .../test_error_handling_with_ray.py | 4 +- .../test_explain_executor.py | 8 +- test/integration_tests/test_fuzzy_join.py | 4 +- .../test_huggingface_udfs.py | 4 +- .../integration_tests/test_insert_executor.py | 4 +- test/integration_tests/test_like.py | 8 +- test/integration_tests/test_load_executor.py | 12 +-- .../test_load_pdf_executor.py | 4 +- test/integration_tests/test_mat_executor.py | 6 +- test/integration_tests/test_open.py | 6 +- .../integration_tests/test_optimizer_rules.py | 28 +++--- test/integration_tests/test_pytorch.py | 26 +++--- .../integration_tests/test_rename_executor.py | 2 +- test/integration_tests/test_reuse.py | 14 +-- .../test_s3_load_executor.py | 8 +- test/integration_tests/test_saliency.py | 8 +- .../integration_tests/test_select_executor.py | 10 +-- .../test_show_info_executor.py | 8 +- test/integration_tests/test_similarity.py | 6 +- test/integration_tests/test_udf_executor.py | 10 +-- .../relational/test_relational_api.py | 14 +-- test/models/catalog/test_frame_info.py | 6 +- test/models/server/test_response.py | 6 +- test/models/storage/test_batch.py | 6 +- test/optimizer/rules/test_rules.py | 14 +-- test/optimizer/test_binder.py | 10 +-- test/optimizer/test_cascade_optimizer.py | 4 +- test/optimizer/test_cost_model.py | 12 +-- test/optimizer/test_group.py | 8 +- test/optimizer/test_memo.py | 6 +- test/optimizer/test_optimizer_context.py | 4 +- test/optimizer/test_optimizer_task.py | 22 ++--- test/optimizer/test_optimizer_utils.py | 8 +- .../test_statement_to_opr_converter.py | 42 ++++----- test/parser/test_parser.py | 46 +++++----- test/parser/test_parser_statements.py | 6 +- test/plan_nodes/test_plan.py | 30 +++---- test/readers/test_csv_reader.py | 6 +- test/readers/test_decord_reader.py | 18 ++-- test/server/test_command_handler.py | 2 +- test/server/test_db_api.py | 4 +- test/server/test_interpreter.py | 8 +- test/server/test_server.py | 2 +- test/storage/test_sqlite_storage_engine.py | 8 +- test/storage/test_video_storage.py | 10 +-- test/test_eva_cmd_client.py | 14 +-- test/test_eva_imports.py | 6 +- test/test_eva_server.py | 6 +- .../io_descriptors/test_descriptors.py | 8 +- test/udfs/decorators/test_decorators.py | 8 +- test/udfs/ndarray/test_annotate.py | 6 +- test/udfs/ndarray/test_array_count.py | 4 +- test/udfs/ndarray/test_crop.py | 4 +- test/udfs/ndarray/test_flips.py | 8 +- test/udfs/ndarray/test_gaussian_blur.py | 4 +- test/udfs/ndarray/test_open.py | 6 +- test/udfs/ndarray/test_to_grayscale.py | 4 +- test/udfs/test_abstract_udf.py | 12 +-- test/udfs/test_chatgpt.py | 18 ++-- test/udfs/test_emotion_detector.py | 6 +- test/udfs/test_facenet_udf.py | 14 +-- test/udfs/test_fastrcnn_object_detector.py | 10 +-- test/udfs/test_yolo_object_detector.py | 6 +- test/util.py | 38 ++++---- test/utils/test_generic_utils.py | 22 ++--- test/utils/test_timer.py | 4 +- tutorials/00-start-eva-server.ipynb | 6 +- 407 files changed, 1695 insertions(+), 1694 deletions(-) delete mode 100644 eva/models/__init__.py rename {eva => evadb}/README.md (93%) rename {eva => evadb}/__init__.py (84%) rename {eva => evadb}/binder/__init__.py (100%) rename {eva => evadb}/binder/binder_utils.py (93%) rename {eva => evadb}/binder/statement_binder.py (91%) rename {eva => evadb}/binder/statement_binder_context.py (94%) rename {eva => evadb}/catalog/__init__.py (100%) rename {eva => evadb}/catalog/catalog_manager.md (100%) rename {eva => evadb}/catalog/catalog_manager.py (93%) rename {eva => evadb}/catalog/catalog_type.py (98%) rename {eva => evadb}/catalog/catalog_utils.py (94%) rename {eva => evadb}/catalog/models/__init__.py (100%) rename {eva => evadb}/catalog/models/association_models.py (96%) rename {eva => evadb}/catalog/models/base_model.py (97%) rename {eva => evadb}/catalog/models/column_catalog.py (94%) rename {eva => evadb}/catalog/models/index_catalog.py (94%) rename {eva => evadb}/catalog/models/table_catalog.py (93%) rename {eva => evadb}/catalog/models/udf_cache_catalog.py (94%) rename {eva => evadb}/catalog/models/udf_catalog.py (93%) rename {eva => evadb}/catalog/models/udf_cost_catalog.py (93%) rename {eva => evadb}/catalog/models/udf_io_catalog.py (95%) rename {eva => evadb}/catalog/models/udf_metadata_catalog.py (94%) rename {eva => evadb}/catalog/models/utils.py (96%) rename {eva => evadb}/catalog/schema_utils.py (92%) rename {eva => evadb}/catalog/services/__init__.py (100%) rename {eva => evadb}/catalog/services/base_service.py (95%) rename {eva => evadb}/catalog/services/column_catalog_service.py (94%) rename {eva => evadb}/catalog/services/index_catalog_service.py (89%) rename {eva => evadb}/catalog/services/table_catalog_service.py (92%) rename {eva => evadb}/catalog/services/udf_cache_catalog_service.py (89%) rename {eva => evadb}/catalog/services/udf_catalog_service.py (93%) rename {eva => evadb}/catalog/services/udf_cost_catalog_service.py (93%) rename {eva => evadb}/catalog/services/udf_io_catalog_service.py (93%) rename {eva => evadb}/catalog/services/udf_metadata_catalog_service.py (90%) rename {eva => evadb}/catalog/sql_config.py (100%) rename {eva => evadb}/configuration/__init__.py (100%) rename {eva => evadb}/configuration/bootstrap_environment.py (94%) rename {eva => evadb}/configuration/configuration_manager.py (91%) rename {eva => evadb}/configuration/constants.py (79%) rename {eva => evadb}/constants.py (100%) rename {eva => evadb}/database.py (86%) rename {eva => evadb}/eva_cmd_client.py (89%) rename {eva => evadb}/eva_server.py (97%) rename eva/eva.yml => evadb/evadb.yml (95%) rename {eva => evadb}/executor/README.md (100%) rename {eva => evadb}/executor/__init__.py (100%) rename {eva => evadb}/executor/abstract_executor.py (92%) rename {eva => evadb}/executor/apply_and_merge_executor.py (90%) rename {eva => evadb}/executor/create_executor.py (84%) rename {eva => evadb}/executor/create_index_executor.py (88%) rename {eva => evadb}/executor/create_mat_view_executor.py (84%) rename {eva => evadb}/executor/create_udf_executor.py (90%) rename {eva => evadb}/executor/delete_executor.py (84%) rename {eva => evadb}/executor/drop_executor.py (84%) rename {eva => evadb}/executor/drop_udf_executor.py (87%) rename {eva => evadb}/executor/exchange_executor.py (91%) rename {eva => evadb}/executor/execution_context.py (94%) rename {eva => evadb}/executor/executor_utils.py (90%) rename {eva => evadb}/executor/explain_executor.py (83%) rename {eva => evadb}/executor/function_scan_executor.py (89%) rename {eva => evadb}/executor/groupby_executor.py (89%) rename {eva => evadb}/executor/hash_join_executor.py (85%) rename {eva => evadb}/executor/insert_executor.py (86%) rename {eva => evadb}/executor/join_build_executor.py (87%) rename {eva => evadb}/executor/lateral_join_executor.py (84%) rename {eva => evadb}/executor/limit_executor.py (88%) rename {eva => evadb}/executor/load_csv_executor.py (84%) rename {eva => evadb}/executor/load_executor.py (80%) rename {eva => evadb}/executor/load_multimedia_executor.py (89%) rename {eva => evadb}/executor/nested_loop_join_executor.py (82%) rename {eva => evadb}/executor/orderby_executor.py (89%) rename {eva => evadb}/executor/plan_executor.py (73%) rename {eva => evadb}/executor/pp_executor.py (88%) rename {eva => evadb}/executor/predicate_executor.py (80%) rename {eva => evadb}/executor/project_executor.py (81%) rename {eva => evadb}/executor/ray_utils.py (97%) rename {eva => evadb}/executor/rename_executor.py (83%) rename {eva => evadb}/executor/sample_executor.py (86%) rename {eva => evadb}/executor/seq_scan_executor.py (85%) rename {eva => evadb}/executor/show_info_executor.py (84%) rename {eva => evadb}/executor/storage_executor.py (84%) rename {eva => evadb}/executor/union_executor.py (85%) rename {eva => evadb}/executor/vector_index_scan_executor.py (87%) rename {eva => evadb}/expression/__init__.py (100%) rename {eva => evadb}/expression/abstract_expression.py (100%) rename {eva => evadb}/expression/aggregation_expression.py (97%) rename {eva => evadb}/expression/arithmetic_expression.py (94%) rename {eva => evadb}/expression/comparison_expression.py (97%) rename {eva => evadb}/expression/constant_value_expression.py (92%) rename {eva => evadb}/expression/expression_utils.py (96%) rename {eva => evadb}/expression/function_expression.py (94%) rename {eva => evadb}/expression/logical_expression.py (98%) rename {eva => evadb}/expression/tuple_value_expression.py (96%) rename {eva => evadb}/interfaces/__init__.py (100%) rename {eva => evadb}/interfaces/relational/__init__.py (100%) rename {eva => evadb}/interfaces/relational/db.py (93%) rename {eva => evadb}/interfaces/relational/relation.py (94%) rename {eva => evadb}/interfaces/relational/utils.py (82%) rename {eva => evadb}/models/catalog/__init__.py (100%) rename {eva => evadb}/models/catalog/frame_info.py (95%) rename {eva => evadb}/models/catalog/properties.py (100%) rename {eva => evadb}/models/server/__init__.py (100%) rename {eva => evadb}/models/server/response.py (92%) rename {eva => evadb}/models/storage/__init__.py (100%) rename {eva => evadb}/models/storage/batch.py (98%) rename {eva => evadb}/optimizer/__init__.py (100%) rename {eva => evadb}/optimizer/binder.py (93%) rename {eva => evadb}/optimizer/cost_model.py (79%) rename {eva => evadb}/optimizer/group.py (94%) rename {eva => evadb}/optimizer/group_expression.py (94%) rename {eva => evadb}/optimizer/memo.py (94%) rename {eva => evadb}/optimizer/operators.py (98%) rename {eva => evadb}/optimizer/optimizer_context.py (89%) rename {eva => evadb}/optimizer/optimizer_task_stack.py (94%) rename {eva => evadb}/optimizer/optimizer_tasks.py (97%) rename {eva => evadb}/optimizer/optimizer_utils.py (92%) rename {eva => evadb}/optimizer/plan_generator.py (88%) rename {eva => evadb}/optimizer/property.py (100%) rename {eva => evadb}/optimizer/rules/__init__.py (100%) rename {eva => evadb}/optimizer/rules/pattern.py (95%) rename {eva => evadb}/optimizer/rules/rules.py (95%) rename {eva => evadb}/optimizer/rules/rules_base.py (98%) rename {eva => evadb}/optimizer/rules/rules_manager.py (97%) rename {eva => evadb}/optimizer/statement_to_opr_converter.py (91%) rename {eva => evadb}/parser/__init__.py (100%) rename {eva => evadb}/parser/alias.py (100%) rename {eva => evadb}/parser/create_index_statement.py (88%) rename {eva => evadb}/parser/create_mat_view_statement.py (90%) rename {eva => evadb}/parser/create_statement.py (92%) rename {eva => evadb}/parser/create_udf_statement.py (96%) rename {eva => evadb}/parser/delete_statement.py (89%) rename {eva => evadb}/parser/drop_statement.py (91%) rename {eva => evadb}/parser/drop_udf_statement.py (94%) rename eva/parser/eva.lark => evadb/parser/evadb.lark (100%) rename {eva => evadb}/parser/explain_statement.py (92%) rename {eva => evadb}/parser/insert_statement.py (92%) rename {eva => evadb}/parser/lark_parser.py (93%) rename {eva => evadb}/parser/lark_visitor/__init__.py (68%) rename {eva => evadb}/parser/lark_visitor/_common_clauses_ids.py (90%) rename {eva => evadb}/parser/lark_visitor/_create_statements.py (95%) rename {eva => evadb}/parser/lark_visitor/_delete_statement.py (92%) rename {eva => evadb}/parser/lark_visitor/_drop_statement.py (95%) rename {eva => evadb}/parser/lark_visitor/_explain_statement.py (94%) rename {eva => evadb}/parser/lark_visitor/_expressions.py (92%) rename {eva => evadb}/parser/lark_visitor/_functions.py (92%) rename {eva => evadb}/parser/lark_visitor/_insert_statements.py (92%) rename {eva => evadb}/parser/lark_visitor/_load_statement.py (95%) rename {eva => evadb}/parser/lark_visitor/_rename_statement.py (88%) rename {eva => evadb}/parser/lark_visitor/_select_statement.py (93%) rename {eva => evadb}/parser/lark_visitor/_show_statements.py (91%) rename {eva => evadb}/parser/lark_visitor/_table_sources.py (96%) rename {eva => evadb}/parser/load_statement.py (93%) rename {eva => evadb}/parser/parser.py (92%) rename {eva => evadb}/parser/rename_statement.py (92%) rename {eva => evadb}/parser/select_statement.py (96%) rename {eva => evadb}/parser/show_statement.py (92%) rename {eva => evadb}/parser/statement.py (96%) rename {eva => evadb}/parser/table_ref.py (96%) rename {eva => evadb}/parser/types.py (97%) rename {eva => evadb}/parser/utils.py (93%) rename {eva => evadb}/plan_nodes/__init__.py (100%) rename {eva => evadb}/plan_nodes/abstract_join_plan.py (87%) rename {eva => evadb}/plan_nodes/abstract_plan.py (98%) rename {eva => evadb}/plan_nodes/abstract_scan_plan.py (88%) rename {eva => evadb}/plan_nodes/apply_and_merge_plan.py (89%) rename {eva => evadb}/plan_nodes/create_index_plan.py (86%) rename {eva => evadb}/plan_nodes/create_mat_view_plan.py (90%) rename {eva => evadb}/plan_nodes/create_plan.py (90%) rename {eva => evadb}/plan_nodes/create_udf_plan.py (93%) rename {eva => evadb}/plan_nodes/delete_plan.py (89%) rename {eva => evadb}/plan_nodes/drop_plan.py (91%) rename {eva => evadb}/plan_nodes/drop_udf_plan.py (93%) rename {eva => evadb}/plan_nodes/exchange_plan.py (95%) rename {eva => evadb}/plan_nodes/explain_plan.py (90%) rename {eva => evadb}/plan_nodes/function_scan_plan.py (90%) rename {eva => evadb}/plan_nodes/groupby_plan.py (87%) rename {eva => evadb}/plan_nodes/hash_join_build_plan.py (87%) rename {eva => evadb}/plan_nodes/hash_join_probe_plan.py (87%) rename {eva => evadb}/plan_nodes/insert_plan.py (88%) rename {eva => evadb}/plan_nodes/lateral_join_plan.py (84%) rename {eva => evadb}/plan_nodes/limit_plan.py (87%) rename {eva => evadb}/plan_nodes/load_data_plan.py (92%) rename {eva => evadb}/plan_nodes/nested_loop_join_plan.py (85%) rename {eva => evadb}/plan_nodes/orderby_plan.py (93%) rename {eva => evadb}/plan_nodes/pp_plan.py (85%) rename {eva => evadb}/plan_nodes/predicate_plan.py (86%) rename {eva => evadb}/plan_nodes/project_plan.py (86%) rename {eva => evadb}/plan_nodes/rename_plan.py (90%) rename {eva => evadb}/plan_nodes/sample_plan.py (87%) rename {eva => evadb}/plan_nodes/seq_scan_plan.py (90%) rename {eva => evadb}/plan_nodes/show_info_plan.py (88%) rename {eva => evadb}/plan_nodes/storage_plan.py (93%) rename {eva => evadb}/plan_nodes/types.py (100%) rename {eva => evadb}/plan_nodes/union_plan.py (91%) rename {eva => evadb}/plan_nodes/vector_index_scan_plan.py (88%) rename {eva => evadb}/readers/__init__.py (100%) rename {eva => evadb}/readers/abstract_reader.py (93%) rename {eva => evadb}/readers/csv_reader.py (94%) rename {eva => evadb}/readers/decord_reader.py (94%) rename {eva => evadb}/readers/document/__init__.py (100%) rename {eva => evadb}/readers/document/document_reader.py (91%) rename {eva => evadb}/readers/document/registry.py (100%) rename {eva => evadb}/readers/image/__init__.py (100%) rename {eva => evadb}/readers/image/opencv_image_reader.py (94%) rename {eva => evadb}/readers/pdf_reader.py (97%) rename {eva => evadb}/server/__init__.py (100%) rename {eva => evadb}/server/command_handler.py (82%) rename {eva => evadb}/server/interpreter.py (97%) rename {eva => evadb}/server/server.py (93%) rename {eva => evadb}/storage/__init__.py (100%) rename {eva => evadb}/storage/abstract_media_storage_engine.py (93%) rename {eva => evadb}/storage/abstract_storage_engine.py (91%) rename {eva => evadb}/storage/document_storage_engine.py (83%) rename {eva => evadb}/storage/image_storage_engine.py (83%) rename {eva => evadb}/storage/pdf_storage_engine.py (86%) rename {eva => evadb}/storage/sqlite_storage_engine.py (93%) rename {eva => evadb}/storage/storage_engine.py (72%) rename {eva => evadb}/storage/video_storage_engine.py (86%) rename {eva => evadb}/third_party/__init__.py (100%) rename {eva => evadb}/third_party/huggingface/__init__.py (100%) rename {eva => evadb}/third_party/huggingface/binder.py (86%) rename {eva => evadb}/third_party/huggingface/create.py (96%) rename {eva => evadb}/third_party/huggingface/model.py (95%) rename {eva => evadb}/third_party/vector_stores/__init__.py (100%) rename {eva => evadb}/third_party/vector_stores/faiss.py (98%) rename {eva => evadb}/third_party/vector_stores/qdrant.py (98%) rename {eva => evadb}/third_party/vector_stores/types.py (100%) rename {eva => evadb}/third_party/vector_stores/utils.py (75%) rename {eva => evadb}/udfs/README.md (100%) rename {eva => evadb}/udfs/__init__.py (100%) rename {eva => evadb}/udfs/abstract/__init__.py (100%) rename {eva => evadb}/udfs/abstract/abstract_udf.py (100%) rename {eva => evadb}/udfs/abstract/hf_abstract_udf.py (95%) rename {eva => evadb}/udfs/abstract/pytorch_abstract_udf.py (95%) rename {eva => evadb}/udfs/abstract/tracker_abstract_udf.py (93%) rename {eva => evadb}/udfs/asl_20_actions_map.pkl (100%) rename {eva => evadb}/udfs/asl_action_recognition.py (97%) rename {eva => evadb}/udfs/chatgpt.py (87%) rename {eva => evadb}/udfs/decorators/__init__.py (100%) rename {eva => evadb}/udfs/decorators/decorators.py (96%) rename {eva => evadb}/udfs/decorators/io_descriptors/__init__.py (100%) rename {eva => evadb}/udfs/decorators/io_descriptors/abstract_types.py (95%) rename {eva => evadb}/udfs/decorators/io_descriptors/data_types.py (92%) rename {eva => evadb}/udfs/decorators/utils.py (94%) rename {eva => evadb}/udfs/emotion_detector.py (98%) rename {eva => evadb}/udfs/face_detector.py (93%) rename {eva => evadb}/udfs/fastrcnn_object_detector.py (95%) rename {eva => evadb}/udfs/feature_extractor.py (95%) rename {eva => evadb}/udfs/gpu_compatible.py (100%) rename {eva => evadb}/udfs/mnist_image_classifier.py (97%) rename {eva => evadb}/udfs/mvit_action_recognition.py (96%) rename {eva => evadb}/udfs/ndarray/__init__.py (100%) rename {eva => evadb}/udfs/ndarray/annotate.py (90%) rename {eva => evadb}/udfs/ndarray/array_count.py (97%) rename {eva => evadb}/udfs/ndarray/crop.py (96%) rename {eva => evadb}/udfs/ndarray/fuzzy_join.py (95%) rename {eva => evadb}/udfs/ndarray/gaussian_blur.py (88%) rename {eva => evadb}/udfs/ndarray/horizontal_flip.py (88%) rename {eva => evadb}/udfs/ndarray/open.py (96%) rename {eva => evadb}/udfs/ndarray/similarity.py (96%) rename {eva => evadb}/udfs/ndarray/to_grayscale.py (88%) rename {eva => evadb}/udfs/ndarray/vertical_flip.py (88%) rename {eva => evadb}/udfs/ocr_extractor.py (95%) rename {eva => evadb}/udfs/saliency_feature_extractor.py (89%) rename {eva => evadb}/udfs/sentence_transformer_feature_extractor.py (89%) rename {eva => evadb}/udfs/sift_feature_extractor.py (89%) rename {eva => evadb}/udfs/trackers/__init__.py (100%) rename {eva => evadb}/udfs/trackers/nor_fair.py (94%) rename {eva => evadb}/udfs/tutorials/__init__.py (100%) rename {eva => evadb}/udfs/udf_bootstrap_queries.py (97%) rename {eva => evadb}/udfs/yolo_object_detector.py (92%) rename {eva => evadb}/utils/__init__.py (100%) rename {eva => evadb}/utils/errors.py (100%) rename {eva => evadb}/utils/generic_utils.py (99%) rename {eva => evadb}/utils/kv_cache.py (100%) rename {eva => evadb}/utils/logging_manager.py (100%) rename {eva => evadb}/utils/math_utils.py (100%) rename {eva => evadb}/utils/s3_utils.py (100%) rename {eva => evadb}/utils/stats.py (97%) rename {eva => evadb}/version.py (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab051642c..9e7aee4bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,7 +105,7 @@ jobs: name: Disable Ray setting in the config.yml file command: | source test_evadb/bin/activate - python -c "import yaml;f = open('eva/eva.yml', 'r+');config_obj = yaml.load(f, Loader=yaml.FullLoader);config_obj['experimental']['ray'] = False;f.seek(0);f.write(yaml.dump(config_obj));f.truncate();" + python -c "import yaml;f = open('evadb/evadb.yml', 'r+');config_obj = yaml.load(f, Loader=yaml.FullLoader);config_obj['experimental']['ray'] = False;f.seek(0);f.write(yaml.dump(config_obj));f.truncate();" - run: name: Test and upload coverage report to coveralls diff --git a/.coveragerc b/.coveragerc index 81ccd5575..28acb4697 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,10 +1,10 @@ [run] omit = - eva/udfs/abstract/* - eva/udfs/emotion_detector.py - eva/udfs/yolo_object_detector.py - eva/executor/exchange_executor.py - eva/executor/ray_utils.py + evadb/udfs/abstract/* + evadb/udfs/emotion_detector.py + evadb/udfs/yolo_object_detector.py + evadb/executor/exchange_executor.py + evadb/executor/ray_utils.py [report] exclude_lines = diff --git a/.flake8 b/.flake8 index 3b48cb400..dc5b0589e 100644 --- a/.flake8 +++ b/.flake8 @@ -1,7 +1,7 @@ [flake8] exclude = - eva/filters - eva/parser/evaql + evadb/filters + evadb/parser/evaql ignore = E203 E266 diff --git a/.gitignore b/.gitignore index 7acc23b88..2e8345e32 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,7 @@ test.py # faiss *.faiss eva_db/* + + +# older code +eva/* \ No newline at end of file diff --git a/RELEASING.md b/RELEASING.md index ff74a608e..857f5d356 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -39,7 +39,7 @@ Then run `chmod 600 ./.pypirc` so only you can read/write. Make sure `CHANGELOG.md` is up to date for the release: compare against PRs merged since the last release. -1. Update version to, e.g. 0.0.6 (remove the `+dev` label) in `eva/version.py`. +1. Update version to, e.g. 0.0.6 (remove the `+dev` label) in `evadb/version.py`. 1. Commit these changes and create a PR: @@ -66,7 +66,7 @@ Then run `chmod 600 ./.pypirc` so only you can read/write. python3 -m venv test_evadb # create a virtualenv for testing source test_evadb/bin/activate # activate virtualenv python3 -m pip install dist/evadb-0.9.1-py3-none-any.whl - python3 -c "import eva; print(eva.__version__)" + python3 -c "import evadb; print(evadb.__version__)" 1. Publish to PyPI @@ -83,7 +83,7 @@ Then run `chmod 600 ./.pypirc` so only you can read/write. * Publish the release. -1. Update version to, e.g. 0.9.1+dev in `eva/version.py`. +1. Update version to, e.g. 0.9.1+dev in `evadb/version.py`. 1. Add a new changelog entry for the unreleased version in `CHANGELOG.md`: diff --git a/docs/conf.py b/docs/conf.py index dcb8b32f5..6d93cf6aa 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -11,7 +11,7 @@ # The full version, including alpha/beta/rc tags VERSION_DICT = {} -with open("../eva/version.py", "r") as version_file: +with open("../evadb/version.py", "r") as version_file: exec(version_file.read(), VERSION_DICT) # Set the latest version. diff --git a/docs/source/contribute/index.rst b/docs/source/contribute/index.rst index 1cfdd8129..cc43dc3e5 100644 --- a/docs/source/contribute/index.rst +++ b/docs/source/contribute/index.rst @@ -123,4 +123,4 @@ Architecture Diagram Troubleshooting ==== -If the test suite fails with a `PermissionDenied` exception, update the `path_prefix` attribute under the `storage` section in the EVA configuration file (``~/.eva/eva.yml``) to a directory where you have write privileges. +If the test suite fails with a `PermissionDenied` exception, update the `path_prefix` attribute under the `storage` section in the EVA configuration file (``~/.evadb/evadb.yml``) to a directory where you have write privileges. diff --git a/docs/source/contribute/internals.rst b/docs/source/contribute/internals.rst index 13c6ed45a..8333d5e72 100644 --- a/docs/source/contribute/internals.rst +++ b/docs/source/contribute/internals.rst @@ -4,7 +4,7 @@ EVA Internals Path of a Query ------------------- -The following code represents a sequence of operations that can be used to execute a query in a evaql database. found in `eva/server/command_handler.py `_ +The following code represents a sequence of operations that can be used to execute a query in a evaql database. found in `evadb/server/command_handler.py `_ Parse the query using the Parser() function provided by the evaql library. The result of this step will be a parsed representation of the query in the form of an abstract syntax tree (AST). diff --git a/docs/source/contribute/internals/catalog.rst b/docs/source/contribute/internals/catalog.rst index 672a37f15..f08dbbcb1 100644 --- a/docs/source/contribute/internals/catalog.rst +++ b/docs/source/contribute/internals/catalog.rst @@ -4,11 +4,11 @@ Catalog Catalog Manager --------------- -Explanation for developers on how to use the eva `catalog_manager `_. +Explanation for developers on how to use the eva `catalog_manager `_. CatalogManager class that provides a set of services to interact with a database that stores metadata about tables, columns, and user-defined functions (UDFs). Information like what is the data type in a certain column in a table, type of a table, its name, etc.. It contains functions to get, insert and delete catalog entries for Tables, UDFs, UDF IOs, Columns and Indexes. -This data is stored in the eva_catalog.db file which can be found in `~/.eva//` folder. +This data is stored in the eva_catalog.db file which can be found in `~/.evadb//` folder. Catalog manager currently has 5 services in it: diff --git a/docs/source/contribute/new_command.rst b/docs/source/contribute/new_command.rst index 1a0d48c17..3eecab963 100644 --- a/docs/source/contribute/new_command.rst +++ b/docs/source/contribute/new_command.rst @@ -38,7 +38,7 @@ The first part of Parser is build from a LARK grammar file. parser/eva ~~~~~~~~~~~~ -- ``eva.lark`` - add keywords(eg. CREATE, TABLE) under **Common +- ``evadb.lark`` - add keywords(eg. CREATE, TABLE) under **Common Keywords** - Add new grammar rule (eg. create_table) diff --git a/docs/source/contribute/release.rst b/docs/source/contribute/release.rst index 2964bdc15..e1b0862ee 100644 --- a/docs/source/contribute/release.rst +++ b/docs/source/contribute/release.rst @@ -79,7 +79,7 @@ merged since the last release. python3 -m venv test_evadb # create a virtualenv for testing source test_evadb/bin/activate # activate virtualenv python3 -m pip install dist/evadb-0.9.1-py3-none-any.whl - python3 -c "import eva; print(eva.__version__)" + python3 -c "import evasb; print(evadb.__version__)" 10. Publish to PyPI diff --git a/docs/source/overview/installation.rst b/docs/source/overview/installation.rst index cf753d2cb..7fa8d6489 100644 --- a/docs/source/overview/installation.rst +++ b/docs/source/overview/installation.rst @@ -35,7 +35,7 @@ Connect to the EVA server in the notebook using the following code: # allow nested asyncio calls for client to connect with server import nest_asyncio nest_asyncio.apply() - from eva.server.db_api import connect + from evadb.server.db_api import connect # hostname and port of the server where EVA is running connection = connect(host = '0.0.0.0', port = 8803) diff --git a/docs/source/overview/udf.rst b/docs/source/overview/udf.rst index 41791beaa..394488208 100644 --- a/docs/source/overview/udf.rst +++ b/docs/source/overview/udf.rst @@ -7,7 +7,7 @@ Here is an illustrative UDF for classifying MNIST images. .. code-block:: bash - !wget -nc https://raw.githubusercontent.com/georgia-tech-db/eva/master/eva/udfs/mnist_image_classifier.py + !wget -nc https://raw.githubusercontent.com/georgia-tech-db/eva/master/evadb/udfs/mnist_image_classifier.py .. code-block:: python diff --git a/docs/source/reference/api.rst b/docs/source/reference/api.rst index 4494dc876..02f2608c5 100644 --- a/docs/source/reference/api.rst +++ b/docs/source/reference/api.rst @@ -6,11 +6,11 @@ To begin your querying session, get a connection to the EvaDB using ``connect``: .. autosummary:: :toctree: ./doc - ~eva.connect + ~evadb.connect .. code-block:: python - from eva import connect + from evadb import connect conn = connect() You can then use this connection to run queries: @@ -37,7 +37,7 @@ EVADBConnection Interface .. autosummary:: :toctree: ./doc - ~eva.EVADBConnection.cursor + ~evadb.EVADBConnection.cursor EVADBCursor Interface @@ -46,13 +46,13 @@ EVADBCursor Interface .. autosummary:: :toctree: ./doc - ~eva.EVADBCursor.connect - ~eva.EVADBCursor.load - ~eva.EVADBCursor.query - ~eva.EVADBCursor.table - ~eva.EVADBCursor.create_udf - ~eva.EVADBCursor.create_vector_index - ~eva.EVADBCursor.df + ~evadb.EVADBCursor.connect + ~evadb.EVADBCursor.load + ~evadb.EVADBCursor.query + ~evadb.EVADBCursor.table + ~evadb.EVADBCursor.create_udf + ~evadb.EVADBCursor.create_vector_index + ~evadb.EVADBCursor.df EVADBQuery Interface --------------------- @@ -60,12 +60,12 @@ EVADBQuery Interface .. autosummary:: :toctree: ./doc - ~eva.EVADBQuery.select - ~eva.EVADBQuery.cross_apply - ~eva.EVADBQuery.filter - ~eva.EVADBQuery.df - ~eva.EVADBQuery.alias - ~eva.EVADBQuery.limit - ~eva.EVADBQuery.order - ~eva.EVADBQuery.show - ~eva.EVADBQuery.sql_query \ No newline at end of file + ~evadb.EVADBQuery.select + ~evadb.EVADBQuery.cross_apply + ~evadb.EVADBQuery.filter + ~evadb.EVADBQuery.df + ~evadb.EVADBQuery.alias + ~evadb.EVADBQuery.limit + ~evadb.EVADBQuery.order + ~evadb.EVADBQuery.show + ~evadb.EVADBQuery.sql_query \ No newline at end of file diff --git a/docs/source/reference/evaql.rst b/docs/source/reference/evaql.rst index 26b060de1..1d13bd141 100644 --- a/docs/source/reference/evaql.rst +++ b/docs/source/reference/evaql.rst @@ -14,7 +14,7 @@ Here is an example where we first define a UDF wrapping around the FastRCNN obje OUTPUT (labels NDARRAY STR(ANYDIM), bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE Classification - IMPL 'eva/udfs/fastrcnn_object_detector.py'; + IMPL 'evadb/udfs/fastrcnn_object_detector.py'; --- Use the function to retrieve frames that contain more than 3 cars SELECT id FROM MyVideo diff --git a/docs/source/reference/evaql/create.rst b/docs/source/reference/evaql/create.rst index 2a989cd62..931292f3c 100644 --- a/docs/source/reference/evaql/create.rst +++ b/docs/source/reference/evaql/create.rst @@ -30,7 +30,7 @@ To register an user-defined function, specify the implementation details of the OUTPUT (labels NDARRAY STR(ANYDIM), bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE Classification - IMPL 'eva/udfs/fastrcnn_object_detector.py'; + IMPL 'evadb/udfs/fastrcnn_object_detector.py'; CREATE MATERIALIZED VIEW ---- diff --git a/docs/source/reference/gpu.rst b/docs/source/reference/gpu.rst index 183ef7db9..0c305609b 100644 --- a/docs/source/reference/gpu.rst +++ b/docs/source/reference/gpu.rst @@ -23,7 +23,7 @@ A valid output from the command indicates that your GPU is configured and ready Output of `cuda:0` indicates the presence of a GPU. 0 indicates the index of the GPU in system. If you have multiple GPUs on your workstation, the index must be updated accordingly. -3. Now configure the executor section in eva.yml as follows: +3. Now configure the executor section in evadb.yml as follows: .. code-block:: yaml diff --git a/docs/source/reference/io.rst b/docs/source/reference/io.rst index a60185ebe..eed4fd737 100644 --- a/docs/source/reference/io.rst +++ b/docs/source/reference/io.rst @@ -18,7 +18,7 @@ dimensions(*Tuple(int)*): shape of the numpy array .. code-block:: python - from eva.catalog.catalog_type import NdArrayType + from evadb.catalog.catalog_type import NdArrayType NumpyArray( name="input_arr", is_nullable=False, @@ -34,13 +34,13 @@ name (*str*): name of the pytorch tensor. is_nullable (*bool*): boolean value indicating if the pytorch tensor can be NULL. -type (*NdArrayType*): data type of elements in the pytorch tensor. The available types can be found in eva/catalog/catalog_type.py in class NdArrayType +type (*NdArrayType*): data type of elements in the pytorch tensor. The available types can be found in evadb/catalog/catalog_type.py in class NdArrayType dimensions(*Tuple(int)*): shape of the numpy array .. code-block:: python - from eva.catalog.catalog_type import NdArrayType + from evadb.catalog.catalog_type import NdArrayType PyTorchTensor( name="input_arr", is_nullable=False, @@ -53,7 +53,7 @@ PandasDataframe ---------------- columns (*List[str]*): list of strings that represent the expected column names in the pandas dataframe that is returned from the UDF. -column_types (*NdArrayType*): expected datatype of the column in the pandas dataframe returned from the UDF. The NdArrayType class is inherited from eva.catalog.catalog_type. +column_types (*NdArrayType*): expected datatype of the column in the pandas dataframe returned from the UDF. The NdArrayType class is inherited from evadb.catalog.catalog_type. column_shapes (*List[tuples]*): list of tuples that represent the expected shapes of columns in the pandas dataframe returned from the UDF. diff --git a/docs/source/reference/udfs/custom.rst b/docs/source/reference/udfs/custom.rst index a64e6f598..d21f3b675 100644 --- a/docs/source/reference/udfs/custom.rst +++ b/docs/source/reference/udfs/custom.rst @@ -6,13 +6,13 @@ This section provides an overview of how you can create and use a custom user-de Part 1: Writing a custom UDF ------------------------------ -During each step, use `this UDF implementation `_ as a reference. +During each step, use `this UDF implementation `_ as a reference. 1. Create a new file under `udfs/` folder and give it a descriptive name. eg: `yolo_object_detection.py`. .. note:: - UDFs packaged along with EVA are located inside the `udfs `_ folder. + UDFs packaged along with EVA are located inside the `udfs `_ folder. 2. Create a Python class that inherits from `PytorchClassifierAbstractUDF`. @@ -131,7 +131,7 @@ Now that you have implemented your UDF, we need to register it as a UDF in EVA. .. code-block:: sql CREATE UDF YoloDecorators - IMPL 'eva/udfs/decorators/yolo_object_detection_decorators.py'; + IMPL 'evadb/udfs/decorators/yolo_object_detection_decorators.py'; A status of 0 in the response denotes the successful registration of this UDF. diff --git a/docs/source/reference/udfs/openai.rst b/docs/source/reference/udfs/openai.rst index 717786ad3..faeccb796 100644 --- a/docs/source/reference/udfs/openai.rst +++ b/docs/source/reference/udfs/openai.rst @@ -12,7 +12,7 @@ To create a chat completion UDF in EVA, use the following SQL command: .. code-block:: sql CREATE UDF IF NOT EXISTS OpenAIChatCompletion - IMPL 'eva/udfs/openai_chat_completion_udf.py' + IMPL 'evadb/udfs/openai_chat_completion_udf.py' 'model' 'gpt-3.5-turbo' EVA supports the following models for chat completion task: diff --git a/eva/models/__init__.py b/eva/models/__init__.py deleted file mode 100644 index 0754a2b4a..000000000 --- a/eva/models/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# coding=utf-8 -# Copyright 2018-2023 EVA -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -"""builds the different models used in eva""" diff --git a/eva/README.md b/evadb/README.md similarity index 93% rename from eva/README.md rename to evadb/README.md index 1511ff321..348b089a8 100644 --- a/eva/README.md +++ b/evadb/README.md @@ -1,6 +1,6 @@ # Architecture of EVA Database System -EVA Architecture Diagram +EVA Architecture Diagram * `server` - Code for launching server that sends client commands to command handler. * `parser` - Converts SQL queries to statements (e.g., CREATE, SELECT, INSERT, and LOAD statements). diff --git a/eva/__init__.py b/evadb/__init__.py similarity index 84% rename from eva/__init__.py rename to evadb/__init__.py index c413ac799..3011c7829 100644 --- a/eva/__init__.py +++ b/evadb/__init__.py @@ -12,12 +12,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.interfaces.relational.db import ( # noqa: E402,F401 +from evadb.interfaces.relational.db import ( # noqa: E402,F401 EVADBConnection, EVADBCursor, connect, ) -from eva.interfaces.relational.relation import EVADBQuery # noqa: E402,F401 +from evadb.interfaces.relational.relation import EVADBQuery # noqa: E402,F401 from .version import VERSION as __version__ # noqa: E402,F401 diff --git a/eva/binder/__init__.py b/evadb/binder/__init__.py similarity index 100% rename from eva/binder/__init__.py rename to evadb/binder/__init__.py diff --git a/eva/binder/binder_utils.py b/evadb/binder/binder_utils.py similarity index 93% rename from eva/binder/binder_utils.py rename to evadb/binder/binder_utils.py index a1a1e773f..488216908 100644 --- a/eva/binder/binder_utils.py +++ b/evadb/binder/binder_utils.py @@ -17,23 +17,23 @@ import re from typing import TYPE_CHECKING, List -from eva.catalog.catalog_type import TableType -from eva.catalog.catalog_utils import ( +from evadb.catalog.catalog_type import TableType +from evadb.catalog.catalog_utils import ( get_video_table_column_definitions, is_document_table, is_string_col, is_video_table, ) -from eva.expression.function_expression import FunctionExpression -from eva.parser.alias import Alias +from evadb.expression.function_expression import FunctionExpression +from evadb.parser.alias import Alias if TYPE_CHECKING: - from eva.binder.statement_binder_context import StatementBinderContext - from eva.catalog.catalog_manager import CatalogManager -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.table_ref import TableInfo, TableRef -from eva.utils.logging_manager import logger + from evadb.binder.statement_binder_context import StatementBinderContext + from evadb.catalog.catalog_manager import CatalogManager +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.table_ref import TableInfo, TableRef +from evadb.utils.logging_manager import logger class BinderError(Exception): diff --git a/eva/binder/statement_binder.py b/evadb/binder/statement_binder.py similarity index 91% rename from eva/binder/statement_binder.py rename to evadb/binder/statement_binder.py index da8734a98..d8ccb9f94 100644 --- a/eva/binder/statement_binder.py +++ b/evadb/binder/statement_binder.py @@ -16,7 +16,7 @@ from pathlib import Path from typing import Callable -from eva.binder.binder_utils import ( +from evadb.binder.binder_utils import ( BinderError, bind_table_info, check_column_name_is_string, @@ -26,26 +26,26 @@ handle_bind_extract_object_function, resolve_alias_table_value_expression, ) -from eva.binder.statement_binder_context import StatementBinderContext -from eva.catalog.catalog_type import NdArrayType, TableType, VideoColumnName -from eva.catalog.catalog_utils import get_metadata_properties -from eva.configuration.constants import EVA_INSTALLATION_DIR -from eva.expression.abstract_expression import AbstractExpression, ExpressionType -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.create_index_statement import CreateIndexStatement -from eva.parser.create_mat_view_statement import CreateMaterializedViewStatement -from eva.parser.create_statement import ColumnDefinition, CreateTableStatement -from eva.parser.delete_statement import DeleteTableStatement -from eva.parser.explain_statement import ExplainStatement -from eva.parser.rename_statement import RenameTableStatement -from eva.parser.select_statement import SelectStatement -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableRef -from eva.parser.types import UDFType -from eva.third_party.huggingface.binder import assign_hf_udf -from eva.utils.generic_utils import get_file_checksum, load_udf_class_from_file -from eva.utils.logging_manager import logger +from evadb.binder.statement_binder_context import StatementBinderContext +from evadb.catalog.catalog_type import NdArrayType, TableType, VideoColumnName +from evadb.catalog.catalog_utils import get_metadata_properties +from evadb.configuration.constants import EVA_INSTALLATION_DIR +from evadb.expression.abstract_expression import AbstractExpression, ExpressionType +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.create_index_statement import CreateIndexStatement +from evadb.parser.create_mat_view_statement import CreateMaterializedViewStatement +from evadb.parser.create_statement import ColumnDefinition, CreateTableStatement +from evadb.parser.delete_statement import DeleteTableStatement +from evadb.parser.explain_statement import ExplainStatement +from evadb.parser.rename_statement import RenameTableStatement +from evadb.parser.select_statement import SelectStatement +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableRef +from evadb.parser.types import UDFType +from evadb.third_party.huggingface.binder import assign_hf_udf +from evadb.utils.generic_utils import get_file_checksum, load_udf_class_from_file +from evadb.utils.logging_manager import logger class StatementBinder: diff --git a/eva/binder/statement_binder_context.py b/evadb/binder/statement_binder_context.py similarity index 94% rename from eva/binder/statement_binder_context.py rename to evadb/binder/statement_binder_context.py index 36602aeb6..eab01632e 100644 --- a/eva/binder/statement_binder_context.py +++ b/evadb/binder/statement_binder_context.py @@ -14,13 +14,13 @@ # limitations under the License. from typing import Callable, Dict, List, Tuple, Union -from eva.binder.binder_utils import BinderError -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.utils.logging_manager import logger +from evadb.binder.binder_utils import BinderError +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.utils.logging_manager import logger CatalogColumnType = Union[ColumnCatalogEntry, UdfIOCatalogEntry] diff --git a/eva/catalog/__init__.py b/evadb/catalog/__init__.py similarity index 100% rename from eva/catalog/__init__.py rename to evadb/catalog/__init__.py diff --git a/eva/catalog/catalog_manager.md b/evadb/catalog/catalog_manager.md similarity index 100% rename from eva/catalog/catalog_manager.md rename to evadb/catalog/catalog_manager.md diff --git a/eva/catalog/catalog_manager.py b/evadb/catalog/catalog_manager.py similarity index 93% rename from eva/catalog/catalog_manager.py rename to evadb/catalog/catalog_manager.py index 2ef465d06..dcc456005 100644 --- a/eva/catalog/catalog_manager.py +++ b/evadb/catalog/catalog_manager.py @@ -16,13 +16,13 @@ from pathlib import Path from typing import List -from eva.catalog.catalog_type import ( +from evadb.catalog.catalog_type import ( ColumnType, TableType, VectorStoreType, VideoColumnName, ) -from eva.catalog.catalog_utils import ( +from evadb.catalog.catalog_utils import ( cleanup_storage, construct_udf_cache_catalog_entry, get_document_table_column_definitions, @@ -31,7 +31,7 @@ get_video_table_column_definitions, xform_column_definitions_to_catalog_entries, ) -from eva.catalog.models.utils import ( +from evadb.catalog.models.utils import ( ColumnCatalogEntry, IndexCatalogEntry, TableCatalogEntry, @@ -44,22 +44,24 @@ init_db, truncate_catalog_tables, ) -from eva.catalog.services.column_catalog_service import ColumnCatalogService -from eva.catalog.services.index_catalog_service import IndexCatalogService -from eva.catalog.services.table_catalog_service import TableCatalogService -from eva.catalog.services.udf_cache_catalog_service import UdfCacheCatalogService -from eva.catalog.services.udf_catalog_service import UdfCatalogService -from eva.catalog.services.udf_cost_catalog_service import UdfCostCatalogService -from eva.catalog.services.udf_io_catalog_service import UdfIOCatalogService -from eva.catalog.services.udf_metadata_catalog_service import UdfMetadataCatalogService -from eva.catalog.sql_config import IDENTIFIER_COLUMN, SQLConfig -from eva.configuration.configuration_manager import ConfigurationManager -from eva.expression.function_expression import FunctionExpression -from eva.parser.create_statement import ColumnDefinition -from eva.parser.table_ref import TableInfo -from eva.parser.types import FileFormatType -from eva.utils.generic_utils import generate_file_path, get_file_checksum -from eva.utils.logging_manager import logger +from evadb.catalog.services.column_catalog_service import ColumnCatalogService +from evadb.catalog.services.index_catalog_service import IndexCatalogService +from evadb.catalog.services.table_catalog_service import TableCatalogService +from evadb.catalog.services.udf_cache_catalog_service import UdfCacheCatalogService +from evadb.catalog.services.udf_catalog_service import UdfCatalogService +from evadb.catalog.services.udf_cost_catalog_service import UdfCostCatalogService +from evadb.catalog.services.udf_io_catalog_service import UdfIOCatalogService +from evadb.catalog.services.udf_metadata_catalog_service import ( + UdfMetadataCatalogService, +) +from evadb.catalog.sql_config import IDENTIFIER_COLUMN, SQLConfig +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.expression.function_expression import FunctionExpression +from evadb.parser.create_statement import ColumnDefinition +from evadb.parser.table_ref import TableInfo +from evadb.parser.types import FileFormatType +from evadb.utils.generic_utils import generate_file_path, get_file_checksum +from evadb.utils.logging_manager import logger class CatalogManager(object): diff --git a/eva/catalog/catalog_type.py b/evadb/catalog/catalog_type.py similarity index 98% rename from eva/catalog/catalog_type.py rename to evadb/catalog/catalog_type.py index 58d010b53..e738715e2 100644 --- a/eva/catalog/catalog_type.py +++ b/evadb/catalog/catalog_type.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.utils.generic_utils import EVAEnum +from evadb.utils.generic_utils import EVAEnum class Dimension(EVAEnum): diff --git a/eva/catalog/catalog_utils.py b/evadb/catalog/catalog_utils.py similarity index 94% rename from eva/catalog/catalog_utils.py rename to evadb/catalog/catalog_utils.py index 168036310..a2077e01c 100644 --- a/eva/catalog/catalog_utils.py +++ b/evadb/catalog/catalog_utils.py @@ -16,7 +16,7 @@ from pathlib import Path from typing import Any, Dict, List -from eva.catalog.catalog_type import ( +from evadb.catalog.catalog_type import ( ColumnType, DocumentColumnName, ImageColumnName, @@ -25,17 +25,17 @@ TableType, VideoColumnName, ) -from eva.catalog.models.utils import ( +from evadb.catalog.models.utils import ( ColumnCatalogEntry, TableCatalogEntry, UdfCacheCatalogEntry, UdfCatalogEntry, ) -from eva.configuration.configuration_manager import ConfigurationManager -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.create_statement import ColConstraintInfo, ColumnDefinition -from eva.utils.generic_utils import get_str_hash, remove_directory_contents +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.create_statement import ColConstraintInfo, ColumnDefinition +from evadb.utils.generic_utils import get_str_hash, remove_directory_contents CATALOG_TABLES = [ "column_catalog", @@ -288,6 +288,6 @@ def get_metadata_properties(udf_obj: UdfCatalogEntry) -> Dict: # SQLAlchemy already handles this optimization for us, which will be explored at a # later time. def get_catalog_instance(db_uri: str, config: ConfigurationManager): - from eva.catalog.catalog_manager import CatalogManager + from evadb.catalog.catalog_manager import CatalogManager return CatalogManager(db_uri, config) diff --git a/eva/catalog/models/__init__.py b/evadb/catalog/models/__init__.py similarity index 100% rename from eva/catalog/models/__init__.py rename to evadb/catalog/models/__init__.py diff --git a/eva/catalog/models/association_models.py b/evadb/catalog/models/association_models.py similarity index 96% rename from eva/catalog/models/association_models.py rename to evadb/catalog/models/association_models.py index 6e189026f..cd940e8a0 100644 --- a/eva/catalog/models/association_models.py +++ b/evadb/catalog/models/association_models.py @@ -14,7 +14,7 @@ # limitations under the License. from sqlalchemy import Column, ForeignKey, Table, UniqueConstraint -from eva.catalog.models.base_model import BaseModel +from evadb.catalog.models.base_model import BaseModel # dependency table to maintain a many-to-many relationship between udf_catalog and udf_cache_catalog. This is important to ensure that any changes to udf are propagated to udf_cache. For example, deletion of a udf should also clear the associated caches. diff --git a/eva/catalog/models/base_model.py b/evadb/catalog/models/base_model.py similarity index 97% rename from eva/catalog/models/base_model.py rename to evadb/catalog/models/base_model.py index fcd64c3e3..578f18c4b 100644 --- a/eva/catalog/models/base_model.py +++ b/evadb/catalog/models/base_model.py @@ -21,8 +21,8 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy_utils import create_database, database_exists -from eva.catalog.sql_config import CATALOG_TABLES -from eva.utils.logging_manager import logger +from evadb.catalog.sql_config import CATALOG_TABLES +from evadb.utils.logging_manager import logger class CustomModel: diff --git a/eva/catalog/models/column_catalog.py b/evadb/catalog/models/column_catalog.py similarity index 94% rename from eva/catalog/models/column_catalog.py rename to evadb/catalog/models/column_catalog.py index d3dd07308..caacdea5c 100644 --- a/eva/catalog/models/column_catalog.py +++ b/evadb/catalog/models/column_catalog.py @@ -21,10 +21,10 @@ from sqlalchemy.orm import relationship from sqlalchemy.types import Enum -from eva.catalog.catalog_type import ColumnType, Dimension, NdArrayType -from eva.catalog.models.association_models import depend_column_and_udf_cache -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import ColumnCatalogEntry +from evadb.catalog.catalog_type import ColumnType, Dimension, NdArrayType +from evadb.catalog.models.association_models import depend_column_and_udf_cache +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import ColumnCatalogEntry class ColumnCatalog(BaseModel): diff --git a/eva/catalog/models/index_catalog.py b/evadb/catalog/models/index_catalog.py similarity index 94% rename from eva/catalog/models/index_catalog.py rename to evadb/catalog/models/index_catalog.py index 3c4535ac4..5fd7f0ff1 100644 --- a/eva/catalog/models/index_catalog.py +++ b/evadb/catalog/models/index_catalog.py @@ -17,9 +17,9 @@ from sqlalchemy.orm import relationship from sqlalchemy.types import Enum -from eva.catalog.catalog_type import VectorStoreType -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import IndexCatalogEntry +from evadb.catalog.catalog_type import VectorStoreType +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import IndexCatalogEntry class IndexCatalog(BaseModel): diff --git a/eva/catalog/models/table_catalog.py b/evadb/catalog/models/table_catalog.py similarity index 93% rename from eva/catalog/models/table_catalog.py rename to evadb/catalog/models/table_catalog.py index 7fbc3b7f1..7946e1893 100644 --- a/eva/catalog/models/table_catalog.py +++ b/evadb/catalog/models/table_catalog.py @@ -16,9 +16,9 @@ from sqlalchemy import Column, Enum, String from sqlalchemy.orm import relationship -from eva.catalog.catalog_type import TableType -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import TableCatalogEntry +from evadb.catalog.catalog_type import TableType +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import TableCatalogEntry class TableCatalog(BaseModel): diff --git a/eva/catalog/models/udf_cache_catalog.py b/evadb/catalog/models/udf_cache_catalog.py similarity index 94% rename from eva/catalog/models/udf_cache_catalog.py rename to evadb/catalog/models/udf_cache_catalog.py index 6bcb7d517..8dacfdaa2 100644 --- a/eva/catalog/models/udf_cache_catalog.py +++ b/evadb/catalog/models/udf_cache_catalog.py @@ -18,12 +18,12 @@ from sqlalchemy import Column, ForeignKey, Integer, String, UniqueConstraint from sqlalchemy.orm import relationship -from eva.catalog.models.association_models import ( +from evadb.catalog.models.association_models import ( depend_column_and_udf_cache, depend_udf_and_udf_cache, ) -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import UdfCacheCatalogEntry +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import UdfCacheCatalogEntry class UdfCacheCatalog(BaseModel): diff --git a/eva/catalog/models/udf_catalog.py b/evadb/catalog/models/udf_catalog.py similarity index 93% rename from eva/catalog/models/udf_catalog.py rename to evadb/catalog/models/udf_catalog.py index 9412e8755..cc7ad387e 100644 --- a/eva/catalog/models/udf_catalog.py +++ b/evadb/catalog/models/udf_catalog.py @@ -17,9 +17,9 @@ from sqlalchemy import Column, String from sqlalchemy.orm import relationship -from eva.catalog.models.association_models import depend_udf_and_udf_cache -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import UdfCatalogEntry +from evadb.catalog.models.association_models import depend_udf_and_udf_cache +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import UdfCatalogEntry class UdfCatalog(BaseModel): diff --git a/eva/catalog/models/udf_cost_catalog.py b/evadb/catalog/models/udf_cost_catalog.py similarity index 93% rename from eva/catalog/models/udf_cost_catalog.py rename to evadb/catalog/models/udf_cost_catalog.py index 8949c425f..668b176ce 100644 --- a/eva/catalog/models/udf_cost_catalog.py +++ b/evadb/catalog/models/udf_cost_catalog.py @@ -15,8 +15,8 @@ from sqlalchemy import Column, Float, ForeignKey, Integer, String -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import UdfCostCatalogEntry +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import UdfCostCatalogEntry class UdfCostCatalog(BaseModel): diff --git a/eva/catalog/models/udf_io_catalog.py b/evadb/catalog/models/udf_io_catalog.py similarity index 95% rename from eva/catalog/models/udf_io_catalog.py rename to evadb/catalog/models/udf_io_catalog.py index 19fc68c91..0137e0992 100644 --- a/eva/catalog/models/udf_io_catalog.py +++ b/evadb/catalog/models/udf_io_catalog.py @@ -19,9 +19,9 @@ from sqlalchemy.orm import relationship from sqlalchemy.types import Enum -from eva.catalog.catalog_type import ColumnType, Dimension, NdArrayType -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import UdfIOCatalogEntry +from evadb.catalog.catalog_type import ColumnType, Dimension, NdArrayType +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import UdfIOCatalogEntry class UdfIOCatalog(BaseModel): diff --git a/eva/catalog/models/udf_metadata_catalog.py b/evadb/catalog/models/udf_metadata_catalog.py similarity index 94% rename from eva/catalog/models/udf_metadata_catalog.py rename to evadb/catalog/models/udf_metadata_catalog.py index 5c0c64b2f..566eb841e 100644 --- a/eva/catalog/models/udf_metadata_catalog.py +++ b/evadb/catalog/models/udf_metadata_catalog.py @@ -16,8 +16,8 @@ from sqlalchemy import Column, ForeignKey, Integer, String, UniqueConstraint from sqlalchemy.orm import relationship -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.utils import UdfMetadataCatalogEntry +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.utils import UdfMetadataCatalogEntry class UdfMetadataCatalog(BaseModel): diff --git a/eva/catalog/models/utils.py b/evadb/catalog/models/utils.py similarity index 96% rename from eva/catalog/models/utils.py rename to evadb/catalog/models/utils.py index 56837fa74..02c61c9f9 100644 --- a/eva/catalog/models/utils.py +++ b/evadb/catalog/models/utils.py @@ -20,10 +20,15 @@ from sqlalchemy.engine import Engine from sqlalchemy_utils import create_database, database_exists -from eva.catalog.catalog_type import ColumnType, NdArrayType, TableType, VectorStoreType -from eva.catalog.models.base_model import BaseModel -from eva.catalog.sql_config import CATALOG_TABLES -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import ( + ColumnType, + NdArrayType, + TableType, + VectorStoreType, +) +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.sql_config import CATALOG_TABLES +from evadb.utils.logging_manager import logger def init_db(engine: Engine): diff --git a/eva/catalog/schema_utils.py b/evadb/catalog/schema_utils.py similarity index 92% rename from eva/catalog/schema_utils.py rename to evadb/catalog/schema_utils.py index 96ca51a6f..9652c8b52 100644 --- a/eva/catalog/schema_utils.py +++ b/evadb/catalog/schema_utils.py @@ -16,9 +16,9 @@ from sqlalchemy import TEXT, Column, Float, Integer, LargeBinary -from eva.catalog.catalog_type import ColumnType -from eva.catalog.models.utils import ColumnCatalogEntry -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import ColumnType +from evadb.catalog.models.utils import ColumnCatalogEntry +from evadb.utils.logging_manager import logger class SchemaUtils(object): diff --git a/eva/catalog/services/__init__.py b/evadb/catalog/services/__init__.py similarity index 100% rename from eva/catalog/services/__init__.py rename to evadb/catalog/services/__init__.py diff --git a/eva/catalog/services/base_service.py b/evadb/catalog/services/base_service.py similarity index 95% rename from eva/catalog/services/base_service.py rename to evadb/catalog/services/base_service.py index 68037f788..16ba3872f 100644 --- a/eva/catalog/services/base_service.py +++ b/evadb/catalog/services/base_service.py @@ -17,7 +17,7 @@ from sqlalchemy.orm import Session from sqlalchemy.orm.exc import NoResultFound -from eva.catalog.models.base_model import BaseModel +from evadb.catalog.models.base_model import BaseModel class BaseService: diff --git a/eva/catalog/services/column_catalog_service.py b/evadb/catalog/services/column_catalog_service.py similarity index 94% rename from eva/catalog/services/column_catalog_service.py rename to evadb/catalog/services/column_catalog_service.py index f537ed211..c387d44bf 100644 --- a/eva/catalog/services/column_catalog_service.py +++ b/evadb/catalog/services/column_catalog_service.py @@ -18,9 +18,9 @@ from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.sql.expression import select -from eva.catalog.models.column_catalog import ColumnCatalog -from eva.catalog.models.utils import ColumnCatalogEntry, TableCatalogEntry -from eva.catalog.services.base_service import BaseService +from evadb.catalog.models.column_catalog import ColumnCatalog +from evadb.catalog.models.utils import ColumnCatalogEntry, TableCatalogEntry +from evadb.catalog.services.base_service import BaseService class ColumnCatalogService(BaseService): diff --git a/eva/catalog/services/index_catalog_service.py b/evadb/catalog/services/index_catalog_service.py similarity index 89% rename from eva/catalog/services/index_catalog_service.py rename to evadb/catalog/services/index_catalog_service.py index 61f75904f..59aa211d7 100644 --- a/eva/catalog/services/index_catalog_service.py +++ b/evadb/catalog/services/index_catalog_service.py @@ -17,11 +17,11 @@ from sqlalchemy.orm import Session from sqlalchemy.orm.exc import NoResultFound -from eva.catalog.catalog_type import VectorStoreType -from eva.catalog.models.index_catalog import IndexCatalog, IndexCatalogEntry -from eva.catalog.models.utils import ColumnCatalogEntry -from eva.catalog.services.base_service import BaseService -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import VectorStoreType +from evadb.catalog.models.index_catalog import IndexCatalog, IndexCatalogEntry +from evadb.catalog.models.utils import ColumnCatalogEntry +from evadb.catalog.services.base_service import BaseService +from evadb.utils.logging_manager import logger class IndexCatalogService(BaseService): diff --git a/eva/catalog/services/table_catalog_service.py b/evadb/catalog/services/table_catalog_service.py similarity index 92% rename from eva/catalog/services/table_catalog_service.py rename to evadb/catalog/services/table_catalog_service.py index e0363230c..951726478 100644 --- a/eva/catalog/services/table_catalog_service.py +++ b/evadb/catalog/services/table_catalog_service.py @@ -16,12 +16,12 @@ from sqlalchemy.orm import Session from sqlalchemy.sql.expression import select -from eva.catalog.catalog_type import TableType -from eva.catalog.models.table_catalog import TableCatalog, TableCatalogEntry -from eva.catalog.services.base_service import BaseService -from eva.catalog.services.column_catalog_service import ColumnCatalogService -from eva.utils.errors import CatalogError -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import TableType +from evadb.catalog.models.table_catalog import TableCatalog, TableCatalogEntry +from evadb.catalog.services.base_service import BaseService +from evadb.catalog.services.column_catalog_service import ColumnCatalogService +from evadb.utils.errors import CatalogError +from evadb.utils.logging_manager import logger class TableCatalogService(BaseService): diff --git a/eva/catalog/services/udf_cache_catalog_service.py b/evadb/catalog/services/udf_cache_catalog_service.py similarity index 89% rename from eva/catalog/services/udf_cache_catalog_service.py rename to evadb/catalog/services/udf_cache_catalog_service.py index 97e603dd5..75da4bd9e 100644 --- a/eva/catalog/services/udf_cache_catalog_service.py +++ b/evadb/catalog/services/udf_cache_catalog_service.py @@ -16,13 +16,13 @@ from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.sql.expression import select -from eva.catalog.models.udf_cache_catalog import UdfCacheCatalog -from eva.catalog.models.utils import UdfCacheCatalogEntry -from eva.catalog.services.base_service import BaseService -from eva.catalog.services.column_catalog_service import ColumnCatalogService -from eva.catalog.services.udf_catalog_service import UdfCatalogService -from eva.utils.errors import CatalogError -from eva.utils.logging_manager import logger +from evadb.catalog.models.udf_cache_catalog import UdfCacheCatalog +from evadb.catalog.models.utils import UdfCacheCatalogEntry +from evadb.catalog.services.base_service import BaseService +from evadb.catalog.services.column_catalog_service import ColumnCatalogService +from evadb.catalog.services.udf_catalog_service import UdfCatalogService +from evadb.utils.errors import CatalogError +from evadb.utils.logging_manager import logger class UdfCacheCatalogService(BaseService): diff --git a/eva/catalog/services/udf_catalog_service.py b/evadb/catalog/services/udf_catalog_service.py similarity index 93% rename from eva/catalog/services/udf_catalog_service.py rename to evadb/catalog/services/udf_catalog_service.py index 076ed0cd5..6dc4f6aa9 100644 --- a/eva/catalog/services/udf_catalog_service.py +++ b/evadb/catalog/services/udf_catalog_service.py @@ -15,9 +15,9 @@ from sqlalchemy.orm import Session from sqlalchemy.sql.expression import select -from eva.catalog.models.udf_catalog import UdfCatalog, UdfCatalogEntry -from eva.catalog.services.base_service import BaseService -from eva.utils.logging_manager import logger +from evadb.catalog.models.udf_catalog import UdfCatalog, UdfCatalogEntry +from evadb.catalog.services.base_service import BaseService +from evadb.utils.logging_manager import logger class UdfCatalogService(BaseService): @@ -31,7 +31,7 @@ def insert_entry( Arguments: name (str): name of the udf - impl_path (str): path to the udf implementation relative to eva/udf + impl_path (str): path to the udf implementation relative to evadb/udf type (str): udf operator kind, classification or detection or etc checksum(str): checksum of the udf file content, used for consistency diff --git a/eva/catalog/services/udf_cost_catalog_service.py b/evadb/catalog/services/udf_cost_catalog_service.py similarity index 93% rename from eva/catalog/services/udf_cost_catalog_service.py rename to evadb/catalog/services/udf_cost_catalog_service.py index d68294db0..19d369d86 100644 --- a/eva/catalog/services/udf_cost_catalog_service.py +++ b/evadb/catalog/services/udf_cost_catalog_service.py @@ -16,9 +16,9 @@ from sqlalchemy.orm import Session from sqlalchemy.sql.expression import select -from eva.catalog.models.udf_cost_catalog import UdfCostCatalog, UdfCostCatalogEntry -from eva.catalog.services.base_service import BaseService -from eva.utils.errors import CatalogError +from evadb.catalog.models.udf_cost_catalog import UdfCostCatalog, UdfCostCatalogEntry +from evadb.catalog.services.base_service import BaseService +from evadb.utils.errors import CatalogError class UdfCostCatalogService(BaseService): diff --git a/eva/catalog/services/udf_io_catalog_service.py b/evadb/catalog/services/udf_io_catalog_service.py similarity index 93% rename from eva/catalog/services/udf_io_catalog_service.py rename to evadb/catalog/services/udf_io_catalog_service.py index 765b523ce..5d9f44f14 100644 --- a/eva/catalog/services/udf_io_catalog_service.py +++ b/evadb/catalog/services/udf_io_catalog_service.py @@ -17,9 +17,9 @@ from sqlalchemy.orm import Session from sqlalchemy.sql.expression import select -from eva.catalog.models.udf_io_catalog import UdfIOCatalog, UdfIOCatalogEntry -from eva.catalog.services.base_service import BaseService -from eva.utils.logging_manager import logger +from evadb.catalog.models.udf_io_catalog import UdfIOCatalog, UdfIOCatalogEntry +from evadb.catalog.services.base_service import BaseService +from evadb.utils.logging_manager import logger class UdfIOCatalogService(BaseService): diff --git a/eva/catalog/services/udf_metadata_catalog_service.py b/evadb/catalog/services/udf_metadata_catalog_service.py similarity index 90% rename from eva/catalog/services/udf_metadata_catalog_service.py rename to evadb/catalog/services/udf_metadata_catalog_service.py index d7e364cd3..7f8bef26c 100644 --- a/eva/catalog/services/udf_metadata_catalog_service.py +++ b/evadb/catalog/services/udf_metadata_catalog_service.py @@ -17,13 +17,13 @@ from sqlalchemy.orm import Session from sqlalchemy.sql.expression import select -from eva.catalog.models.udf_metadata_catalog import ( +from evadb.catalog.models.udf_metadata_catalog import ( UdfMetadataCatalog, UdfMetadataCatalogEntry, ) -from eva.catalog.services.base_service import BaseService -from eva.utils.errors import CatalogError -from eva.utils.logging_manager import logger +from evadb.catalog.services.base_service import BaseService +from evadb.utils.errors import CatalogError +from evadb.utils.logging_manager import logger class UdfMetadataCatalogService(BaseService): diff --git a/eva/catalog/sql_config.py b/evadb/catalog/sql_config.py similarity index 100% rename from eva/catalog/sql_config.py rename to evadb/catalog/sql_config.py diff --git a/eva/configuration/__init__.py b/evadb/configuration/__init__.py similarity index 100% rename from eva/configuration/__init__.py rename to evadb/configuration/__init__.py diff --git a/eva/configuration/bootstrap_environment.py b/evadb/configuration/bootstrap_environment.py similarity index 94% rename from eva/configuration/bootstrap_environment.py rename to evadb/configuration/bootstrap_environment.py index ece06026b..daba331e6 100644 --- a/eva/configuration/bootstrap_environment.py +++ b/evadb/configuration/bootstrap_environment.py @@ -19,7 +19,7 @@ import yaml -from eva.configuration.constants import ( +from evadb.configuration.constants import ( CACHE_DIR, DB_DEFAULT_NAME, EVA_CONFIG_FILE, @@ -29,17 +29,17 @@ TMP_DIR, UDF_DIR, ) -from eva.utils.logging_manager import logger as eva_logger +from evadb.utils.logging_manager import logger as eva_logger def get_base_config(eva_installation_dir: Path) -> Path: """ - Get path to .eva.yml source path. + Get path to .evadb.yml source path. This file will be copied to user's .eva directory. """ # if eva package is installed into environment - if importlib_resources.is_resource("eva", EVA_CONFIG_FILE): - with importlib_resources.path("eva", EVA_CONFIG_FILE) as yml_path: + if importlib_resources.is_resource("evadb", EVA_CONFIG_FILE): + with importlib_resources.path("evadb", EVA_CONFIG_FILE) as yml_path: return yml_path else: # For local dev environments without package installed diff --git a/eva/configuration/configuration_manager.py b/evadb/configuration/configuration_manager.py similarity index 91% rename from eva/configuration/configuration_manager.py rename to evadb/configuration/configuration_manager.py index 4bfd76623..f175f0aa1 100644 --- a/eva/configuration/configuration_manager.py +++ b/evadb/configuration/configuration_manager.py @@ -15,9 +15,9 @@ from pathlib import Path from typing import Any -from eva.configuration.bootstrap_environment import bootstrap_environment -from eva.configuration.constants import EVA_DATABASE_DIR, EVA_INSTALLATION_DIR -from eva.utils.logging_manager import logger +from evadb.configuration.bootstrap_environment import bootstrap_environment +from evadb.configuration.constants import EVA_DATABASE_DIR, EVA_INSTALLATION_DIR +from evadb.utils.logging_manager import logger class ConfigurationManager(object): diff --git a/eva/configuration/constants.py b/evadb/configuration/constants.py similarity index 79% rename from eva/configuration/constants.py rename to evadb/configuration/constants.py index 27c4d95ae..111116b18 100644 --- a/eva/configuration/constants.py +++ b/evadb/configuration/constants.py @@ -14,13 +14,13 @@ # limitations under the License. from pathlib import Path -import eva +import evadb -EVA_INSTALLATION_DIR = Path(eva.__file__).parent -EVA_ROOT_DIR = Path(eva.__file__).parent.parent -EVA_DATABASE_DIR = "eva_data" -EVA_DATASET_DIR = "eva_datasets" -EVA_CONFIG_FILE = "eva.yml" +EVA_INSTALLATION_DIR = Path(evadb.__file__).parent +EVA_ROOT_DIR = Path(evadb.__file__).parent.parent +EVA_DATABASE_DIR = "evadb_data" +EVA_DATASET_DIR = "evadb_datasets" +EVA_CONFIG_FILE = "evadb.yml" UDF_DIR = "udfs" CATALOG_DIR = "catalog" INDEX_DIR = "index" diff --git a/eva/constants.py b/evadb/constants.py similarity index 100% rename from eva/constants.py rename to evadb/constants.py diff --git a/eva/database.py b/evadb/database.py similarity index 86% rename from eva/database.py rename to evadb/database.py index 3674e1e24..b14d75df5 100644 --- a/eva/database.py +++ b/evadb/database.py @@ -16,12 +16,12 @@ from pathlib import Path from typing import TYPE_CHECKING, Callable -from eva.catalog.catalog_utils import get_catalog_instance -from eva.configuration.configuration_manager import ConfigurationManager -from eva.configuration.constants import DB_DEFAULT_NAME, EVA_DATABASE_DIR +from evadb.catalog.catalog_utils import get_catalog_instance +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.configuration.constants import DB_DEFAULT_NAME, EVA_DATABASE_DIR if TYPE_CHECKING: - from eva.catalog.catalog_manager import CatalogManager + from evadb.catalog.catalog_manager import CatalogManager @dataclass diff --git a/eva/eva_cmd_client.py b/evadb/eva_cmd_client.py similarity index 89% rename from eva/eva_cmd_client.py rename to evadb/eva_cmd_client.py index b7f8c7f6a..cb60a7143 100644 --- a/eva/eva_cmd_client.py +++ b/evadb/eva_cmd_client.py @@ -17,7 +17,7 @@ import sys from os.path import abspath, dirname, join -from eva.utils.logging_manager import logger +from evadb.utils.logging_manager import logger """ To allow running eva_server from any location @@ -26,8 +26,8 @@ EVA_CODE_DIR = abspath(join(THIS_DIR, "..")) sys.path.append(EVA_CODE_DIR) -from eva.configuration.configuration_manager import ConfigurationManager # noqa: E402 -from eva.server.interpreter import start_cmd_client # noqa: E402 +from evadb.configuration.configuration_manager import ConfigurationManager # noqa: E402 +from evadb.server.interpreter import start_cmd_client # noqa: E402 async def eva_client(host: str, port: int): diff --git a/eva/eva_server.py b/evadb/eva_server.py similarity index 97% rename from eva/eva_server.py rename to evadb/eva_server.py index 4766f0d69..042b0ce3b 100644 --- a/eva/eva_server.py +++ b/evadb/eva_server.py @@ -27,7 +27,7 @@ EVA_CODE_DIR = abspath(join(THIS_DIR, "..")) sys.path.append(EVA_CODE_DIR) -from eva.server.server import EvaServer # noqa: E402 +from evadb.server.server import EvaServer # noqa: E402 async def start_eva_server( diff --git a/eva/eva.yml b/evadb/evadb.yml similarity index 95% rename from eva/eva.yml rename to evadb/evadb.yml index 9052646e7..43914d4b0 100644 --- a/eva/eva.yml +++ b/evadb/evadb.yml @@ -2,7 +2,7 @@ core: eva_installation_dir: "" datasets_dir: "" catalog_database_uri: "" - application: "eva" + application: "evadb" mode: "release" #release or debug executor: diff --git a/eva/executor/README.md b/evadb/executor/README.md similarity index 100% rename from eva/executor/README.md rename to evadb/executor/README.md diff --git a/eva/executor/__init__.py b/evadb/executor/__init__.py similarity index 100% rename from eva/executor/__init__.py rename to evadb/executor/__init__.py diff --git a/eva/executor/abstract_executor.py b/evadb/executor/abstract_executor.py similarity index 92% rename from eva/executor/abstract_executor.py rename to evadb/executor/abstract_executor.py index 3e482cdab..5d5ef810c 100644 --- a/eva/executor/abstract_executor.py +++ b/evadb/executor/abstract_executor.py @@ -17,11 +17,11 @@ from typing import TYPE_CHECKING, Any, Generator, Iterable, List, TypeVar if TYPE_CHECKING: - from eva.catalog.catalog_manager import CatalogManager -from eva.configuration.configuration_manager import ConfigurationManager -from eva.database import EVADatabase -from eva.models.storage.batch import Batch -from eva.plan_nodes.abstract_plan import AbstractPlan + from evadb.catalog.catalog_manager import CatalogManager +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.database import EVADatabase +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.abstract_plan import AbstractPlan AbstractExecutor = TypeVar("AbstractExecutor") diff --git a/eva/executor/apply_and_merge_executor.py b/evadb/executor/apply_and_merge_executor.py similarity index 90% rename from eva/executor/apply_and_merge_executor.py rename to evadb/executor/apply_and_merge_executor.py index 6067e27e0..5bcc2bb6b 100644 --- a/eva/executor/apply_and_merge_executor.py +++ b/evadb/executor/apply_and_merge_executor.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.apply_and_merge_plan import ApplyAndMergePlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.apply_and_merge_plan import ApplyAndMergePlan class ApplyAndMergeExecutor(AbstractExecutor): diff --git a/eva/executor/create_executor.py b/evadb/executor/create_executor.py similarity index 84% rename from eva/executor/create_executor.py rename to evadb/executor/create_executor.py index 7b9f4f474..6ac7ac256 100644 --- a/eva/executor/create_executor.py +++ b/evadb/executor/create_executor.py @@ -12,12 +12,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import handle_if_not_exists -from eva.plan_nodes.create_plan import CreatePlan -from eva.storage.storage_engine import StorageEngine -from eva.utils.logging_manager import logger +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import handle_if_not_exists +from evadb.plan_nodes.create_plan import CreatePlan +from evadb.storage.storage_engine import StorageEngine +from evadb.utils.logging_manager import logger class CreateExecutor(AbstractExecutor): diff --git a/eva/executor/create_index_executor.py b/evadb/executor/create_index_executor.py similarity index 88% rename from eva/executor/create_index_executor.py rename to evadb/executor/create_index_executor.py index 5d8469d68..c5c2251c9 100644 --- a/eva/executor/create_index_executor.py +++ b/evadb/executor/create_index_executor.py @@ -16,16 +16,16 @@ import pandas as pd -from eva.catalog.sql_config import IDENTIFIER_COLUMN -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import ExecutorError, handle_vector_store_params -from eva.models.storage.batch import Batch -from eva.plan_nodes.create_index_plan import CreateIndexPlan -from eva.storage.storage_engine import StorageEngine -from eva.third_party.vector_stores.types import FeaturePayload -from eva.third_party.vector_stores.utils import VectorStoreFactory -from eva.utils.logging_manager import logger +from evadb.catalog.sql_config import IDENTIFIER_COLUMN +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import ExecutorError, handle_vector_store_params +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.create_index_plan import CreateIndexPlan +from evadb.storage.storage_engine import StorageEngine +from evadb.third_party.vector_stores.types import FeaturePayload +from evadb.third_party.vector_stores.utils import VectorStoreFactory +from evadb.utils.logging_manager import logger class CreateIndexExecutor(AbstractExecutor): diff --git a/eva/executor/create_mat_view_executor.py b/evadb/executor/create_mat_view_executor.py similarity index 84% rename from eva/executor/create_mat_view_executor.py rename to evadb/executor/create_mat_view_executor.py index 88e7481c7..7c86ea817 100644 --- a/eva/executor/create_mat_view_executor.py +++ b/evadb/executor/create_mat_view_executor.py @@ -12,11 +12,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import handle_if_not_exists -from eva.plan_nodes.create_mat_view_plan import CreateMaterializedViewPlan -from eva.storage.storage_engine import StorageEngine +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import handle_if_not_exists +from evadb.plan_nodes.create_mat_view_plan import CreateMaterializedViewPlan +from evadb.storage.storage_engine import StorageEngine class CreateMaterializedViewExecutor(AbstractExecutor): diff --git a/eva/executor/create_udf_executor.py b/evadb/executor/create_udf_executor.py similarity index 90% rename from eva/executor/create_udf_executor.py rename to evadb/executor/create_udf_executor.py index a064bb615..25a5160b1 100644 --- a/eva/executor/create_udf_executor.py +++ b/evadb/executor/create_udf_executor.py @@ -17,18 +17,18 @@ import pandas as pd -from eva.catalog.catalog_utils import get_metadata_properties -from eva.catalog.models.udf_catalog import UdfCatalogEntry -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.create_udf_plan import CreateUDFPlan -from eva.third_party.huggingface.create import gen_hf_io_catalog_entries -from eva.udfs.decorators.utils import load_io_from_udf_decorators -from eva.utils.errors import UDFIODefinitionError -from eva.utils.generic_utils import load_udf_class_from_file -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_utils import get_metadata_properties +from evadb.catalog.models.udf_catalog import UdfCatalogEntry +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.create_udf_plan import CreateUDFPlan +from evadb.third_party.huggingface.create import gen_hf_io_catalog_entries +from evadb.udfs.decorators.utils import load_io_from_udf_decorators +from evadb.utils.errors import UDFIODefinitionError +from evadb.utils.generic_utils import load_udf_class_from_file +from evadb.utils.logging_manager import logger class CreateUDFExecutor(AbstractExecutor): diff --git a/eva/executor/delete_executor.py b/evadb/executor/delete_executor.py similarity index 84% rename from eva/executor/delete_executor.py rename to evadb/executor/delete_executor.py index d59c802bf..3c758360f 100644 --- a/eva/executor/delete_executor.py +++ b/evadb/executor/delete_executor.py @@ -17,18 +17,18 @@ import pandas as pd from sqlalchemy import and_, or_ -from eva.catalog.catalog_type import TableType -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.expression.abstract_expression import ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.logical_expression import LogicalExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch -from eva.plan_nodes.project_plan import ProjectPlan -from eva.storage.storage_engine import StorageEngine +from evadb.catalog.catalog_type import TableType +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.logical_expression import LogicalExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.project_plan import ProjectPlan +from evadb.storage.storage_engine import StorageEngine class DeleteExecutor(AbstractExecutor): diff --git a/eva/executor/drop_executor.py b/evadb/executor/drop_executor.py similarity index 84% rename from eva/executor/drop_executor.py rename to evadb/executor/drop_executor.py index 59ecb5e58..9eabbf19a 100644 --- a/eva/executor/drop_executor.py +++ b/evadb/executor/drop_executor.py @@ -16,14 +16,14 @@ import pandas as pd -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import ExecutorError -from eva.models.storage.batch import Batch -from eva.parser.table_ref import TableInfo -from eva.plan_nodes.drop_plan import DropPlan -from eva.storage.storage_engine import StorageEngine -from eva.utils.logging_manager import logger +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import ExecutorError +from evadb.models.storage.batch import Batch +from evadb.parser.table_ref import TableInfo +from evadb.plan_nodes.drop_plan import DropPlan +from evadb.storage.storage_engine import StorageEngine +from evadb.utils.logging_manager import logger class DropExecutor(AbstractExecutor): diff --git a/eva/executor/drop_udf_executor.py b/evadb/executor/drop_udf_executor.py similarity index 87% rename from eva/executor/drop_udf_executor.py rename to evadb/executor/drop_udf_executor.py index ba43bd51e..ce29eb658 100644 --- a/eva/executor/drop_udf_executor.py +++ b/evadb/executor/drop_udf_executor.py @@ -16,11 +16,11 @@ import pandas as pd -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.drop_udf_plan import DropUDFPlan -from eva.utils.logging_manager import logger +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.drop_udf_plan import DropUDFPlan +from evadb.utils.logging_manager import logger class DropUDFExecutor(AbstractExecutor): diff --git a/eva/executor/exchange_executor.py b/evadb/executor/exchange_executor.py similarity index 91% rename from eva/executor/exchange_executor.py rename to evadb/executor/exchange_executor.py index 31ad952ec..36f109f7a 100644 --- a/eva/executor/exchange_executor.py +++ b/evadb/executor/exchange_executor.py @@ -16,17 +16,17 @@ from ray.util.queue import Queue -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import ExecutorError -from eva.executor.ray_utils import ( +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import ExecutorError +from evadb.executor.ray_utils import ( StageCompleteSignal, ray_parallel, ray_pull, ray_wait_and_alert, ) -from eva.models.storage.batch import Batch -from eva.plan_nodes.exchange_plan import ExchangePlan +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.exchange_plan import ExchangePlan class QueueReaderExecutor(AbstractExecutor): diff --git a/eva/executor/execution_context.py b/evadb/executor/execution_context.py similarity index 94% rename from eva/executor/execution_context.py rename to evadb/executor/execution_context.py index 2189586f2..3c9366af4 100644 --- a/eva/executor/execution_context.py +++ b/evadb/executor/execution_context.py @@ -16,9 +16,9 @@ import random from typing import List -from eva.configuration.configuration_manager import ConfigurationManager -from eva.constants import NO_GPU -from eva.utils.generic_utils import get_gpu_count, is_gpu_available +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.constants import NO_GPU +from evadb.utils.generic_utils import get_gpu_count, is_gpu_available class Context: diff --git a/eva/executor/executor_utils.py b/evadb/executor/executor_utils.py similarity index 90% rename from eva/executor/executor_utils.py rename to evadb/executor/executor_utils.py index 54cca2855..1d70f55f9 100644 --- a/eva/executor/executor_utils.py +++ b/evadb/executor/executor_utils.py @@ -20,16 +20,16 @@ import cv2 if TYPE_CHECKING: - from eva.catalog.catalog_manager import CatalogManager - -from eva.catalog.catalog_type import VectorStoreType -from eva.expression.abstract_expression import AbstractExpression -from eva.expression.function_expression import FunctionExpression -from eva.models.storage.batch import Batch -from eva.parser.table_ref import TableInfo -from eva.parser.types import FileFormatType -from eva.readers.document.registry import SUPPORTED_TYPES -from eva.utils.logging_manager import logger + from evadb.catalog.catalog_manager import CatalogManager + +from evadb.catalog.catalog_type import VectorStoreType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.expression.function_expression import FunctionExpression +from evadb.models.storage.batch import Batch +from evadb.parser.table_ref import TableInfo +from evadb.parser.types import FileFormatType +from evadb.readers.document.registry import SUPPORTED_TYPES +from evadb.utils.logging_manager import logger class ExecutorError(Exception): diff --git a/eva/executor/explain_executor.py b/evadb/executor/explain_executor.py similarity index 83% rename from eva/executor/explain_executor.py rename to evadb/executor/explain_executor.py index a6117bc59..70cfb479e 100644 --- a/eva/executor/explain_executor.py +++ b/evadb/executor/explain_executor.py @@ -14,11 +14,11 @@ # limitations under the License. import pandas as pd -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.explain_plan import ExplainPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.explain_plan import ExplainPlan class ExplainExecutor(AbstractExecutor): diff --git a/eva/executor/function_scan_executor.py b/evadb/executor/function_scan_executor.py similarity index 89% rename from eva/executor/function_scan_executor.py rename to evadb/executor/function_scan_executor.py index 8e00fa27a..cc654a4e6 100644 --- a/eva/executor/function_scan_executor.py +++ b/evadb/executor/function_scan_executor.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.function_scan_plan import FunctionScanPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.function_scan_plan import FunctionScanPlan class FunctionScanExecutor(AbstractExecutor): diff --git a/eva/executor/groupby_executor.py b/evadb/executor/groupby_executor.py similarity index 89% rename from eva/executor/groupby_executor.py rename to evadb/executor/groupby_executor.py index 09a7d2e91..aa0e88739 100644 --- a/eva/executor/groupby_executor.py +++ b/evadb/executor/groupby_executor.py @@ -17,10 +17,10 @@ import pandas as pd -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.groupby_plan import GroupByPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.groupby_plan import GroupByPlan class GroupByExecutor(AbstractExecutor): diff --git a/eva/executor/hash_join_executor.py b/evadb/executor/hash_join_executor.py similarity index 85% rename from eva/executor/hash_join_executor.py rename to evadb/executor/hash_join_executor.py index a31f72f6f..a76dea5b3 100644 --- a/eva/executor/hash_join_executor.py +++ b/evadb/executor/hash_join_executor.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import apply_predicate, apply_project -from eva.models.storage.batch import Batch -from eva.plan_nodes.hash_join_probe_plan import HashJoinProbePlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import apply_predicate, apply_project +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.hash_join_probe_plan import HashJoinProbePlan class HashJoinExecutor(AbstractExecutor): diff --git a/eva/executor/insert_executor.py b/evadb/executor/insert_executor.py similarity index 86% rename from eva/executor/insert_executor.py rename to evadb/executor/insert_executor.py index 5190fa0a0..a2dce5850 100644 --- a/eva/executor/insert_executor.py +++ b/evadb/executor/insert_executor.py @@ -14,12 +14,12 @@ # limitations under the License. import pandas as pd -from eva.catalog.catalog_type import TableType -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.insert_plan import InsertPlan -from eva.storage.storage_engine import StorageEngine +from evadb.catalog.catalog_type import TableType +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.insert_plan import InsertPlan +from evadb.storage.storage_engine import StorageEngine class InsertExecutor(AbstractExecutor): diff --git a/eva/executor/join_build_executor.py b/evadb/executor/join_build_executor.py similarity index 87% rename from eva/executor/join_build_executor.py rename to evadb/executor/join_build_executor.py index 681510bd7..f75b585bb 100644 --- a/eva/executor/join_build_executor.py +++ b/evadb/executor/join_build_executor.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.hash_join_build_plan import HashJoinBuildPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.hash_join_build_plan import HashJoinBuildPlan class BuildJoinExecutor(AbstractExecutor): diff --git a/eva/executor/lateral_join_executor.py b/evadb/executor/lateral_join_executor.py similarity index 84% rename from eva/executor/lateral_join_executor.py rename to evadb/executor/lateral_join_executor.py index 0a078b219..569c0897c 100644 --- a/eva/executor/lateral_join_executor.py +++ b/evadb/executor/lateral_join_executor.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import apply_predicate, apply_project -from eva.models.storage.batch import Batch -from eva.plan_nodes.lateral_join_plan import LateralJoinPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import apply_predicate, apply_project +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.lateral_join_plan import LateralJoinPlan class LateralJoinExecutor(AbstractExecutor): diff --git a/eva/executor/limit_executor.py b/evadb/executor/limit_executor.py similarity index 88% rename from eva/executor/limit_executor.py rename to evadb/executor/limit_executor.py index 65ae88cd5..73c924dc8 100644 --- a/eva/executor/limit_executor.py +++ b/evadb/executor/limit_executor.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.limit_plan import LimitPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.limit_plan import LimitPlan class LimitExecutor(AbstractExecutor): diff --git a/eva/executor/load_csv_executor.py b/evadb/executor/load_csv_executor.py similarity index 84% rename from eva/executor/load_csv_executor.py rename to evadb/executor/load_csv_executor.py index 7c34a67e2..9ebf6b6d6 100644 --- a/eva/executor/load_csv_executor.py +++ b/evadb/executor/load_csv_executor.py @@ -14,15 +14,15 @@ # limitations under the License. import pandas as pd -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import ExecutorError -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch -from eva.plan_nodes.load_data_plan import LoadDataPlan -from eva.readers.csv_reader import CSVReader -from eva.storage.storage_engine import StorageEngine -from eva.utils.logging_manager import logger +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import ExecutorError +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.load_data_plan import LoadDataPlan +from evadb.readers.csv_reader import CSVReader +from evadb.storage.storage_engine import StorageEngine +from evadb.utils.logging_manager import logger class LoadCSVExecutor(AbstractExecutor): diff --git a/eva/executor/load_executor.py b/evadb/executor/load_executor.py similarity index 80% rename from eva/executor/load_executor.py rename to evadb/executor/load_executor.py index 7d9db7b4d..09a932e9b 100644 --- a/eva/executor/load_executor.py +++ b/evadb/executor/load_executor.py @@ -12,12 +12,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.load_csv_executor import LoadCSVExecutor -from eva.executor.load_multimedia_executor import LoadMultimediaExecutor -from eva.parser.types import FileFormatType -from eva.plan_nodes.load_data_plan import LoadDataPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.load_csv_executor import LoadCSVExecutor +from evadb.executor.load_multimedia_executor import LoadMultimediaExecutor +from evadb.parser.types import FileFormatType +from evadb.plan_nodes.load_data_plan import LoadDataPlan class LoadDataExecutor(AbstractExecutor): diff --git a/eva/executor/load_multimedia_executor.py b/evadb/executor/load_multimedia_executor.py similarity index 89% rename from eva/executor/load_multimedia_executor.py rename to evadb/executor/load_multimedia_executor.py index b31b3c9cb..3c1117762 100644 --- a/eva/executor/load_multimedia_executor.py +++ b/evadb/executor/load_multimedia_executor.py @@ -18,17 +18,17 @@ import pandas as pd -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import ExecutorError, iter_path_regex, validate_media -from eva.models.storage.batch import Batch -from eva.plan_nodes.load_data_plan import LoadDataPlan -from eva.storage.abstract_storage_engine import AbstractStorageEngine -from eva.storage.storage_engine import StorageEngine -from eva.utils.errors import DatasetFileNotFoundError -from eva.utils.logging_manager import logger -from eva.utils.s3_utils import download_from_s3 +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import ExecutorError, iter_path_regex, validate_media +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.load_data_plan import LoadDataPlan +from evadb.storage.abstract_storage_engine import AbstractStorageEngine +from evadb.storage.storage_engine import StorageEngine +from evadb.utils.errors import DatasetFileNotFoundError +from evadb.utils.logging_manager import logger +from evadb.utils.s3_utils import download_from_s3 class LoadMultimediaExecutor(AbstractExecutor): diff --git a/eva/executor/nested_loop_join_executor.py b/evadb/executor/nested_loop_join_executor.py similarity index 82% rename from eva/executor/nested_loop_join_executor.py rename to evadb/executor/nested_loop_join_executor.py index bb47a0fcb..5d5857c3b 100644 --- a/eva/executor/nested_loop_join_executor.py +++ b/evadb/executor/nested_loop_join_executor.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import apply_predicate -from eva.models.storage.batch import Batch -from eva.plan_nodes.nested_loop_join_plan import NestedLoopJoinPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import apply_predicate +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.nested_loop_join_plan import NestedLoopJoinPlan class NestedLoopJoinExecutor(AbstractExecutor): diff --git a/eva/executor/orderby_executor.py b/evadb/executor/orderby_executor.py similarity index 89% rename from eva/executor/orderby_executor.py rename to evadb/executor/orderby_executor.py index 434884561..e783d1800 100644 --- a/eva/executor/orderby_executor.py +++ b/evadb/executor/orderby_executor.py @@ -14,14 +14,14 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import ExecutorError -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch -from eva.parser.types import ParserOrderBySortType -from eva.plan_nodes.orderby_plan import OrderByPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import ExecutorError +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch +from evadb.parser.types import ParserOrderBySortType +from evadb.plan_nodes.orderby_plan import OrderByPlan class OrderByExecutor(AbstractExecutor): diff --git a/eva/executor/plan_executor.py b/evadb/executor/plan_executor.py similarity index 73% rename from eva/executor/plan_executor.py rename to evadb/executor/plan_executor.py index bf27d09a7..0304c3aa6 100644 --- a/eva/executor/plan_executor.py +++ b/evadb/executor/plan_executor.py @@ -14,43 +14,43 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.apply_and_merge_executor import ApplyAndMergeExecutor -from eva.executor.create_executor import CreateExecutor -from eva.executor.create_index_executor import CreateIndexExecutor -from eva.executor.create_mat_view_executor import CreateMaterializedViewExecutor -from eva.executor.create_udf_executor import CreateUDFExecutor -from eva.executor.delete_executor import DeleteExecutor -from eva.executor.drop_executor import DropExecutor -from eva.executor.drop_udf_executor import DropUDFExecutor -from eva.executor.exchange_executor import ExchangeExecutor -from eva.executor.executor_utils import ExecutorError -from eva.executor.explain_executor import ExplainExecutor -from eva.executor.function_scan_executor import FunctionScanExecutor -from eva.executor.groupby_executor import GroupByExecutor -from eva.executor.hash_join_executor import HashJoinExecutor -from eva.executor.insert_executor import InsertExecutor -from eva.executor.join_build_executor import BuildJoinExecutor -from eva.executor.lateral_join_executor import LateralJoinExecutor -from eva.executor.limit_executor import LimitExecutor -from eva.executor.load_executor import LoadDataExecutor -from eva.executor.nested_loop_join_executor import NestedLoopJoinExecutor -from eva.executor.orderby_executor import OrderByExecutor -from eva.executor.pp_executor import PPExecutor -from eva.executor.predicate_executor import PredicateExecutor -from eva.executor.project_executor import ProjectExecutor -from eva.executor.rename_executor import RenameExecutor -from eva.executor.sample_executor import SampleExecutor -from eva.executor.seq_scan_executor import SequentialScanExecutor -from eva.executor.show_info_executor import ShowInfoExecutor -from eva.executor.storage_executor import StorageExecutor -from eva.executor.union_executor import UnionExecutor -from eva.executor.vector_index_scan_executor import VectorIndexScanExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType -from eva.utils.logging_manager import logger +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.apply_and_merge_executor import ApplyAndMergeExecutor +from evadb.executor.create_executor import CreateExecutor +from evadb.executor.create_index_executor import CreateIndexExecutor +from evadb.executor.create_mat_view_executor import CreateMaterializedViewExecutor +from evadb.executor.create_udf_executor import CreateUDFExecutor +from evadb.executor.delete_executor import DeleteExecutor +from evadb.executor.drop_executor import DropExecutor +from evadb.executor.drop_udf_executor import DropUDFExecutor +from evadb.executor.exchange_executor import ExchangeExecutor +from evadb.executor.executor_utils import ExecutorError +from evadb.executor.explain_executor import ExplainExecutor +from evadb.executor.function_scan_executor import FunctionScanExecutor +from evadb.executor.groupby_executor import GroupByExecutor +from evadb.executor.hash_join_executor import HashJoinExecutor +from evadb.executor.insert_executor import InsertExecutor +from evadb.executor.join_build_executor import BuildJoinExecutor +from evadb.executor.lateral_join_executor import LateralJoinExecutor +from evadb.executor.limit_executor import LimitExecutor +from evadb.executor.load_executor import LoadDataExecutor +from evadb.executor.nested_loop_join_executor import NestedLoopJoinExecutor +from evadb.executor.orderby_executor import OrderByExecutor +from evadb.executor.pp_executor import PPExecutor +from evadb.executor.predicate_executor import PredicateExecutor +from evadb.executor.project_executor import ProjectExecutor +from evadb.executor.rename_executor import RenameExecutor +from evadb.executor.sample_executor import SampleExecutor +from evadb.executor.seq_scan_executor import SequentialScanExecutor +from evadb.executor.show_info_executor import ShowInfoExecutor +from evadb.executor.storage_executor import StorageExecutor +from evadb.executor.union_executor import UnionExecutor +from evadb.executor.vector_index_scan_executor import VectorIndexScanExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType +from evadb.utils.logging_manager import logger class PlanExecutor: diff --git a/eva/executor/pp_executor.py b/evadb/executor/pp_executor.py similarity index 88% rename from eva/executor/pp_executor.py rename to evadb/executor/pp_executor.py index 6916118ce..642fa19ec 100644 --- a/eva/executor/pp_executor.py +++ b/evadb/executor/pp_executor.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.pp_plan import PPScanPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.pp_plan import PPScanPlan class PPExecutor(AbstractExecutor): diff --git a/eva/executor/predicate_executor.py b/evadb/executor/predicate_executor.py similarity index 80% rename from eva/executor/predicate_executor.py rename to evadb/executor/predicate_executor.py index 6715a2c89..21fefa11e 100644 --- a/eva/executor/predicate_executor.py +++ b/evadb/executor/predicate_executor.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import apply_predicate -from eva.models.storage.batch import Batch -from eva.plan_nodes.predicate_plan import PredicatePlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import apply_predicate +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.predicate_plan import PredicatePlan class PredicateExecutor(AbstractExecutor): diff --git a/eva/executor/project_executor.py b/evadb/executor/project_executor.py similarity index 81% rename from eva/executor/project_executor.py rename to evadb/executor/project_executor.py index 659324338..9ffbd7381 100644 --- a/eva/executor/project_executor.py +++ b/evadb/executor/project_executor.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import apply_project -from eva.models.storage.batch import Batch -from eva.plan_nodes.project_plan import ProjectPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import apply_project +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.project_plan import ProjectPlan class ProjectExecutor(AbstractExecutor): diff --git a/eva/executor/ray_utils.py b/evadb/executor/ray_utils.py similarity index 97% rename from eva/executor/ray_utils.py rename to evadb/executor/ray_utils.py index bd2c83714..6cf7abe51 100644 --- a/eva/executor/ray_utils.py +++ b/evadb/executor/ray_utils.py @@ -19,7 +19,7 @@ from ray.exceptions import RayTaskError from ray.util.queue import Queue -from eva.executor.executor_utils import ExecutorError +from evadb.executor.executor_utils import ExecutorError class StageCompleteSignal: diff --git a/eva/executor/rename_executor.py b/evadb/executor/rename_executor.py similarity index 83% rename from eva/executor/rename_executor.py rename to evadb/executor/rename_executor.py index 5e5403d65..2ad422a99 100644 --- a/eva/executor/rename_executor.py +++ b/evadb/executor/rename_executor.py @@ -12,10 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.plan_nodes.rename_plan import RenamePlan -from eva.storage.storage_engine import StorageEngine +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.plan_nodes.rename_plan import RenamePlan +from evadb.storage.storage_engine import StorageEngine class RenameExecutor(AbstractExecutor): diff --git a/eva/executor/sample_executor.py b/evadb/executor/sample_executor.py similarity index 86% rename from eva/executor/sample_executor.py rename to evadb/executor/sample_executor.py index 4729174bd..4ba242c0a 100644 --- a/eva/executor/sample_executor.py +++ b/evadb/executor/sample_executor.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.sample_plan import SamplePlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.sample_plan import SamplePlan class SampleExecutor(AbstractExecutor): diff --git a/eva/executor/seq_scan_executor.py b/evadb/executor/seq_scan_executor.py similarity index 85% rename from eva/executor/seq_scan_executor.py rename to evadb/executor/seq_scan_executor.py index 590b7e35c..b6d142c85 100644 --- a/eva/executor/seq_scan_executor.py +++ b/evadb/executor/seq_scan_executor.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import apply_predicate, apply_project -from eva.models.storage.batch import Batch -from eva.plan_nodes.seq_scan_plan import SeqScanPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import apply_predicate, apply_project +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.seq_scan_plan import SeqScanPlan class SequentialScanExecutor(AbstractExecutor): diff --git a/eva/executor/show_info_executor.py b/evadb/executor/show_info_executor.py similarity index 84% rename from eva/executor/show_info_executor.py rename to evadb/executor/show_info_executor.py index edddb8e53..17dcbce52 100644 --- a/eva/executor/show_info_executor.py +++ b/evadb/executor/show_info_executor.py @@ -14,12 +14,12 @@ # limitations under the License. import pandas as pd -from eva.catalog.catalog_type import TableType -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.parser.types import ShowType -from eva.plan_nodes.show_info_plan import ShowInfoPlan +from evadb.catalog.catalog_type import TableType +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.parser.types import ShowType +from evadb.plan_nodes.show_info_plan import ShowInfoPlan class ShowInfoExecutor(AbstractExecutor): diff --git a/eva/executor/storage_executor.py b/evadb/executor/storage_executor.py similarity index 84% rename from eva/executor/storage_executor.py rename to evadb/executor/storage_executor.py index 644697b48..10eff657e 100644 --- a/eva/executor/storage_executor.py +++ b/evadb/executor/storage_executor.py @@ -14,14 +14,14 @@ # limitations under the License. from typing import Iterator -from eva.catalog.catalog_type import TableType -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import ExecutorError -from eva.models.storage.batch import Batch -from eva.plan_nodes.storage_plan import StoragePlan -from eva.storage.storage_engine import StorageEngine -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import TableType +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import ExecutorError +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.storage_plan import StoragePlan +from evadb.storage.storage_engine import StorageEngine +from evadb.utils.logging_manager import logger class StorageExecutor(AbstractExecutor): diff --git a/eva/executor/union_executor.py b/evadb/executor/union_executor.py similarity index 85% rename from eva/executor/union_executor.py rename to evadb/executor/union_executor.py index 13a05b56c..75952aad4 100644 --- a/eva/executor/union_executor.py +++ b/evadb/executor/union_executor.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import Iterator -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.union_plan import UnionPlan +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.union_plan import UnionPlan class UnionExecutor(AbstractExecutor): diff --git a/eva/executor/vector_index_scan_executor.py b/evadb/executor/vector_index_scan_executor.py similarity index 87% rename from eva/executor/vector_index_scan_executor.py rename to evadb/executor/vector_index_scan_executor.py index 91506443a..2bee363ca 100644 --- a/eva/executor/vector_index_scan_executor.py +++ b/evadb/executor/vector_index_scan_executor.py @@ -16,14 +16,14 @@ import pandas as pd -from eva.catalog.sql_config import IDENTIFIER_COLUMN -from eva.database import EVADatabase -from eva.executor.abstract_executor import AbstractExecutor -from eva.executor.executor_utils import handle_vector_store_params -from eva.models.storage.batch import Batch -from eva.plan_nodes.vector_index_scan_plan import VectorIndexScanPlan -from eva.third_party.vector_stores.types import VectorIndexQuery -from eva.third_party.vector_stores.utils import VectorStoreFactory +from evadb.catalog.sql_config import IDENTIFIER_COLUMN +from evadb.database import EVADatabase +from evadb.executor.abstract_executor import AbstractExecutor +from evadb.executor.executor_utils import handle_vector_store_params +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.vector_index_scan_plan import VectorIndexScanPlan +from evadb.third_party.vector_stores.types import VectorIndexQuery +from evadb.third_party.vector_stores.utils import VectorStoreFactory # Helper function for getting row_id column alias. diff --git a/eva/expression/__init__.py b/evadb/expression/__init__.py similarity index 100% rename from eva/expression/__init__.py rename to evadb/expression/__init__.py diff --git a/eva/expression/abstract_expression.py b/evadb/expression/abstract_expression.py similarity index 100% rename from eva/expression/abstract_expression.py rename to evadb/expression/abstract_expression.py diff --git a/eva/expression/aggregation_expression.py b/evadb/expression/aggregation_expression.py similarity index 97% rename from eva/expression/aggregation_expression.py rename to evadb/expression/aggregation_expression.py index 55db6faa4..fe8693d2c 100644 --- a/eva/expression/aggregation_expression.py +++ b/evadb/expression/aggregation_expression.py @@ -12,12 +12,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import ( +from evadb.expression.abstract_expression import ( AbstractExpression, ExpressionReturnType, ExpressionType, ) -from eva.models.storage.batch import Batch +from evadb.models.storage.batch import Batch class AggregationExpression(AbstractExpression): diff --git a/eva/expression/arithmetic_expression.py b/evadb/expression/arithmetic_expression.py similarity index 94% rename from eva/expression/arithmetic_expression.py rename to evadb/expression/arithmetic_expression.py index 32664cb1b..64f704d53 100644 --- a/eva/expression/arithmetic_expression.py +++ b/evadb/expression/arithmetic_expression.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import ( +from evadb.expression.abstract_expression import ( AbstractExpression, ExpressionReturnType, ExpressionType, ) -from eva.models.storage.batch import Batch +from evadb.models.storage.batch import Batch class ArithmeticExpression(AbstractExpression): diff --git a/eva/expression/comparison_expression.py b/evadb/expression/comparison_expression.py similarity index 97% rename from eva/expression/comparison_expression.py rename to evadb/expression/comparison_expression.py index 39a763e85..5f60fb76a 100644 --- a/eva/expression/comparison_expression.py +++ b/evadb/expression/comparison_expression.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import ( +from evadb.expression.abstract_expression import ( AbstractExpression, ExpressionReturnType, ExpressionType, ) -from eva.models.storage.batch import Batch +from evadb.models.storage.batch import Batch class ComparisonExpression(AbstractExpression): diff --git a/eva/expression/constant_value_expression.py b/evadb/expression/constant_value_expression.py similarity index 92% rename from eva/expression/constant_value_expression.py rename to evadb/expression/constant_value_expression.py index d4932878f..531029a19 100644 --- a/eva/expression/constant_value_expression.py +++ b/evadb/expression/constant_value_expression.py @@ -17,9 +17,9 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import ColumnType -from eva.expression.abstract_expression import AbstractExpression, ExpressionType -from eva.models.storage.batch import Batch +from evadb.catalog.catalog_type import ColumnType +from evadb.expression.abstract_expression import AbstractExpression, ExpressionType +from evadb.models.storage.batch import Batch class ConstantValueExpression(AbstractExpression): diff --git a/eva/expression/expression_utils.py b/evadb/expression/expression_utils.py similarity index 96% rename from eva/expression/expression_utils.py rename to evadb/expression/expression_utils.py index 4d4203b53..3f7c8e524 100644 --- a/eva/expression/expression_utils.py +++ b/evadb/expression/expression_utils.py @@ -15,11 +15,11 @@ from typing import List, Set -from eva.expression.abstract_expression import AbstractExpression, ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.logical_expression import LogicalExpression -from eva.expression.tuple_value_expression import TupleValueExpression +from evadb.expression.abstract_expression import AbstractExpression, ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.logical_expression import LogicalExpression +from evadb.expression.tuple_value_expression import TupleValueExpression def to_conjunction_list( diff --git a/eva/expression/function_expression.py b/evadb/expression/function_expression.py similarity index 94% rename from eva/expression/function_expression.py rename to evadb/expression/function_expression.py index 076542eb1..b2de7658f 100644 --- a/eva/expression/function_expression.py +++ b/evadb/expression/function_expression.py @@ -18,17 +18,17 @@ import numpy as np import pandas as pd -from eva.catalog.models.udf_catalog import UdfCatalogEntry -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.constants import NO_GPU -from eva.executor.execution_context import Context -from eva.expression.abstract_expression import AbstractExpression, ExpressionType -from eva.models.storage.batch import Batch -from eva.parser.alias import Alias -from eva.udfs.gpu_compatible import GPUCompatible -from eva.utils.kv_cache import DiskKVCache -from eva.utils.logging_manager import logger -from eva.utils.stats import UDFStats +from evadb.catalog.models.udf_catalog import UdfCatalogEntry +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.constants import NO_GPU +from evadb.executor.execution_context import Context +from evadb.expression.abstract_expression import AbstractExpression, ExpressionType +from evadb.models.storage.batch import Batch +from evadb.parser.alias import Alias +from evadb.udfs.gpu_compatible import GPUCompatible +from evadb.utils.kv_cache import DiskKVCache +from evadb.utils.logging_manager import logger +from evadb.utils.stats import UDFStats class FunctionExpression(AbstractExpression): diff --git a/eva/expression/logical_expression.py b/evadb/expression/logical_expression.py similarity index 98% rename from eva/expression/logical_expression.py rename to evadb/expression/logical_expression.py index eeae998ab..f1bd74d1b 100644 --- a/eva/expression/logical_expression.py +++ b/evadb/expression/logical_expression.py @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import ( +from evadb.expression.abstract_expression import ( AbstractExpression, ExpressionReturnType, ExpressionType, diff --git a/eva/expression/tuple_value_expression.py b/evadb/expression/tuple_value_expression.py similarity index 96% rename from eva/expression/tuple_value_expression.py rename to evadb/expression/tuple_value_expression.py index 6e9bade34..5ba1c175b 100644 --- a/eva/expression/tuple_value_expression.py +++ b/evadb/expression/tuple_value_expression.py @@ -14,9 +14,9 @@ # limitations under the License. from typing import Union -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.models.storage.batch import Batch +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.models.storage.batch import Batch from .abstract_expression import ( AbstractExpression, diff --git a/eva/interfaces/__init__.py b/evadb/interfaces/__init__.py similarity index 100% rename from eva/interfaces/__init__.py rename to evadb/interfaces/__init__.py diff --git a/eva/interfaces/relational/__init__.py b/evadb/interfaces/relational/__init__.py similarity index 100% rename from eva/interfaces/relational/__init__.py rename to evadb/interfaces/relational/__init__.py diff --git a/eva/interfaces/relational/db.py b/evadb/interfaces/relational/db.py similarity index 93% rename from eva/interfaces/relational/db.py rename to evadb/interfaces/relational/db.py index e8bd8d65c..9af451e29 100644 --- a/eva/interfaces/relational/db.py +++ b/evadb/interfaces/relational/db.py @@ -16,24 +16,24 @@ import pandas -from eva.configuration.constants import EVA_DATABASE_DIR -from eva.database import EVADatabase, init_eva_db_instance -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.interfaces.relational.relation import EVADBQuery -from eva.interfaces.relational.utils import execute_statement, try_binding -from eva.models.server.response import Response -from eva.models.storage.batch import Batch -from eva.parser.alias import Alias -from eva.parser.select_statement import SelectStatement -from eva.parser.utils import ( +from evadb.configuration.constants import EVA_DATABASE_DIR +from evadb.database import EVADatabase, init_eva_db_instance +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.interfaces.relational.relation import EVADBQuery +from evadb.interfaces.relational.utils import execute_statement, try_binding +from evadb.models.server.response import Response +from evadb.models.storage.batch import Batch +from evadb.parser.alias import Alias +from evadb.parser.select_statement import SelectStatement +from evadb.parser.utils import ( parse_create_udf, parse_create_vector_index, parse_load, parse_query, parse_table_clause, ) -from eva.udfs.udf_bootstrap_queries import init_builtin_udfs -from eva.utils.logging_manager import logger +from evadb.udfs.udf_bootstrap_queries import init_builtin_udfs +from evadb.utils.logging_manager import logger class EVADBConnection: diff --git a/eva/interfaces/relational/relation.py b/evadb/interfaces/relational/relation.py similarity index 94% rename from eva/interfaces/relational/relation.py rename to evadb/interfaces/relational/relation.py index 863858b14..fe84495e3 100644 --- a/eva/interfaces/relational/relation.py +++ b/evadb/interfaces/relational/relation.py @@ -16,8 +16,8 @@ import pandas -from eva.database import EVADatabase -from eva.interfaces.relational.utils import ( +from evadb.database import EVADatabase +from evadb.interfaces.relational.utils import ( create_limit_expression, create_star_expression, execute_statement, @@ -27,13 +27,13 @@ string_to_lateral_join, try_binding, ) -from eva.models.storage.batch import Batch -from eva.parser.alias import Alias -from eva.parser.select_statement import SelectStatement -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import JoinNode, TableRef -from eva.parser.types import JoinType -from eva.parser.utils import parse_sql_orderby_expr +from evadb.models.storage.batch import Batch +from evadb.parser.alias import Alias +from evadb.parser.select_statement import SelectStatement +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import JoinNode, TableRef +from evadb.parser.types import JoinType +from evadb.parser.utils import parse_sql_orderby_expr class EVADBQuery: diff --git a/eva/interfaces/relational/utils.py b/evadb/interfaces/relational/utils.py similarity index 82% rename from eva/interfaces/relational/utils.py rename to evadb/interfaces/relational/utils.py index bdbd05bb8..8bf36d6b7 100644 --- a/eva/interfaces/relational/utils.py +++ b/evadb/interfaces/relational/utils.py @@ -15,20 +15,20 @@ import asyncio from typing import Callable, List, Union -from eva.binder.statement_binder import StatementBinder -from eva.binder.statement_binder_context import StatementBinderContext -from eva.database import EVADatabase -from eva.executor.plan_executor import PlanExecutor -from eva.expression.abstract_expression import AbstractExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch -from eva.optimizer.plan_generator import PlanGenerator -from eva.optimizer.statement_to_opr_converter import StatementToPlanConverter -from eva.parser.select_statement import SelectStatement -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableRef -from eva.parser.utils import ( +from evadb.binder.statement_binder import StatementBinder +from evadb.binder.statement_binder_context import StatementBinderContext +from evadb.database import EVADatabase +from evadb.executor.plan_executor import PlanExecutor +from evadb.expression.abstract_expression import AbstractExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch +from evadb.optimizer.plan_generator import PlanGenerator +from evadb.optimizer.statement_to_opr_converter import StatementToPlanConverter +from evadb.parser.select_statement import SelectStatement +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableRef +from evadb.parser.utils import ( parse_expression, parse_lateral_join, parse_predicate_expression, diff --git a/eva/models/catalog/__init__.py b/evadb/models/catalog/__init__.py similarity index 100% rename from eva/models/catalog/__init__.py rename to evadb/models/catalog/__init__.py diff --git a/eva/models/catalog/frame_info.py b/evadb/models/catalog/frame_info.py similarity index 95% rename from eva/models/catalog/frame_info.py rename to evadb/models/catalog/frame_info.py index 6d40ab2c7..1b9dbbbb4 100644 --- a/eva/models/catalog/frame_info.py +++ b/evadb/models/catalog/frame_info.py @@ -14,7 +14,7 @@ # limitations under the License. from dataclasses import dataclass -from eva.models.catalog.properties import ColorSpace +from evadb.models.catalog.properties import ColorSpace @dataclass(frozen=True) diff --git a/eva/models/catalog/properties.py b/evadb/models/catalog/properties.py similarity index 100% rename from eva/models/catalog/properties.py rename to evadb/models/catalog/properties.py diff --git a/eva/models/server/__init__.py b/evadb/models/server/__init__.py similarity index 100% rename from eva/models/server/__init__.py rename to evadb/models/server/__init__.py diff --git a/eva/models/server/response.py b/evadb/models/server/response.py similarity index 92% rename from eva/models/server/response.py rename to evadb/models/server/response.py index 1874a8db1..3696e5a39 100644 --- a/eva/models/server/response.py +++ b/evadb/models/server/response.py @@ -16,9 +16,9 @@ from enum import Enum from typing import Optional -from eva.executor.executor_utils import ExecutorError -from eva.models.storage.batch import Batch -from eva.utils.generic_utils import PickleSerializer +from evadb.executor.executor_utils import ExecutorError +from evadb.models.storage.batch import Batch +from evadb.utils.generic_utils import PickleSerializer class ResponseStatus(str, Enum): diff --git a/eva/models/storage/__init__.py b/evadb/models/storage/__init__.py similarity index 100% rename from eva/models/storage/__init__.py rename to evadb/models/storage/__init__.py diff --git a/eva/models/storage/batch.py b/evadb/models/storage/batch.py similarity index 98% rename from eva/models/storage/batch.py rename to evadb/models/storage/batch.py index db49104f6..5f2bd6135 100644 --- a/eva/models/storage/batch.py +++ b/evadb/models/storage/batch.py @@ -17,10 +17,10 @@ import numpy as np import pandas as pd -from eva.expression.abstract_expression import ExpressionType -from eva.parser.alias import Alias -from eva.utils.generic_utils import PickleSerializer -from eva.utils.logging_manager import logger +from evadb.expression.abstract_expression import ExpressionType +from evadb.parser.alias import Alias +from evadb.utils.generic_utils import PickleSerializer +from evadb.utils.logging_manager import logger Batch = TypeVar("Batch") diff --git a/eva/optimizer/__init__.py b/evadb/optimizer/__init__.py similarity index 100% rename from eva/optimizer/__init__.py rename to evadb/optimizer/__init__.py diff --git a/eva/optimizer/binder.py b/evadb/optimizer/binder.py similarity index 93% rename from eva/optimizer/binder.py rename to evadb/optimizer/binder.py index 9667ec172..c16f3e276 100644 --- a/eva/optimizer/binder.py +++ b/evadb/optimizer/binder.py @@ -15,10 +15,10 @@ import copy import itertools -from eva.optimizer.group_expression import GroupExpression -from eva.optimizer.memo import Memo -from eva.optimizer.operators import Dummy, Operator, OperatorType -from eva.optimizer.rules.pattern import Pattern +from evadb.optimizer.group_expression import GroupExpression +from evadb.optimizer.memo import Memo +from evadb.optimizer.operators import Dummy, Operator, OperatorType +from evadb.optimizer.rules.pattern import Pattern class Binder: diff --git a/eva/optimizer/cost_model.py b/evadb/optimizer/cost_model.py similarity index 79% rename from eva/optimizer/cost_model.py rename to evadb/optimizer/cost_model.py index 209836e9a..5bb1b825e 100644 --- a/eva/optimizer/cost_model.py +++ b/evadb/optimizer/cost_model.py @@ -14,13 +14,13 @@ # limitations under the License. from functools import singledispatch -from eva.optimizer.group_expression import GroupExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.apply_and_merge_plan import ApplyAndMergePlan -from eva.plan_nodes.hash_join_build_plan import HashJoinBuildPlan -from eva.plan_nodes.hash_join_probe_plan import HashJoinProbePlan -from eva.plan_nodes.nested_loop_join_plan import NestedLoopJoinPlan -from eva.plan_nodes.seq_scan_plan import SeqScanPlan +from evadb.optimizer.group_expression import GroupExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.apply_and_merge_plan import ApplyAndMergePlan +from evadb.plan_nodes.hash_join_build_plan import HashJoinBuildPlan +from evadb.plan_nodes.hash_join_probe_plan import HashJoinProbePlan +from evadb.plan_nodes.nested_loop_join_plan import NestedLoopJoinPlan +from evadb.plan_nodes.seq_scan_plan import SeqScanPlan class CostModel: diff --git a/eva/optimizer/group.py b/evadb/optimizer/group.py similarity index 94% rename from eva/optimizer/group.py rename to evadb/optimizer/group.py index b3fd3d143..be5c66669 100644 --- a/eva/optimizer/group.py +++ b/evadb/optimizer/group.py @@ -16,10 +16,10 @@ from typing import Dict, List -from eva.constants import UNDEFINED_GROUP_ID -from eva.optimizer.group_expression import GroupExpression -from eva.optimizer.property import Property -from eva.utils.logging_manager import logger +from evadb.constants import UNDEFINED_GROUP_ID +from evadb.optimizer.group_expression import GroupExpression +from evadb.optimizer.property import Property +from evadb.utils.logging_manager import logger class Winner: diff --git a/eva/optimizer/group_expression.py b/evadb/optimizer/group_expression.py similarity index 94% rename from eva/optimizer/group_expression.py rename to evadb/optimizer/group_expression.py index 94a8a7163..fe337377c 100644 --- a/eva/optimizer/group_expression.py +++ b/evadb/optimizer/group_expression.py @@ -14,9 +14,9 @@ # limitations under the License. from typing import List -from eva.constants import UNDEFINED_GROUP_ID -from eva.optimizer.operators import Operator -from eva.optimizer.rules.rules_base import RuleType +from evadb.constants import UNDEFINED_GROUP_ID +from evadb.optimizer.operators import Operator +from evadb.optimizer.rules.rules_base import RuleType class GroupExpression: diff --git a/eva/optimizer/memo.py b/evadb/optimizer/memo.py similarity index 94% rename from eva/optimizer/memo.py rename to evadb/optimizer/memo.py index af25358af..dc32db34e 100644 --- a/eva/optimizer/memo.py +++ b/evadb/optimizer/memo.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import Dict, List -from eva.constants import UNDEFINED_GROUP_ID -from eva.optimizer.group import Group -from eva.optimizer.group_expression import GroupExpression -from eva.optimizer.operators import OperatorType -from eva.utils.logging_manager import logger +from evadb.constants import UNDEFINED_GROUP_ID +from evadb.optimizer.group import Group +from evadb.optimizer.group_expression import GroupExpression +from evadb.optimizer.operators import OperatorType +from evadb.utils.logging_manager import logger class Memo: diff --git a/eva/optimizer/operators.py b/evadb/optimizer/operators.py similarity index 98% rename from eva/optimizer/operators.py rename to evadb/optimizer/operators.py index e04931049..ed58b59fe 100644 --- a/eva/optimizer/operators.py +++ b/evadb/optimizer/operators.py @@ -17,18 +17,18 @@ from pathlib import Path from typing import Any, List -from eva.catalog.catalog_type import VectorStoreType -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry -from eva.expression.abstract_expression import AbstractExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.function_expression import FunctionExpression -from eva.parser.alias import Alias -from eva.parser.create_statement import ColumnDefinition -from eva.parser.table_ref import TableInfo, TableRef -from eva.parser.types import JoinType, ShowType +from evadb.catalog.catalog_type import VectorStoreType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry +from evadb.expression.abstract_expression import AbstractExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.function_expression import FunctionExpression +from evadb.parser.alias import Alias +from evadb.parser.create_statement import ColumnDefinition +from evadb.parser.table_ref import TableInfo, TableRef +from evadb.parser.types import JoinType, ShowType class OperatorType(IntEnum): diff --git a/eva/optimizer/optimizer_context.py b/evadb/optimizer/optimizer_context.py similarity index 89% rename from eva/optimizer/optimizer_context.py rename to evadb/optimizer/optimizer_context.py index c9c63a286..60bf17493 100644 --- a/eva/optimizer/optimizer_context.py +++ b/evadb/optimizer/optimizer_context.py @@ -14,14 +14,14 @@ # limitations under the License. import copy -from eva.constants import UNDEFINED_GROUP_ID -from eva.database import EVADatabase -from eva.optimizer.cost_model import CostModel -from eva.optimizer.group_expression import GroupExpression -from eva.optimizer.memo import Memo -from eva.optimizer.operators import Dummy, Operator -from eva.optimizer.optimizer_task_stack import OptimizerTaskStack -from eva.optimizer.rules.rules_manager import RulesManager +from evadb.constants import UNDEFINED_GROUP_ID +from evadb.database import EVADatabase +from evadb.optimizer.cost_model import CostModel +from evadb.optimizer.group_expression import GroupExpression +from evadb.optimizer.memo import Memo +from evadb.optimizer.operators import Dummy, Operator +from evadb.optimizer.optimizer_task_stack import OptimizerTaskStack +from evadb.optimizer.rules.rules_manager import RulesManager class OptimizerContext: diff --git a/eva/optimizer/optimizer_task_stack.py b/evadb/optimizer/optimizer_task_stack.py similarity index 94% rename from eva/optimizer/optimizer_task_stack.py rename to evadb/optimizer/optimizer_task_stack.py index 824723e85..ffea74603 100644 --- a/eva/optimizer/optimizer_task_stack.py +++ b/evadb/optimizer/optimizer_task_stack.py @@ -14,7 +14,7 @@ # limitations under the License. from collections import deque -from eva.optimizer.optimizer_tasks import OptimizerTask +from evadb.optimizer.optimizer_tasks import OptimizerTask class OptimizerTaskStack: diff --git a/eva/optimizer/optimizer_tasks.py b/evadb/optimizer/optimizer_tasks.py similarity index 97% rename from eva/optimizer/optimizer_tasks.py rename to evadb/optimizer/optimizer_tasks.py index 10877a1bf..6d8645bc6 100644 --- a/eva/optimizer/optimizer_tasks.py +++ b/evadb/optimizer/optimizer_tasks.py @@ -18,15 +18,15 @@ from enum import IntEnum, auto from typing import TYPE_CHECKING, List -from eva.optimizer.binder import Binder -from eva.optimizer.group import Group -from eva.optimizer.group_expression import GroupExpression -from eva.optimizer.property import PropertyType -from eva.optimizer.rules.rules_base import Rule -from eva.utils.logging_manager import logger +from evadb.optimizer.binder import Binder +from evadb.optimizer.group import Group +from evadb.optimizer.group_expression import GroupExpression +from evadb.optimizer.property import PropertyType +from evadb.optimizer.rules.rules_base import Rule +from evadb.utils.logging_manager import logger if TYPE_CHECKING: - from eva.optimizer.optimizer_context import OptimizerContext + from evadb.optimizer.optimizer_context import OptimizerContext class OptimizerTaskType(IntEnum): diff --git a/eva/optimizer/optimizer_utils.py b/evadb/optimizer/optimizer_utils.py similarity index 92% rename from eva/optimizer/optimizer_utils.py rename to evadb/optimizer/optimizer_utils.py index 5e23d78e9..4345654e6 100644 --- a/eva/optimizer/optimizer_utils.py +++ b/evadb/optimizer/optimizer_utils.py @@ -16,29 +16,29 @@ from typing import List, Tuple if typing.TYPE_CHECKING: - from eva.optimizer.optimizer_context import OptimizerContext - -from eva.catalog.catalog_utils import get_table_primary_columns -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry -from eva.constants import CACHEABLE_UDFS, DEFAULT_FUNCTION_EXPRESSION_COST -from eva.expression.abstract_expression import AbstractExpression, ExpressionType -from eva.expression.expression_utils import ( + from evadb.optimizer.optimizer_context import OptimizerContext + +from evadb.catalog.catalog_utils import get_table_primary_columns +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry +from evadb.constants import CACHEABLE_UDFS, DEFAULT_FUNCTION_EXPRESSION_COST +from evadb.expression.abstract_expression import AbstractExpression, ExpressionType +from evadb.expression.expression_utils import ( conjunction_list_to_expression_tree, contains_single_column, get_columns_in_predicate, is_simple_predicate, to_conjunction_list, ) -from eva.expression.function_expression import ( +from evadb.expression.function_expression import ( FunctionExpression, FunctionExpressionCache, ) -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.alias import Alias -from eva.parser.create_statement import ColumnDefinition -from eva.utils.kv_cache import DiskKVCache +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.alias import Alias +from evadb.parser.create_statement import ColumnDefinition +from evadb.utils.kv_cache import DiskKVCache def column_definition_to_udf_io(col_list: List[ColumnDefinition], is_input: bool): diff --git a/eva/optimizer/plan_generator.py b/evadb/optimizer/plan_generator.py similarity index 88% rename from eva/optimizer/plan_generator.py rename to evadb/optimizer/plan_generator.py index e67030fbf..413362cf2 100644 --- a/eva/optimizer/plan_generator.py +++ b/evadb/optimizer/plan_generator.py @@ -16,14 +16,18 @@ import nest_asyncio -from eva.database import EVADatabase -from eva.optimizer.cost_model import CostModel -from eva.optimizer.operators import Operator -from eva.optimizer.optimizer_context import OptimizerContext -from eva.optimizer.optimizer_task_stack import OptimizerTaskStack -from eva.optimizer.optimizer_tasks import BottomUpRewrite, OptimizeGroup, TopDownRewrite -from eva.optimizer.property import PropertyType -from eva.optimizer.rules.rules_manager import RulesManager +from evadb.database import EVADatabase +from evadb.optimizer.cost_model import CostModel +from evadb.optimizer.operators import Operator +from evadb.optimizer.optimizer_context import OptimizerContext +from evadb.optimizer.optimizer_task_stack import OptimizerTaskStack +from evadb.optimizer.optimizer_tasks import ( + BottomUpRewrite, + OptimizeGroup, + TopDownRewrite, +) +from evadb.optimizer.property import PropertyType +from evadb.optimizer.rules.rules_manager import RulesManager nest_asyncio.apply() diff --git a/eva/optimizer/property.py b/evadb/optimizer/property.py similarity index 100% rename from eva/optimizer/property.py rename to evadb/optimizer/property.py diff --git a/eva/optimizer/rules/__init__.py b/evadb/optimizer/rules/__init__.py similarity index 100% rename from eva/optimizer/rules/__init__.py rename to evadb/optimizer/rules/__init__.py diff --git a/eva/optimizer/rules/pattern.py b/evadb/optimizer/rules/pattern.py similarity index 95% rename from eva/optimizer/rules/pattern.py rename to evadb/optimizer/rules/pattern.py index 2cfa4173d..b4d04e2ff 100644 --- a/eva/optimizer/rules/pattern.py +++ b/evadb/optimizer/rules/pattern.py @@ -14,7 +14,7 @@ # limitations under the License. from __future__ import annotations -from eva.optimizer.operators import OperatorType +from evadb.optimizer.operators import OperatorType class Pattern: diff --git a/eva/optimizer/rules/rules.py b/evadb/optimizer/rules/rules.py similarity index 95% rename from eva/optimizer/rules/rules.py rename to evadb/optimizer/rules/rules.py index 3e4ebab9d..1f2c57c9a 100644 --- a/eva/optimizer/rules/rules.py +++ b/evadb/optimizer/rules/rules.py @@ -16,17 +16,17 @@ from typing import TYPE_CHECKING -from eva.catalog.catalog_type import TableType -from eva.catalog.catalog_utils import is_video_table -from eva.constants import CACHEABLE_UDFS -from eva.executor.execution_context import Context -from eva.expression.expression_utils import ( +from evadb.catalog.catalog_type import TableType +from evadb.catalog.catalog_utils import is_video_table +from evadb.constants import CACHEABLE_UDFS +from evadb.executor.execution_context import Context +from evadb.expression.expression_utils import ( conjunction_list_to_expression_tree, to_conjunction_list, ) -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.optimizer.optimizer_utils import ( +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.optimizer.optimizer_utils import ( check_expr_validity_for_cache, enable_cache, enable_cache_on_expression_tree, @@ -35,23 +35,23 @@ extract_pushdown_predicate_for_alias, get_expression_execution_cost, ) -from eva.optimizer.rules.pattern import Pattern -from eva.optimizer.rules.rules_base import Promise, Rule, RuleType -from eva.parser.types import JoinType, ParserOrderBySortType -from eva.plan_nodes.apply_and_merge_plan import ApplyAndMergePlan -from eva.plan_nodes.create_mat_view_plan import CreateMaterializedViewPlan -from eva.plan_nodes.exchange_plan import ExchangePlan -from eva.plan_nodes.explain_plan import ExplainPlan -from eva.plan_nodes.hash_join_build_plan import HashJoinBuildPlan -from eva.plan_nodes.nested_loop_join_plan import NestedLoopJoinPlan -from eva.plan_nodes.predicate_plan import PredicatePlan -from eva.plan_nodes.project_plan import ProjectPlan -from eva.plan_nodes.show_info_plan import ShowInfoPlan +from evadb.optimizer.rules.pattern import Pattern +from evadb.optimizer.rules.rules_base import Promise, Rule, RuleType +from evadb.parser.types import JoinType, ParserOrderBySortType +from evadb.plan_nodes.apply_and_merge_plan import ApplyAndMergePlan +from evadb.plan_nodes.create_mat_view_plan import CreateMaterializedViewPlan +from evadb.plan_nodes.exchange_plan import ExchangePlan +from evadb.plan_nodes.explain_plan import ExplainPlan +from evadb.plan_nodes.hash_join_build_plan import HashJoinBuildPlan +from evadb.plan_nodes.nested_loop_join_plan import NestedLoopJoinPlan +from evadb.plan_nodes.predicate_plan import PredicatePlan +from evadb.plan_nodes.project_plan import ProjectPlan +from evadb.plan_nodes.show_info_plan import ShowInfoPlan if TYPE_CHECKING: - from eva.optimizer.optimizer_context import OptimizerContext + from evadb.optimizer.optimizer_context import OptimizerContext -from eva.optimizer.operators import ( +from evadb.optimizer.operators import ( Dummy, LogicalApplyAndMerge, LogicalCreate, @@ -83,25 +83,25 @@ Operator, OperatorType, ) -from eva.plan_nodes.create_index_plan import CreateIndexPlan -from eva.plan_nodes.create_plan import CreatePlan -from eva.plan_nodes.create_udf_plan import CreateUDFPlan -from eva.plan_nodes.delete_plan import DeletePlan -from eva.plan_nodes.drop_plan import DropPlan -from eva.plan_nodes.drop_udf_plan import DropUDFPlan -from eva.plan_nodes.function_scan_plan import FunctionScanPlan -from eva.plan_nodes.groupby_plan import GroupByPlan -from eva.plan_nodes.hash_join_probe_plan import HashJoinProbePlan -from eva.plan_nodes.insert_plan import InsertPlan -from eva.plan_nodes.lateral_join_plan import LateralJoinPlan -from eva.plan_nodes.limit_plan import LimitPlan -from eva.plan_nodes.load_data_plan import LoadDataPlan -from eva.plan_nodes.orderby_plan import OrderByPlan -from eva.plan_nodes.rename_plan import RenamePlan -from eva.plan_nodes.seq_scan_plan import SeqScanPlan -from eva.plan_nodes.storage_plan import StoragePlan -from eva.plan_nodes.union_plan import UnionPlan -from eva.plan_nodes.vector_index_scan_plan import VectorIndexScanPlan +from evadb.plan_nodes.create_index_plan import CreateIndexPlan +from evadb.plan_nodes.create_plan import CreatePlan +from evadb.plan_nodes.create_udf_plan import CreateUDFPlan +from evadb.plan_nodes.delete_plan import DeletePlan +from evadb.plan_nodes.drop_plan import DropPlan +from evadb.plan_nodes.drop_udf_plan import DropUDFPlan +from evadb.plan_nodes.function_scan_plan import FunctionScanPlan +from evadb.plan_nodes.groupby_plan import GroupByPlan +from evadb.plan_nodes.hash_join_probe_plan import HashJoinProbePlan +from evadb.plan_nodes.insert_plan import InsertPlan +from evadb.plan_nodes.lateral_join_plan import LateralJoinPlan +from evadb.plan_nodes.limit_plan import LimitPlan +from evadb.plan_nodes.load_data_plan import LoadDataPlan +from evadb.plan_nodes.orderby_plan import OrderByPlan +from evadb.plan_nodes.rename_plan import RenamePlan +from evadb.plan_nodes.seq_scan_plan import SeqScanPlan +from evadb.plan_nodes.storage_plan import StoragePlan +from evadb.plan_nodes.union_plan import UnionPlan +from evadb.plan_nodes.vector_index_scan_plan import VectorIndexScanPlan ############################################## # REWRITE RULES START diff --git a/eva/optimizer/rules/rules_base.py b/evadb/optimizer/rules/rules_base.py similarity index 98% rename from eva/optimizer/rules/rules_base.py rename to evadb/optimizer/rules/rules_base.py index d22292714..7513c2f90 100644 --- a/eva/optimizer/rules/rules_base.py +++ b/evadb/optimizer/rules/rules_base.py @@ -19,9 +19,9 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from eva.optimizer.optimizer_context import OptimizerContext + from evadb.optimizer.optimizer_context import OptimizerContext -from eva.optimizer.operators import Operator +from evadb.optimizer.operators import Operator class RuleType(Flag): diff --git a/eva/optimizer/rules/rules_manager.py b/evadb/optimizer/rules/rules_manager.py similarity index 97% rename from eva/optimizer/rules/rules_manager.py rename to evadb/optimizer/rules/rules_manager.py index 12da7df9f..58d3c65b7 100644 --- a/eva/optimizer/rules/rules_manager.py +++ b/evadb/optimizer/rules/rules_manager.py @@ -17,8 +17,8 @@ from contextlib import contextmanager from typing import List -from eva.configuration.configuration_manager import ConfigurationManager -from eva.optimizer.rules.rules import ( +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.optimizer.rules.rules import ( CacheFunctionExpressionInApply, CacheFunctionExpressionInFilter, CacheFunctionExpressionInProject, @@ -62,7 +62,7 @@ XformExtractObjectToLinearFlow, XformLateralJoinToLinearFlow, ) -from eva.optimizer.rules.rules_base import Rule +from evadb.optimizer.rules.rules_base import Rule class RulesManager: diff --git a/eva/optimizer/statement_to_opr_converter.py b/evadb/optimizer/statement_to_opr_converter.py similarity index 91% rename from eva/optimizer/statement_to_opr_converter.py rename to evadb/optimizer/statement_to_opr_converter.py index dd448adff..98153ccda 100644 --- a/eva/optimizer/statement_to_opr_converter.py +++ b/evadb/optimizer/statement_to_opr_converter.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import AbstractExpression -from eva.optimizer.operators import ( +from evadb.expression.abstract_expression import AbstractExpression +from evadb.optimizer.operators import ( LogicalCreate, LogicalCreateIndex, LogicalCreateMaterializedView, @@ -39,27 +39,27 @@ LogicalShow, LogicalUnion, ) -from eva.optimizer.optimizer_utils import ( +from evadb.optimizer.optimizer_utils import ( column_definition_to_udf_io, metadata_definition_to_udf_metadata, ) -from eva.parser.create_index_statement import CreateIndexStatement -from eva.parser.create_mat_view_statement import CreateMaterializedViewStatement -from eva.parser.create_statement import CreateTableStatement -from eva.parser.create_udf_statement import CreateUDFStatement -from eva.parser.delete_statement import DeleteTableStatement -from eva.parser.drop_statement import DropTableStatement -from eva.parser.drop_udf_statement import DropUDFStatement -from eva.parser.explain_statement import ExplainStatement -from eva.parser.insert_statement import InsertTableStatement -from eva.parser.load_statement import LoadDataStatement -from eva.parser.rename_statement import RenameTableStatement -from eva.parser.select_statement import SelectStatement -from eva.parser.show_statement import ShowStatement -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableRef -from eva.parser.types import UDFType -from eva.utils.logging_manager import logger +from evadb.parser.create_index_statement import CreateIndexStatement +from evadb.parser.create_mat_view_statement import CreateMaterializedViewStatement +from evadb.parser.create_statement import CreateTableStatement +from evadb.parser.create_udf_statement import CreateUDFStatement +from evadb.parser.delete_statement import DeleteTableStatement +from evadb.parser.drop_statement import DropTableStatement +from evadb.parser.drop_udf_statement import DropUDFStatement +from evadb.parser.explain_statement import ExplainStatement +from evadb.parser.insert_statement import InsertTableStatement +from evadb.parser.load_statement import LoadDataStatement +from evadb.parser.rename_statement import RenameTableStatement +from evadb.parser.select_statement import SelectStatement +from evadb.parser.show_statement import ShowStatement +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableRef +from evadb.parser.types import UDFType +from evadb.utils.logging_manager import logger class StatementToPlanConverter: diff --git a/eva/parser/__init__.py b/evadb/parser/__init__.py similarity index 100% rename from eva/parser/__init__.py rename to evadb/parser/__init__.py diff --git a/eva/parser/alias.py b/evadb/parser/alias.py similarity index 100% rename from eva/parser/alias.py rename to evadb/parser/alias.py diff --git a/eva/parser/create_index_statement.py b/evadb/parser/create_index_statement.py similarity index 88% rename from eva/parser/create_index_statement.py rename to evadb/parser/create_index_statement.py index 9b81c7354..e28869a00 100644 --- a/eva/parser/create_index_statement.py +++ b/evadb/parser/create_index_statement.py @@ -14,12 +14,12 @@ # limitations under the License. from typing import List -from eva.catalog.catalog_type import VectorStoreType -from eva.expression.function_expression import FunctionExpression -from eva.parser.create_statement import ColumnDefinition -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableRef -from eva.parser.types import StatementType +from evadb.catalog.catalog_type import VectorStoreType +from evadb.expression.function_expression import FunctionExpression +from evadb.parser.create_statement import ColumnDefinition +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableRef +from evadb.parser.types import StatementType class CreateIndexStatement(AbstractStatement): diff --git a/eva/parser/create_mat_view_statement.py b/evadb/parser/create_mat_view_statement.py similarity index 90% rename from eva/parser/create_mat_view_statement.py rename to evadb/parser/create_mat_view_statement.py index 931bd1528..feaef6881 100644 --- a/eva/parser/create_mat_view_statement.py +++ b/evadb/parser/create_mat_view_statement.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import List -from eva.parser.create_statement import ColumnDefinition -from eva.parser.select_statement import SelectStatement -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableInfo -from eva.parser.types import StatementType +from evadb.parser.create_statement import ColumnDefinition +from evadb.parser.select_statement import SelectStatement +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableInfo +from evadb.parser.types import StatementType class CreateMaterializedViewStatement(AbstractStatement): diff --git a/eva/parser/create_statement.py b/evadb/parser/create_statement.py similarity index 92% rename from eva/parser/create_statement.py rename to evadb/parser/create_statement.py index f516c0f06..d82cfa1bc 100644 --- a/eva/parser/create_statement.py +++ b/evadb/parser/create_statement.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import List, Tuple -from eva.catalog.catalog_type import ColumnType, NdArrayType -from eva.parser.select_statement import SelectStatement -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableInfo -from eva.parser.types import StatementType +from evadb.catalog.catalog_type import ColumnType, NdArrayType +from evadb.parser.select_statement import SelectStatement +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableInfo +from evadb.parser.types import StatementType class ColConstraintInfo: @@ -136,9 +136,7 @@ def __str__(self) -> str: ) if self._query is not None: - print_str = "CREATE TABLE {} AS {}\n".format( - self._table_info, self._query - ) + print_str = "CREATE TABLE {} AS {}\n".format(self._table_info, self._query) for column in self.column_list: print_str += str(column) + "\n" @@ -182,6 +180,6 @@ def __hash__(self) -> int: self.table_info, self.if_not_exists, tuple(self.column_list or []), - self.query + self.query, ) ) diff --git a/eva/parser/create_udf_statement.py b/evadb/parser/create_udf_statement.py similarity index 96% rename from eva/parser/create_udf_statement.py rename to evadb/parser/create_udf_statement.py index b60dd5ebf..e2f7b6730 100644 --- a/eva/parser/create_udf_statement.py +++ b/evadb/parser/create_udf_statement.py @@ -15,9 +15,9 @@ from pathlib import Path from typing import List, Tuple -from eva.parser.create_statement import ColumnDefinition -from eva.parser.statement import AbstractStatement -from eva.parser.types import StatementType +from evadb.parser.create_statement import ColumnDefinition +from evadb.parser.statement import AbstractStatement +from evadb.parser.types import StatementType class CreateUDFStatement(AbstractStatement): diff --git a/eva/parser/delete_statement.py b/evadb/parser/delete_statement.py similarity index 89% rename from eva/parser/delete_statement.py rename to evadb/parser/delete_statement.py index 86e844b7d..51be4a732 100644 --- a/eva/parser/delete_statement.py +++ b/evadb/parser/delete_statement.py @@ -12,10 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableRef -from eva.parser.types import StatementType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableRef +from evadb.parser.types import StatementType class DeleteTableStatement(AbstractStatement): diff --git a/eva/parser/drop_statement.py b/evadb/parser/drop_statement.py similarity index 91% rename from eva/parser/drop_statement.py rename to evadb/parser/drop_statement.py index c191def9d..fbdb00347 100644 --- a/eva/parser/drop_statement.py +++ b/evadb/parser/drop_statement.py @@ -14,9 +14,9 @@ # limitations under the License. from typing import List -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableInfo -from eva.parser.types import StatementType +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableInfo +from evadb.parser.types import StatementType class DropTableStatement(AbstractStatement): diff --git a/eva/parser/drop_udf_statement.py b/evadb/parser/drop_udf_statement.py similarity index 94% rename from eva/parser/drop_udf_statement.py rename to evadb/parser/drop_udf_statement.py index 39f13b73b..8448812c6 100644 --- a/eva/parser/drop_udf_statement.py +++ b/evadb/parser/drop_udf_statement.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.statement import AbstractStatement -from eva.parser.types import StatementType +from evadb.parser.statement import AbstractStatement +from evadb.parser.types import StatementType class DropUDFStatement(AbstractStatement): diff --git a/eva/parser/eva.lark b/evadb/parser/evadb.lark similarity index 100% rename from eva/parser/eva.lark rename to evadb/parser/evadb.lark diff --git a/eva/parser/explain_statement.py b/evadb/parser/explain_statement.py similarity index 92% rename from eva/parser/explain_statement.py rename to evadb/parser/explain_statement.py index 096c3b714..1f71a0a4c 100644 --- a/eva/parser/explain_statement.py +++ b/evadb/parser/explain_statement.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.statement import AbstractStatement -from eva.parser.types import StatementType +from evadb.parser.statement import AbstractStatement +from evadb.parser.types import StatementType class ExplainStatement(AbstractStatement): diff --git a/eva/parser/insert_statement.py b/evadb/parser/insert_statement.py similarity index 92% rename from eva/parser/insert_statement.py rename to evadb/parser/insert_statement.py index dda70de58..e5b878c67 100644 --- a/eva/parser/insert_statement.py +++ b/evadb/parser/insert_statement.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import List -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableRef -from eva.parser.types import StatementType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableRef +from evadb.parser.types import StatementType class InsertTableStatement(AbstractStatement): diff --git a/eva/parser/lark_parser.py b/evadb/parser/lark_parser.py similarity index 93% rename from eva/parser/lark_parser.py rename to evadb/parser/lark_parser.py index dfd21107e..7e569e550 100644 --- a/eva/parser/lark_parser.py +++ b/evadb/parser/lark_parser.py @@ -16,7 +16,7 @@ from lark import Lark -from eva.parser.lark_visitor import LarkInterpreter +from evadb.parser.lark_visitor import LarkInterpreter class LarkParser(object): @@ -33,7 +33,7 @@ def __new__(cls): def __init__(self): dir_path = os.path.dirname(os.path.realpath(__file__)) - lark_path = os.path.join(dir_path, "eva.lark") + lark_path = os.path.join(dir_path, "evadb.lark") with open(lark_path) as f: sql_grammar = f.read() self._parser = Lark(sql_grammar, parser="lalr") diff --git a/eva/parser/lark_visitor/__init__.py b/evadb/parser/lark_visitor/__init__.py similarity index 68% rename from eva/parser/lark_visitor/__init__.py rename to evadb/parser/lark_visitor/__init__.py index ffc2fcfd6..47de51370 100644 --- a/eva/parser/lark_visitor/__init__.py +++ b/evadb/parser/lark_visitor/__init__.py @@ -16,19 +16,19 @@ from lark import Tree, visitors -from eva.parser.lark_visitor._common_clauses_ids import CommonClauses -from eva.parser.lark_visitor._create_statements import CreateTable -from eva.parser.lark_visitor._delete_statement import Delete -from eva.parser.lark_visitor._drop_statement import DropTable -from eva.parser.lark_visitor._explain_statement import Explain -from eva.parser.lark_visitor._expressions import Expressions -from eva.parser.lark_visitor._functions import Functions -from eva.parser.lark_visitor._insert_statements import Insert -from eva.parser.lark_visitor._load_statement import Load -from eva.parser.lark_visitor._rename_statement import RenameTable -from eva.parser.lark_visitor._select_statement import Select -from eva.parser.lark_visitor._show_statements import Show -from eva.parser.lark_visitor._table_sources import TableSources +from evadb.parser.lark_visitor._common_clauses_ids import CommonClauses +from evadb.parser.lark_visitor._create_statements import CreateTable +from evadb.parser.lark_visitor._delete_statement import Delete +from evadb.parser.lark_visitor._drop_statement import DropTable +from evadb.parser.lark_visitor._explain_statement import Explain +from evadb.parser.lark_visitor._expressions import Expressions +from evadb.parser.lark_visitor._functions import Functions +from evadb.parser.lark_visitor._insert_statements import Insert +from evadb.parser.lark_visitor._load_statement import Load +from evadb.parser.lark_visitor._rename_statement import RenameTable +from evadb.parser.lark_visitor._select_statement import Select +from evadb.parser.lark_visitor._show_statements import Show +from evadb.parser.lark_visitor._table_sources import TableSources # To add new functionality to the parser, create a new file under # the lark_visitor directory, and implement a new class which diff --git a/eva/parser/lark_visitor/_common_clauses_ids.py b/evadb/parser/lark_visitor/_common_clauses_ids.py similarity index 90% rename from eva/parser/lark_visitor/_common_clauses_ids.py rename to evadb/parser/lark_visitor/_common_clauses_ids.py index 25eae8f39..64adc16a6 100644 --- a/eva/parser/lark_visitor/_common_clauses_ids.py +++ b/evadb/parser/lark_visitor/_common_clauses_ids.py @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.catalog.catalog_type import Dimension -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.table_ref import TableInfo -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import Dimension +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.table_ref import TableInfo +from evadb.utils.logging_manager import logger class CommonClauses: diff --git a/eva/parser/lark_visitor/_create_statements.py b/evadb/parser/lark_visitor/_create_statements.py similarity index 95% rename from eva/parser/lark_visitor/_create_statements.py rename to evadb/parser/lark_visitor/_create_statements.py index c4c360bbf..e5b04a66b 100644 --- a/eva/parser/lark_visitor/_create_statements.py +++ b/evadb/parser/lark_visitor/_create_statements.py @@ -15,17 +15,17 @@ from lark import Tree -from eva.catalog.catalog_type import ColumnType, NdArrayType, VectorStoreType -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.create_index_statement import CreateIndexStatement -from eva.parser.create_mat_view_statement import CreateMaterializedViewStatement -from eva.parser.create_statement import ( +from evadb.catalog.catalog_type import ColumnType, NdArrayType, VectorStoreType +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.create_index_statement import CreateIndexStatement +from evadb.parser.create_mat_view_statement import CreateMaterializedViewStatement +from evadb.parser.create_statement import ( ColConstraintInfo, ColumnDefinition, CreateTableStatement, ) -from eva.parser.table_ref import TableRef -from eva.parser.types import ColumnConstraintEnum +from evadb.parser.table_ref import TableRef +from evadb.parser.types import ColumnConstraintEnum ################################################################## diff --git a/eva/parser/lark_visitor/_delete_statement.py b/evadb/parser/lark_visitor/_delete_statement.py similarity index 92% rename from eva/parser/lark_visitor/_delete_statement.py rename to evadb/parser/lark_visitor/_delete_statement.py index 76531317b..0d0a52df3 100644 --- a/eva/parser/lark_visitor/_delete_statement.py +++ b/evadb/parser/lark_visitor/_delete_statement.py @@ -14,8 +14,8 @@ # limitations under the License. from lark.tree import Tree -from eva.parser.delete_statement import DeleteTableStatement -from eva.parser.table_ref import TableRef +from evadb.parser.delete_statement import DeleteTableStatement +from evadb.parser.table_ref import TableRef ################################################################## diff --git a/eva/parser/lark_visitor/_drop_statement.py b/evadb/parser/lark_visitor/_drop_statement.py similarity index 95% rename from eva/parser/lark_visitor/_drop_statement.py rename to evadb/parser/lark_visitor/_drop_statement.py index 49c7643a4..53494d859 100644 --- a/eva/parser/lark_visitor/_drop_statement.py +++ b/evadb/parser/lark_visitor/_drop_statement.py @@ -14,7 +14,7 @@ # limitations under the License. from lark import Tree -from eva.parser.drop_statement import DropTableStatement +from evadb.parser.drop_statement import DropTableStatement class DropTable: diff --git a/eva/parser/lark_visitor/_explain_statement.py b/evadb/parser/lark_visitor/_explain_statement.py similarity index 94% rename from eva/parser/lark_visitor/_explain_statement.py rename to evadb/parser/lark_visitor/_explain_statement.py index a02bd89ba..d3add9e9b 100644 --- a/eva/parser/lark_visitor/_explain_statement.py +++ b/evadb/parser/lark_visitor/_explain_statement.py @@ -14,7 +14,7 @@ # limitations under the License. from lark import Tree -from eva.parser.explain_statement import ExplainStatement +from evadb.parser.explain_statement import ExplainStatement class Explain: diff --git a/eva/parser/lark_visitor/_expressions.py b/evadb/parser/lark_visitor/_expressions.py similarity index 92% rename from eva/parser/lark_visitor/_expressions.py rename to evadb/parser/lark_visitor/_expressions.py index d80af37c7..3cff779dc 100644 --- a/eva/parser/lark_visitor/_expressions.py +++ b/evadb/parser/lark_visitor/_expressions.py @@ -15,11 +15,11 @@ import numpy as np from lark import Tree -from eva.catalog.catalog_type import ColumnType -from eva.expression.abstract_expression import ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.logical_expression import LogicalExpression +from evadb.catalog.catalog_type import ColumnType +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.logical_expression import LogicalExpression ################################################################## diff --git a/eva/parser/lark_visitor/_functions.py b/evadb/parser/lark_visitor/_functions.py similarity index 92% rename from eva/parser/lark_visitor/_functions.py rename to evadb/parser/lark_visitor/_functions.py index 140f2a934..9f08d10a6 100644 --- a/eva/parser/lark_visitor/_functions.py +++ b/evadb/parser/lark_visitor/_functions.py @@ -15,13 +15,13 @@ from lark import Token, Tree -from eva.expression.abstract_expression import ExpressionType -from eva.expression.aggregation_expression import AggregationExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.create_udf_statement import CreateUDFStatement -from eva.parser.drop_udf_statement import DropUDFStatement +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.aggregation_expression import AggregationExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.create_udf_statement import CreateUDFStatement +from evadb.parser.drop_udf_statement import DropUDFStatement ################################################################## diff --git a/eva/parser/lark_visitor/_insert_statements.py b/evadb/parser/lark_visitor/_insert_statements.py similarity index 92% rename from eva/parser/lark_visitor/_insert_statements.py rename to evadb/parser/lark_visitor/_insert_statements.py index 280ccd5b0..8922e689f 100644 --- a/eva/parser/lark_visitor/_insert_statements.py +++ b/evadb/parser/lark_visitor/_insert_statements.py @@ -14,9 +14,9 @@ # limitations under the License. from lark.tree import Tree -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.insert_statement import InsertTableStatement -from eva.parser.table_ref import TableRef +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.insert_statement import InsertTableStatement +from evadb.parser.table_ref import TableRef ################################################################## diff --git a/eva/parser/lark_visitor/_load_statement.py b/evadb/parser/lark_visitor/_load_statement.py similarity index 95% rename from eva/parser/lark_visitor/_load_statement.py rename to evadb/parser/lark_visitor/_load_statement.py index 87aa87427..37e1f71f7 100644 --- a/eva/parser/lark_visitor/_load_statement.py +++ b/evadb/parser/lark_visitor/_load_statement.py @@ -14,8 +14,8 @@ # limitations under the License. from lark.tree import Tree -from eva.parser.load_statement import LoadDataStatement -from eva.parser.types import FileFormatType +from evadb.parser.load_statement import LoadDataStatement +from evadb.parser.types import FileFormatType class Load: diff --git a/eva/parser/lark_visitor/_rename_statement.py b/evadb/parser/lark_visitor/_rename_statement.py similarity index 88% rename from eva/parser/lark_visitor/_rename_statement.py rename to evadb/parser/lark_visitor/_rename_statement.py index 72cfcb170..714f3f51a 100644 --- a/eva/parser/lark_visitor/_rename_statement.py +++ b/evadb/parser/lark_visitor/_rename_statement.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.rename_statement import RenameTableStatement -from eva.parser.table_ref import TableRef +from evadb.parser.rename_statement import RenameTableStatement +from evadb.parser.table_ref import TableRef class RenameTable: diff --git a/eva/parser/lark_visitor/_select_statement.py b/evadb/parser/lark_visitor/_select_statement.py similarity index 93% rename from eva/parser/lark_visitor/_select_statement.py rename to evadb/parser/lark_visitor/_select_statement.py index 563188f41..c0a3752e9 100644 --- a/eva/parser/lark_visitor/_select_statement.py +++ b/evadb/parser/lark_visitor/_select_statement.py @@ -15,8 +15,8 @@ from lark.tree import Tree -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.parser.types import ParserOrderBySortType +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.parser.types import ParserOrderBySortType ################################################################## diff --git a/eva/parser/lark_visitor/_show_statements.py b/evadb/parser/lark_visitor/_show_statements.py similarity index 91% rename from eva/parser/lark_visitor/_show_statements.py rename to evadb/parser/lark_visitor/_show_statements.py index d10d2654f..2531058a7 100644 --- a/eva/parser/lark_visitor/_show_statements.py +++ b/evadb/parser/lark_visitor/_show_statements.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.show_statement import ShowStatement -from eva.parser.types import ShowType +from evadb.parser.show_statement import ShowStatement +from evadb.parser.types import ShowType ################################################################## diff --git a/eva/parser/lark_visitor/_table_sources.py b/evadb/parser/lark_visitor/_table_sources.py similarity index 96% rename from eva/parser/lark_visitor/_table_sources.py rename to evadb/parser/lark_visitor/_table_sources.py index 217743c34..db8f6d73a 100644 --- a/eva/parser/lark_visitor/_table_sources.py +++ b/evadb/parser/lark_visitor/_table_sources.py @@ -15,11 +15,11 @@ from lark import Token, Tree -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.select_statement import SelectStatement -from eva.parser.table_ref import Alias, JoinNode, TableRef, TableValuedExpression -from eva.parser.types import JoinType -from eva.utils.logging_manager import logger +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.select_statement import SelectStatement +from evadb.parser.table_ref import Alias, JoinNode, TableRef, TableValuedExpression +from evadb.parser.types import JoinType +from evadb.utils.logging_manager import logger ################################################################## # TABLE SOURCES diff --git a/eva/parser/load_statement.py b/evadb/parser/load_statement.py similarity index 93% rename from eva/parser/load_statement.py rename to evadb/parser/load_statement.py index a6638a9cf..5bd7bbcde 100644 --- a/eva/parser/load_statement.py +++ b/evadb/parser/load_statement.py @@ -15,10 +15,10 @@ from pathlib import Path from typing import List -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableInfo -from eva.parser.types import StatementType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableInfo +from evadb.parser.types import StatementType class LoadDataStatement(AbstractStatement): diff --git a/eva/parser/parser.py b/evadb/parser/parser.py similarity index 92% rename from eva/parser/parser.py rename to evadb/parser/parser.py index a49d5cb7a..69b649b5c 100644 --- a/eva/parser/parser.py +++ b/evadb/parser/parser.py @@ -12,12 +12,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.lark_parser import LarkParser +from evadb.parser.lark_parser import LarkParser class Parser(object): """ - Parser based on EVAQL grammar: eva.lark + Parser based on EVAQL grammar: evadb.lark """ _lark_parser = None diff --git a/eva/parser/rename_statement.py b/evadb/parser/rename_statement.py similarity index 92% rename from eva/parser/rename_statement.py rename to evadb/parser/rename_statement.py index e6b22d0ac..0fe52e603 100644 --- a/eva/parser/rename_statement.py +++ b/evadb/parser/rename_statement.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.statement import AbstractStatement -from eva.parser.table_ref import TableInfo, TableRef -from eva.parser.types import StatementType +from evadb.parser.statement import AbstractStatement +from evadb.parser.table_ref import TableInfo, TableRef +from evadb.parser.types import StatementType # Modified diff --git a/eva/parser/select_statement.py b/evadb/parser/select_statement.py similarity index 96% rename from eva/parser/select_statement.py rename to evadb/parser/select_statement.py index 50e27171c..5c34c223f 100644 --- a/eva/parser/select_statement.py +++ b/evadb/parser/select_statement.py @@ -18,11 +18,11 @@ from typing import List, Union if typing.TYPE_CHECKING: - from eva.parser.table_ref import TableRef + from evadb.parser.table_ref import TableRef -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.statement import AbstractStatement -from eva.parser.types import ParserOrderBySortType, StatementType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.statement import AbstractStatement +from evadb.parser.types import ParserOrderBySortType, StatementType class SelectStatement(AbstractStatement): diff --git a/eva/parser/show_statement.py b/evadb/parser/show_statement.py similarity index 92% rename from eva/parser/show_statement.py rename to evadb/parser/show_statement.py index 2d17007e2..1aa37be08 100644 --- a/eva/parser/show_statement.py +++ b/evadb/parser/show_statement.py @@ -14,8 +14,8 @@ # limitations under the License. from __future__ import annotations -from eva.parser.statement import AbstractStatement -from eva.parser.types import ShowType, StatementType +from evadb.parser.statement import AbstractStatement +from evadb.parser.types import ShowType, StatementType class ShowStatement(AbstractStatement): diff --git a/eva/parser/statement.py b/evadb/parser/statement.py similarity index 96% rename from eva/parser/statement.py rename to evadb/parser/statement.py index 400ba8974..f4456000c 100644 --- a/eva/parser/statement.py +++ b/evadb/parser/statement.py @@ -14,7 +14,7 @@ # limitations under the License. from copy import deepcopy -from eva.parser.types import StatementType +from evadb.parser.types import StatementType class AbstractStatement: diff --git a/eva/parser/table_ref.py b/evadb/parser/table_ref.py similarity index 96% rename from eva/parser/table_ref.py rename to evadb/parser/table_ref.py index 1c7e64fea..73c5b1517 100644 --- a/eva/parser/table_ref.py +++ b/evadb/parser/table_ref.py @@ -16,11 +16,11 @@ from typing import Union -from eva.expression.abstract_expression import AbstractExpression -from eva.expression.function_expression import FunctionExpression -from eva.parser.alias import Alias -from eva.parser.select_statement import SelectStatement -from eva.parser.types import JoinType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.expression.function_expression import FunctionExpression +from evadb.parser.alias import Alias +from evadb.parser.select_statement import SelectStatement +from evadb.parser.types import JoinType class TableInfo: diff --git a/eva/parser/types.py b/evadb/parser/types.py similarity index 97% rename from eva/parser/types.py rename to evadb/parser/types.py index dbfbb25d5..8ad0ace97 100644 --- a/eva/parser/types.py +++ b/evadb/parser/types.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.utils.generic_utils import EVAEnum +from evadb.utils.generic_utils import EVAEnum class ColumnConstraintEnum(EVAEnum): diff --git a/eva/parser/utils.py b/evadb/parser/utils.py similarity index 93% rename from eva/parser/utils.py rename to evadb/parser/utils.py index 66f4c5db6..c3276810b 100644 --- a/eva/parser/utils.py +++ b/evadb/parser/utils.py @@ -12,10 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.create_udf_statement import CreateUDFStatement -from eva.parser.load_statement import LoadDataStatement -from eva.parser.parser import Parser -from eva.parser.select_statement import SelectStatement +from evadb.parser.create_udf_statement import CreateUDFStatement +from evadb.parser.load_statement import LoadDataStatement +from evadb.parser.parser import Parser +from evadb.parser.select_statement import SelectStatement def parse_expression(expr: str): diff --git a/eva/plan_nodes/__init__.py b/evadb/plan_nodes/__init__.py similarity index 100% rename from eva/plan_nodes/__init__.py rename to evadb/plan_nodes/__init__.py diff --git a/eva/plan_nodes/abstract_join_plan.py b/evadb/plan_nodes/abstract_join_plan.py similarity index 87% rename from eva/plan_nodes/abstract_join_plan.py rename to evadb/plan_nodes/abstract_join_plan.py index 5625d0624..3e0f267cb 100644 --- a/eva/plan_nodes/abstract_join_plan.py +++ b/evadb/plan_nodes/abstract_join_plan.py @@ -14,10 +14,10 @@ # limitations under the License. """Abstract class for all the join planners """ -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.types import JoinType -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.types import JoinType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class AbstractJoin(AbstractPlan): diff --git a/eva/plan_nodes/abstract_plan.py b/evadb/plan_nodes/abstract_plan.py similarity index 98% rename from eva/plan_nodes/abstract_plan.py rename to evadb/plan_nodes/abstract_plan.py index cace4dfca..b668a2808 100644 --- a/eva/plan_nodes/abstract_plan.py +++ b/evadb/plan_nodes/abstract_plan.py @@ -16,7 +16,7 @@ from collections import deque from typing import Any, List -from eva.plan_nodes.types import PlanOprType +from evadb.plan_nodes.types import PlanOprType class AbstractPlan(ABC): diff --git a/eva/plan_nodes/abstract_scan_plan.py b/evadb/plan_nodes/abstract_scan_plan.py similarity index 88% rename from eva/plan_nodes/abstract_scan_plan.py rename to evadb/plan_nodes/abstract_scan_plan.py index d23d7448f..182b7c26e 100644 --- a/eva/plan_nodes/abstract_scan_plan.py +++ b/evadb/plan_nodes/abstract_scan_plan.py @@ -16,9 +16,9 @@ https://www.postgresql.org/docs/9.1/using-explain.html https://www.postgresql.org/docs/9.5/runtime-config-query.html """ -from eva.expression.abstract_expression import AbstractExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class AbstractScan(AbstractPlan): diff --git a/eva/plan_nodes/apply_and_merge_plan.py b/evadb/plan_nodes/apply_and_merge_plan.py similarity index 89% rename from eva/plan_nodes/apply_and_merge_plan.py rename to evadb/plan_nodes/apply_and_merge_plan.py index 3cd3adb7d..fb0385b3a 100644 --- a/eva/plan_nodes/apply_and_merge_plan.py +++ b/evadb/plan_nodes/apply_and_merge_plan.py @@ -12,10 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.function_expression import FunctionExpression -from eva.parser.alias import Alias -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.function_expression import FunctionExpression +from evadb.parser.alias import Alias +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class ApplyAndMergePlan(AbstractPlan): diff --git a/eva/plan_nodes/create_index_plan.py b/evadb/plan_nodes/create_index_plan.py similarity index 86% rename from eva/plan_nodes/create_index_plan.py rename to evadb/plan_nodes/create_index_plan.py index 7f0f0ee71..bd401450b 100644 --- a/eva/plan_nodes/create_index_plan.py +++ b/evadb/plan_nodes/create_index_plan.py @@ -14,12 +14,12 @@ # limitations under the License. from typing import List -from eva.catalog.catalog_type import VectorStoreType -from eva.expression.function_expression import FunctionExpression -from eva.parser.create_statement import ColumnDefinition -from eva.parser.table_ref import TableRef -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.catalog_type import VectorStoreType +from evadb.expression.function_expression import FunctionExpression +from evadb.parser.create_statement import ColumnDefinition +from evadb.parser.table_ref import TableRef +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class CreateIndexPlan(AbstractPlan): diff --git a/eva/plan_nodes/create_mat_view_plan.py b/evadb/plan_nodes/create_mat_view_plan.py similarity index 90% rename from eva/plan_nodes/create_mat_view_plan.py rename to evadb/plan_nodes/create_mat_view_plan.py index b02de0fdf..c95668ec6 100644 --- a/eva/plan_nodes/create_mat_view_plan.py +++ b/evadb/plan_nodes/create_mat_view_plan.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import List -from eva.parser.create_statement import ColumnDefinition -from eva.parser.table_ref import TableInfo -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.parser.create_statement import ColumnDefinition +from evadb.parser.table_ref import TableInfo +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class CreateMaterializedViewPlan(AbstractPlan): diff --git a/eva/plan_nodes/create_plan.py b/evadb/plan_nodes/create_plan.py similarity index 90% rename from eva/plan_nodes/create_plan.py rename to evadb/plan_nodes/create_plan.py index eed2c9143..f7fcc6cd6 100644 --- a/eva/plan_nodes/create_plan.py +++ b/evadb/plan_nodes/create_plan.py @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. from typing import List -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.parser.table_ref import TableInfo -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.parser.table_ref import TableInfo +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class CreatePlan(AbstractPlan): diff --git a/eva/plan_nodes/create_udf_plan.py b/evadb/plan_nodes/create_udf_plan.py similarity index 93% rename from eva/plan_nodes/create_udf_plan.py rename to evadb/plan_nodes/create_udf_plan.py index 099f06a9a..2415dadfc 100644 --- a/eva/plan_nodes/create_udf_plan.py +++ b/evadb/plan_nodes/create_udf_plan.py @@ -15,10 +15,10 @@ from pathlib import Path from typing import List -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class CreateUDFPlan(AbstractPlan): diff --git a/eva/plan_nodes/delete_plan.py b/evadb/plan_nodes/delete_plan.py similarity index 89% rename from eva/plan_nodes/delete_plan.py rename to evadb/plan_nodes/delete_plan.py index 190828de8..6685458ac 100644 --- a/eva/plan_nodes/delete_plan.py +++ b/evadb/plan_nodes/delete_plan.py @@ -12,10 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.table_ref import TableRef -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.table_ref import TableRef +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class DeletePlan(AbstractPlan): diff --git a/eva/plan_nodes/drop_plan.py b/evadb/plan_nodes/drop_plan.py similarity index 91% rename from eva/plan_nodes/drop_plan.py rename to evadb/plan_nodes/drop_plan.py index e327c66eb..7395e5b10 100644 --- a/eva/plan_nodes/drop_plan.py +++ b/evadb/plan_nodes/drop_plan.py @@ -14,9 +14,9 @@ # limitations under the License. from typing import List -from eva.parser.table_ref import TableInfo -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.parser.table_ref import TableInfo +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class DropPlan(AbstractPlan): diff --git a/eva/plan_nodes/drop_udf_plan.py b/evadb/plan_nodes/drop_udf_plan.py similarity index 93% rename from eva/plan_nodes/drop_udf_plan.py rename to evadb/plan_nodes/drop_udf_plan.py index 284b38598..2c25c1a0d 100644 --- a/eva/plan_nodes/drop_udf_plan.py +++ b/evadb/plan_nodes/drop_udf_plan.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class DropUDFPlan(AbstractPlan): diff --git a/eva/plan_nodes/exchange_plan.py b/evadb/plan_nodes/exchange_plan.py similarity index 95% rename from eva/plan_nodes/exchange_plan.py rename to evadb/plan_nodes/exchange_plan.py index 037f456d6..942b6036f 100644 --- a/eva/plan_nodes/exchange_plan.py +++ b/evadb/plan_nodes/exchange_plan.py @@ -15,8 +15,8 @@ from typing import Any, Dict, List -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class ExchangePlan(AbstractPlan): diff --git a/eva/plan_nodes/explain_plan.py b/evadb/plan_nodes/explain_plan.py similarity index 90% rename from eva/plan_nodes/explain_plan.py rename to evadb/plan_nodes/explain_plan.py index 782831ac1..2c1bac6ca 100644 --- a/eva/plan_nodes/explain_plan.py +++ b/evadb/plan_nodes/explain_plan.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class ExplainPlan(AbstractPlan): diff --git a/eva/plan_nodes/function_scan_plan.py b/evadb/plan_nodes/function_scan_plan.py similarity index 90% rename from eva/plan_nodes/function_scan_plan.py rename to evadb/plan_nodes/function_scan_plan.py index 7a86bf860..6e3be1ba5 100644 --- a/eva/plan_nodes/function_scan_plan.py +++ b/evadb/plan_nodes/function_scan_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.function_expression import FunctionExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.function_expression import FunctionExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class FunctionScanPlan(AbstractPlan): diff --git a/eva/plan_nodes/groupby_plan.py b/evadb/plan_nodes/groupby_plan.py similarity index 87% rename from eva/plan_nodes/groupby_plan.py rename to evadb/plan_nodes/groupby_plan.py index 41a9e7eb9..2585f36eb 100644 --- a/eva/plan_nodes/groupby_plan.py +++ b/evadb/plan_nodes/groupby_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class GroupByPlan(AbstractPlan): diff --git a/eva/plan_nodes/hash_join_build_plan.py b/evadb/plan_nodes/hash_join_build_plan.py similarity index 87% rename from eva/plan_nodes/hash_join_build_plan.py rename to evadb/plan_nodes/hash_join_build_plan.py index 8f9fc0522..305ef4f8f 100644 --- a/eva/plan_nodes/hash_join_build_plan.py +++ b/evadb/plan_nodes/hash_join_build_plan.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import List -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.parser.types import JoinType -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.parser.types import JoinType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class HashJoinBuildPlan(AbstractPlan): diff --git a/eva/plan_nodes/hash_join_probe_plan.py b/evadb/plan_nodes/hash_join_probe_plan.py similarity index 87% rename from eva/plan_nodes/hash_join_probe_plan.py rename to evadb/plan_nodes/hash_join_probe_plan.py index 20eb3c34c..0eb98c741 100644 --- a/eva/plan_nodes/hash_join_probe_plan.py +++ b/evadb/plan_nodes/hash_join_probe_plan.py @@ -14,11 +14,11 @@ # limitations under the License. from typing import List -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.types import JoinType -from eva.plan_nodes.abstract_join_plan import AbstractJoin -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.types import JoinType +from evadb.plan_nodes.abstract_join_plan import AbstractJoin +from evadb.plan_nodes.types import PlanOprType class HashJoinProbePlan(AbstractJoin): diff --git a/eva/plan_nodes/insert_plan.py b/evadb/plan_nodes/insert_plan.py similarity index 88% rename from eva/plan_nodes/insert_plan.py rename to evadb/plan_nodes/insert_plan.py index 38f9dbacd..eaa4f0e28 100644 --- a/eva/plan_nodes/insert_plan.py +++ b/evadb/plan_nodes/insert_plan.py @@ -14,10 +14,10 @@ # limitations under the License. from typing import List -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.expression.abstract_expression import AbstractExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.expression.abstract_expression import AbstractExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class InsertPlan(AbstractPlan): diff --git a/eva/plan_nodes/lateral_join_plan.py b/evadb/plan_nodes/lateral_join_plan.py similarity index 84% rename from eva/plan_nodes/lateral_join_plan.py rename to evadb/plan_nodes/lateral_join_plan.py index c636d05ef..823515495 100644 --- a/eva/plan_nodes/lateral_join_plan.py +++ b/evadb/plan_nodes/lateral_join_plan.py @@ -12,10 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.types import JoinType -from eva.plan_nodes.abstract_join_plan import AbstractJoin -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.types import JoinType +from evadb.plan_nodes.abstract_join_plan import AbstractJoin +from evadb.plan_nodes.types import PlanOprType class LateralJoinPlan(AbstractJoin): diff --git a/eva/plan_nodes/limit_plan.py b/evadb/plan_nodes/limit_plan.py similarity index 87% rename from eva/plan_nodes/limit_plan.py rename to evadb/plan_nodes/limit_plan.py index 2781ade88..b33dc4497 100644 --- a/eva/plan_nodes/limit_plan.py +++ b/evadb/plan_nodes/limit_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class LimitPlan(AbstractPlan): diff --git a/eva/plan_nodes/load_data_plan.py b/evadb/plan_nodes/load_data_plan.py similarity index 92% rename from eva/plan_nodes/load_data_plan.py rename to evadb/plan_nodes/load_data_plan.py index 43269b477..4260f76a2 100644 --- a/eva/plan_nodes/load_data_plan.py +++ b/evadb/plan_nodes/load_data_plan.py @@ -15,10 +15,10 @@ from pathlib import Path from typing import List -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.table_ref import TableInfo -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.table_ref import TableInfo +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class LoadDataPlan(AbstractPlan): diff --git a/eva/plan_nodes/nested_loop_join_plan.py b/evadb/plan_nodes/nested_loop_join_plan.py similarity index 85% rename from eva/plan_nodes/nested_loop_join_plan.py rename to evadb/plan_nodes/nested_loop_join_plan.py index 00872b3bc..2c08a3147 100644 --- a/eva/plan_nodes/nested_loop_join_plan.py +++ b/evadb/plan_nodes/nested_loop_join_plan.py @@ -13,10 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.types import JoinType -from eva.plan_nodes.abstract_join_plan import AbstractJoin -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.types import JoinType +from evadb.plan_nodes.abstract_join_plan import AbstractJoin +from evadb.plan_nodes.types import PlanOprType class NestedLoopJoinPlan(AbstractJoin): diff --git a/eva/plan_nodes/orderby_plan.py b/evadb/plan_nodes/orderby_plan.py similarity index 93% rename from eva/plan_nodes/orderby_plan.py rename to evadb/plan_nodes/orderby_plan.py index 06fc949ae..137aa04bd 100644 --- a/eva/plan_nodes/orderby_plan.py +++ b/evadb/plan_nodes/orderby_plan.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class OrderByPlan(AbstractPlan): diff --git a/eva/plan_nodes/pp_plan.py b/evadb/plan_nodes/pp_plan.py similarity index 85% rename from eva/plan_nodes/pp_plan.py rename to evadb/plan_nodes/pp_plan.py index e2f69627f..c6b75c95e 100644 --- a/eva/plan_nodes/pp_plan.py +++ b/evadb/plan_nodes/pp_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import AbstractExpression -from eva.plan_nodes.abstract_scan_plan import AbstractScan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.plan_nodes.abstract_scan_plan import AbstractScan +from evadb.plan_nodes.types import PlanOprType class PPScanPlan(AbstractScan): diff --git a/eva/plan_nodes/predicate_plan.py b/evadb/plan_nodes/predicate_plan.py similarity index 86% rename from eva/plan_nodes/predicate_plan.py rename to evadb/plan_nodes/predicate_plan.py index 45efc3694..ef629bc90 100644 --- a/eva/plan_nodes/predicate_plan.py +++ b/evadb/plan_nodes/predicate_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.abstract_expression import AbstractExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class PredicatePlan(AbstractPlan): diff --git a/eva/plan_nodes/project_plan.py b/evadb/plan_nodes/project_plan.py similarity index 86% rename from eva/plan_nodes/project_plan.py rename to evadb/plan_nodes/project_plan.py index c7893cac2..292b9cf60 100644 --- a/eva/plan_nodes/project_plan.py +++ b/evadb/plan_nodes/project_plan.py @@ -14,9 +14,9 @@ # limitations under the License. from typing import List -from eva.expression.abstract_expression import AbstractExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class ProjectPlan(AbstractPlan): diff --git a/eva/plan_nodes/rename_plan.py b/evadb/plan_nodes/rename_plan.py similarity index 90% rename from eva/plan_nodes/rename_plan.py rename to evadb/plan_nodes/rename_plan.py index ee97cd269..f6c4c1849 100644 --- a/eva/plan_nodes/rename_plan.py +++ b/evadb/plan_nodes/rename_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.table_ref import TableInfo, TableRef -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.parser.table_ref import TableInfo, TableRef +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType # Modified diff --git a/eva/plan_nodes/sample_plan.py b/evadb/plan_nodes/sample_plan.py similarity index 87% rename from eva/plan_nodes/sample_plan.py rename to evadb/plan_nodes/sample_plan.py index c95cdcd85..31b53b1d2 100644 --- a/eva/plan_nodes/sample_plan.py +++ b/evadb/plan_nodes/sample_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class SamplePlan(AbstractPlan): diff --git a/eva/plan_nodes/seq_scan_plan.py b/evadb/plan_nodes/seq_scan_plan.py similarity index 90% rename from eva/plan_nodes/seq_scan_plan.py rename to evadb/plan_nodes/seq_scan_plan.py index c07763810..7e075ccfa 100644 --- a/eva/plan_nodes/seq_scan_plan.py +++ b/evadb/plan_nodes/seq_scan_plan.py @@ -14,9 +14,9 @@ # limitations under the License. from typing import List -from eva.expression.abstract_expression import AbstractExpression -from eva.plan_nodes.abstract_scan_plan import AbstractScan -from eva.plan_nodes.types import PlanOprType +from evadb.expression.abstract_expression import AbstractExpression +from evadb.plan_nodes.abstract_scan_plan import AbstractScan +from evadb.plan_nodes.types import PlanOprType class SeqScanPlan(AbstractScan): diff --git a/eva/plan_nodes/show_info_plan.py b/evadb/plan_nodes/show_info_plan.py similarity index 88% rename from eva/plan_nodes/show_info_plan.py rename to evadb/plan_nodes/show_info_plan.py index 12870abad..24c32e4b7 100644 --- a/eva/plan_nodes/show_info_plan.py +++ b/evadb/plan_nodes/show_info_plan.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.parser.types import ShowType -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.parser.types import ShowType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class ShowInfoPlan(AbstractPlan): diff --git a/eva/plan_nodes/storage_plan.py b/evadb/plan_nodes/storage_plan.py similarity index 93% rename from eva/plan_nodes/storage_plan.py rename to evadb/plan_nodes/storage_plan.py index d07bbdbd5..fbd1f287f 100644 --- a/eva/plan_nodes/storage_plan.py +++ b/evadb/plan_nodes/storage_plan.py @@ -12,11 +12,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.expression.abstract_expression import AbstractExpression -from eva.parser.table_ref import TableRef -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.expression.abstract_expression import AbstractExpression +from evadb.parser.table_ref import TableRef +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class StoragePlan(AbstractPlan): diff --git a/eva/plan_nodes/types.py b/evadb/plan_nodes/types.py similarity index 100% rename from eva/plan_nodes/types.py rename to evadb/plan_nodes/types.py diff --git a/eva/plan_nodes/union_plan.py b/evadb/plan_nodes/union_plan.py similarity index 91% rename from eva/plan_nodes/union_plan.py rename to evadb/plan_nodes/union_plan.py index e291e1f15..4291c8ad4 100644 --- a/eva/plan_nodes/union_plan.py +++ b/evadb/plan_nodes/union_plan.py @@ -12,8 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class UnionPlan(AbstractPlan): diff --git a/eva/plan_nodes/vector_index_scan_plan.py b/evadb/plan_nodes/vector_index_scan_plan.py similarity index 88% rename from eva/plan_nodes/vector_index_scan_plan.py rename to evadb/plan_nodes/vector_index_scan_plan.py index 259e1d689..71a0818fb 100644 --- a/eva/plan_nodes/vector_index_scan_plan.py +++ b/evadb/plan_nodes/vector_index_scan_plan.py @@ -12,11 +12,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.catalog.catalog_type import VectorStoreType -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.function_expression import FunctionExpression -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.types import PlanOprType +from evadb.catalog.catalog_type import VectorStoreType +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.function_expression import FunctionExpression +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.types import PlanOprType class VectorIndexScanPlan(AbstractPlan): diff --git a/eva/readers/__init__.py b/evadb/readers/__init__.py similarity index 100% rename from eva/readers/__init__.py rename to evadb/readers/__init__.py diff --git a/eva/readers/abstract_reader.py b/evadb/readers/abstract_reader.py similarity index 93% rename from eva/readers/abstract_reader.py rename to evadb/readers/abstract_reader.py index d16498196..b0d4caf1b 100644 --- a/eva/readers/abstract_reader.py +++ b/evadb/readers/abstract_reader.py @@ -18,9 +18,9 @@ import pandas as pd -from eva.models.storage.batch import Batch -from eva.utils.errors import DatasetFileNotFoundError -from eva.utils.generic_utils import get_size +from evadb.models.storage.batch import Batch +from evadb.utils.errors import DatasetFileNotFoundError +from evadb.utils.generic_utils import get_size class AbstractReader(metaclass=ABCMeta): diff --git a/eva/readers/csv_reader.py b/evadb/readers/csv_reader.py similarity index 94% rename from eva/readers/csv_reader.py rename to evadb/readers/csv_reader.py index d471b16b6..95782824c 100644 --- a/eva/readers/csv_reader.py +++ b/evadb/readers/csv_reader.py @@ -17,9 +17,9 @@ import numpy as np import pandas as pd -from eva.catalog.sql_config import IDENTIFIER_COLUMN -from eva.readers.abstract_reader import AbstractReader -from eva.utils.logging_manager import logger +from evadb.catalog.sql_config import IDENTIFIER_COLUMN +from evadb.readers.abstract_reader import AbstractReader +from evadb.utils.logging_manager import logger class CSVReader(AbstractReader): diff --git a/eva/readers/decord_reader.py b/evadb/readers/decord_reader.py similarity index 94% rename from eva/readers/decord_reader.py rename to evadb/readers/decord_reader.py index ae9b09ff8..037f74122 100644 --- a/eva/readers/decord_reader.py +++ b/evadb/readers/decord_reader.py @@ -16,12 +16,12 @@ import numpy as np -from eva.catalog.catalog_type import VideoColumnName -from eva.constants import AUDIORATE, IFRAMES -from eva.expression.abstract_expression import AbstractExpression -from eva.expression.expression_utils import extract_range_list_from_predicate -from eva.readers.abstract_reader import AbstractReader -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import VideoColumnName +from evadb.constants import AUDIORATE, IFRAMES +from evadb.expression.abstract_expression import AbstractExpression +from evadb.expression.expression_utils import extract_range_list_from_predicate +from evadb.readers.abstract_reader import AbstractReader +from evadb.utils.logging_manager import logger # Lazy import to avoid torch init failures _decord = None diff --git a/eva/readers/document/__init__.py b/evadb/readers/document/__init__.py similarity index 100% rename from eva/readers/document/__init__.py rename to evadb/readers/document/__init__.py diff --git a/eva/readers/document/document_reader.py b/evadb/readers/document/document_reader.py similarity index 91% rename from eva/readers/document/document_reader.py rename to evadb/readers/document/document_reader.py index 14c0381e2..e7ad21d77 100644 --- a/eva/readers/document/document_reader.py +++ b/evadb/readers/document/document_reader.py @@ -15,8 +15,8 @@ from pathlib import Path from typing import Dict, Iterator -from eva.readers.abstract_reader import AbstractReader -from eva.readers.document.registry import _lazy_import_loader +from evadb.readers.abstract_reader import AbstractReader +from evadb.readers.document.registry import _lazy_import_loader class DocumentReader(AbstractReader): diff --git a/eva/readers/document/registry.py b/evadb/readers/document/registry.py similarity index 100% rename from eva/readers/document/registry.py rename to evadb/readers/document/registry.py diff --git a/eva/readers/image/__init__.py b/evadb/readers/image/__init__.py similarity index 100% rename from eva/readers/image/__init__.py rename to evadb/readers/image/__init__.py diff --git a/eva/readers/image/opencv_image_reader.py b/evadb/readers/image/opencv_image_reader.py similarity index 94% rename from eva/readers/image/opencv_image_reader.py rename to evadb/readers/image/opencv_image_reader.py index f0d54c9fc..2050b645d 100644 --- a/eva/readers/image/opencv_image_reader.py +++ b/evadb/readers/image/opencv_image_reader.py @@ -16,7 +16,7 @@ import cv2 -from eva.readers.abstract_reader import AbstractReader +from evadb.readers.abstract_reader import AbstractReader class CVImageReader(AbstractReader): diff --git a/eva/readers/pdf_reader.py b/evadb/readers/pdf_reader.py similarity index 97% rename from eva/readers/pdf_reader.py rename to evadb/readers/pdf_reader.py index 73d34d3d1..fb06cf1e8 100644 --- a/eva/readers/pdf_reader.py +++ b/evadb/readers/pdf_reader.py @@ -14,7 +14,7 @@ # limitations under the License. from typing import Dict, Iterator -from eva.readers.abstract_reader import AbstractReader +from evadb.readers.abstract_reader import AbstractReader class PDFReader(AbstractReader): diff --git a/eva/server/__init__.py b/evadb/server/__init__.py similarity index 100% rename from eva/server/__init__.py rename to evadb/server/__init__.py diff --git a/eva/server/command_handler.py b/evadb/server/command_handler.py similarity index 82% rename from eva/server/command_handler.py rename to evadb/server/command_handler.py index 7724b92c4..5bac82dcd 100644 --- a/eva/server/command_handler.py +++ b/evadb/server/command_handler.py @@ -15,17 +15,17 @@ import asyncio from typing import Iterator, Optional -from eva.binder.statement_binder import StatementBinder -from eva.binder.statement_binder_context import StatementBinderContext -from eva.database import EVADatabase -from eva.executor.plan_executor import PlanExecutor -from eva.models.server.response import Response, ResponseStatus -from eva.models.storage.batch import Batch -from eva.optimizer.plan_generator import PlanGenerator -from eva.optimizer.statement_to_opr_converter import StatementToPlanConverter -from eva.parser.parser import Parser -from eva.utils.logging_manager import logger -from eva.utils.stats import Timer +from evadb.binder.statement_binder import StatementBinder +from evadb.binder.statement_binder_context import StatementBinderContext +from evadb.database import EVADatabase +from evadb.executor.plan_executor import PlanExecutor +from evadb.models.server.response import Response, ResponseStatus +from evadb.models.storage.batch import Batch +from evadb.optimizer.plan_generator import PlanGenerator +from evadb.optimizer.statement_to_opr_converter import StatementToPlanConverter +from evadb.parser.parser import Parser +from evadb.utils.logging_manager import logger +from evadb.utils.stats import Timer def execute_query( diff --git a/eva/server/interpreter.py b/evadb/server/interpreter.py similarity index 97% rename from eva/server/interpreter.py rename to evadb/server/interpreter.py index 4cc7deb7f..04cb1012d 100644 --- a/eva/server/interpreter.py +++ b/evadb/server/interpreter.py @@ -19,8 +19,8 @@ from collections import deque from typing import Dict -from eva.interfaces.relational.db import EVADBConnection -from eva.utils.logging_manager import logger +from evadb.interfaces.relational.db import EVADBConnection +from evadb.utils.logging_manager import logger # version.py defines the VERSION and VERSION_SHORT variables VERSION_DICT: Dict[str, str] = {} diff --git a/eva/server/server.py b/evadb/server/server.py similarity index 93% rename from eva/server/server.py rename to evadb/server/server.py index f3254cdc4..df840bbd9 100644 --- a/eva/server/server.py +++ b/evadb/server/server.py @@ -16,9 +16,9 @@ import string from asyncio import StreamReader, StreamWriter -from eva.database import init_eva_db_instance -from eva.udfs.udf_bootstrap_queries import init_builtin_udfs -from eva.utils.logging_manager import logger +from evadb.database import init_eva_db_instance +from evadb.udfs.udf_bootstrap_queries import init_builtin_udfs +from evadb.utils.logging_manager import logger class EvaServer: @@ -91,7 +91,7 @@ async def handle_client( return logger.debug("Handle request") - from eva.server.command_handler import handle_request + from evadb.server.command_handler import handle_request asyncio.create_task(handle_request(self._evadb, client_writer, message)) diff --git a/eva/storage/__init__.py b/evadb/storage/__init__.py similarity index 100% rename from eva/storage/__init__.py rename to evadb/storage/__init__.py diff --git a/eva/storage/abstract_media_storage_engine.py b/evadb/storage/abstract_media_storage_engine.py similarity index 93% rename from eva/storage/abstract_media_storage_engine.py rename to evadb/storage/abstract_media_storage_engine.py index 8d71f9aa6..eb32dd403 100644 --- a/eva/storage/abstract_media_storage_engine.py +++ b/evadb/storage/abstract_media_storage_engine.py @@ -19,13 +19,13 @@ import pandas as pd -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.models.storage.batch import Batch -from eva.parser.table_ref import TableInfo -from eva.storage.abstract_storage_engine import AbstractStorageEngine -from eva.storage.sqlite_storage_engine import SQLStorageEngine -from eva.utils.logging_manager import logger +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.models.storage.batch import Batch +from evadb.parser.table_ref import TableInfo +from evadb.storage.abstract_storage_engine import AbstractStorageEngine +from evadb.storage.sqlite_storage_engine import SQLStorageEngine +from evadb.utils.logging_manager import logger class AbstractMediaStorageEngine(AbstractStorageEngine): diff --git a/eva/storage/abstract_storage_engine.py b/evadb/storage/abstract_storage_engine.py similarity index 91% rename from eva/storage/abstract_storage_engine.py rename to evadb/storage/abstract_storage_engine.py index af4f56f88..e186b24a8 100644 --- a/eva/storage/abstract_storage_engine.py +++ b/evadb/storage/abstract_storage_engine.py @@ -15,10 +15,10 @@ from abc import ABCMeta, abstractmethod from typing import Iterator -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.expression.abstract_expression import AbstractExpression -from eva.models.storage.batch import Batch +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.expression.abstract_expression import AbstractExpression +from evadb.models.storage.batch import Batch class AbstractStorageEngine(metaclass=ABCMeta): diff --git a/eva/storage/document_storage_engine.py b/evadb/storage/document_storage_engine.py similarity index 83% rename from eva/storage/document_storage_engine.py rename to evadb/storage/document_storage_engine.py index 6e918f8d1..becc8c303 100644 --- a/eva/storage/document_storage_engine.py +++ b/evadb/storage/document_storage_engine.py @@ -15,11 +15,11 @@ from pathlib import Path from typing import Iterator -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.models.storage.batch import Batch -from eva.readers.document.document_reader import DocumentReader -from eva.storage.abstract_media_storage_engine import AbstractMediaStorageEngine +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.models.storage.batch import Batch +from evadb.readers.document.document_reader import DocumentReader +from evadb.storage.abstract_media_storage_engine import AbstractMediaStorageEngine class DocumentStorageEngine(AbstractMediaStorageEngine): diff --git a/eva/storage/image_storage_engine.py b/evadb/storage/image_storage_engine.py similarity index 83% rename from eva/storage/image_storage_engine.py rename to evadb/storage/image_storage_engine.py index 1eae0d7c2..05397f29b 100644 --- a/eva/storage/image_storage_engine.py +++ b/evadb/storage/image_storage_engine.py @@ -15,11 +15,11 @@ from pathlib import Path from typing import Iterator -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.models.storage.batch import Batch -from eva.readers.image.opencv_image_reader import CVImageReader -from eva.storage.abstract_media_storage_engine import AbstractMediaStorageEngine +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.models.storage.batch import Batch +from evadb.readers.image.opencv_image_reader import CVImageReader +from evadb.storage.abstract_media_storage_engine import AbstractMediaStorageEngine class ImageStorageEngine(AbstractMediaStorageEngine): diff --git a/eva/storage/pdf_storage_engine.py b/evadb/storage/pdf_storage_engine.py similarity index 86% rename from eva/storage/pdf_storage_engine.py rename to evadb/storage/pdf_storage_engine.py index 752a1f26f..b1873ccd6 100644 --- a/eva/storage/pdf_storage_engine.py +++ b/evadb/storage/pdf_storage_engine.py @@ -15,11 +15,11 @@ from pathlib import Path from typing import Iterator -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.models.storage.batch import Batch -from eva.readers.pdf_reader import PDFReader -from eva.storage.abstract_media_storage_engine import AbstractMediaStorageEngine +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.models.storage.batch import Batch +from evadb.readers.pdf_reader import PDFReader +from evadb.storage.abstract_media_storage_engine import AbstractMediaStorageEngine class PDFStorageEngine(AbstractMediaStorageEngine): diff --git a/eva/storage/sqlite_storage_engine.py b/evadb/storage/sqlite_storage_engine.py similarity index 93% rename from eva/storage/sqlite_storage_engine.py rename to evadb/storage/sqlite_storage_engine.py index 337dfc683..30be4ae22 100644 --- a/eva/storage/sqlite_storage_engine.py +++ b/evadb/storage/sqlite_storage_engine.py @@ -19,18 +19,18 @@ from sqlalchemy import Table, inspect from sqlalchemy.sql.expression import ColumnElement -from eva.catalog.catalog_type import ColumnType -from eva.catalog.models.base_model import BaseModel -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.catalog.schema_utils import SchemaUtils -from eva.catalog.sql_config import IDENTIFIER_COLUMN -from eva.database import EVADatabase -from eva.models.storage.batch import Batch -from eva.parser.table_ref import TableInfo -from eva.storage.abstract_storage_engine import AbstractStorageEngine -from eva.utils.generic_utils import PickleSerializer, get_size -from eva.utils.logging_manager import logger +from evadb.catalog.catalog_type import ColumnType +from evadb.catalog.models.base_model import BaseModel +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.catalog.schema_utils import SchemaUtils +from evadb.catalog.sql_config import IDENTIFIER_COLUMN +from evadb.database import EVADatabase +from evadb.models.storage.batch import Batch +from evadb.parser.table_ref import TableInfo +from evadb.storage.abstract_storage_engine import AbstractStorageEngine +from evadb.utils.generic_utils import PickleSerializer, get_size +from evadb.utils.logging_manager import logger # Leveraging Dynamic schema in SQLAlchemy # https://sparrigan.github.io/sql/sqla/2016/01/03/dynamic-tables.html diff --git a/eva/storage/storage_engine.py b/evadb/storage/storage_engine.py similarity index 72% rename from eva/storage/storage_engine.py rename to evadb/storage/storage_engine.py index 3c46fa52e..a83dfdc30 100644 --- a/eva/storage/storage_engine.py +++ b/evadb/storage/storage_engine.py @@ -12,15 +12,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.catalog.catalog_type import TableType -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.storage.abstract_storage_engine import AbstractStorageEngine -from eva.storage.document_storage_engine import DocumentStorageEngine -from eva.storage.image_storage_engine import ImageStorageEngine -from eva.storage.pdf_storage_engine import PDFStorageEngine -from eva.storage.sqlite_storage_engine import SQLStorageEngine -from eva.storage.video_storage_engine import DecordStorageEngine +from evadb.catalog.catalog_type import TableType +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.storage.abstract_storage_engine import AbstractStorageEngine +from evadb.storage.document_storage_engine import DocumentStorageEngine +from evadb.storage.image_storage_engine import ImageStorageEngine +from evadb.storage.pdf_storage_engine import PDFStorageEngine +from evadb.storage.sqlite_storage_engine import SQLStorageEngine +from evadb.storage.video_storage_engine import DecordStorageEngine class StorageEngine: diff --git a/eva/storage/video_storage_engine.py b/evadb/storage/video_storage_engine.py similarity index 86% rename from eva/storage/video_storage_engine.py rename to evadb/storage/video_storage_engine.py index f79cabc6b..b511913e6 100644 --- a/eva/storage/video_storage_engine.py +++ b/evadb/storage/video_storage_engine.py @@ -16,12 +16,12 @@ from pathlib import Path from typing import Iterator -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.database import EVADatabase -from eva.expression.abstract_expression import AbstractExpression -from eva.models.storage.batch import Batch -from eva.readers.decord_reader import DecordReader -from eva.storage.abstract_media_storage_engine import AbstractMediaStorageEngine +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.database import EVADatabase +from evadb.expression.abstract_expression import AbstractExpression +from evadb.models.storage.batch import Batch +from evadb.readers.decord_reader import DecordReader +from evadb.storage.abstract_media_storage_engine import AbstractMediaStorageEngine class DecordStorageEngine(AbstractMediaStorageEngine): diff --git a/eva/third_party/__init__.py b/evadb/third_party/__init__.py similarity index 100% rename from eva/third_party/__init__.py rename to evadb/third_party/__init__.py diff --git a/eva/third_party/huggingface/__init__.py b/evadb/third_party/huggingface/__init__.py similarity index 100% rename from eva/third_party/huggingface/__init__.py rename to evadb/third_party/huggingface/__init__.py diff --git a/eva/third_party/huggingface/binder.py b/evadb/third_party/huggingface/binder.py similarity index 86% rename from eva/third_party/huggingface/binder.py rename to evadb/third_party/huggingface/binder.py index acdf6aa06..b8d2cf2ae 100644 --- a/eva/third_party/huggingface/binder.py +++ b/evadb/third_party/huggingface/binder.py @@ -12,9 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.catalog.catalog_utils import get_metadata_entry_or_val -from eva.catalog.models.udf_catalog import UdfCatalogEntry -from eva.third_party.huggingface.create import MODEL_FOR_TASK +from evadb.catalog.catalog_utils import get_metadata_entry_or_val +from evadb.catalog.models.udf_catalog import UdfCatalogEntry +from evadb.third_party.huggingface.create import MODEL_FOR_TASK def assign_hf_udf(udf_obj: UdfCatalogEntry): diff --git a/eva/third_party/huggingface/create.py b/evadb/third_party/huggingface/create.py similarity index 96% rename from eva/third_party/huggingface/create.py rename to evadb/third_party/huggingface/create.py index 87c13a19a..615a77478 100644 --- a/eva/third_party/huggingface/create.py +++ b/evadb/third_party/huggingface/create.py @@ -18,10 +18,10 @@ from PIL import Image, ImageDraw from transformers import pipeline -from eva.catalog.catalog_type import ColumnType, NdArrayType -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry -from eva.third_party.huggingface.model import ( +from evadb.catalog.catalog_type import ColumnType, NdArrayType +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.catalog.models.udf_metadata_catalog import UdfMetadataCatalogEntry +from evadb.third_party.huggingface.model import ( ASRHFModel, AudioHFModel, HFInputTypes, diff --git a/eva/third_party/huggingface/model.py b/evadb/third_party/huggingface/model.py similarity index 95% rename from eva/third_party/huggingface/model.py rename to evadb/third_party/huggingface/model.py index 9a3640edf..ca7852134 100644 --- a/eva/third_party/huggingface/model.py +++ b/evadb/third_party/huggingface/model.py @@ -18,8 +18,8 @@ import numpy as np from PIL import Image -from eva.udfs.abstract.hf_abstract_udf import AbstractHFUdf -from eva.utils.generic_utils import EVAEnum +from evadb.udfs.abstract.hf_abstract_udf import AbstractHFUdf +from evadb.utils.generic_utils import EVAEnum class HFInputTypes(EVAEnum): diff --git a/eva/third_party/vector_stores/__init__.py b/evadb/third_party/vector_stores/__init__.py similarity index 100% rename from eva/third_party/vector_stores/__init__.py rename to evadb/third_party/vector_stores/__init__.py diff --git a/eva/third_party/vector_stores/faiss.py b/evadb/third_party/vector_stores/faiss.py similarity index 98% rename from eva/third_party/vector_stores/faiss.py rename to evadb/third_party/vector_stores/faiss.py index 01c2fc6a4..74d353e69 100644 --- a/eva/third_party/vector_stores/faiss.py +++ b/evadb/third_party/vector_stores/faiss.py @@ -17,7 +17,7 @@ import numpy as np -from eva.third_party.vector_stores.types import ( +from evadb.third_party.vector_stores.types import ( FeaturePayload, VectorIndexQuery, VectorIndexQueryResult, diff --git a/eva/third_party/vector_stores/qdrant.py b/evadb/third_party/vector_stores/qdrant.py similarity index 98% rename from eva/third_party/vector_stores/qdrant.py rename to evadb/third_party/vector_stores/qdrant.py index 3f2164bd2..5e60f1456 100644 --- a/eva/third_party/vector_stores/qdrant.py +++ b/evadb/third_party/vector_stores/qdrant.py @@ -14,7 +14,7 @@ # limitations under the License. from typing import List -from eva.third_party.vector_stores.types import ( +from evadb.third_party.vector_stores.types import ( FeaturePayload, VectorIndexQuery, VectorIndexQueryResult, diff --git a/eva/third_party/vector_stores/types.py b/evadb/third_party/vector_stores/types.py similarity index 100% rename from eva/third_party/vector_stores/types.py rename to evadb/third_party/vector_stores/types.py diff --git a/eva/third_party/vector_stores/utils.py b/evadb/third_party/vector_stores/utils.py similarity index 75% rename from eva/third_party/vector_stores/utils.py rename to evadb/third_party/vector_stores/utils.py index 38bc751fb..6a23c53c3 100644 --- a/eva/third_party/vector_stores/utils.py +++ b/evadb/third_party/vector_stores/utils.py @@ -12,10 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from eva.catalog.catalog_type import VectorStoreType -from eva.third_party.vector_stores.faiss import FaissVectorStore -from eva.third_party.vector_stores.qdrant import QdrantVectorStore -from eva.utils.generic_utils import validate_kwargs +from evadb.catalog.catalog_type import VectorStoreType +from evadb.third_party.vector_stores.faiss import FaissVectorStore +from evadb.third_party.vector_stores.qdrant import QdrantVectorStore +from evadb.utils.generic_utils import validate_kwargs class VectorStoreFactory: @@ -24,13 +24,13 @@ def init_vector_store( vector_store_type: VectorStoreType, index_name: str, **kwargs ): if vector_store_type == VectorStoreType.FAISS: - from eva.third_party.vector_stores.faiss import required_params + from evadb.third_party.vector_stores.faiss import required_params validate_kwargs(kwargs, required_params, required_params) return FaissVectorStore(index_name, **kwargs) elif vector_store_type == VectorStoreType.QDRANT: - from eva.third_party.vector_stores.qdrant import required_params + from evadb.third_party.vector_stores.qdrant import required_params validate_kwargs(kwargs, required_params, required_params) return QdrantVectorStore(index_name, **kwargs) diff --git a/eva/udfs/README.md b/evadb/udfs/README.md similarity index 100% rename from eva/udfs/README.md rename to evadb/udfs/README.md diff --git a/eva/udfs/__init__.py b/evadb/udfs/__init__.py similarity index 100% rename from eva/udfs/__init__.py rename to evadb/udfs/__init__.py diff --git a/eva/udfs/abstract/__init__.py b/evadb/udfs/abstract/__init__.py similarity index 100% rename from eva/udfs/abstract/__init__.py rename to evadb/udfs/abstract/__init__.py diff --git a/eva/udfs/abstract/abstract_udf.py b/evadb/udfs/abstract/abstract_udf.py similarity index 100% rename from eva/udfs/abstract/abstract_udf.py rename to evadb/udfs/abstract/abstract_udf.py diff --git a/eva/udfs/abstract/hf_abstract_udf.py b/evadb/udfs/abstract/hf_abstract_udf.py similarity index 95% rename from eva/udfs/abstract/hf_abstract_udf.py rename to evadb/udfs/abstract/hf_abstract_udf.py index 5cb20bc5c..74a2f099c 100644 --- a/eva/udfs/abstract/hf_abstract_udf.py +++ b/evadb/udfs/abstract/hf_abstract_udf.py @@ -17,9 +17,9 @@ import pandas as pd from transformers import pipeline -from eva.catalog.models.udf_catalog import UdfCatalogEntry -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.catalog.models.udf_catalog import UdfCatalogEntry +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.gpu_compatible import GPUCompatible class AbstractHFUdf(AbstractUDF, GPUCompatible): diff --git a/eva/udfs/abstract/pytorch_abstract_udf.py b/evadb/udfs/abstract/pytorch_abstract_udf.py similarity index 95% rename from eva/udfs/abstract/pytorch_abstract_udf.py rename to evadb/udfs/abstract/pytorch_abstract_udf.py index 45c7c5f08..43672ed3d 100644 --- a/eva/udfs/abstract/pytorch_abstract_udf.py +++ b/evadb/udfs/abstract/pytorch_abstract_udf.py @@ -21,12 +21,12 @@ from torch import Tensor, nn from torchvision.transforms import Compose, transforms -from eva.configuration.configuration_manager import ConfigurationManager -from eva.udfs.abstract.abstract_udf import ( +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.udfs.abstract.abstract_udf import ( AbstractClassifierUDF, AbstractTransformationUDF, ) -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.udfs.gpu_compatible import GPUCompatible class PytorchAbstractClassifierUDF(AbstractClassifierUDF, nn.Module, GPUCompatible): diff --git a/eva/udfs/abstract/tracker_abstract_udf.py b/evadb/udfs/abstract/tracker_abstract_udf.py similarity index 93% rename from eva/udfs/abstract/tracker_abstract_udf.py rename to evadb/udfs/abstract/tracker_abstract_udf.py index 6441e0715..7064ba364 100644 --- a/eva/udfs/abstract/tracker_abstract_udf.py +++ b/evadb/udfs/abstract/tracker_abstract_udf.py @@ -17,10 +17,10 @@ import numpy import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe class EVATrackerAbstractUDF(AbstractUDF): diff --git a/eva/udfs/asl_20_actions_map.pkl b/evadb/udfs/asl_20_actions_map.pkl similarity index 100% rename from eva/udfs/asl_20_actions_map.pkl rename to evadb/udfs/asl_20_actions_map.pkl diff --git a/eva/udfs/asl_action_recognition.py b/evadb/udfs/asl_action_recognition.py similarity index 97% rename from eva/udfs/asl_action_recognition.py rename to evadb/udfs/asl_action_recognition.py index 53986a2ab..4181e7d0f 100644 --- a/eva/udfs/asl_action_recognition.py +++ b/evadb/udfs/asl_action_recognition.py @@ -31,7 +31,7 @@ import torch.nn as nn import torchvision -from eva.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF +from evadb.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF class ASLActionRecognition(PytorchAbstractClassifierUDF): diff --git a/eva/udfs/chatgpt.py b/evadb/udfs/chatgpt.py similarity index 87% rename from eva/udfs/chatgpt.py rename to evadb/udfs/chatgpt.py index 0c1eb1e1b..600fbe3df 100644 --- a/eva/udfs/chatgpt.py +++ b/evadb/udfs/chatgpt.py @@ -19,11 +19,11 @@ import openai import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.configuration.configuration_manager import ConfigurationManager -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe _VALID_CHAT_COMPLETION_MODEL = [ "gpt-4", @@ -53,7 +53,7 @@ def setup( openai.api_key = os.environ.get("OPENAI_KEY", "") assert ( len(openai.api_key) != 0 - ), "Please set your OpenAI API key in eva.yml file (third_party, open_api_key) or environment variable (OPENAI_KEY)" + ), "Please set your OpenAI API key in evadb.yml file (third_party, open_api_key) or environment variable (OPENAI_KEY)" assert model in _VALID_CHAT_COMPLETION_MODEL, f"Unsupported ChatGPT {model}" diff --git a/eva/udfs/decorators/__init__.py b/evadb/udfs/decorators/__init__.py similarity index 100% rename from eva/udfs/decorators/__init__.py rename to evadb/udfs/decorators/__init__.py diff --git a/eva/udfs/decorators/decorators.py b/evadb/udfs/decorators/decorators.py similarity index 96% rename from eva/udfs/decorators/decorators.py rename to evadb/udfs/decorators/decorators.py index 194d35636..b31bb4af3 100644 --- a/eva/udfs/decorators/decorators.py +++ b/evadb/udfs/decorators/decorators.py @@ -16,7 +16,7 @@ from typing import List -from eva.udfs.decorators.io_descriptors.abstract_types import IOArgument +from evadb.udfs.decorators.io_descriptors.abstract_types import IOArgument def setup(cacheable: bool = False, udf_type: str = "Abstract", batchable: bool = True): diff --git a/eva/udfs/decorators/io_descriptors/__init__.py b/evadb/udfs/decorators/io_descriptors/__init__.py similarity index 100% rename from eva/udfs/decorators/io_descriptors/__init__.py rename to evadb/udfs/decorators/io_descriptors/__init__.py diff --git a/eva/udfs/decorators/io_descriptors/abstract_types.py b/evadb/udfs/decorators/io_descriptors/abstract_types.py similarity index 95% rename from eva/udfs/decorators/io_descriptors/abstract_types.py rename to evadb/udfs/decorators/io_descriptors/abstract_types.py index 048c490de..95179b5b7 100644 --- a/eva/udfs/decorators/io_descriptors/abstract_types.py +++ b/evadb/udfs/decorators/io_descriptors/abstract_types.py @@ -15,8 +15,8 @@ from abc import ABC, abstractmethod from typing import List, Tuple, Type -from eva.catalog.catalog_type import ColumnType, NdArrayType -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.catalog.catalog_type import ColumnType, NdArrayType +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry class IOArgument(ABC): diff --git a/eva/udfs/decorators/io_descriptors/data_types.py b/evadb/udfs/decorators/io_descriptors/data_types.py similarity index 92% rename from eva/udfs/decorators/io_descriptors/data_types.py rename to evadb/udfs/decorators/io_descriptors/data_types.py index 67151cf55..da7694b0a 100644 --- a/eva/udfs/decorators/io_descriptors/data_types.py +++ b/evadb/udfs/decorators/io_descriptors/data_types.py @@ -14,13 +14,13 @@ # limitations under the License. from typing import List, Tuple, Type -from eva.catalog.catalog_type import ColumnType, Dimension, NdArrayType -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.udfs.decorators.io_descriptors.abstract_types import ( +from evadb.catalog.catalog_type import ColumnType, Dimension, NdArrayType +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.udfs.decorators.io_descriptors.abstract_types import ( IOArgument, IOColumnArgument, ) -from eva.utils.errors import UDFIODefinitionError +from evadb.utils.errors import UDFIODefinitionError class NumpyArray(IOColumnArgument): diff --git a/eva/udfs/decorators/utils.py b/evadb/udfs/decorators/utils.py similarity index 94% rename from eva/udfs/decorators/utils.py rename to evadb/udfs/decorators/utils.py index d079fde83..c08f11b9a 100644 --- a/eva/udfs/decorators/utils.py +++ b/evadb/udfs/decorators/utils.py @@ -14,8 +14,8 @@ # limitations under the License. from typing import List, Type -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry -from eva.udfs.abstract.abstract_udf import AbstractUDF +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.udfs.abstract.abstract_udf import AbstractUDF def load_io_from_udf_decorators( diff --git a/eva/udfs/emotion_detector.py b/evadb/udfs/emotion_detector.py similarity index 98% rename from eva/udfs/emotion_detector.py rename to evadb/udfs/emotion_detector.py index f4986e3b7..a10447b49 100644 --- a/eva/udfs/emotion_detector.py +++ b/evadb/udfs/emotion_detector.py @@ -25,7 +25,7 @@ from torch import Tensor from torchvision import transforms -from eva.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF +from evadb.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF # VGG configuration cfg = { diff --git a/eva/udfs/face_detector.py b/evadb/udfs/face_detector.py similarity index 93% rename from eva/udfs/face_detector.py rename to evadb/udfs/face_detector.py index 7a208c783..bf6212cfb 100644 --- a/eva/udfs/face_detector.py +++ b/evadb/udfs/face_detector.py @@ -20,9 +20,9 @@ import torch from facenet_pytorch import MTCNN -from eva.udfs.abstract.abstract_udf import AbstractClassifierUDF -from eva.udfs.gpu_compatible import GPUCompatible -from eva.utils.logging_manager import logger +from evadb.udfs.abstract.abstract_udf import AbstractClassifierUDF +from evadb.udfs.gpu_compatible import GPUCompatible +from evadb.utils.logging_manager import logger class FaceDetector(AbstractClassifierUDF, GPUCompatible): diff --git a/eva/udfs/fastrcnn_object_detector.py b/evadb/udfs/fastrcnn_object_detector.py similarity index 95% rename from eva/udfs/fastrcnn_object_detector.py rename to evadb/udfs/fastrcnn_object_detector.py index 70af7b650..c42db3112 100644 --- a/eva/udfs/fastrcnn_object_detector.py +++ b/evadb/udfs/fastrcnn_object_detector.py @@ -17,10 +17,13 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe, PyTorchTensor +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import ( + PandasDataframe, + PyTorchTensor, +) try: from torch import Tensor diff --git a/eva/udfs/feature_extractor.py b/evadb/udfs/feature_extractor.py similarity index 95% rename from eva/udfs/feature_extractor.py rename to evadb/udfs/feature_extractor.py index 55b452e07..8c4f6c388 100644 --- a/eva/udfs/feature_extractor.py +++ b/evadb/udfs/feature_extractor.py @@ -20,7 +20,7 @@ from torch import Tensor from torchvision import models -from eva.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF +from evadb.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF class FeatureExtractor(PytorchAbstractClassifierUDF): diff --git a/eva/udfs/gpu_compatible.py b/evadb/udfs/gpu_compatible.py similarity index 100% rename from eva/udfs/gpu_compatible.py rename to evadb/udfs/gpu_compatible.py diff --git a/eva/udfs/mnist_image_classifier.py b/evadb/udfs/mnist_image_classifier.py similarity index 97% rename from eva/udfs/mnist_image_classifier.py rename to evadb/udfs/mnist_image_classifier.py index 37e8443e6..7fa9bd779 100644 --- a/eva/udfs/mnist_image_classifier.py +++ b/evadb/udfs/mnist_image_classifier.py @@ -22,7 +22,7 @@ from torch import Tensor from torchvision.transforms import Compose, Grayscale, Normalize, ToTensor -from eva.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF +from evadb.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF class MnistImageClassifier(PytorchAbstractClassifierUDF): diff --git a/eva/udfs/mvit_action_recognition.py b/evadb/udfs/mvit_action_recognition.py similarity index 96% rename from eva/udfs/mvit_action_recognition.py rename to evadb/udfs/mvit_action_recognition.py index 01b73c5ff..cd49d8be4 100644 --- a/eva/udfs/mvit_action_recognition.py +++ b/evadb/udfs/mvit_action_recognition.py @@ -24,7 +24,7 @@ raise ImportError( f"torchvision>=0.14.0 is required to use MVITActionRecognition, found {torchvision.__version__}" ) -from eva.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF +from evadb.udfs.abstract.pytorch_abstract_udf import PytorchAbstractClassifierUDF class MVITActionRecognition(PytorchAbstractClassifierUDF): diff --git a/eva/udfs/ndarray/__init__.py b/evadb/udfs/ndarray/__init__.py similarity index 100% rename from eva/udfs/ndarray/__init__.py rename to evadb/udfs/ndarray/__init__.py diff --git a/eva/udfs/ndarray/annotate.py b/evadb/udfs/ndarray/annotate.py similarity index 90% rename from eva/udfs/ndarray/annotate.py rename to evadb/udfs/ndarray/annotate.py index 4a7a8cebd..1c05de910 100644 --- a/eva/udfs/ndarray/annotate.py +++ b/evadb/udfs/ndarray/annotate.py @@ -16,10 +16,10 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe color = (207, 248, 64) thickness = 4 diff --git a/eva/udfs/ndarray/array_count.py b/evadb/udfs/ndarray/array_count.py similarity index 97% rename from eva/udfs/ndarray/array_count.py rename to evadb/udfs/ndarray/array_count.py index d16feb8ed..19755ad58 100644 --- a/eva/udfs/ndarray/array_count.py +++ b/evadb/udfs/ndarray/array_count.py @@ -15,7 +15,7 @@ import numpy as np import pandas as pd -from eva.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.abstract.abstract_udf import AbstractUDF class ArrayCount(AbstractUDF): diff --git a/eva/udfs/ndarray/crop.py b/evadb/udfs/ndarray/crop.py similarity index 96% rename from eva/udfs/ndarray/crop.py rename to evadb/udfs/ndarray/crop.py index 5eb78bfbf..ad606ff9f 100644 --- a/eva/udfs/ndarray/crop.py +++ b/evadb/udfs/ndarray/crop.py @@ -15,7 +15,7 @@ import numpy as np import pandas as pd -from eva.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.abstract.abstract_udf import AbstractUDF class Crop(AbstractUDF): diff --git a/eva/udfs/ndarray/fuzzy_join.py b/evadb/udfs/ndarray/fuzzy_join.py similarity index 95% rename from eva/udfs/ndarray/fuzzy_join.py rename to evadb/udfs/ndarray/fuzzy_join.py index a3614e31a..a4d32acf0 100644 --- a/eva/udfs/ndarray/fuzzy_join.py +++ b/evadb/udfs/ndarray/fuzzy_join.py @@ -15,7 +15,7 @@ import pandas as pd from thefuzz import fuzz -from eva.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.abstract.abstract_udf import AbstractUDF class FuzzDistance(AbstractUDF): diff --git a/eva/udfs/ndarray/gaussian_blur.py b/evadb/udfs/ndarray/gaussian_blur.py similarity index 88% rename from eva/udfs/ndarray/gaussian_blur.py rename to evadb/udfs/ndarray/gaussian_blur.py index 4d70d83be..4dcdaf464 100644 --- a/eva/udfs/ndarray/gaussian_blur.py +++ b/evadb/udfs/ndarray/gaussian_blur.py @@ -16,10 +16,10 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe class GaussianBlur(AbstractUDF): diff --git a/eva/udfs/ndarray/horizontal_flip.py b/evadb/udfs/ndarray/horizontal_flip.py similarity index 88% rename from eva/udfs/ndarray/horizontal_flip.py rename to evadb/udfs/ndarray/horizontal_flip.py index 19a57d9e5..5a90e7dc8 100644 --- a/eva/udfs/ndarray/horizontal_flip.py +++ b/evadb/udfs/ndarray/horizontal_flip.py @@ -16,10 +16,10 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe class HorizontalFlip(AbstractUDF): diff --git a/eva/udfs/ndarray/open.py b/evadb/udfs/ndarray/open.py similarity index 96% rename from eva/udfs/ndarray/open.py rename to evadb/udfs/ndarray/open.py index fadca56d5..129d908d8 100644 --- a/eva/udfs/ndarray/open.py +++ b/evadb/udfs/ndarray/open.py @@ -16,7 +16,7 @@ import numpy as np import pandas as pd -from eva.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.abstract.abstract_udf import AbstractUDF class Open(AbstractUDF): diff --git a/eva/udfs/ndarray/similarity.py b/evadb/udfs/ndarray/similarity.py similarity index 96% rename from eva/udfs/ndarray/similarity.py rename to evadb/udfs/ndarray/similarity.py index 3041a770b..800f35ebe 100644 --- a/eva/udfs/ndarray/similarity.py +++ b/evadb/udfs/ndarray/similarity.py @@ -15,7 +15,7 @@ import faiss import pandas as pd -from eva.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.abstract.abstract_udf import AbstractUDF class Similarity(AbstractUDF): diff --git a/eva/udfs/ndarray/to_grayscale.py b/evadb/udfs/ndarray/to_grayscale.py similarity index 88% rename from eva/udfs/ndarray/to_grayscale.py rename to evadb/udfs/ndarray/to_grayscale.py index bb26e5e23..029ba83bb 100644 --- a/eva/udfs/ndarray/to_grayscale.py +++ b/evadb/udfs/ndarray/to_grayscale.py @@ -16,10 +16,10 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe class ToGrayscale(AbstractUDF): diff --git a/eva/udfs/ndarray/vertical_flip.py b/evadb/udfs/ndarray/vertical_flip.py similarity index 88% rename from eva/udfs/ndarray/vertical_flip.py rename to evadb/udfs/ndarray/vertical_flip.py index 4d31bfab9..83d55bd71 100644 --- a/eva/udfs/ndarray/vertical_flip.py +++ b/evadb/udfs/ndarray/vertical_flip.py @@ -16,10 +16,10 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe class VerticalFlip(AbstractUDF): diff --git a/eva/udfs/ocr_extractor.py b/evadb/udfs/ocr_extractor.py similarity index 95% rename from eva/udfs/ocr_extractor.py rename to evadb/udfs/ocr_extractor.py index a0b45516a..d157f446e 100644 --- a/eva/udfs/ocr_extractor.py +++ b/evadb/udfs/ocr_extractor.py @@ -19,8 +19,8 @@ import numpy as np import pandas as pd -from eva.udfs.abstract.abstract_udf import AbstractClassifierUDF -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.udfs.abstract.abstract_udf import AbstractClassifierUDF +from evadb.udfs.gpu_compatible import GPUCompatible class OCRExtractor(AbstractClassifierUDF, GPUCompatible): diff --git a/eva/udfs/saliency_feature_extractor.py b/evadb/udfs/saliency_feature_extractor.py similarity index 89% rename from eva/udfs/saliency_feature_extractor.py rename to evadb/udfs/saliency_feature_extractor.py index 85fbf42ca..5b8e0eb73 100644 --- a/eva/udfs/saliency_feature_extractor.py +++ b/evadb/udfs/saliency_feature_extractor.py @@ -19,11 +19,11 @@ from PIL import Image from torchvision.transforms import Compose, Resize, ToTensor -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.udfs.gpu_compatible import GPUCompatible class SaliencyFeatureExtractor(AbstractUDF, GPUCompatible): diff --git a/eva/udfs/sentence_transformer_feature_extractor.py b/evadb/udfs/sentence_transformer_feature_extractor.py similarity index 89% rename from eva/udfs/sentence_transformer_feature_extractor.py rename to evadb/udfs/sentence_transformer_feature_extractor.py index 224b6341a..3f57f6f46 100644 --- a/eva/udfs/sentence_transformer_feature_extractor.py +++ b/evadb/udfs/sentence_transformer_feature_extractor.py @@ -31,11 +31,11 @@ import pandas as pd from sentence_transformers import SentenceTransformer -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.udfs.gpu_compatible import GPUCompatible class SentenceTransformerFeatureExtractor(AbstractUDF, GPUCompatible): diff --git a/eva/udfs/sift_feature_extractor.py b/evadb/udfs/sift_feature_extractor.py similarity index 89% rename from eva/udfs/sift_feature_extractor.py rename to evadb/udfs/sift_feature_extractor.py index d4d5dc29c..47ba5f1d3 100644 --- a/eva/udfs/sift_feature_extractor.py +++ b/evadb/udfs/sift_feature_extractor.py @@ -18,11 +18,11 @@ import pandas as pd import torch -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.udfs.gpu_compatible import GPUCompatible class SiftFeatureExtractor(AbstractUDF, GPUCompatible): diff --git a/eva/udfs/trackers/__init__.py b/evadb/udfs/trackers/__init__.py similarity index 100% rename from eva/udfs/trackers/__init__.py rename to evadb/udfs/trackers/__init__.py diff --git a/eva/udfs/trackers/nor_fair.py b/evadb/udfs/trackers/nor_fair.py similarity index 94% rename from eva/udfs/trackers/nor_fair.py rename to evadb/udfs/trackers/nor_fair.py index edd4267a1..84181359a 100644 --- a/eva/udfs/trackers/nor_fair.py +++ b/evadb/udfs/trackers/nor_fair.py @@ -15,8 +15,8 @@ import numpy as np from norfair import Detection, Tracker -from eva.udfs.abstract.tracker_abstract_udf import EVATrackerAbstractUDF -from eva.utils.math_utils import get_centroid +from evadb.udfs.abstract.tracker_abstract_udf import EVATrackerAbstractUDF +from evadb.utils.math_utils import get_centroid DISTANCE_THRESHOLD_CENTROID: int = 30 diff --git a/eva/udfs/tutorials/__init__.py b/evadb/udfs/tutorials/__init__.py similarity index 100% rename from eva/udfs/tutorials/__init__.py rename to evadb/udfs/tutorials/__init__.py diff --git a/eva/udfs/udf_bootstrap_queries.py b/evadb/udfs/udf_bootstrap_queries.py similarity index 97% rename from eva/udfs/udf_bootstrap_queries.py rename to evadb/udfs/udf_bootstrap_queries.py index 03bd472cf..37fff1dfa 100644 --- a/eva/udfs/udf_bootstrap_queries.py +++ b/evadb/udfs/udf_bootstrap_queries.py @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from eva.configuration.constants import EVA_INSTALLATION_DIR -from eva.database import EVADatabase -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_INSTALLATION_DIR +from evadb.database import EVADatabase +from evadb.server.command_handler import execute_query_fetch_all NDARRAY_DIR = "ndarray" TUTORIALS_DIR = "tutorials" diff --git a/eva/udfs/yolo_object_detector.py b/evadb/udfs/yolo_object_detector.py similarity index 92% rename from eva/udfs/yolo_object_detector.py rename to evadb/udfs/yolo_object_detector.py index 5b636853c..8ea8e224e 100644 --- a/eva/udfs/yolo_object_detector.py +++ b/evadb/udfs/yolo_object_detector.py @@ -15,11 +15,11 @@ import numpy as np import pandas as pd -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.udfs.gpu_compatible import GPUCompatible try: from ultralytics import YOLO diff --git a/eva/utils/__init__.py b/evadb/utils/__init__.py similarity index 100% rename from eva/utils/__init__.py rename to evadb/utils/__init__.py diff --git a/eva/utils/errors.py b/evadb/utils/errors.py similarity index 100% rename from eva/utils/errors.py rename to evadb/utils/errors.py diff --git a/eva/utils/generic_utils.py b/evadb/utils/generic_utils.py similarity index 99% rename from eva/utils/generic_utils.py rename to evadb/utils/generic_utils.py index 0f1e2734d..095920c48 100644 --- a/eva/utils/generic_utils.py +++ b/evadb/utils/generic_utils.py @@ -25,7 +25,7 @@ from aenum import AutoEnum, unique -from eva.utils.logging_manager import logger +from evadb.utils.logging_manager import logger def validate_kwargs( diff --git a/eva/utils/kv_cache.py b/evadb/utils/kv_cache.py similarity index 100% rename from eva/utils/kv_cache.py rename to evadb/utils/kv_cache.py diff --git a/eva/utils/logging_manager.py b/evadb/utils/logging_manager.py similarity index 100% rename from eva/utils/logging_manager.py rename to evadb/utils/logging_manager.py diff --git a/eva/utils/math_utils.py b/evadb/utils/math_utils.py similarity index 100% rename from eva/utils/math_utils.py rename to evadb/utils/math_utils.py diff --git a/eva/utils/s3_utils.py b/evadb/utils/s3_utils.py similarity index 100% rename from eva/utils/s3_utils.py rename to evadb/utils/s3_utils.py diff --git a/eva/utils/stats.py b/evadb/utils/stats.py similarity index 97% rename from eva/utils/stats.py rename to evadb/utils/stats.py index 1ab8b6a0b..b6c291e6b 100644 --- a/eva/utils/stats.py +++ b/evadb/utils/stats.py @@ -16,7 +16,7 @@ import time from dataclasses import dataclass -from eva.utils.logging_manager import logger +from evadb.utils.logging_manager import logger class Timer: diff --git a/eva/version.py b/evadb/version.py similarity index 100% rename from eva/version.py rename to evadb/version.py diff --git a/examples/youtube_qa/README.md b/examples/youtube_qa/README.md index 5b93b71c7..2dc42e565 100644 --- a/examples/youtube_qa/README.md +++ b/examples/youtube_qa/README.md @@ -17,7 +17,7 @@ pip install evadb pytube ```bat wget -nc https://github.com/georgia-tech-db/eva/tree/master/examples/youtube_qa/youtube_qa.py -wget -nc https://raw.githubusercontent.com/georgia-tech-db/eva/master/eva/udfs/chatgpt.py +wget -nc https://raw.githubusercontent.com/georgia-tech-db/eva/master/evadb/udfs/chatgpt.py ``` 2. Run script: diff --git a/examples/youtube_qa/youtube_qa.py b/examples/youtube_qa/youtube_qa.py index a7b6a028e..bb7a625c5 100644 --- a/examples/youtube_qa/youtube_qa.py +++ b/examples/youtube_qa/youtube_qa.py @@ -16,8 +16,8 @@ import shutil import time -from eva.interfaces.relational.db import EVADBConnection, EVADBCursor, connect -from eva.configuration.configuration_manager import ConfigurationManager +from evadb.interfaces.relational.db import EVADBConnection, EVADBCursor, connect +from evadb.configuration.configuration_manager import ConfigurationManager from pytube import YouTube def download_youtube_video_from_link(video_link: str): @@ -54,7 +54,7 @@ def analyze_video() -> EVADBCursor: speech_analyzer_udf_rel.execute() # create chatgpt udf from implemententation - chatgpt_udf_rel = cursor.create_udf("ChatGPT", impl_path='../../eva/udfs/chatgpt.py') + chatgpt_udf_rel = cursor.create_udf("ChatGPT", impl_path='../../evadb/udfs/chatgpt.py') chatgpt_udf_rel.execute() # load youtube video into an evadb table diff --git a/script/data/download_dataset.sh b/script/data/download_dataset.sh index c5c0f52fc..619e0b269 100644 --- a/script/data/download_dataset.sh +++ b/script/data/download_dataset.sh @@ -7,7 +7,7 @@ DATASET_NAME=$1 SCRIPT_PATH=$(dirname "$0") # compute dataset path relative to script path -DATASET_PATH=$HOME/.eva/data/datasets +DATASET_PATH=$HOME/.evadb/data/datasets # check if the datasets folder exists, if not create it if [ ! -d "$DATASET_PATH" ]; then diff --git a/script/data/download_model.sh b/script/data/download_model.sh index 06efb55e6..01405be11 100644 --- a/script/data/download_model.sh +++ b/script/data/download_model.sh @@ -7,7 +7,7 @@ MODEL_NAME=$1 SCRIPT_PATH=$(dirname "$0") # compute model path relative to script path -MODEL_PATH=$HOME/.eva/data/models +MODEL_PATH=$HOME/.evadb/data/models # check if the models folder exists, if not create it if [ ! -d "$MODEL_PATH" ]; then diff --git a/script/docs/catalog_plotter.py b/script/docs/catalog_plotter.py index 4038fa50d..77c8505fd 100644 --- a/script/docs/catalog_plotter.py +++ b/script/docs/catalog_plotter.py @@ -1,7 +1,7 @@ # updated SQLA schema display to work with pydot 1.0.2 -from eva.catalog.catalog_manager import CatalogManager -from eva.configuration.configuration_manager import ConfigurationManager +from evadb.catalog.catalog_manager import CatalogManager +from evadb.configuration.configuration_manager import ConfigurationManager from sqlalchemy.orm.properties import RelationshipProperty import pydot import types diff --git a/script/formatting/formatter.py b/script/formatting/formatter.py index 11911ad6c..17331f0f7 100755 --- a/script/formatting/formatter.py +++ b/script/formatting/formatter.py @@ -444,7 +444,7 @@ def check_file(file): # CODESPELL #LOG.info("Codespell") - subprocess.check_output("codespell eva/", + subprocess.check_output("codespell evadb/", shell=True, universal_newlines=True) subprocess.check_output("codespell docs/source/*/*.rst", @@ -456,7 +456,7 @@ def check_file(file): subprocess.check_output("codespell *.md", shell=True, universal_newlines=True) - subprocess.check_output("codespell eva/*.md", + subprocess.check_output("codespell evadb/*.md", shell=True, universal_newlines=True) diff --git a/script/releasing/releaser.py b/script/releasing/releaser.py index 8dbb705df..13a84c07f 100755 --- a/script/releasing/releaser.py +++ b/script/releasing/releaser.py @@ -56,7 +56,7 @@ def get_string_in_line(file_path, line_number): # ============================================== # NOTE: absolute path to eva directory is calculated from current directory -# directory structure: eva/scripts/formatting/ +# directory structure: evadb/scripts/formatting/ # EVA_DIR needs to be redefined if the directory structure is changed CODE_SOURCE_DIR = os.path.abspath(os.path.dirname(__file__)) EVA_DIR = functools.reduce( @@ -208,7 +208,7 @@ def publish_wheels(tag): run_command("python3 setup.py bdist_wheel") run_command(f"python3 -m pip install dist/evadb-{tag}-py3-none-any.whl") - run_command("""python3 -c "import eva; print(eva.__version__)" """) + run_command("""python3 -c "import evadb; print(evadb.__version__)" """) print("Running twine to upload wheels") print("Ensure that you have .pypirc file in your $HOME folder") @@ -299,7 +299,7 @@ def bump_up_version(next_version): # version.py defines the VERSION and VERSION_SHORT variables VERSION_DICT: Dict[str, str] = {} - with open("eva/version.py", "r") as version_file: + with open("evadb/version.py", "r") as version_file: exec(version_file.read(), VERSION_DICT) VERSION = VERSION_DICT["VERSION"] diff --git a/script/test/package.sh b/script/test/package.sh index 03928321b..f3125d987 100644 --- a/script/test/package.sh +++ b/script/test/package.sh @@ -16,7 +16,7 @@ function is_server_up () { return $? } -eva_server &> eva.log & +eva_server &> evadb.log & SERVER_PID=$! i=0 while [ $i -lt 5 ]; @@ -32,7 +32,7 @@ do done echo "Contents of server log" -cat eva.log +cat evadb.log if [ "$test_code" -ne 0 ]; then diff --git a/script/test/test.sh b/script/test/test.sh index 499cabec2..35058862c 100644 --- a/script/test/test.sh +++ b/script/test/test.sh @@ -54,7 +54,7 @@ if [[ ( "$OSTYPE" != "msys" ) && ( "$MODE" = "LINTER" || "$MODE" = "ALL" ) ]]; then # Keeping the duplicate linting for time being # Run linter (checks code style) - PYTHONPATH=./ python -m flake8 --config=.flake8 eva/ test/ + PYTHONPATH=./ python -m flake8 --config=.flake8 evadb/ test/ linter_code=$? if [ "$linter_code" != "0" ]; @@ -76,11 +76,11 @@ if [[ "$OSTYPE" != "msys" ]]; then if [[ "$MODE" = "TEST" || "$MODE" = "ALL" ]]; then - PYTHONPATH=./ pytest --durations=20 --capture=sys --tb=short -v --log-level=WARNING -rs -p no:cov test/ -m "not benchmark" + PYTHONPATH=./ pytest --durations=20 --capture=sys --tb=short -v --log-level=WARNING -rsf -p no:cov test/ -m "not benchmark" elif [[ "$MODE" = "COV" ]]; then # As a workaround, ray needs to be disabled for COV. - PYTHONPATH=./ pytest --durations=20 --cov-report term-missing:skip-covered --cov-config=.coveragerc --cov-context=test --cov=eva/ --capture=sys --tb=short -v -rs --log-level=WARNING -m "not benchmark" + PYTHONPATH=./ pytest --durations=20 --cov-report term-missing:skip-covered --cov-config=.coveragerc --cov-context=test --cov=evadb/ --capture=sys --tb=short -v -rsf --log-level=WARNING -m "not benchmark" fi test_code=$? @@ -114,7 +114,7 @@ then notebook_test_code=$? if [ "$notebook_test_code" != "0" ]; then - cat tutorials/eva.log + cat tutorials/evadb.log echo "NOTEBOOK CODE: --|${notebook_test_code}|-- FAILURE" exit $notebook_test_code else diff --git a/setup.py b/setup.py index e73dfbe0c..d689462d6 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ def read(path, encoding="utf-8"): # version.py defines the VERSION and VERSION_SHORT variables VERSION_DICT: Dict[str, str] = {} -with open("eva/version.py", "r") as version_file: +with open("evadb/version.py", "r") as version_file: exec(version_file.read(), VERSION_DICT) DOWNLOAD_URL = "https://github.com/georgia-tech-db/eva" @@ -167,13 +167,13 @@ def read(path, encoding="utf-8"): # https://python-packaging.readthedocs.io/en/latest/command-line-scripts.html#the-console-scripts-entry-point entry_points={ "console_scripts": [ - "eva_server=eva.eva_server:main", - "eva_client=eva.eva_cmd_client:main", + "eva_server=evadb.eva_server:main", + "eva_client=evadb.eva_cmd_client:main", ] }, python_requires=">=3.8", install_requires=INSTALL_REQUIRES, extras_require=EXTRA_REQUIRES, include_package_data=True, - package_data={"eva": ["eva.yml", "parser/eva.lark"]}, + package_data={"evadb": ["evadb.yml", "parser/evadb.lark"]}, ) diff --git a/test/benchmark_tests/conftest.py b/test/benchmark_tests/conftest.py index 6e24e0e8f..c11cdbfdb 100644 --- a/test/benchmark_tests/conftest.py +++ b/test/benchmark_tests/conftest.py @@ -16,8 +16,8 @@ import pytest -from eva.server.command_handler import execute_query_fetch_all -from eva.udfs.udf_bootstrap_queries import init_builtin_udfs +from evadb.server.command_handler import execute_query_fetch_all +from evadb.udfs.udf_bootstrap_queries import init_builtin_udfs @pytest.fixture(autouse=False) diff --git a/test/benchmark_tests/test_benchmark_pytorch.py b/test/benchmark_tests/test_benchmark_pytorch.py index e65189687..75d5ad31f 100644 --- a/test/benchmark_tests/test_benchmark_pytorch.py +++ b/test/benchmark_tests/test_benchmark_pytorch.py @@ -17,7 +17,7 @@ import pytest -from eva.server.command_handler import execute_query_fetch_all +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.torchtest @@ -47,7 +47,7 @@ def test_should_run_pytorch_and_facenet(benchmark, setup_pytorch_tests): OUTPUT (bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE FaceDetection - IMPL 'eva/udfs/face_detector.py'; + IMPL 'evadb/udfs/face_detector.py'; """ execute_query_fetch_all(setup_pytorch_tests, create_udf_query) @@ -70,7 +70,7 @@ def test_should_run_pytorch_and_resnet50(benchmark, setup_pytorch_tests): INPUT (frame NDARRAY UINT8(3, ANYDIM, ANYDIM)) OUTPUT (features NDARRAY FLOAT32(ANYDIM)) TYPE Classification - IMPL 'eva/udfs/feature_extractor.py'; + IMPL 'evadb/udfs/feature_extractor.py'; """ execute_query_fetch_all(setup_pytorch_tests, create_udf_query) diff --git a/test/binder/test_statement_binder.py b/test/binder/test_statement_binder.py index e79f09b2f..d9e68a0c5 100644 --- a/test/binder/test_statement_binder.py +++ b/test/binder/test_statement_binder.py @@ -15,13 +15,13 @@ import unittest from unittest.mock import MagicMock, patch -from eva.binder.binder_utils import BinderError -from eva.binder.statement_binder import StatementBinder -from eva.binder.statement_binder_context import StatementBinderContext -from eva.catalog.catalog_type import NdArrayType -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.alias import Alias -from eva.parser.create_statement import ColumnDefinition +from evadb.binder.binder_utils import BinderError +from evadb.binder.statement_binder import StatementBinder +from evadb.binder.statement_binder_context import StatementBinderContext +from evadb.catalog.catalog_type import NdArrayType +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.alias import Alias +from evadb.parser.create_statement import ColumnDefinition class StatementBinderTests(unittest.TestCase): @@ -40,7 +40,7 @@ def test_bind_tuple_value_expression(self): self.assertEqual(tve.col_object, "col_obj") self.assertEqual(tve.col_alias, col_alias) - @patch("eva.binder.statement_binder.bind_table_info") + @patch("evadb.binder.statement_binder.bind_table_info") def test_bind_tableref(self, mock_bind_table_info): with patch.object(StatementBinderContext, "add_table_alias") as mock: catalog = MagicMock() @@ -100,7 +100,7 @@ def test_bind_tableref_should_raise(self): tableref.is_table_atom.return_value = False binder._bind_tableref(tableref) - @patch("eva.binder.statement_binder.StatementBinderContext") + @patch("evadb.binder.statement_binder.StatementBinderContext") def test_bind_tableref_starts_new_context(self, mock_ctx): with patch.object(StatementBinder, "bind"): binder = StatementBinder(StatementBinderContext(MagicMock())) @@ -139,8 +139,8 @@ def test_bind_explain_statement(self): binder._bind_explain_statement(stmt) mock_binder.assert_called_with(stmt.explainable_stmt) - @patch("eva.binder.statement_binder.load_udf_class_from_file") - @patch("eva.binder.statement_binder.get_file_checksum") + @patch("evadb.binder.statement_binder.load_udf_class_from_file") + @patch("evadb.binder.statement_binder.get_file_checksum") def test_bind_func_expr( self, mock_get_file_checksum, mock_load_udf_class_from_file ): @@ -225,8 +225,8 @@ def test_bind_func_expr( ) self.assertEqual(str(cm.exception), err_msg) - @patch("eva.binder.statement_binder.check_table_object_is_groupable") - @patch("eva.binder.statement_binder.check_groupby_pattern") + @patch("evadb.binder.statement_binder.check_table_object_is_groupable") + @patch("evadb.binder.statement_binder.check_groupby_pattern") def test_bind_select_statement(self, is_groupable_mock, groupby_mock): with patch.object(StatementBinder, "bind") as mock_binder: binder = StatementBinder(StatementBinderContext(MagicMock())) @@ -245,7 +245,7 @@ def test_bind_select_statement(self, is_groupable_mock, groupby_mock): for mock in mocks: mock_binder.assert_any_call(mock) - @patch("eva.binder.statement_binder.StatementBinderContext") + @patch("evadb.binder.statement_binder.StatementBinderContext") def test_bind_select_statement_union_starts_new_context(self, mock_ctx): with patch.object(StatementBinder, "bind"): binder = StatementBinder(StatementBinderContext(MagicMock())) diff --git a/test/binder/test_statement_binder_context.py b/test/binder/test_statement_binder_context.py index 025c0c154..4d5724679 100644 --- a/test/binder/test_statement_binder_context.py +++ b/test/binder/test_statement_binder_context.py @@ -17,10 +17,10 @@ import pytest -from eva.binder.binder_utils import BinderError -from eva.binder.statement_binder_context import StatementBinderContext -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression +from evadb.binder.binder_utils import BinderError +from evadb.binder.statement_binder_context import StatementBinderContext +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression @pytest.mark.notparallel diff --git a/test/catalog/models/test_models.py b/test/catalog/models/test_models.py index 0f1cb5eb8..2b5193e61 100644 --- a/test/catalog/models/test_models.py +++ b/test/catalog/models/test_models.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ # limitations under the License. import unittest -from eva.catalog.catalog_type import ColumnType, NdArrayType, TableType -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.index_catalog import IndexCatalogEntry -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.catalog.models.udf_catalog import UdfCatalogEntry -from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry +from evadb.catalog.catalog_type import ColumnType, NdArrayType, TableType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.index_catalog import IndexCatalogEntry +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.catalog.models.udf_catalog import UdfCatalogEntry +from evadb.catalog.models.udf_io_catalog import UdfIOCatalogEntry class CatalogModelsTest(unittest.TestCase): diff --git a/test/catalog/test_catalog_manager.py b/test/catalog/test_catalog_manager.py index 9db1cd315..cd6edc6e2 100644 --- a/test/catalog/test_catalog_manager.py +++ b/test/catalog/test_catalog_manager.py @@ -18,13 +18,13 @@ import pytest from mock import ANY, MagicMock -from eva.catalog.catalog_manager import CatalogManager -from eva.catalog.catalog_type import ColumnType, TableType -from eva.catalog.catalog_utils import get_video_table_column_definitions -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.udf_catalog import UdfCatalogEntry -from eva.parser.table_ref import TableInfo -from eva.parser.types import FileFormatType +from evadb.catalog.catalog_manager import CatalogManager +from evadb.catalog.catalog_type import ColumnType, TableType +from evadb.catalog.catalog_utils import get_video_table_column_definitions +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.udf_catalog import UdfCatalogEntry +from evadb.parser.table_ref import TableInfo +from evadb.parser.types import FileFormatType @pytest.mark.notparallel @@ -35,21 +35,21 @@ def __init__(self, *args, **kwargs): @classmethod def setUpClass(cls) -> None: cls.mocks = [ - mock.patch("eva.catalog.catalog_manager.SQLConfig"), - mock.patch("eva.catalog.catalog_manager.init_db"), + mock.patch("evadb.catalog.catalog_manager.SQLConfig"), + mock.patch("evadb.catalog.catalog_manager.init_db"), ] for single_mock in cls.mocks: single_mock.start() cls.addClassCleanup(single_mock.stop) - @mock.patch("eva.catalog.catalog_manager.init_db") + @mock.patch("evadb.catalog.catalog_manager.init_db") def test_catalog_bootstrap(self, mocked_db): x = CatalogManager(MagicMock(), MagicMock()) x._bootstrap_catalog() mocked_db.assert_called() @mock.patch( - "eva.catalog.catalog_manager.CatalogManager.create_and_insert_table_catalog_entry" + "evadb.catalog.catalog_manager.CatalogManager.create_and_insert_table_catalog_entry" ) def test_create_multimedia_table_catalog_entry(self, mock): x = CatalogManager(MagicMock(), MagicMock()) @@ -66,8 +66,8 @@ def test_create_multimedia_table_catalog_entry(self, mock): table_type=TableType.VIDEO_DATA, ) - @mock.patch("eva.catalog.catalog_manager.init_db") - @mock.patch("eva.catalog.catalog_manager.TableCatalogService") + @mock.patch("evadb.catalog.catalog_manager.init_db") + @mock.patch("evadb.catalog.catalog_manager.TableCatalogService") def test_insert_table_catalog_entry_should_create_table_and_columns( self, ds_mock, initdb_mock ): @@ -85,8 +85,8 @@ def test_insert_table_catalog_entry_should_create_table_and_columns( column_list=[ANY] + columns, ) - @mock.patch("eva.catalog.catalog_manager.init_db") - @mock.patch("eva.catalog.catalog_manager.TableCatalogService") + @mock.patch("evadb.catalog.catalog_manager.init_db") + @mock.patch("evadb.catalog.catalog_manager.TableCatalogService") def test_get_table_catalog_entry_when_table_exists(self, ds_mock, initdb_mock): catalog = CatalogManager(MagicMock(), MagicMock()) table_name = "name" @@ -104,9 +104,9 @@ def test_get_table_catalog_entry_when_table_exists(self, ds_mock, initdb_mock): ) self.assertEqual(actual.row_id, row_id) - @mock.patch("eva.catalog.catalog_manager.init_db") - @mock.patch("eva.catalog.catalog_manager.TableCatalogService") - @mock.patch("eva.catalog.catalog_manager.ColumnCatalogService") + @mock.patch("evadb.catalog.catalog_manager.init_db") + @mock.patch("evadb.catalog.catalog_manager.TableCatalogService") + @mock.patch("evadb.catalog.catalog_manager.ColumnCatalogService") def test_get_table_catalog_entry_when_table_doesnot_exists( self, dcs_mock, ds_mock, initdb_mock ): @@ -125,10 +125,10 @@ def test_get_table_catalog_entry_when_table_doesnot_exists( dcs_mock.return_value.filter_entries_by_table_id.assert_not_called() self.assertEqual(actual, table_obj) - @mock.patch("eva.catalog.catalog_manager.UdfCatalogService") - @mock.patch("eva.catalog.catalog_manager.UdfIOCatalogService") - @mock.patch("eva.catalog.catalog_manager.UdfMetadataCatalogService") - @mock.patch("eva.catalog.catalog_manager.get_file_checksum") + @mock.patch("evadb.catalog.catalog_manager.UdfCatalogService") + @mock.patch("evadb.catalog.catalog_manager.UdfIOCatalogService") + @mock.patch("evadb.catalog.catalog_manager.UdfMetadataCatalogService") + @mock.patch("evadb.catalog.catalog_manager.get_file_checksum") def test_insert_udf(self, checksum_mock, udfmetadata_mock, udfio_mock, udf_mock): catalog = CatalogManager(MagicMock(), MagicMock()) udf_io_list = [MagicMock()] @@ -146,21 +146,21 @@ def test_insert_udf(self, checksum_mock, udfmetadata_mock, udfio_mock, udf_mock) checksum_mock.assert_called_with("sample.py") self.assertEqual(actual, udf_mock.return_value.insert_entry.return_value) - @mock.patch("eva.catalog.catalog_manager.UdfCatalogService") + @mock.patch("evadb.catalog.catalog_manager.UdfCatalogService") def test_get_udf_catalog_entry_by_name(self, udf_mock): catalog = CatalogManager(MagicMock(), MagicMock()) actual = catalog.get_udf_catalog_entry_by_name("name") udf_mock.return_value.get_entry_by_name.assert_called_with("name") self.assertEqual(actual, udf_mock.return_value.get_entry_by_name.return_value) - @mock.patch("eva.catalog.catalog_manager.UdfCatalogService") + @mock.patch("evadb.catalog.catalog_manager.UdfCatalogService") def test_delete_udf(self, udf_mock): CatalogManager(MagicMock(), MagicMock()).delete_udf_catalog_entry_by_name( "name" ) udf_mock.return_value.delete_entry_by_name.assert_called_with("name") - @mock.patch("eva.catalog.catalog_manager.UdfIOCatalogService") + @mock.patch("evadb.catalog.catalog_manager.UdfIOCatalogService") def test_get_udf_outputs(self, udf_mock): mock_func = udf_mock.return_value.get_output_entries_by_udf_id udf_obj = MagicMock(spec=UdfCatalogEntry) @@ -169,7 +169,7 @@ def test_get_udf_outputs(self, udf_mock): ) mock_func.assert_called_once_with(udf_obj.row_id) - @mock.patch("eva.catalog.catalog_manager.UdfIOCatalogService") + @mock.patch("evadb.catalog.catalog_manager.UdfIOCatalogService") def test_get_udf_inputs(self, udf_mock): mock_func = udf_mock.return_value.get_input_entries_by_udf_id udf_obj = MagicMock(spec=UdfCatalogEntry) diff --git a/test/catalog/test_column_type.py b/test/catalog/test_column_type.py index 52dd25e20..80faf072b 100644 --- a/test/catalog/test_column_type.py +++ b/test/catalog/test_column_type.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ import numpy as np -from eva.catalog.catalog_type import ColumnType, NdArrayType +from evadb.catalog.catalog_type import ColumnType, NdArrayType class ColumnTypeTests(unittest.TestCase): diff --git a/test/executor/test_abstract_executor.py b/test/executor/test_abstract_executor.py index 3eb30e2e6..de3b7f28e 100644 --- a/test/executor/test_abstract_executor.py +++ b/test/executor/test_abstract_executor.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ from inspect import signature from test.util import get_all_subclasses -from eva.executor.abstract_executor import AbstractExecutor +from evadb.executor.abstract_executor import AbstractExecutor class AbstractExecutorTest(unittest.TestCase): diff --git a/test/executor/test_create_udf_executor.py b/test/executor/test_create_udf_executor.py index 20d2b3f57..1f56a4582 100644 --- a/test/executor/test_create_udf_executor.py +++ b/test/executor/test_create_udf_executor.py @@ -16,13 +16,13 @@ from mock import MagicMock, patch -from eva.catalog.catalog_type import NdArrayType -from eva.executor.create_udf_executor import CreateUDFExecutor -from eva.udfs.decorators.io_descriptors.data_types import PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.executor.create_udf_executor import CreateUDFExecutor +from evadb.udfs.decorators.io_descriptors.data_types import PandasDataframe class CreateUdfExecutorTest(unittest.TestCase): - @patch("eva.executor.create_udf_executor.load_udf_class_from_file") + @patch("evadb.executor.create_udf_executor.load_udf_class_from_file") def test_should_create_udf(self, load_udf_class_from_file_mock): catalog_instance = MagicMock() catalog_instance().get_udf_catalog_entry_by_name.return_value = None @@ -57,7 +57,7 @@ def test_should_create_udf(self, load_udf_class_from_file_mock): {"key1": "value1", "key2": "value2"}, ) - @patch("eva.executor.create_udf_executor.load_udf_class_from_file") + @patch("evadb.executor.create_udf_executor.load_udf_class_from_file") def test_should_raise_error_on_incorrect_io_definition( self, load_udf_class_from_file_mock ): diff --git a/test/executor/test_execution_context.py b/test/executor/test_execution_context.py index 7be69910f..ddd5ac74b 100644 --- a/test/executor/test_execution_context.py +++ b/test/executor/test_execution_context.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ from mock import patch -from eva.constants import NO_GPU -from eva.executor.execution_context import Context +from evadb.constants import NO_GPU +from evadb.executor.execution_context import Context class ExecutionContextTest(unittest.TestCase): - @patch("eva.executor.execution_context.ConfigurationManager") - @patch("eva.executor.execution_context.get_gpu_count") - @patch("eva.executor.execution_context.is_gpu_available") + @patch("evadb.executor.execution_context.ConfigurationManager") + @patch("evadb.executor.execution_context.get_gpu_count") + @patch("evadb.executor.execution_context.is_gpu_available") def test_CUDA_VISIBLE_DEVICES_gets_populated_from_config( self, gpu_check, get_gpu_count, cfm ): @@ -34,10 +34,10 @@ def test_CUDA_VISIBLE_DEVICES_gets_populated_from_config( self.assertEqual(context.gpus, [0, 1]) - @patch("eva.executor.execution_context.ConfigurationManager") - @patch("eva.executor.execution_context.os") - @patch("eva.executor.execution_context.get_gpu_count") - @patch("eva.executor.execution_context.is_gpu_available") + @patch("evadb.executor.execution_context.ConfigurationManager") + @patch("evadb.executor.execution_context.os") + @patch("evadb.executor.execution_context.get_gpu_count") + @patch("evadb.executor.execution_context.is_gpu_available") def test_CUDA_VISIBLE_DEVICES_gets_populated_from_environment_if_no_config( self, is_gpu, get_gpu_count, os, cfm ): @@ -50,10 +50,10 @@ def test_CUDA_VISIBLE_DEVICES_gets_populated_from_environment_if_no_config( self.assertEqual(context.gpus, [0, 1]) - @patch("eva.executor.execution_context.ConfigurationManager") - @patch("eva.executor.execution_context.os") - @patch("eva.executor.execution_context.get_gpu_count") - @patch("eva.executor.execution_context.is_gpu_available") + @patch("evadb.executor.execution_context.ConfigurationManager") + @patch("evadb.executor.execution_context.os") + @patch("evadb.executor.execution_context.get_gpu_count") + @patch("evadb.executor.execution_context.is_gpu_available") def test_CUDA_VISIBLE_DEVICES_should_be_empty_if_nothing_provided( self, gpu_check, get_gpu_count, os, cfm ): @@ -66,9 +66,9 @@ def test_CUDA_VISIBLE_DEVICES_should_be_empty_if_nothing_provided( self.assertEqual(context.gpus, []) - @patch("eva.executor.execution_context.ConfigurationManager") - @patch("eva.executor.execution_context.os") - @patch("eva.executor.execution_context.is_gpu_available") + @patch("evadb.executor.execution_context.ConfigurationManager") + @patch("evadb.executor.execution_context.os") + @patch("evadb.executor.execution_context.is_gpu_available") def test_gpus_ignores_config_if_no_gpu_available(self, gpu_check, os, cfm): gpu_check.return_value = False cfm.return_value.get_value.return_value = [0, 1, 2] @@ -77,9 +77,9 @@ def test_gpus_ignores_config_if_no_gpu_available(self, gpu_check, os, cfm): self.assertEqual(context.gpus, []) - @patch("eva.executor.execution_context.ConfigurationManager") - @patch("eva.executor.execution_context.os") - @patch("eva.executor.execution_context.is_gpu_available") + @patch("evadb.executor.execution_context.ConfigurationManager") + @patch("evadb.executor.execution_context.os") + @patch("evadb.executor.execution_context.is_gpu_available") def test_gpu_device_should_return_NO_GPU_if_GPU_not_available( self, gpu_check, os, cfm ): @@ -91,9 +91,9 @@ def test_gpu_device_should_return_NO_GPU_if_GPU_not_available( self.assertEqual(context.gpu_device(), NO_GPU) - @patch("eva.executor.execution_context.ConfigurationManager") - @patch("eva.executor.execution_context.get_gpu_count") - @patch("eva.executor.execution_context.is_gpu_available") + @patch("evadb.executor.execution_context.ConfigurationManager") + @patch("evadb.executor.execution_context.get_gpu_count") + @patch("evadb.executor.execution_context.is_gpu_available") def test_should_return_random_gpu_ID_if_available( self, gpu_check, get_gpu_count, cfm ): diff --git a/test/executor/test_limit_executor.py b/test/executor/test_limit_executor.py index 987e679b7..e65ec9033 100644 --- a/test/executor/test_limit_executor.py +++ b/test/executor/test_limit_executor.py @@ -19,14 +19,14 @@ import pandas as pd from mock import MagicMock -from eva.executor.limit_executor import LimitExecutor -from eva.executor.orderby_executor import OrderByExecutor -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch -from eva.parser.types import ParserOrderBySortType -from eva.plan_nodes.limit_plan import LimitPlan -from eva.plan_nodes.orderby_plan import OrderByPlan +from evadb.executor.limit_executor import LimitExecutor +from evadb.executor.orderby_executor import OrderByExecutor +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch +from evadb.parser.types import ParserOrderBySortType +from evadb.plan_nodes.limit_plan import LimitPlan +from evadb.plan_nodes.orderby_plan import OrderByPlan class LimitExecutorTest(unittest.TestCase): diff --git a/test/executor/test_orderby_executor.py b/test/executor/test_orderby_executor.py index f247dcab8..a30690ead 100644 --- a/test/executor/test_orderby_executor.py +++ b/test/executor/test_orderby_executor.py @@ -19,11 +19,11 @@ import pandas as pd from mock import MagicMock -from eva.executor.orderby_executor import OrderByExecutor -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch -from eva.parser.types import ParserOrderBySortType -from eva.plan_nodes.orderby_plan import OrderByPlan +from evadb.executor.orderby_executor import OrderByExecutor +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch +from evadb.parser.types import ParserOrderBySortType +from evadb.plan_nodes.orderby_plan import OrderByPlan class OrderByExecutorTest(unittest.TestCase): diff --git a/test/executor/test_plan_executor.py b/test/executor/test_plan_executor.py index e248e5849..1ada13cf6 100644 --- a/test/executor/test_plan_executor.py +++ b/test/executor/test_plan_executor.py @@ -17,27 +17,27 @@ import pandas as pd -from eva.catalog.catalog_type import TableType -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.executor.create_executor import CreateExecutor -from eva.executor.create_udf_executor import CreateUDFExecutor -from eva.executor.drop_udf_executor import DropUDFExecutor -from eva.executor.insert_executor import InsertExecutor -from eva.executor.load_executor import LoadDataExecutor -from eva.executor.plan_executor import PlanExecutor -from eva.executor.pp_executor import PPExecutor -from eva.executor.seq_scan_executor import SequentialScanExecutor -from eva.models.storage.batch import Batch -from eva.plan_nodes.create_plan import CreatePlan -from eva.plan_nodes.create_udf_plan import CreateUDFPlan -from eva.plan_nodes.drop_plan import DropPlan -from eva.plan_nodes.drop_udf_plan import DropUDFPlan -from eva.plan_nodes.insert_plan import InsertPlan -from eva.plan_nodes.load_data_plan import LoadDataPlan -from eva.plan_nodes.pp_plan import PPScanPlan -from eva.plan_nodes.rename_plan import RenamePlan -from eva.plan_nodes.seq_scan_plan import SeqScanPlan -from eva.plan_nodes.storage_plan import StoragePlan +from evadb.catalog.catalog_type import TableType +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.executor.create_executor import CreateExecutor +from evadb.executor.create_udf_executor import CreateUDFExecutor +from evadb.executor.drop_udf_executor import DropUDFExecutor +from evadb.executor.insert_executor import InsertExecutor +from evadb.executor.load_executor import LoadDataExecutor +from evadb.executor.plan_executor import PlanExecutor +from evadb.executor.pp_executor import PPExecutor +from evadb.executor.seq_scan_executor import SequentialScanExecutor +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.create_plan import CreatePlan +from evadb.plan_nodes.create_udf_plan import CreateUDFPlan +from evadb.plan_nodes.drop_plan import DropPlan +from evadb.plan_nodes.drop_udf_plan import DropUDFPlan +from evadb.plan_nodes.insert_plan import InsertPlan +from evadb.plan_nodes.load_data_plan import LoadDataPlan +from evadb.plan_nodes.pp_plan import PPScanPlan +from evadb.plan_nodes.rename_plan import RenamePlan +from evadb.plan_nodes.seq_scan_plan import SeqScanPlan +from evadb.plan_nodes.storage_plan import StoragePlan class PlanExecutorTest(unittest.TestCase): @@ -121,7 +121,7 @@ def test_build_execution_tree_should_create_correct_exec_node(self): executor = PlanExecutor(MagicMock(), plan)._build_execution_tree(plan) self.assertIsInstance(executor, LoadDataExecutor) - @patch("eva.executor.plan_executor.PlanExecutor._build_execution_tree") + @patch("evadb.executor.plan_executor.PlanExecutor._build_execution_tree") def test_execute_plan_for_seq_scan_plan(self, mock_build): batch_list = [ Batch(pd.DataFrame([1])), @@ -140,7 +140,7 @@ def test_execute_plan_for_seq_scan_plan(self, mock_build): tree.exec.assert_called_once() self.assertEqual(actual, batch_list) - @patch("eva.executor.plan_executor.PlanExecutor._build_execution_tree") + @patch("evadb.executor.plan_executor.PlanExecutor._build_execution_tree") def test_execute_plan_for_pp_scan_plan(self, mock_build): batch_list = [ Batch(pd.DataFrame([1])), @@ -158,7 +158,7 @@ def test_execute_plan_for_pp_scan_plan(self, mock_build): tree.exec.assert_called_once() self.assertEqual(actual, batch_list) - @patch("eva.executor.plan_executor.PlanExecutor._build_execution_tree") + @patch("evadb.executor.plan_executor.PlanExecutor._build_execution_tree") def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): # CreateExecutor tree = MagicMock(node=CreatePlan(None, [], False)) @@ -202,7 +202,7 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): self.assertEqual(actual, []) - @patch("eva.executor.plan_executor.PlanExecutor._build_execution_tree") + @patch("evadb.executor.plan_executor.PlanExecutor._build_execution_tree") def test_execute_plan_for_rename_plans(self, mock_build): # RenameExecutor tree = MagicMock(node=RenamePlan(None, None)) @@ -213,7 +213,7 @@ def test_execute_plan_for_rename_plans(self, mock_build): self.assertEqual(actual, []) - @patch("eva.executor.plan_executor.PlanExecutor._build_execution_tree") + @patch("evadb.executor.plan_executor.PlanExecutor._build_execution_tree") def test_execute_plan_for_drop_plans(self, mock_build): # DropExecutor tree = MagicMock(node=DropPlan(None, None)) @@ -236,7 +236,7 @@ def test_execute_plan_for_drop_plans(self, mock_build): self.assertEqual(actual, []) @unittest.skip("disk_based_storage_deprecated") - @patch("eva.executor.disk_based_storage_executor.Loader") + @patch("evadb.executor.disk_based_storage_executor.Loader") def test_should_return_the_new_path_after_execution(self, mock_class): class_instance = mock_class.return_value diff --git a/test/executor/test_sample_executor.py b/test/executor/test_sample_executor.py index 1c3a18741..f9e672f65 100644 --- a/test/executor/test_sample_executor.py +++ b/test/executor/test_sample_executor.py @@ -19,10 +19,10 @@ import pandas as pd from mock import MagicMock -from eva.executor.sample_executor import SampleExecutor -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.models.storage.batch import Batch -from eva.plan_nodes.sample_plan import SamplePlan +from evadb.executor.sample_executor import SampleExecutor +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.models.storage.batch import Batch +from evadb.plan_nodes.sample_plan import SamplePlan class SampleExecutorTest(unittest.TestCase): diff --git a/test/executor/test_seq_scan_executor.py b/test/executor/test_seq_scan_executor.py index b2ed512cb..c4cdf2cdf 100644 --- a/test/executor/test_seq_scan_executor.py +++ b/test/executor/test_seq_scan_executor.py @@ -19,8 +19,8 @@ import pandas as pd from mock import MagicMock -from eva.executor.seq_scan_executor import SequentialScanExecutor -from eva.models.storage.batch import Batch +from evadb.executor.seq_scan_executor import SequentialScanExecutor +from evadb.models.storage.batch import Batch class SeqScanExecutorTest(unittest.TestCase): diff --git a/test/executor/utils.py b/test/executor/utils.py index c19846173..9d3b4cadd 100644 --- a/test/executor/utils.py +++ b/test/executor/utils.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # limitations under the License. from typing import List -from eva.models.storage.batch import Batch +from evadb.models.storage.batch import Batch class DummyExecutor: diff --git a/test/expression/test_abstract_expression.py b/test/expression/test_abstract_expression.py index f49bd14dd..22802cb26 100644 --- a/test/expression/test_abstract_expression.py +++ b/test/expression/test_abstract_expression.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ from mock import patch -from eva.expression.abstract_expression import AbstractExpression, ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.logical_expression import LogicalExpression -from eva.expression.tuple_value_expression import TupleValueExpression +from evadb.expression.abstract_expression import AbstractExpression, ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.logical_expression import LogicalExpression +from evadb.expression.tuple_value_expression import TupleValueExpression class AbstractExpressionsTest(unittest.TestCase): diff --git a/test/expression/test_aggregation.py b/test/expression/test_aggregation.py index 78d92c413..609064e25 100644 --- a/test/expression/test_aggregation.py +++ b/test/expression/test_aggregation.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ import pandas as pd import pytest -from eva.expression.abstract_expression import ExpressionType -from eva.expression.aggregation_expression import AggregationExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.aggregation_expression import AggregationExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch class AggregationExpressionsTest(unittest.TestCase): diff --git a/test/expression/test_arithmetic.py b/test/expression/test_arithmetic.py index 4bf9ef7cf..8c1bd90ad 100644 --- a/test/expression/test_arithmetic.py +++ b/test/expression/test_arithmetic.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ import pandas as pd -from eva.expression.abstract_expression import ExpressionType -from eva.expression.arithmetic_expression import ArithmeticExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.models.storage.batch import Batch +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.arithmetic_expression import ArithmeticExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.models.storage.batch import Batch class ArithmeticExpressionsTest(unittest.TestCase): diff --git a/test/expression/test_comparison.py b/test/expression/test_comparison.py index 38fdc7c0d..3861b0713 100644 --- a/test/expression/test_comparison.py +++ b/test/expression/test_comparison.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ import pandas as pd -from eva.catalog.catalog_type import ColumnType -from eva.expression.abstract_expression import ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.models.storage.batch import Batch +from evadb.catalog.catalog_type import ColumnType +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.models.storage.batch import Batch class ComparisonExpressionsTest(unittest.TestCase): diff --git a/test/expression/test_expression_tree.py b/test/expression/test_expression_tree.py index 303fdc3f1..93a047d22 100644 --- a/test/expression/test_expression_tree.py +++ b/test/expression/test_expression_tree.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ # limitations under the License. import unittest -from eva.expression.abstract_expression import ExpressionType -from eva.expression.aggregation_expression import AggregationExpression -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.function_expression import FunctionExpression -from eva.expression.logical_expression import LogicalExpression -from eva.expression.tuple_value_expression import TupleValueExpression +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.aggregation_expression import AggregationExpression +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.logical_expression import LogicalExpression +from evadb.expression.tuple_value_expression import TupleValueExpression class ExpressionEvaluationTest(unittest.TestCase): diff --git a/test/expression/test_expression_utils.py b/test/expression/test_expression_utils.py index bbbecfdda..d068bcc01 100644 --- a/test/expression/test_expression_utils.py +++ b/test/expression/test_expression_utils.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,19 +15,19 @@ import unittest from unittest.mock import Mock -from eva.expression.abstract_expression import ExpressionType -from eva.expression.arithmetic_expression import ArithmeticExpression -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.expression_utils import ( +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.arithmetic_expression import ArithmeticExpression +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.expression_utils import ( conjunction_list_to_expression_tree, contains_single_column, extract_range_list_from_comparison_expr, extract_range_list_from_predicate, is_simple_predicate, ) -from eva.expression.logical_expression import LogicalExpression -from eva.expression.tuple_value_expression import TupleValueExpression +from evadb.expression.logical_expression import LogicalExpression +from evadb.expression.tuple_value_expression import TupleValueExpression class ExpressionUtilsTest(unittest.TestCase): diff --git a/test/expression/test_function_expression.py b/test/expression/test_function_expression.py index 05a33bf61..1cfb94f27 100644 --- a/test/expression/test_function_expression.py +++ b/test/expression/test_function_expression.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,15 +17,15 @@ import pandas as pd from mock import MagicMock, Mock, patch -from eva.constants import NO_GPU -from eva.expression.function_expression import FunctionExpression -from eva.models.storage.batch import Batch -from eva.parser.alias import Alias -from eva.udfs.gpu_compatible import GPUCompatible +from evadb.constants import NO_GPU +from evadb.expression.function_expression import FunctionExpression +from evadb.models.storage.batch import Batch +from evadb.parser.alias import Alias +from evadb.udfs.gpu_compatible import GPUCompatible class FunctionExpressionTest(unittest.TestCase): - @patch("eva.expression.function_expression.Context") + @patch("evadb.expression.function_expression.Context") def test_function_move_the_device_to_gpu_if_compatible(self, context): context_instance = context.return_value mock_function = MagicMock(spec=GPUCompatible) @@ -53,7 +53,7 @@ def test_should_use_the_same_function_if_not_gpu_compatible(self): expression.evaluate(input_batch) mock_function.assert_called() - @patch("eva.expression.function_expression.Context") + @patch("evadb.expression.function_expression.Context") def test_should_execute_same_function_if_no_gpu(self, context): context_instance = context.return_value mock_function = MagicMock(spec=GPUCompatible, return_value=pd.DataFrame()) diff --git a/test/expression/test_logical.py b/test/expression/test_logical.py index a44cad7a9..a6cab327f 100644 --- a/test/expression/test_logical.py +++ b/test/expression/test_logical.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ import pandas as pd from mock import Mock -from eva.expression.abstract_expression import ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.logical_expression import LogicalExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.models.storage.batch import Batch +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.logical_expression import LogicalExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.models.storage.batch import Batch class LogicalExpressionsTest(unittest.TestCase): diff --git a/test/integration_tests/test_array_count.py b/test/integration_tests/test_array_count.py index 7fbf3da13..3d0641f28 100644 --- a/test/integration_tests/test_array_count.py +++ b/test/integration_tests/test_array_count.py @@ -25,8 +25,8 @@ import pandas as pd import pytest -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_create_index_executor.py b/test/integration_tests/test_create_index_executor.py index 5cd5183f4..8823d8f20 100644 --- a/test/integration_tests/test_create_index_executor.py +++ b/test/integration_tests/test_create_index_executor.py @@ -21,10 +21,10 @@ import pandas as pd import pytest -from eva.catalog.catalog_type import VectorStoreType -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all -from eva.storage.storage_engine import StorageEngine +from evadb.catalog.catalog_type import VectorStoreType +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all +from evadb.storage.storage_engine import StorageEngine @pytest.mark.notparallel diff --git a/test/integration_tests/test_create_table_executor.py b/test/integration_tests/test_create_table_executor.py index 3389ac30a..233645ef5 100644 --- a/test/integration_tests/test_create_table_executor.py +++ b/test/integration_tests/test_create_table_executor.py @@ -25,10 +25,10 @@ import pandas as pd import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.executor.executor_utils import ExecutorError -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.executor.executor_utils import ExecutorError +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all NUM_FRAMES = 10 diff --git a/test/integration_tests/test_delete_executor.py b/test/integration_tests/test_delete_executor.py index 244b03de1..0f8fbfdf3 100644 --- a/test/integration_tests/test_delete_executor.py +++ b/test/integration_tests/test_delete_executor.py @@ -23,8 +23,8 @@ import numpy as np import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_drop_executor.py b/test/integration_tests/test_drop_executor.py index c7578508d..daba85f55 100644 --- a/test/integration_tests/test_drop_executor.py +++ b/test/integration_tests/test_drop_executor.py @@ -18,9 +18,9 @@ import pytest -from eva.catalog.catalog_utils import get_video_table_column_definitions -from eva.executor.executor_utils import ExecutorError -from eva.server.command_handler import execute_query_fetch_all +from evadb.catalog.catalog_utils import get_video_table_column_definitions +from evadb.executor.executor_utils import ExecutorError +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_error_handling_with_ray.py b/test/integration_tests/test_error_handling_with_ray.py index 8d0f8a4af..ebfd34550 100644 --- a/test/integration_tests/test_error_handling_with_ray.py +++ b/test/integration_tests/test_error_handling_with_ray.py @@ -25,8 +25,8 @@ shutdown_ray, ) -from eva.executor.executor_utils import ExecutorError -from eva.server.command_handler import execute_query_fetch_all +from evadb.executor.executor_utils import ExecutorError +from evadb.server.command_handler import execute_query_fetch_all class ErrorHandlingRayTests(unittest.TestCase): diff --git a/test/integration_tests/test_explain_executor.py b/test/integration_tests/test_explain_executor.py index da58c2369..5bcd73895 100644 --- a/test/integration_tests/test_explain_executor.py +++ b/test/integration_tests/test_explain_executor.py @@ -22,14 +22,14 @@ import pytest -from eva.optimizer.plan_generator import PlanGenerator -from eva.optimizer.rules.rules import ( +from evadb.optimizer.plan_generator import PlanGenerator +from evadb.optimizer.rules.rules import ( EmbedFilterIntoGet, LogicalInnerJoinCommutativity, XformLateralJoinToLinearFlow, ) -from eva.optimizer.rules.rules_manager import RulesManager, disable_rules -from eva.server.command_handler import execute_query_fetch_all +from evadb.optimizer.rules.rules_manager import RulesManager, disable_rules +from evadb.server.command_handler import execute_query_fetch_all NUM_FRAMES = 10 diff --git a/test/integration_tests/test_fuzzy_join.py b/test/integration_tests/test_fuzzy_join.py index 5b0cab16b..c38085add 100644 --- a/test/integration_tests/test_fuzzy_join.py +++ b/test/integration_tests/test_fuzzy_join.py @@ -24,8 +24,8 @@ import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_huggingface_udfs.py b/test/integration_tests/test_huggingface_udfs.py index c65fd1dfe..50a039aeb 100644 --- a/test/integration_tests/test_huggingface_udfs.py +++ b/test/integration_tests/test_huggingface_udfs.py @@ -17,8 +17,8 @@ import pytest -from eva.executor.executor_utils import ExecutorError -from eva.server.command_handler import execute_query_fetch_all +from evadb.executor.executor_utils import ExecutorError +from evadb.server.command_handler import execute_query_fetch_all NUM_FRAMES = 10 diff --git a/test/integration_tests/test_insert_executor.py b/test/integration_tests/test_insert_executor.py index a085a8115..a57b7f1c8 100644 --- a/test/integration_tests/test_insert_executor.py +++ b/test/integration_tests/test_insert_executor.py @@ -24,8 +24,8 @@ import pandas as pd import pytest -from eva.server.command_handler import execute_query_fetch_all -from eva.utils.logging_manager import logger +from evadb.server.command_handler import execute_query_fetch_all +from evadb.utils.logging_manager import logger @pytest.mark.notparallel diff --git a/test/integration_tests/test_like.py b/test/integration_tests/test_like.py index e577d5e7b..4888bcdd6 100644 --- a/test/integration_tests/test_like.py +++ b/test/integration_tests/test_like.py @@ -16,8 +16,8 @@ from test.markers import ocr_skip_marker from test.util import get_evadb_for_testing, shutdown_ray -from eva.configuration.constants import EVA_ROOT_DIR -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.server.command_handler import execute_query_fetch_all class LikeTest(unittest.TestCase): @@ -44,7 +44,7 @@ def test_like_with_ocr(self): bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE OCRExtraction - IMPL 'eva/udfs/ocr_extractor.py'; + IMPL 'evadb/udfs/ocr_extractor.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) select_query = """SELECT X.label, X.x, X.y FROM MemeImages JOIN LATERAL UNNEST(OCRExtractor(data)) AS X(label, x, y) WHERE label LIKE {};""".format( @@ -61,7 +61,7 @@ def test_like_fails_on_non_string_col(self): bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE OCRExtraction - IMPL 'eva/udfs/ocr_extractor.py'; + IMPL 'evadb/udfs/ocr_extractor.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) diff --git a/test/integration_tests/test_load_executor.py b/test/integration_tests/test_load_executor.py index 6eded76ad..9b3ae0ccf 100644 --- a/test/integration_tests/test_load_executor.py +++ b/test/integration_tests/test_load_executor.py @@ -34,12 +34,12 @@ import pandas as pd import pytest -from eva.binder.binder_utils import BinderError -from eva.configuration.constants import EVA_ROOT_DIR -from eva.executor.executor_utils import ExecutorError -from eva.models.storage.batch import Batch -from eva.parser.types import FileFormatType -from eva.server.command_handler import execute_query_fetch_all +from evadb.binder.binder_utils import BinderError +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.executor.executor_utils import ExecutorError +from evadb.models.storage.batch import Batch +from evadb.parser.types import FileFormatType +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_load_pdf_executor.py b/test/integration_tests/test_load_pdf_executor.py index c5cfbd139..7b4d17fa3 100644 --- a/test/integration_tests/test_load_pdf_executor.py +++ b/test/integration_tests/test_load_pdf_executor.py @@ -17,8 +17,8 @@ import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_mat_executor.py b/test/integration_tests/test_mat_executor.py index 0f95f4a0a..9bbaf85d5 100644 --- a/test/integration_tests/test_mat_executor.py +++ b/test/integration_tests/test_mat_executor.py @@ -25,9 +25,9 @@ import pandas as pd import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all NUM_FRAMES = 10 diff --git a/test/integration_tests/test_open.py b/test/integration_tests/test_open.py index 041974924..f827c1a5e 100644 --- a/test/integration_tests/test_open.py +++ b/test/integration_tests/test_open.py @@ -25,9 +25,9 @@ import pandas as pd import pytest -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all -from eva.storage.storage_engine import StorageEngine +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all +from evadb.storage.storage_engine import StorageEngine @pytest.mark.notparallel diff --git a/test/integration_tests/test_optimizer_rules.py b/test/integration_tests/test_optimizer_rules.py index 38fce818f..71f5e46bd 100644 --- a/test/integration_tests/test_optimizer_rules.py +++ b/test/integration_tests/test_optimizer_rules.py @@ -26,20 +26,20 @@ import pytest from mock import MagicMock, patch -from eva.configuration.constants import EVA_ROOT_DIR -from eva.expression.comparison_expression import ComparisonExpression -from eva.models.storage.batch import Batch -from eva.optimizer.plan_generator import PlanGenerator -from eva.optimizer.rules.rules import ( +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.models.storage.batch import Batch +from evadb.optimizer.plan_generator import PlanGenerator +from evadb.optimizer.rules.rules import ( PushDownFilterThroughApplyAndMerge, PushDownFilterThroughJoin, ReorderPredicates, XformLateralJoinToLinearFlow, ) -from eva.optimizer.rules.rules_manager import RulesManager, disable_rules -from eva.plan_nodes.predicate_plan import PredicatePlan -from eva.server.command_handler import execute_query_fetch_all -from eva.utils.stats import Timer +from evadb.optimizer.rules.rules_manager import RulesManager, disable_rules +from evadb.plan_nodes.predicate_plan import PredicatePlan +from evadb.server.command_handler import execute_query_fetch_all +from evadb.utils.stats import Timer @pytest.mark.notparallel @@ -59,8 +59,8 @@ def tearDownClass(cls): shutdown_ray() execute_query_fetch_all(cls.evadb, "DROP TABLE IF EXISTS MyVideo;") - @patch("eva.expression.function_expression.FunctionExpression.evaluate") - @patch("eva.models.storage.batch.Batch.merge_column_wise") + @patch("evadb.expression.function_expression.FunctionExpression.evaluate") + @patch("evadb.models.storage.batch.Batch.merge_column_wise") def test_should_benefit_from_pushdown(self, merge_mock, evaluate_mock): # added to mock away the evaluate_mock.return_value = Batch( @@ -146,7 +146,7 @@ def test_should_pushdown_without_pushdown_join_rule(self): self.assertEqual(result_without_pushdown_join_rule, result_with_rule) self.assertEqual(query_plan, query_plan_without_pushdown_join_rule) - @patch("eva.catalog.catalog_manager.CatalogManager.get_udf_cost_catalog_entry") + @patch("evadb.catalog.catalog_manager.CatalogManager.get_udf_cost_catalog_entry") def test_should_reorder_predicates(self, mock): def _check_reorder(cost_func): mock.side_effect = cost_func @@ -179,7 +179,7 @@ def _check_reorder(cost_func): lambda name: MagicMock(cost=5) if name == "DummyObjectDetector" else None ) - @patch("eva.catalog.catalog_manager.CatalogManager.get_udf_cost_catalog_entry") + @patch("evadb.catalog.catalog_manager.CatalogManager.get_udf_cost_catalog_entry") def test_should_not_reorder_predicates(self, mock): def _check_no_reorder(cost_func): mock.side_effect = cost_func @@ -221,7 +221,7 @@ def _check_no_reorder(cost_func): # no reordering if default cost is used for both UDF _check_no_reorder(lambda name: None) - @patch("eva.catalog.catalog_manager.CatalogManager.get_udf_cost_catalog_entry") + @patch("evadb.catalog.catalog_manager.CatalogManager.get_udf_cost_catalog_entry") def test_should_reorder_multiple_predicates(self, mock): def side_effect_func(name): if name == "DummyMultiObjectDetector": diff --git a/test/integration_tests/test_pytorch.py b/test/integration_tests/test_pytorch.py index 8c6864752..3d8bb653a 100644 --- a/test/integration_tests/test_pytorch.py +++ b/test/integration_tests/test_pytorch.py @@ -28,11 +28,11 @@ import pandas.testing as pd_testing import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.executor.executor_utils import ExecutorError -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all -from eva.udfs.udf_bootstrap_queries import Asl_udf_query, Mvit_udf_query +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.executor.executor_utils import ExecutorError +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all +from evadb.udfs.udf_bootstrap_queries import Asl_udf_query, Mvit_udf_query @pytest.mark.notparallel @@ -116,7 +116,7 @@ def test_should_project_parallel_match_sequential(self): OUTPUT (bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE FaceDetection - IMPL 'eva/udfs/face_detector.py'; + IMPL 'evadb/udfs/face_detector.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) @@ -200,7 +200,7 @@ def test_should_run_pytorch_and_facenet(self): OUTPUT (bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE FaceDetection - IMPL 'eva/udfs/face_detector.py'; + IMPL 'evadb/udfs/face_detector.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) @@ -219,7 +219,7 @@ def test_should_run_pytorch_and_ocr(self): bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE OCRExtraction - IMPL 'eva/udfs/ocr_extractor.py'; + IMPL 'evadb/udfs/ocr_extractor.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) @@ -239,7 +239,7 @@ def test_should_run_pytorch_and_resnet50(self): INPUT (frame NDARRAY UINT8(3, ANYDIM, ANYDIM)) OUTPUT (features NDARRAY FLOAT32(ANYDIM)) TYPE Classification - IMPL 'eva/udfs/feature_extractor.py'; + IMPL 'evadb/udfs/feature_extractor.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) @@ -259,7 +259,7 @@ def test_should_run_pytorch_and_similarity(self): INPUT (img_path TEXT(1000)) OUTPUT (data NDARRAY UINT8(3, ANYDIM, ANYDIM)) TYPE NdarrayUDF - IMPL "eva/udfs/ndarray/open.py"; + IMPL "evadb/udfs/ndarray/open.py"; """ execute_query_fetch_all(self.evadb, create_open_udf_query) @@ -269,7 +269,7 @@ def test_should_run_pytorch_and_similarity(self): Feature_Extractor_Name TEXT(100)) OUTPUT (distance FLOAT(32, 7)) TYPE NdarrayUDF - IMPL "eva/udfs/ndarray/similarity.py"; + IMPL "evadb/udfs/ndarray/similarity.py"; """ execute_query_fetch_all(self.evadb, create_similarity_udf_query) @@ -277,7 +277,7 @@ def test_should_run_pytorch_and_similarity(self): INPUT (frame NDARRAY UINT8(3, ANYDIM, ANYDIM)) OUTPUT (features NDARRAY FLOAT32(ANYDIM)) TYPE Classification - IMPL "eva/udfs/feature_extractor.py"; + IMPL "evadb/udfs/feature_extractor.py"; """ execute_query_fetch_all(self.evadb, create_feat_udf_query) @@ -315,7 +315,7 @@ def test_should_run_ocr_on_cropped_data(self): bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE OCRExtraction - IMPL 'eva/udfs/ocr_extractor.py'; + IMPL 'evadb/udfs/ocr_extractor.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) diff --git a/test/integration_tests/test_rename_executor.py b/test/integration_tests/test_rename_executor.py index 0bf7c4360..b58644965 100644 --- a/test/integration_tests/test_rename_executor.py +++ b/test/integration_tests/test_rename_executor.py @@ -22,7 +22,7 @@ import pytest -from eva.server.command_handler import execute_query_fetch_all +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_reuse.py b/test/integration_tests/test_reuse.py index 29b00b0eb..568213fa5 100644 --- a/test/integration_tests/test_reuse.py +++ b/test/integration_tests/test_reuse.py @@ -24,17 +24,17 @@ shutdown_ray, ) -from eva.configuration.constants import EVA_ROOT_DIR -from eva.optimizer.operators import LogicalFunctionScan -from eva.optimizer.plan_generator import PlanGenerator -from eva.optimizer.rules.rules import ( +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.optimizer.operators import LogicalFunctionScan +from evadb.optimizer.plan_generator import PlanGenerator +from evadb.optimizer.rules.rules import ( CacheFunctionExpressionInApply, CacheFunctionExpressionInFilter, CacheFunctionExpressionInProject, ) -from eva.optimizer.rules.rules_manager import RulesManager, disable_rules -from eva.server.command_handler import execute_query_fetch_all -from eva.utils.stats import Timer +from evadb.optimizer.rules.rules_manager import RulesManager, disable_rules +from evadb.server.command_handler import execute_query_fetch_all +from evadb.utils.stats import Timer class ReuseTest(unittest.TestCase): diff --git a/test/integration_tests/test_s3_load_executor.py b/test/integration_tests/test_s3_load_executor.py index a33cd943a..3863be3fa 100644 --- a/test/integration_tests/test_s3_load_executor.py +++ b/test/integration_tests/test_s3_load_executor.py @@ -28,10 +28,10 @@ import pytest from moto import mock_s3 -from eva.configuration.constants import EVA_ROOT_DIR -from eva.models.storage.batch import Batch -from eva.parser.types import FileFormatType -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.models.storage.batch import Batch +from evadb.parser.types import FileFormatType +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/integration_tests/test_saliency.py b/test/integration_tests/test_saliency.py index 62a915e48..70c72c053 100644 --- a/test/integration_tests/test_saliency.py +++ b/test/integration_tests/test_saliency.py @@ -17,9 +17,9 @@ import pytest -from eva.configuration.constants import EVA_DATABASE_DIR, EVA_ROOT_DIR -from eva.interfaces.relational.db import connect -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_DATABASE_DIR, EVA_ROOT_DIR +from evadb.interfaces.relational.db import connect +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel @@ -49,7 +49,7 @@ def test_saliency(self): ) create_udf_query = f"""CREATE UDF IF NOT EXISTS SaliencyFeatureExtractor - IMPL '{EVA_ROOT_DIR}/eva/udfs/saliency_feature_extractor.py'; + IMPL '{EVA_ROOT_DIR}/evadb/udfs/saliency_feature_extractor.py'; """ execute_query_fetch_all(self.evadb, create_udf_query) diff --git a/test/integration_tests/test_select_executor.py b/test/integration_tests/test_select_executor.py index c54bd520a..1418e88e7 100644 --- a/test/integration_tests/test_select_executor.py +++ b/test/integration_tests/test_select_executor.py @@ -29,11 +29,11 @@ import pandas as pd import pytest -from eva.binder.binder_utils import BinderError -from eva.configuration.constants import EVA_ROOT_DIR -from eva.models.storage.batch import Batch -from eva.readers.decord_reader import DecordReader -from eva.server.command_handler import execute_query_fetch_all +from evadb.binder.binder_utils import BinderError +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.models.storage.batch import Batch +from evadb.readers.decord_reader import DecordReader +from evadb.server.command_handler import execute_query_fetch_all NUM_FRAMES = 10 diff --git a/test/integration_tests/test_show_info_executor.py b/test/integration_tests/test_show_info_executor.py index 7fc2b18ab..d78afdd0c 100644 --- a/test/integration_tests/test_show_info_executor.py +++ b/test/integration_tests/test_show_info_executor.py @@ -20,10 +20,10 @@ import pandas as pd import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all -from eva.udfs.udf_bootstrap_queries import ArrayCount_udf_query, Fastrcnn_udf_query +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all +from evadb.udfs.udf_bootstrap_queries import ArrayCount_udf_query, Fastrcnn_udf_query NUM_FRAMES = 10 diff --git a/test/integration_tests/test_similarity.py b/test/integration_tests/test_similarity.py index 24a8d394e..541ac745b 100644 --- a/test/integration_tests/test_similarity.py +++ b/test/integration_tests/test_similarity.py @@ -27,9 +27,9 @@ import pandas as pd import pytest -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all -from eva.storage.storage_engine import StorageEngine +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all +from evadb.storage.storage_engine import StorageEngine @pytest.mark.notparallel diff --git a/test/integration_tests/test_udf_executor.py b/test/integration_tests/test_udf_executor.py index 7497cc5ec..4fa851ebf 100644 --- a/test/integration_tests/test_udf_executor.py +++ b/test/integration_tests/test_udf_executor.py @@ -27,11 +27,11 @@ import pandas as pd import pytest -from eva.binder.binder_utils import BinderError -from eva.catalog.catalog_type import ColumnType, NdArrayType -from eva.executor.executor_utils import ExecutorError -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all +from evadb.binder.binder_utils import BinderError +from evadb.catalog.catalog_type import ColumnType, NdArrayType +from evadb.executor.executor_utils import ExecutorError +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all NUM_FRAMES = 10 diff --git a/test/interfaces/relational/test_relational_api.py b/test/interfaces/relational/test_relational_api.py index 5b5217ccb..23b5afe21 100644 --- a/test/interfaces/relational/test_relational_api.py +++ b/test/interfaces/relational/test_relational_api.py @@ -25,11 +25,11 @@ import pandas as pd from pandas.testing import assert_frame_equal -from eva.configuration.constants import EVA_DATABASE_DIR, EVA_ROOT_DIR -from eva.executor.executor_utils import ExecutorError -from eva.interfaces.relational.db import connect -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.constants import EVA_DATABASE_DIR, EVA_ROOT_DIR +from evadb.executor.executor_utils import ExecutorError +from evadb.interfaces.relational.db import connect +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all class RelationalAPI(unittest.TestCase): @@ -174,7 +174,7 @@ def test_create_index(self): # todo support register udf cursor.query( f"""CREATE UDF IF NOT EXISTS SiftFeatureExtractor - IMPL '{EVA_ROOT_DIR}/eva/udfs/sift_feature_extractor.py'""" + IMPL '{EVA_ROOT_DIR}/evadb/udfs/sift_feature_extractor.py'""" ).df() # create a vector index using QDRANT @@ -278,7 +278,7 @@ def test_pdf_similarity_search(self): udf = cursor.create_udf( "SentenceTransformerFeatureExtractor", True, - f"{EVA_ROOT_DIR}/eva/udfs/sentence_transformer_feature_extractor.py", + f"{EVA_ROOT_DIR}/evadb/udfs/sentence_transformer_feature_extractor.py", ) udf.execute() diff --git a/test/models/catalog/test_frame_info.py b/test/models/catalog/test_frame_info.py index ce3fef246..8a474419b 100644 --- a/test/models/catalog/test_frame_info.py +++ b/test/models/catalog/test_frame_info.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ # limitations under the License. import unittest -from eva.models.catalog.frame_info import FrameInfo -from eva.models.catalog.properties import ColorSpace +from evadb.models.catalog.frame_info import FrameInfo +from evadb.models.catalog.properties import ColorSpace class FrameInfoTest(unittest.TestCase): diff --git a/test/models/server/test_response.py b/test/models/server/test_response.py index 594285a9c..5d69635a2 100644 --- a/test/models/server/test_response.py +++ b/test/models/server/test_response.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,8 +15,8 @@ import unittest from test.util import create_dataframe -from eva.models.server.response import Response, ResponseStatus -from eva.models.storage.batch import Batch +from evadb.models.server.response import Response, ResponseStatus +from evadb.models.storage.batch import Batch class ResponseTest(unittest.TestCase): diff --git a/test/models/storage/test_batch.py b/test/models/storage/test_batch.py index 212970a95..83aa968cd 100644 --- a/test/models/storage/test_batch.py +++ b/test/models/storage/test_batch.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import numpy as np import pandas as pd -from eva.models.storage.batch import Batch -from eva.parser.alias import Alias +from evadb.models.storage.batch import Batch +from evadb.parser.alias import Alias class BatchTest(unittest.TestCase): diff --git a/test/optimizer/rules/test_rules.py b/test/optimizer/rules/test_rules.py index 645cdb7a8..b436204b4 100644 --- a/test/optimizer/rules/test_rules.py +++ b/test/optimizer/rules/test_rules.py @@ -18,15 +18,15 @@ import pytest from mock import MagicMock, patch -from eva.catalog.catalog_type import TableType -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.optimizer.operators import ( +from evadb.catalog.catalog_type import TableType +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.optimizer.operators import ( LogicalFilter, LogicalGet, LogicalJoin, LogicalSample, ) -from eva.optimizer.rules.rules import ( +from evadb.optimizer.rules.rules import ( CacheFunctionExpressionInApply, CacheFunctionExpressionInFilter, CacheFunctionExpressionInProject, @@ -73,9 +73,9 @@ XformExtractObjectToLinearFlow, XformLateralJoinToLinearFlow, ) -from eva.optimizer.rules.rules_manager import RulesManager, disable_rules -from eva.parser.types import JoinType -from eva.server.command_handler import execute_query_fetch_all +from evadb.optimizer.rules.rules_manager import RulesManager, disable_rules +from evadb.parser.types import JoinType +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/optimizer/test_binder.py b/test/optimizer/test_binder.py index c46e3d6cd..346a2b53f 100644 --- a/test/optimizer/test_binder.py +++ b/test/optimizer/test_binder.py @@ -17,11 +17,11 @@ from mock import MagicMock -from eva.optimizer.binder import Binder -from eva.optimizer.cost_model import CostModel -from eva.optimizer.operators import Dummy, LogicalFilter, LogicalGet, OperatorType -from eva.optimizer.optimizer_context import OptimizerContext -from eva.optimizer.rules.pattern import Pattern +from evadb.optimizer.binder import Binder +from evadb.optimizer.cost_model import CostModel +from evadb.optimizer.operators import Dummy, LogicalFilter, LogicalGet, OperatorType +from evadb.optimizer.optimizer_context import OptimizerContext +from evadb.optimizer.rules.pattern import Pattern class TestBinder(unittest.TestCase): diff --git a/test/optimizer/test_cascade_optimizer.py b/test/optimizer/test_cascade_optimizer.py index a656ade4c..ee355f7b4 100644 --- a/test/optimizer/test_cascade_optimizer.py +++ b/test/optimizer/test_cascade_optimizer.py @@ -24,8 +24,8 @@ import pandas as pd import pytest -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all @pytest.mark.notparallel diff --git a/test/optimizer/test_cost_model.py b/test/optimizer/test_cost_model.py index 909200d1a..6d6c8d911 100644 --- a/test/optimizer/test_cost_model.py +++ b/test/optimizer/test_cost_model.py @@ -17,12 +17,12 @@ from mock import MagicMock -from eva.optimizer.group_expression import GroupExpression -from eva.optimizer.operators import Operator -from eva.optimizer.optimizer_context import OptimizerContext -from eva.optimizer.optimizer_tasks import OptimizeGroup -from eva.optimizer.plan_generator import PlanGenerator -from eva.optimizer.property import PropertyType +from evadb.optimizer.group_expression import GroupExpression +from evadb.optimizer.operators import Operator +from evadb.optimizer.optimizer_context import OptimizerContext +from evadb.optimizer.optimizer_tasks import OptimizeGroup +from evadb.optimizer.plan_generator import PlanGenerator +from evadb.optimizer.property import PropertyType class CostModel(unittest.TestCase): diff --git a/test/optimizer/test_group.py b/test/optimizer/test_group.py index eb701867b..bcceaab5b 100644 --- a/test/optimizer/test_group.py +++ b/test/optimizer/test_group.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ from mock import MagicMock -from eva.optimizer.group import Group -from eva.optimizer.group_expression import GroupExpression -from eva.optimizer.property import Property, PropertyType +from evadb.optimizer.group import Group +from evadb.optimizer.group_expression import GroupExpression +from evadb.optimizer.property import Property, PropertyType class TestGroup(unittest.TestCase): diff --git a/test/optimizer/test_memo.py b/test/optimizer/test_memo.py index d48b2d939..065bf6a74 100644 --- a/test/optimizer/test_memo.py +++ b/test/optimizer/test_memo.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,8 +16,8 @@ from mock import MagicMock -from eva.constants import UNDEFINED_GROUP_ID -from eva.optimizer.memo import Memo +from evadb.constants import UNDEFINED_GROUP_ID +from evadb.optimizer.memo import Memo class MemoTest(unittest.TestCase): diff --git a/test/optimizer/test_optimizer_context.py b/test/optimizer/test_optimizer_context.py index 159c9f78c..339f9e54a 100644 --- a/test/optimizer/test_optimizer_context.py +++ b/test/optimizer/test_optimizer_context.py @@ -16,8 +16,8 @@ from mock import MagicMock -from eva.optimizer.cost_model import CostModel -from eva.optimizer.optimizer_context import OptimizerContext +from evadb.optimizer.cost_model import CostModel +from evadb.optimizer.optimizer_context import OptimizerContext class TestOptimizerContext(unittest.TestCase): diff --git a/test/optimizer/test_optimizer_task.py b/test/optimizer/test_optimizer_task.py index 190bf881f..15f30a40e 100644 --- a/test/optimizer/test_optimizer_task.py +++ b/test/optimizer/test_optimizer_task.py @@ -17,25 +17,25 @@ from mock import MagicMock -from eva.optimizer.cost_model import CostModel -from eva.optimizer.operators import ( +from evadb.optimizer.cost_model import CostModel +from evadb.optimizer.operators import ( LogicalFilter, LogicalGet, LogicalProject, LogicalQueryDerivedGet, ) -from eva.optimizer.optimizer_context import OptimizerContext -from eva.optimizer.optimizer_tasks import ( +from evadb.optimizer.optimizer_context import OptimizerContext +from evadb.optimizer.optimizer_tasks import ( BottomUpRewrite, OptimizeGroup, OptimizerTask, TopDownRewrite, ) -from eva.optimizer.property import PropertyType -from eva.optimizer.rules.rules_manager import RulesManager -from eva.plan_nodes.predicate_plan import PredicatePlan -from eva.plan_nodes.project_plan import ProjectPlan -from eva.plan_nodes.seq_scan_plan import SeqScanPlan +from evadb.optimizer.property import PropertyType +from evadb.optimizer.rules.rules_manager import RulesManager +from evadb.plan_nodes.predicate_plan import PredicatePlan +from evadb.plan_nodes.project_plan import ProjectPlan +from evadb.plan_nodes.seq_scan_plan import SeqScanPlan class TestOptimizerTask(unittest.TestCase): @@ -95,8 +95,8 @@ def test_simple_implementation(self): def test_nested_implementation(self): child_predicate = MagicMock() root_predicate = MagicMock() - with patch("eva.optimizer.rules.rules.extract_pushdown_predicate") as mock: - with patch("eva.optimizer.rules.rules.is_video_table") as mock_vid: + with patch("evadb.optimizer.rules.rules.extract_pushdown_predicate") as mock: + with patch("evadb.optimizer.rules.rules.is_video_table") as mock_vid: mock_vid.return_value = True mock.side_effect = [ (child_predicate, None), diff --git a/test/optimizer/test_optimizer_utils.py b/test/optimizer/test_optimizer_utils.py index 8517c6b2b..fe54ba4b2 100644 --- a/test/optimizer/test_optimizer_utils.py +++ b/test/optimizer/test_optimizer_utils.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ # limitations under the License. import unittest -from eva.catalog.catalog_type import ColumnType, NdArrayType -from eva.optimizer.optimizer_utils import column_definition_to_udf_io -from eva.parser.create_statement import ColumnDefinition +from evadb.catalog.catalog_type import ColumnType, NdArrayType +from evadb.optimizer.optimizer_utils import column_definition_to_udf_io +from evadb.parser.create_statement import ColumnDefinition class OptimizerUtilsTest(unittest.TestCase): diff --git a/test/optimizer/test_statement_to_opr_converter.py b/test/optimizer/test_statement_to_opr_converter.py index a89a9f76e..78f8979ec 100644 --- a/test/optimizer/test_statement_to_opr_converter.py +++ b/test/optimizer/test_statement_to_opr_converter.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ from mock import MagicMock, patch -from eva.optimizer.operators import ( +from evadb.optimizer.operators import ( Dummy, LogicalApplyAndMerge, LogicalCreate, @@ -49,21 +49,21 @@ LogicalVectorIndexScan, Operator, ) -from eva.optimizer.statement_to_opr_converter import StatementToPlanConverter -from eva.parser.create_index_statement import CreateIndexStatement -from eva.parser.create_statement import CreateTableStatement -from eva.parser.create_udf_statement import CreateUDFStatement -from eva.parser.drop_statement import DropTableStatement -from eva.parser.drop_udf_statement import DropUDFStatement -from eva.parser.explain_statement import ExplainStatement -from eva.parser.insert_statement import InsertTableStatement -from eva.parser.rename_statement import RenameTableStatement -from eva.parser.select_statement import SelectStatement -from eva.parser.table_ref import TableRef +from evadb.optimizer.statement_to_opr_converter import StatementToPlanConverter +from evadb.parser.create_index_statement import CreateIndexStatement +from evadb.parser.create_statement import CreateTableStatement +from evadb.parser.create_udf_statement import CreateUDFStatement +from evadb.parser.drop_statement import DropTableStatement +from evadb.parser.drop_udf_statement import DropUDFStatement +from evadb.parser.explain_statement import ExplainStatement +from evadb.parser.insert_statement import InsertTableStatement +from evadb.parser.rename_statement import RenameTableStatement +from evadb.parser.select_statement import SelectStatement +from evadb.parser.table_ref import TableRef class StatementToOprTest(unittest.TestCase): - @patch("eva.optimizer.statement_to_opr_converter.LogicalGet") + @patch("evadb.optimizer.statement_to_opr_converter.LogicalGet") def test_visit_table_ref_should_create_logical_get_opr(self, mock_lget): converter = StatementToPlanConverter() table_ref = MagicMock(spec=TableRef, alias="alias") @@ -73,7 +73,7 @@ def test_visit_table_ref_should_create_logical_get_opr(self, mock_lget): mock_lget.assert_called_with(table_ref, table_ref.table.table_obj, "alias") self.assertEqual(mock_lget.return_value, converter._plan) - @patch("eva.optimizer.statement_to_opr_converter.LogicalFilter") + @patch("evadb.optimizer.statement_to_opr_converter.LogicalFilter") def test_visit_select_predicate_should_add_logical_filter(self, mock_lfilter): converter = StatementToPlanConverter() select_predicate = MagicMock() @@ -83,7 +83,7 @@ def test_visit_select_predicate_should_add_logical_filter(self, mock_lfilter): mock_lfilter.return_value.append_child.assert_called() self.assertEqual(mock_lfilter.return_value, converter._plan) - @patch("eva.optimizer.statement_to_opr_converter.LogicalProject") + @patch("evadb.optimizer.statement_to_opr_converter.LogicalProject") def test_visit_projection_should_add_logical_predicate(self, mock_lproject): converter = StatementToPlanConverter() projects = MagicMock() @@ -123,13 +123,13 @@ def test_visit_select_should_not_call_visits_for_null_values(self): converter._visit_projection.assert_not_called() converter._visit_select_predicate.assert_not_called() - @patch("eva.optimizer.statement_to_opr_converter.LogicalCreateUDF") + @patch("evadb.optimizer.statement_to_opr_converter.LogicalCreateUDF") @patch( - "eva.optimizer.\ + "evadb.optimizer.\ statement_to_opr_converter.column_definition_to_udf_io" ) @patch( - "eva.optimizer.\ + "evadb.optimizer.\ statement_to_opr_converter.metadata_definition_to_udf_metadata" ) def test_visit_create_udf(self, metadata_def_mock, col_def_mock, l_create_udf_mock): @@ -169,9 +169,9 @@ def test_visit_should_call_create_udf(self): mock.assert_called_once() mock.assert_called_with(stmt) - @patch("eva.optimizer.statement_to_opr_converter.LogicalDropUDF") + @patch("evadb.optimizer.statement_to_opr_converter.LogicalDropUDF") @patch( - "eva.optimizer.\ + "evadb.optimizer.\ statement_to_opr_converter.column_definition_to_udf_io" ) def test_visit_drop_udf(self, mock, l_drop_udf_mock): diff --git a/test/parser/test_parser.py b/test/parser/test_parser.py index 6678b7d6f..8e7aee3c1 100644 --- a/test/parser/test_parser.py +++ b/test/parser/test_parser.py @@ -15,32 +15,32 @@ import unittest from pathlib import Path -from eva.catalog.catalog_type import ColumnType, NdArrayType, VectorStoreType -from eva.expression.abstract_expression import ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.function_expression import FunctionExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.parser.alias import Alias -from eva.parser.create_index_statement import CreateIndexStatement -from eva.parser.create_mat_view_statement import CreateMaterializedViewStatement -from eva.parser.create_statement import ( +from evadb.catalog.catalog_type import ColumnType, NdArrayType, VectorStoreType +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.function_expression import FunctionExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.parser.alias import Alias +from evadb.parser.create_index_statement import CreateIndexStatement +from evadb.parser.create_mat_view_statement import CreateMaterializedViewStatement +from evadb.parser.create_statement import ( ColConstraintInfo, ColumnDefinition, CreateTableStatement, ) -from eva.parser.create_udf_statement import CreateUDFStatement -from eva.parser.delete_statement import DeleteTableStatement -from eva.parser.drop_statement import DropTableStatement -from eva.parser.drop_udf_statement import DropUDFStatement -from eva.parser.insert_statement import InsertTableStatement -from eva.parser.load_statement import LoadDataStatement -from eva.parser.parser import Parser -from eva.parser.rename_statement import RenameTableStatement -from eva.parser.select_statement import SelectStatement -from eva.parser.statement import AbstractStatement, StatementType -from eva.parser.table_ref import JoinNode, TableInfo, TableRef, TableValuedExpression -from eva.parser.types import FileFormatType, JoinType, ParserOrderBySortType +from evadb.parser.create_udf_statement import CreateUDFStatement +from evadb.parser.delete_statement import DeleteTableStatement +from evadb.parser.drop_statement import DropTableStatement +from evadb.parser.drop_udf_statement import DropUDFStatement +from evadb.parser.insert_statement import InsertTableStatement +from evadb.parser.load_statement import LoadDataStatement +from evadb.parser.parser import Parser +from evadb.parser.rename_statement import RenameTableStatement +from evadb.parser.select_statement import SelectStatement +from evadb.parser.statement import AbstractStatement, StatementType +from evadb.parser.table_ref import JoinNode, TableInfo, TableRef, TableValuedExpression +from evadb.parser.types import FileFormatType, JoinType, ParserOrderBySortType class ParserTests(unittest.TestCase): @@ -894,7 +894,7 @@ def test_lark(self): OUTPUT (bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE FaceDetection - IMPL 'eva/udfs/face_detector.py'; + IMPL 'evadb/udfs/face_detector.py'; """ parser = Parser() parser.parse(query) diff --git a/test/parser/test_parser_statements.py b/test/parser/test_parser_statements.py index c3c56e53a..8cbf1568c 100644 --- a/test/parser/test_parser_statements.py +++ b/test/parser/test_parser_statements.py @@ -15,7 +15,7 @@ import unittest from pprint import pprint -from eva.parser.parser import Parser +from evadb.parser.parser import Parser class ParserStatementTests(unittest.TestCase): @@ -77,7 +77,7 @@ def test_parser_statement_types(self): OUTPUT (bboxes NDARRAY FLOAT32(ANYDIM, 4), scores NDARRAY FLOAT32(ANYDIM)) TYPE FaceDetection - IMPL 'eva/udfs/face_detector.py'; + IMPL 'evadb/udfs/face_detector.py'; """, "SHOW TABLES;", "SHOW UDFS;", @@ -137,7 +137,7 @@ def test_parser_statement_types(self): Output (bboxes ndArray float32(anydim, 4), scores ndArray float32(ANYdim)) Type FaceDetection - Impl 'eva/udfs/face_detector.py'; + Impl 'evadb/udfs/face_detector.py'; """, ] queries = queries + randomized_cases diff --git a/test/plan_nodes/test_plan.py b/test/plan_nodes/test_plan.py index 3d7f86f11..a3839c564 100644 --- a/test/plan_nodes/test_plan.py +++ b/test/plan_nodes/test_plan.py @@ -18,21 +18,21 @@ import pytest -from eva.catalog.catalog_type import ColumnType -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.parser.table_ref import TableInfo, TableRef -from eva.parser.types import FileFormatType -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.plan_nodes.create_mat_view_plan import CreateMaterializedViewPlan -from eva.plan_nodes.create_plan import CreatePlan -from eva.plan_nodes.create_udf_plan import CreateUDFPlan -from eva.plan_nodes.drop_plan import DropPlan -from eva.plan_nodes.drop_udf_plan import DropUDFPlan -from eva.plan_nodes.insert_plan import InsertPlan -from eva.plan_nodes.load_data_plan import LoadDataPlan -from eva.plan_nodes.rename_plan import RenamePlan -from eva.plan_nodes.types import PlanOprType -from eva.plan_nodes.union_plan import UnionPlan +from evadb.catalog.catalog_type import ColumnType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.parser.table_ref import TableInfo, TableRef +from evadb.parser.types import FileFormatType +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.plan_nodes.create_mat_view_plan import CreateMaterializedViewPlan +from evadb.plan_nodes.create_plan import CreatePlan +from evadb.plan_nodes.create_udf_plan import CreateUDFPlan +from evadb.plan_nodes.drop_plan import DropPlan +from evadb.plan_nodes.drop_udf_plan import DropUDFPlan +from evadb.plan_nodes.insert_plan import InsertPlan +from evadb.plan_nodes.load_data_plan import LoadDataPlan +from evadb.plan_nodes.rename_plan import RenamePlan +from evadb.plan_nodes.types import PlanOprType +from evadb.plan_nodes.union_plan import UnionPlan @pytest.mark.notparallel diff --git a/test/readers/test_csv_reader.py b/test/readers/test_csv_reader.py index 699172781..fc2419482 100644 --- a/test/readers/test_csv_reader.py +++ b/test/readers/test_csv_reader.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,8 +15,8 @@ import unittest from test.util import create_dummy_csv_batches, create_sample_csv, file_remove -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.readers.csv_reader import CSVReader +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.readers.csv_reader import CSVReader class CSVLoaderTest(unittest.TestCase): diff --git a/test/readers/test_decord_reader.py b/test/readers/test_decord_reader.py index d9af61d41..dbd0b6b1c 100644 --- a/test/readers/test_decord_reader.py +++ b/test/readers/test_decord_reader.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,14 +24,14 @@ import numpy as np import pytest -from eva.configuration.constants import EVA_ROOT_DIR -from eva.constants import AUDIORATE, IFRAMES -from eva.expression.abstract_expression import ExpressionType -from eva.expression.comparison_expression import ComparisonExpression -from eva.expression.constant_value_expression import ConstantValueExpression -from eva.expression.logical_expression import LogicalExpression -from eva.expression.tuple_value_expression import TupleValueExpression -from eva.readers.decord_reader import DecordReader +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.constants import AUDIORATE, IFRAMES +from evadb.expression.abstract_expression import ExpressionType +from evadb.expression.comparison_expression import ComparisonExpression +from evadb.expression.constant_value_expression import ConstantValueExpression +from evadb.expression.logical_expression import LogicalExpression +from evadb.expression.tuple_value_expression import TupleValueExpression +from evadb.readers.decord_reader import DecordReader @pytest.mark.notparallel diff --git a/test/server/test_command_handler.py b/test/server/test_command_handler.py index b8d9ae8b4..ec18aa2f2 100644 --- a/test/server/test_command_handler.py +++ b/test/server/test_command_handler.py @@ -18,7 +18,7 @@ import mock -from eva.server.command_handler import handle_request +from evadb.server.command_handler import handle_request class CommandHandlerTests(unittest.TestCase): diff --git a/test/server/test_db_api.py b/test/server/test_db_api.py index d460cc81f..61d9f0fa1 100644 --- a/test/server/test_db_api.py +++ b/test/server/test_db_api.py @@ -20,8 +20,8 @@ from mock import MagicMock, patch -from eva.interfaces.relational.db import EVADBCursor, connect_remote -from eva.models.server.response import Response +from evadb.interfaces.relational.db import EVADBCursor, connect_remote +from evadb.models.server.response import Response # Check for Python 3.8+ for IsolatedAsyncioTestCase support if sys.version_info >= (3, 8): diff --git a/test/server/test_interpreter.py b/test/server/test_interpreter.py index 6f6d0070d..e536a686c 100644 --- a/test/server/test_interpreter.py +++ b/test/server/test_interpreter.py @@ -19,7 +19,7 @@ from mock import MagicMock, patch -from eva.server.interpreter import create_stdin_reader, start_cmd_client +from evadb.server.interpreter import create_stdin_reader, start_cmd_client # Check for Python 3.8+ for IsolatedAsyncioTestCase support if sys.version_info >= (3, 8): @@ -29,9 +29,9 @@ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @patch("asyncio.open_connection") - @patch("eva.server.interpreter.create_stdin_reader") - @patch("eva.interfaces.relational.db.EVADBCursor.execute_async") - @patch("eva.interfaces.relational.db.EVADBCursor.fetch_all_async") + @patch("evadb.server.interpreter.create_stdin_reader") + @patch("evadb.interfaces.relational.db.EVADBCursor.execute_async") + @patch("evadb.interfaces.relational.db.EVADBCursor.fetch_all_async") async def test_start_cmd_client( self, mock_fetch, mock_execute, mock_stdin_reader, mock_open ): diff --git a/test/server/test_server.py b/test/server/test_server.py index 22b6ec576..1940c4739 100644 --- a/test/server/test_server.py +++ b/test/server/test_server.py @@ -18,7 +18,7 @@ from mock import MagicMock, patch -from eva.server.server import EvaServer +from evadb.server.server import EvaServer # Check for Python 3.8+ for IsolatedAsyncioTestCase support if sys.version_info >= (3, 8): diff --git a/test/storage/test_sqlite_storage_engine.py b/test/storage/test_sqlite_storage_engine.py index 9f0ac05f1..c44583533 100644 --- a/test/storage/test_sqlite_storage_engine.py +++ b/test/storage/test_sqlite_storage_engine.py @@ -22,10 +22,10 @@ import pytest -from eva.catalog.catalog_type import ColumnType, NdArrayType, TableType -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.storage.sqlite_storage_engine import SQLStorageEngine +from evadb.catalog.catalog_type import ColumnType, NdArrayType, TableType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.storage.sqlite_storage_engine import SQLStorageEngine @pytest.mark.notparallel diff --git a/test/storage/test_video_storage.py b/test/storage/test_video_storage.py index 45867cb59..38e48c99f 100644 --- a/test/storage/test_video_storage.py +++ b/test/storage/test_video_storage.py @@ -24,11 +24,11 @@ import pandas as pd import pytest -from eva.catalog.catalog_type import ColumnType, NdArrayType, TableType -from eva.catalog.models.column_catalog import ColumnCatalogEntry -from eva.catalog.models.table_catalog import TableCatalogEntry -from eva.models.storage.batch import Batch -from eva.storage.storage_engine import StorageEngine +from evadb.catalog.catalog_type import ColumnType, NdArrayType, TableType +from evadb.catalog.models.column_catalog import ColumnCatalogEntry +from evadb.catalog.models.table_catalog import TableCatalogEntry +from evadb.models.storage.batch import Batch +from evadb.storage.storage_engine import StorageEngine @pytest.mark.notparallel diff --git a/test/test_eva_cmd_client.py b/test/test_eva_cmd_client.py index 05c8fe67b..86e9ee154 100644 --- a/test/test_eva_cmd_client.py +++ b/test/test_eva_cmd_client.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ from mock import call, patch -from eva.configuration.configuration_manager import ConfigurationManager -from eva.eva_cmd_client import eva_client, main +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.eva_cmd_client import eva_client, main class CMDClientTest(unittest.TestCase): @@ -32,8 +32,8 @@ def get_mock_stdin_reader(self) -> asyncio.StreamReader: stdin_reader.feed_eof() return stdin_reader - @patch("eva.eva_cmd_client.start_cmd_client") - @patch("eva.server.interpreter.create_stdin_reader") + @patch("evadb.eva_cmd_client.start_cmd_client") + @patch("evadb.server.interpreter.create_stdin_reader") def test_eva_client(self, mock_stdin_reader, mock_client): mock_stdin_reader.return_value = self.get_mock_stdin_reader() mock_client.side_effect = Exception("Test") @@ -54,7 +54,7 @@ async def test2(): asyncio.run(test2()) @patch("argparse.ArgumentParser.parse_known_args") - @patch("eva.eva_cmd_client.start_cmd_client") + @patch("evadb.eva_cmd_client.start_cmd_client") def test_eva_client_with_cmd_arguments( self, mock_start_cmd_client, mock_parse_known_args ): @@ -69,7 +69,7 @@ def test_eva_client_with_cmd_arguments( mock_start_cmd_client.assert_called_once_with("127.0.0.1", "8800") @patch("argparse.ArgumentParser.parse_known_args") - @patch("eva.eva_cmd_client.start_cmd_client") + @patch("evadb.eva_cmd_client.start_cmd_client") def test_main_without_cmd_arguments( self, mock_start_cmd_client, mock_parse_known_args ): diff --git a/test/test_eva_imports.py b/test/test_eva_imports.py index f30932f5a..736493941 100644 --- a/test/test_eva_imports.py +++ b/test/test_eva_imports.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ def test_eva_cli_imports(self): if not os.path.exists(new_dir): os.makedirs(new_dir) os.chdir(new_dir) - _ = importlib.import_module("eva.eva_cmd_client") - _ = importlib.import_module("eva.eva_server") + _ = importlib.import_module("evadb.eva_cmd_client") + _ = importlib.import_module("evadb.eva_server") os.chdir(cur_dir) shutil.rmtree(new_dir) diff --git a/test/test_eva_server.py b/test/test_eva_server.py index 17fcb07e5..610436fdf 100644 --- a/test/test_eva_server.py +++ b/test/test_eva_server.py @@ -16,21 +16,21 @@ from mock import patch -from eva.eva_server import main, start_eva_server +from evadb.eva_server import main, start_eva_server class EVAServerTest(unittest.IsolatedAsyncioTestCase): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - @patch("eva.eva_server.start_eva_server") + @patch("evadb.eva_server.start_eva_server") @patch("asyncio.run") def test_main(self, mock_run, mock_start_eva_server): main() mock_start_eva_server.assert_called_once() mock_run.assert_called_once() - @patch("eva.eva_server.start_eva_server") + @patch("evadb.eva_server.start_eva_server") @patch("asyncio.start_server") async def test_start_eva_server(self, mock_start_eva_server, mock_start): await start_eva_server("eva_data", "0.0.0.0", 8803) diff --git a/test/udfs/decorators/io_descriptors/test_descriptors.py b/test/udfs/decorators/io_descriptors/test_descriptors.py index 418ed0704..e4093c5bd 100644 --- a/test/udfs/decorators/io_descriptors/test_descriptors.py +++ b/test/udfs/decorators/io_descriptors/test_descriptors.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ # limitations under the License. import unittest -from eva.catalog.catalog_type import ColumnType, Dimension, NdArrayType -from eva.udfs.decorators.io_descriptors.data_types import ( +from evadb.catalog.catalog_type import ColumnType, Dimension, NdArrayType +from evadb.udfs.decorators.io_descriptors.data_types import ( NumpyArray, PandasDataframe, PyTorchTensor, ) -from eva.utils.errors import UDFIODefinitionError +from evadb.utils.errors import UDFIODefinitionError class UDFIODescriptorsTests(unittest.TestCase): diff --git a/test/udfs/decorators/test_decorators.py b/test/udfs/decorators/test_decorators.py index a17d516cc..34e4eab6e 100644 --- a/test/udfs/decorators/test_decorators.py +++ b/test/udfs/decorators/test_decorators.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ # limitations under the License. import unittest -from eva.catalog.catalog_type import NdArrayType -from eva.udfs.decorators.decorators import forward, setup -from eva.udfs.decorators.io_descriptors.data_types import NumpyArray, PandasDataframe +from evadb.catalog.catalog_type import NdArrayType +from evadb.udfs.decorators.decorators import forward, setup +from evadb.udfs.decorators.io_descriptors.data_types import NumpyArray, PandasDataframe class DecoratorTests(unittest.TestCase): diff --git a/test/udfs/ndarray/test_annotate.py b/test/udfs/ndarray/test_annotate.py index 321d4396a..e66523e08 100644 --- a/test/udfs/ndarray/test_annotate.py +++ b/test/udfs/ndarray/test_annotate.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ from numpy import asarray from PIL import Image -from eva.configuration.constants import EVA_ROOT_DIR -from eva.udfs.ndarray.annotate import Annotate +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.udfs.ndarray.annotate import Annotate class AnnotateTests(unittest.TestCase): diff --git a/test/udfs/ndarray/test_array_count.py b/test/udfs/ndarray/test_array_count.py index 1b5586eee..665661ebc 100644 --- a/test/udfs/ndarray/test_array_count.py +++ b/test/udfs/ndarray/test_array_count.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # limitations under the License. import unittest -from eva.udfs.ndarray.array_count import ArrayCount +from evadb.udfs.ndarray.array_count import ArrayCount class CropTests(unittest.TestCase): diff --git a/test/udfs/ndarray/test_crop.py b/test/udfs/ndarray/test_crop.py index d33782b9f..d1e18ac13 100644 --- a/test/udfs/ndarray/test_crop.py +++ b/test/udfs/ndarray/test_crop.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ import numpy as np import pandas as pd -from eva.udfs.ndarray.crop import Crop +from evadb.udfs.ndarray.crop import Crop class CropTests(unittest.TestCase): diff --git a/test/udfs/ndarray/test_flips.py b/test/udfs/ndarray/test_flips.py index 44491287c..46d85ba64 100644 --- a/test/udfs/ndarray/test_flips.py +++ b/test/udfs/ndarray/test_flips.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ from numpy import asarray from PIL import Image -from eva.configuration.constants import EVA_ROOT_DIR -from eva.udfs.ndarray.horizontal_flip import HorizontalFlip -from eva.udfs.ndarray.vertical_flip import VerticalFlip +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.udfs.ndarray.horizontal_flip import HorizontalFlip +from evadb.udfs.ndarray.vertical_flip import VerticalFlip class FlipTests(unittest.TestCase): diff --git a/test/udfs/ndarray/test_gaussian_blur.py b/test/udfs/ndarray/test_gaussian_blur.py index f05f52867..b7a2380da 100644 --- a/test/udfs/ndarray/test_gaussian_blur.py +++ b/test/udfs/ndarray/test_gaussian_blur.py @@ -20,8 +20,8 @@ import numpy as np import pandas as pd -from eva.configuration.constants import EVA_ROOT_DIR -from eva.udfs.ndarray.gaussian_blur import GaussianBlur +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.udfs.ndarray.gaussian_blur import GaussianBlur class GaussianBlurTests(unittest.TestCase): diff --git a/test/udfs/ndarray/test_open.py b/test/udfs/ndarray/test_open.py index a9616b4da..14d1e7dbc 100644 --- a/test/udfs/ndarray/test_open.py +++ b/test/udfs/ndarray/test_open.py @@ -20,7 +20,7 @@ import pytest from mock import patch -from eva.udfs.ndarray.open import Open +from evadb.udfs.ndarray.open import Open @pytest.mark.notparallel @@ -47,12 +47,12 @@ def test_should_open_image(self): def test_open_same_path_should_use_cache(self): # un-cached open - with patch("eva.udfs.ndarray.open.cv2") as mock_cv2: + with patch("evadb.udfs.ndarray.open.cv2") as mock_cv2: self.open_instance(pd.DataFrame([self.image_file_path])) mock_cv2.imread.assert_called_once_with(self.image_file_path) # cached open - with patch("eva.udfs.ndarray.open.cv2") as mock_cv2: + with patch("evadb.udfs.ndarray.open.cv2") as mock_cv2: self.open_instance(pd.DataFrame([self.image_file_path])) mock_cv2.imread.assert_not_called() diff --git a/test/udfs/ndarray/test_to_grayscale.py b/test/udfs/ndarray/test_to_grayscale.py index 722ae332a..c04621a90 100644 --- a/test/udfs/ndarray/test_to_grayscale.py +++ b/test/udfs/ndarray/test_to_grayscale.py @@ -20,8 +20,8 @@ import numpy as np import pandas as pd -from eva.configuration.constants import EVA_ROOT_DIR -from eva.udfs.ndarray.to_grayscale import ToGrayscale +from evadb.configuration.constants import EVA_ROOT_DIR +from evadb.udfs.ndarray.to_grayscale import ToGrayscale class ToGrayscaleTests(unittest.TestCase): diff --git a/test/udfs/test_abstract_udf.py b/test/udfs/test_abstract_udf.py index d98d8c92d..9b3ddea74 100644 --- a/test/udfs/test_abstract_udf.py +++ b/test/udfs/test_abstract_udf.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ from inspect import isabstract from test.util import get_all_subclasses, get_mock_object -import eva -from eva.udfs.abstract.abstract_udf import AbstractUDF -from eva.udfs.abstract.hf_abstract_udf import AbstractHFUdf -from eva.udfs.yolo_object_detector import Yolo +import evadb +from evadb.udfs.abstract.abstract_udf import AbstractUDF +from evadb.udfs.abstract.hf_abstract_udf import AbstractHFUdf +from evadb.udfs.yolo_object_detector import Yolo class AbstractUDFTest(unittest.TestCase): @@ -79,7 +79,7 @@ def get_all_classes(module, level): flat_class_list = [item for sublist in class_list for item in sublist] return set(flat_class_list) - class_list = get_all_classes(eva, 1) + class_list = get_all_classes(evadb, 1) base_id = 0 ref_object = None diff --git a/test/udfs/test_chatgpt.py b/test/udfs/test_chatgpt.py index 213ed1e5f..22cf7e90f 100644 --- a/test/udfs/test_chatgpt.py +++ b/test/udfs/test_chatgpt.py @@ -23,9 +23,9 @@ import pandas as pd from mock import patch -from eva.configuration.configuration_manager import ConfigurationManager -from eva.models.storage.batch import Batch -from eva.server.command_handler import execute_query_fetch_all +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.models.storage.batch import Batch +from evadb.server.command_handler import execute_query_fetch_all def create_dummy_csv_file(config) -> str: @@ -65,7 +65,7 @@ def tearDown(self) -> None: execute_query_fetch_all(self.evadb, "DROP TABLE IF EXISTS MyTextCSV;") @ray_skip_marker - @patch("eva.udfs.chatgpt.openai.ChatCompletion.create") + @patch("evadb.udfs.chatgpt.openai.ChatCompletion.create") def test_openai_chat_completion_udf(self, mock_req): # set dummy api key os.environ["openai_api_key"] = "my_key" @@ -74,7 +74,7 @@ def test_openai_chat_completion_udf(self, mock_req): execute_query_fetch_all(self.evadb, f"DROP UDF IF EXISTS {udf_name};") create_udf_query = f"""CREATE UDF {udf_name} - IMPL 'eva/udfs/chatgpt.py' + IMPL 'evadb/udfs/chatgpt.py' 'model' 'gpt-3.5-turbo' """ execute_query_fetch_all(self.evadb, create_udf_query) @@ -93,7 +93,7 @@ def test_openai_chat_completion_udf(self, mock_req): # test without providing model name execute_query_fetch_all(self.evadb, f"DROP UDF IF EXISTS {udf_name};") create_udf_query = f"""CREATE UDF {udf_name} - IMPL 'eva/udfs/chatgpt.py' + IMPL 'evadb/udfs/chatgpt.py' """ execute_query_fetch_all(self.evadb, create_udf_query) @@ -108,7 +108,7 @@ def test_gpt_udf_no_key_in_yml_should_read_env(self): execute_query_fetch_all(self.evadb, f"DROP UDF IF EXISTS {udf_name};") create_udf_query = f"""CREATE UDF {udf_name} - IMPL 'eva/udfs/chatgpt.py' + IMPL 'evadb/udfs/chatgpt.py' """ execute_query_fetch_all(self.evadb, create_udf_query) self.assertEqual(openai.api_key, "dummy_openai_key") @@ -121,9 +121,9 @@ def test_gpt_udf_no_key_in_yml_and_env_should_raise(self): with self.assertRaises( Exception, - msg="Please set your OpenAI API key in eva.yml file (third_party, open_api_key) or environment variable (OPENAI_KEY)", + msg="Please set your OpenAI API key in evadb.yml file (third_party, open_api_key) or environment variable (OPENAI_KEY)", ): create_udf_query = f"""CREATE UDF {udf_name} - IMPL 'eva/udfs/chatgpt.py' + IMPL 'evadb/udfs/chatgpt.py' """ execute_query_fetch_all(self.evadb, create_udf_query) diff --git a/test/udfs/test_emotion_detector.py b/test/udfs/test_emotion_detector.py index 1023462f8..98334a3c0 100644 --- a/test/udfs/test_emotion_detector.py +++ b/test/udfs/test_emotion_detector.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import cv2 import pandas as pd -from eva.models.storage.batch import Batch +from evadb.models.storage.batch import Batch class EmotionDetector(unittest.TestCase): @@ -35,7 +35,7 @@ def _load_image(self, path): @unittest.skip("disable test due to model downloading time") def test_should_return_correct_emotion(self): - from eva.udfs.emotion_detector import EmotionDetector + from evadb.udfs.emotion_detector import EmotionDetector happy_img = self.base_path / "happy.jpg" sad_img = self.base_path / "sad.jpg" diff --git a/test/udfs/test_facenet_udf.py b/test/udfs/test_facenet_udf.py index a5c0ad4fd..cf77c37b7 100644 --- a/test/udfs/test_facenet_udf.py +++ b/test/udfs/test_facenet_udf.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import cv2 import pandas as pd -from eva.models.storage.batch import Batch +from evadb.models.storage.batch import Batch NUM_FRAMES = 10 @@ -38,7 +38,7 @@ def _load_image(self, path): @windows_skip_marker def test_should_return_batches_equivalent_to_number_of_frames(self): - from eva.udfs.face_detector import FaceDetector + from evadb.udfs.face_detector import FaceDetector single_face_img = Path("data/facenet/one.jpg") multi_face_img = Path("data/facenet/multiface.jpg") @@ -63,7 +63,7 @@ def test_should_return_batches_equivalent_to_number_of_frames(self): @unittest.skip("Needs GPU") def test_should_run_on_gpu(self): - from eva.udfs.face_detector import FaceDetector + from evadb.udfs.face_detector import FaceDetector single_face_img = Path("data/facenet/one.jpg") frame_single_face = { @@ -79,10 +79,10 @@ def test_should_run_on_gpu(self): def test_mock_to_device(self): device = 10 - from eva.udfs.face_detector import FaceDetector + from evadb.udfs.face_detector import FaceDetector - with patch("eva.udfs.face_detector.MTCNN") as mock_mtcnn: - with patch("eva.udfs.face_detector.torch") as mock_torch: + with patch("evadb.udfs.face_detector.MTCNN") as mock_mtcnn: + with patch("evadb.udfs.face_detector.torch") as mock_torch: mock_torch.device.return_value = "cuda:10" detector = FaceDetector() detector = detector.to_device(device) diff --git a/test/udfs/test_fastrcnn_object_detector.py b/test/udfs/test_fastrcnn_object_detector.py index 51ee4149a..9bc3cc45f 100644 --- a/test/udfs/test_fastrcnn_object_detector.py +++ b/test/udfs/test_fastrcnn_object_detector.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import mock import pandas as pd -from eva.models.storage.batch import Batch +from evadb.models.storage.batch import Batch NUM_FRAMES = 10 @@ -37,7 +37,7 @@ def _load_image(self, path): def test_should_raise_import_error_with_missing_torch(self): with self.assertRaises(ImportError): with mock.patch.dict(sys.modules, {"torch": None}): - from eva.udfs.fastrcnn_object_detector import ( # noqa: F401 + from evadb.udfs.fastrcnn_object_detector import ( # noqa: F401 FastRCNNObjectDetector, ) @@ -46,7 +46,7 @@ def test_should_raise_import_error_with_missing_torch(self): def test_should_raise_import_error_with_missing_torchvision(self): with self.assertRaises(ImportError): with mock.patch.dict(sys.modules, {"torchvision": None}): - from eva.udfs.fastrcnn_object_detector import ( # noqa: F401 + from evadb.udfs.fastrcnn_object_detector import ( # noqa: F401 FastRCNNObjectDetector, ) @@ -54,7 +54,7 @@ def test_should_raise_import_error_with_missing_torchvision(self): @unittest.skip("disable test due to model downloading time") def test_should_return_batches_equivalent_to_number_of_frames(self): - from eva.udfs.fastrcnn_object_detector import FastRCNNObjectDetector + from evadb.udfs.fastrcnn_object_detector import FastRCNNObjectDetector frame_dog = { "id": 1, diff --git a/test/udfs/test_yolo_object_detector.py b/test/udfs/test_yolo_object_detector.py index 1e287d0ac..dbe4ebde0 100644 --- a/test/udfs/test_yolo_object_detector.py +++ b/test/udfs/test_yolo_object_detector.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright 2018-2022 EVA +# Copyright 2018-2023 EVA # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ def _load_image(self, path): def test_should_raise_import_error_with_missing_torch(self): with self.assertRaises(ImportError): with mock.patch.dict(sys.modules, {"torch": None}): - from eva.udfs.decorators.yolo_object_detection_decorators import ( # noqa: F401 + from evadb.udfs.decorators.yolo_object_detection_decorators import ( # noqa: F401 Yolo, ) @@ -56,7 +56,7 @@ def test_should_raise_import_error_with_missing_torch(self): @unittest.skip("disable test due to model downloading time") def test_should_return_batches_equivalent_to_number_of_frames(self): - from eva.udfs.decorators.yolo_object_detection_decorators import Yolo + from evadb.udfs.decorators.yolo_object_detection_decorators import Yolo frame_dog = { "id": 1, diff --git a/test/util.py b/test/util.py index 08ac96d86..946ab313c 100644 --- a/test/util.py +++ b/test/util.py @@ -30,25 +30,25 @@ import ray from mock import MagicMock -from eva.binder.statement_binder import StatementBinder -from eva.binder.statement_binder_context import StatementBinderContext -from eva.catalog.catalog_type import NdArrayType -from eva.configuration.configuration_manager import ConfigurationManager -from eva.configuration.constants import EVA_DATABASE_DIR, EVA_INSTALLATION_DIR -from eva.database import init_eva_db_instance -from eva.expression.function_expression import FunctionExpression -from eva.models.storage.batch import Batch -from eva.optimizer.operators import LogicalFilter, Operator -from eva.optimizer.plan_generator import PlanGenerator -from eva.optimizer.statement_to_opr_converter import StatementToPlanConverter -from eva.parser.parser import Parser -from eva.plan_nodes.abstract_plan import AbstractPlan -from eva.server.command_handler import execute_query_fetch_all -from eva.udfs.abstract.abstract_udf import AbstractClassifierUDF -from eva.udfs.decorators import decorators -from eva.udfs.decorators.io_descriptors.data_types import NumpyArray, PandasDataframe -from eva.udfs.udf_bootstrap_queries import init_builtin_udfs -from eva.utils.generic_utils import remove_directory_contents +from evadb.binder.statement_binder import StatementBinder +from evadb.binder.statement_binder_context import StatementBinderContext +from evadb.catalog.catalog_type import NdArrayType +from evadb.configuration.configuration_manager import ConfigurationManager +from evadb.configuration.constants import EVA_DATABASE_DIR, EVA_INSTALLATION_DIR +from evadb.database import init_eva_db_instance +from evadb.expression.function_expression import FunctionExpression +from evadb.models.storage.batch import Batch +from evadb.optimizer.operators import LogicalFilter, Operator +from evadb.optimizer.plan_generator import PlanGenerator +from evadb.optimizer.statement_to_opr_converter import StatementToPlanConverter +from evadb.parser.parser import Parser +from evadb.plan_nodes.abstract_plan import AbstractPlan +from evadb.server.command_handler import execute_query_fetch_all +from evadb.udfs.abstract.abstract_udf import AbstractClassifierUDF +from evadb.udfs.decorators import decorators +from evadb.udfs.decorators.io_descriptors.data_types import NumpyArray, PandasDataframe +from evadb.udfs.udf_bootstrap_queries import init_builtin_udfs +from evadb.utils.generic_utils import remove_directory_contents NUM_FRAMES = 10 FRAME_SIZE = (32, 32) diff --git a/test/utils/test_generic_utils.py b/test/utils/test_generic_utils.py index ce4b2bcd2..3533f7811 100644 --- a/test/utils/test_generic_utils.py +++ b/test/utils/test_generic_utils.py @@ -16,8 +16,8 @@ import unittest from test.markers import windows_skip_marker -from eva.readers.decord_reader import DecordReader -from eva.utils.generic_utils import ( +from evadb.readers.decord_reader import DecordReader +from evadb.utils.generic_utils import ( generate_file_path, is_gpu_available, load_udf_class_from_file, @@ -32,35 +32,35 @@ def test_helper_validates_kwargs(self): validate_kwargs({"a": 1, "b": 2}, ["a"], "Invalid keyword argument:") def test_should_return_correct_class_for_string(self): - vl = str_to_class("eva.readers.decord_reader.DecordReader") + vl = str_to_class("evadb.readers.decord_reader.DecordReader") self.assertEqual(vl, DecordReader) def test_should_return_correct_class_for_path(self): - vl = load_udf_class_from_file("eva/readers/decord_reader.py", "DecordReader") - # Can't check that v1 = DecordReader because the above function returns decord_reader.DecordReader instead of eva.readers.decord_reader.DecordReader + vl = load_udf_class_from_file("evadb/readers/decord_reader.py", "DecordReader") + # Can't check that v1 = DecordReader because the above function returns decord_reader.DecordReader instead of evadb.readers.decord_reader.DecordReader # So we check the qualname instead, qualname is the path to the class including the module name # Ref: https://peps.python.org/pep-3155/#rationale assert vl.__qualname__ == DecordReader.__qualname__ def test_should_return_correct_class_for_path_without_classname(self): - vl = load_udf_class_from_file("eva/readers/decord_reader.py") + vl = load_udf_class_from_file("evadb/readers/decord_reader.py") assert vl.__qualname__ == DecordReader.__qualname__ def test_should_raise_on_missing_file(self): with self.assertRaises(RuntimeError): - load_udf_class_from_file("eva/readers/opencv_reader_abdfdsfds.py") + load_udf_class_from_file("evadb/readers/opencv_reader_abdfdsfds.py") def test_should_raise_if_class_does_not_exists(self): with self.assertRaises(RuntimeError): - # eva/utils/s3_utils.py has no class in it + # evadb/utils/s3_utils.py has no class in it # if this test fails due to change in s3_utils.py, change the file to something else - load_udf_class_from_file("eva/utils/s3_utils.py") + load_udf_class_from_file("evadb/utils/s3_utils.py") def test_should_raise_if_multiple_classes_exist_and_no_class_mentioned(self): with self.assertRaises(RuntimeError): - # eva/utils/generic_utils.py has multiple classes in it + # evadb/utils/generic_utils.py has multiple classes in it # if this test fails due to change in generic_utils.py, change the file to something else - load_udf_class_from_file("eva/utils/generic_utils.py") + load_udf_class_from_file("evadb/utils/generic_utils.py") def test_should_use_torch_to_check_if_gpu_is_available(self): # Emulate a missing import diff --git a/test/utils/test_timer.py b/test/utils/test_timer.py index 8bbeab176..03c566459 100644 --- a/test/utils/test_timer.py +++ b/test/utils/test_timer.py @@ -22,8 +22,8 @@ import pytest -from eva.server.command_handler import handle_request -from eva.utils.stats import Timer +from evadb.server.command_handler import handle_request +from evadb.utils.stats import Timer NUM_FRAMES = 10 diff --git a/tutorials/00-start-eva-server.ipynb b/tutorials/00-start-eva-server.ipynb index efe806478..0f90a7366 100644 --- a/tutorials/00-start-eva-server.ipynb +++ b/tutorials/00-start-eva-server.ipynb @@ -102,11 +102,11 @@ "\n", " # Start EVA server\n", " print(\"Starting EVA Server ...\")\n", - " shell(\"nohup eva_server > eva.log 2>&1 &\")\n", + " shell(\"nohup eva_server > evadb.log 2>&1 &\")\n", "\n", " last_few_lines_count = 3\n", " try:\n", - " with open('eva.log', 'r') as f:\n", + " with open('evadb.log', 'r') as f:\n", " for lines in itertools.zip_longest(*[f]*last_few_lines_count):\n", " print(lines)\n", " except FileNotFoundError:\n", @@ -117,7 +117,7 @@ " \n", " \n", "def connect_to_server():\n", - " from eva.interfaces.relational.db import connect_remote\n", + " from evadb.interfaces.relational.db import connect_remote\n", " import nest_asyncio\n", " nest_asyncio.apply()\n", "\n",