From caa13785de8284f2293e7780409c7da609c95c64 Mon Sep 17 00:00:00 2001 From: Jiashen Cao Date: Wed, 6 Sep 2023 00:40:48 -0400 Subject: [PATCH] feat: sync master staging (#1050) Co-authored-by: Joy Arulraj Co-authored-by: Jiashen Cao Co-authored-by: Andy Xu Co-authored-by: Sayan Sinha Co-authored-by: Hersh Dhillon --- README.md | 76 ++- docs/_toc.yml | 110 +++- docs/conf.py | 8 + docs/source/benchmarks/text_summarization.rst | 248 +++++++- docs/source/overview/concepts.rst | 40 ++ docs/source/overview/getting-started.rst | 78 ++- .../getting-started/installation-options.rst | 9 + docs/source/reference/ai/custom.rst | 6 + .../source/reference/ai/model-forecasting.rst | 91 +++ docs/source/reference/api.rst | 54 ++ docs/source/reference/evaql/create.rst | 18 + docs/source/reference/evaql/drop.rst | 45 ++ docs/source/reference/evaql/select.rst | 26 + docs/source/reference/evaql/show.rst | 9 + docs/source/reference/evaql/udf.rst | 20 + docs/source/reference/evaql/use.rst | 57 ++ docs/source/reference/udfs/model-train.rst | 48 -- docs/source/reference/udfs/openai.rst | 27 - docs/source/shared/postgresql.rst | 61 ++ docs/source/usecases/emotion-analysis.rst | 74 +++ docs/source/usecases/food-review.rst | 147 ----- docs/source/usecases/image-classification.rst | 137 +++++ docs/source/usecases/object-detection.rst | 93 +++ docs/source/usecases/qa-video.rst | 89 --- docs/source/usecases/question-answering.rst | 74 +++ docs/source/usecases/sentiment-analysis.rst | 25 + docs/source/usecases/similar-image-search.rst | 83 --- docs/source/usecases/text-summarization.rst | 37 ++ evadb/binder/statement_binder.py | 163 +++++ evadb/executor/create_function_executor.py | 559 ++++++++++++++++++ evadb/executor/create_udf_executor.py | 109 ++++ evadb/executor/drop_object_executor.py | 12 + evadb/functions/chatgpt.py | 28 + evadb/functions/forecast.py | 133 +++++ evadb/functions/function_bootstrap_queries.py | 92 +++ evadb/optimizer/operators.py | 57 ++ evadb/optimizer/optimizer_utils.py | 37 ++ evadb/optimizer/rules/rules.py | 62 ++ evadb/optimizer/statement_to_opr_converter.py | 30 + evadb/parser/create_function_statement.py | 38 ++ evadb/parser/evadb.lark | 65 ++ .../parser/lark_visitor/_create_statements.py | 23 + evadb/parser/lark_visitor/_drop_statement.py | 34 ++ evadb/parser/lark_visitor/_functions.py | 108 ++++ evadb/plan_nodes/create_function_plan.py | 57 ++ .../third_party/databases/mariadb/__init__.py | 16 + evadb/utils/generic_utils.py | 10 + script/formatting/spelling.txt | 163 +++++ setup.py | 48 ++ .../long/test_function_executor.py | 34 ++ .../long/test_model_forecasting.py | 156 +++++ .../long/test_model_train.py | 28 + test/integration_tests/long/test_reuse.py | 34 ++ .../short/test_drop_executor.py | 45 ++ .../short/test_select_executor.py | 28 + test/markers.py | 26 + .../binder/test_statement_binder.py | 98 +++ .../executor/test_create_udf_executor.py | 76 +++ .../unit_tests/executor/test_plan_executor.py | 28 + .../test_statement_to_opr_converter.py | 59 ++ test/unit_tests/parser/test_parser.py | 77 +++ test/unit_tests/plan_nodes/test_plan.py | 57 ++ .../test_sqlite_native_storage_engine.py | 34 ++ test/util.py | 38 ++ ...1-similarity-search-for-motif-mining.ipynb | 28 + 65 files changed, 4064 insertions(+), 416 deletions(-) delete mode 100644 docs/source/reference/udfs/model-train.rst delete mode 100644 docs/source/reference/udfs/openai.rst delete mode 100644 docs/source/usecases/food-review.rst delete mode 100644 docs/source/usecases/qa-video.rst delete mode 100644 docs/source/usecases/similar-image-search.rst diff --git a/README.md b/README.md index dacd5fa2b..a5e516cee 100644 --- a/README.md +++ b/README.md @@ -981,6 +981,14 @@ EvaDB enables software developers to build AI apps in a few lines of code. Its p We would love to learn about your AI app. Please complete this 1-minute form: https://v0fbgcue0cm.typeform.com/to/BZHZWeZm +👋 Hey! If you're excited about our vision of bringing AI inside database systems, show some ❤️ by: + + ## Quick Links <<<<<<< HEAD @@ -989,6 +997,7 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -996,6 +1005,8 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht <<<<<<< HEAD <<<<<<< HEAD ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -1014,6 +1025,7 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -1086,9 +1098,21 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) - [Quick Links](#quick-links) - [Documentation](#documentation) - [Why EvaDB](#why-evadb) @@ -1117,6 +1141,7 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) >>>>>>> 54907d3e (release: merge staging into master (#1032)) @@ -1140,6 +1165,7 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= @@ -1147,6 +1173,10 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD ======= @@ -1154,6 +1184,7 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD - [Documentation](#documentation) - [Why EvaDB](#why-evadb) - [How does EvaDB work](#how-does-evadb-work) @@ -1171,6 +1202,8 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) - [Documentation](#documentation) @@ -1245,6 +1278,9 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht - [Quick Links](#quick-links) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +<<<<<<< HEAD +>>>>>>> 70850a8b (feat: sync master staging (#1050)) - [Documentation](#documentation) - [Why EvaDB](#why-evadb) - [How does EvaDB work](#how-does-evadb-work) @@ -1273,16 +1309,36 @@ We would love to learn about your AI app. Please complete this 1-minute form: ht ======= ======= ======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) - [Documentation](#documentation) - [Why EvaDB](#why-evadb) - [How does EvaDB work](#how-does-evadb-work) -- [Community and Support](#community-and-support) - [Illustrative Queries](#illustrative-queries) - [Illustrative Apps](#illustrative-apps) +<<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +- [More Illustrative Queries](#more-illustrative-queries) +- [Architecture of EvaDB](#architecture-of-evadb) +- [Community and Support](#community-and-support) +- [Contributing](#contributing) +- [Star History](#star-history) +- [License](#license) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ## Documentation @@ -2392,6 +2448,7 @@ TIME_LIMIT 120; ```sql <<<<<<< HEAD +<<<<<<< HEAD CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM ( SELECT * FROM HomeRentals ) TYPE Ludwig @@ -2471,14 +2528,31 @@ TIME_LIMIT 120; >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= CREATE UDF IF NOT EXISTS PredictHouseRent FROM +======= +CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ( SELECT * FROM HomeRentals ) TYPE Ludwig +<<<<<<< HEAD 'predict' 'rental_price' 'time_limit' 120; >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +PREDICT 'rental_price' +TIME_LIMIT 120; +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ``` diff --git a/docs/_toc.yml b/docs/_toc.yml index 1bcea4e58..9481a96af 100644 --- a/docs/_toc.yml +++ b/docs/_toc.yml @@ -361,13 +361,17 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= - file: source/overview/concepts title: Concepts >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -378,6 +382,10 @@ parts: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) #- file: source/overview/faq - caption: Use Cases @@ -387,12 +395,15 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) - file: source/usecases/sentiment-analysis.rst title: Sentiment Analysis - file: source/usecases/question-answering.rst @@ -599,24 +610,23 @@ parts: ======= ======= - file: source/usecases/food-review.rst +======= + - file: source/usecases/sentiment-analysis.rst +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) title: Sentiment Analysis + - file: source/usecases/question-answering.rst + title: Question Answering + - file: source/usecases/text-summarization.rst + title: Text Summarization - file: source/usecases/image-classification.rst title: Image Classification - - file: source/usecases/similar-image-search.rst + - file: source/usecases/image-search.rst title: Image Search - - file: source/usecases/qa-video.rst - title: Video Question Answering - - file: source/usecases/08-chatgpt.ipynb - title: ChatGPT-based Video Question Answering - - file: source/usecases/12-query-pdf.ipynb - title: PDF Question Answering - - file: source/usecases/02-object-detection.ipynb + - file: source/usecases/object-detection.rst title: Object Detection - - file: source/usecases/03-emotion-analysis.ipynb - title: Emotions Analysis - - file: source/usecases/07-object-segmentation-huggingface.ipynb - title: Image Segmentation - - file: source/usecases/13-privategpt.ipynb + - file: source/usecases/emotion-analysis.rst + title: Emotion Analysis + - file: source/usecases/privategpt.rst title: PrivateGPT >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -748,6 +758,9 @@ parts: <<<<<<< HEAD ======= + - file: source/reference/api + title: Python API + - file: source/reference/databases/index title: Data Sources sections: @@ -756,9 +769,12 @@ parts: - file: source/reference/databases/mysql >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) ======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) - file: source/reference/api title: Python API @@ -1068,14 +1084,20 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) - file: source/reference/ai/model-train-xgboost title: Model Training with XGBoost ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= <<<<<<< HEAD @@ -1087,6 +1109,7 @@ parts: title: Model Training with XGBoost >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= - file: source/reference/ai/model-train-xgboost title: Model Training with XGBoost @@ -1096,6 +1119,8 @@ parts: >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) ======= >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= - file: source/reference/ai/index @@ -1108,10 +1133,14 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -1122,6 +1151,8 @@ parts: ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) - file: source/reference/ai/model-train title: Model Training >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1138,12 +1169,15 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= - file: source/reference/ai/model-train title: Model Training @@ -1155,12 +1189,17 @@ parts: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= - file: source/reference/ai/model-train-xgboost @@ -1200,13 +1239,17 @@ parts: ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) - file: source/reference/ai/model-train title: Model Training >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -1278,6 +1321,10 @@ parts: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) - file: source/reference/ai/model-forecasting title: Time Series Forecasting - file: source/reference/ai/hf @@ -1297,6 +1344,7 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -1307,6 +1355,8 @@ parts: >>>>>>> 8a8a90aa (Add stable diffusion integration (#1240)) ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) - file: source/reference/ai/stablediffusion title: Stable Diffusion @@ -1328,6 +1378,8 @@ parts: >>>>>>> 2b924b76 (Add stable diffusion integration (#1240)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) - file: source/reference/ai/custom title: Custom Model <<<<<<< HEAD @@ -1335,22 +1387,44 @@ parts: ======= ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) - file: source/reference/ai/stablediffusion title: Stable Diffusion >>>>>>> bf022329 (Add stable diffusion integration (#1240)) - file: source/reference/ai/custom-ai-function title: Bring Your Own AI Function +<<<<<<< HEAD >>>>>>> c952858c (docs: updates) +<<<<<<< HEAD >>>>>>> 35b99c88 (docs: updates) +======= +======= +======= + - file: source/reference/ai/custom + title: Custom Model +<<<<<<< HEAD +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) - file: source/reference/optimizations title: Optimizations >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD +<<<<<<< HEAD + - file: source/reference/ai/custom + title: Custom Model +======= +======= <<<<<<< HEAD - file: source/reference/ai/custom title: Custom Model +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +<<<<<<< HEAD +>>>>>>> 70850a8b (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -1444,11 +1518,14 @@ parts: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -1458,11 +1535,14 @@ parts: ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= - file: source/reference/ai/custom @@ -1492,6 +1572,7 @@ parts: >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -1544,6 +1625,9 @@ parts: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) # - file: source/reference/io # title: IO Descriptors diff --git a/docs/conf.py b/docs/conf.py index 3311c96e3..f7036fb05 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -173,6 +173,7 @@ ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) + # The name of the Pygments (syntax highlighting) style to use. pygments_style = "github-dark" @@ -320,6 +321,7 @@ ======= ======= +<<<<<<< HEAD for i in os.listdir("../tutorials"): if i in [ @@ -338,6 +340,7 @@ >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD <<<<<<< HEAD for i in os.listdir("../tutorials"): @@ -477,6 +480,7 @@ >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -485,6 +489,10 @@ ======= ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) # -- Initialize Sphinx ---------------------------------------------- def setup(app): diff --git a/docs/source/benchmarks/text_summarization.rst b/docs/source/benchmarks/text_summarization.rst index 0b09da528..07f0c5939 100644 --- a/docs/source/benchmarks/text_summarization.rst +++ b/docs/source/benchmarks/text_summarization.rst @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -18,6 +19,8 @@ ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -27,6 +30,8 @@ ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -63,6 +68,7 @@ >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -89,9 +95,21 @@ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Text Summarization Benchmark ============================ @@ -122,11 +140,15 @@ Text summarization benchmark <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) @@ -135,6 +157,8 @@ Text summarization benchmark >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Text Summarization Benchmark >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ============================ @@ -237,11 +261,15 @@ Prepare dataset ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= Text Summarization Benchmark >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) +<<<<<<< HEAD ============================ <<<<<<< HEAD @@ -362,16 +390,40 @@ Prepare dataset >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ============================ -In this benchmark, we compare the performance of text summarization between EvaDB and MindsDB on `CNN-DailyMail News `_. +<<<<<<< HEAD 1. Prepare dataset ------------------ >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +In this benchmark, we compare the runtime performance of EvaDB and MindsDB on +a text summarization application operating on a news dataset. In particular, +we focus on the `CNN-DailyMail News `_ dataset. + +All the relevant files are located in the `text summarization benchmark folder on Github `_. + +Prepare dataset +--------------- +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. code-block:: bash @@ -391,11 +443,14 @@ In this benchmark, we compare the performance of text summarization between EvaD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -410,6 +465,7 @@ In this benchmark, we compare the performance of text summarization between EvaD >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -441,6 +497,14 @@ In this benchmark, we compare the performance of text summarization between EvaD >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Use EvaDB for Text Summarization -------------------------------- >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -468,18 +532,25 @@ Use EvaDB for Text Summarization <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) @@ -490,6 +561,8 @@ Use EvaDB for Text Summarization ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Use EvaDB for Text Summarization -------------------------------- >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -504,6 +577,7 @@ Use EvaDB for Text Summarization <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -513,6 +587,8 @@ Use EvaDB for Text Summarization ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -527,6 +603,7 @@ Use EvaDB for Text Summarization >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) @@ -536,6 +613,8 @@ Use EvaDB for Text Summarization ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= 2. Using EvaDB to summarize the CNN DailyMail News @@ -564,6 +643,9 @@ Use EvaDB for Text Summarization >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= ======= @@ -573,6 +655,7 @@ Use EvaDB for Text Summarization >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -592,6 +675,8 @@ Use EvaDB for Text Summarization ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. note:: @@ -609,11 +694,14 @@ Use EvaDB for Text Summarization <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) Loading Data Into EvaDB ~~~~~~~~~~~~~~~~~~~~~~~ @@ -651,6 +739,7 @@ Loading Data Into EvaDB >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -669,6 +758,8 @@ Loading Data Into EvaDB ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Loading Data Into EvaDB ~~~~~~~~~~~~~~~~~~~~~~~ @@ -743,19 +834,28 @@ Prepare sqlite database for MindsDB <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Loading Data Into EvaDB ~~~~~~~~~~~~~~~~~~~~~~~ @@ -1027,10 +1127,71 @@ Setup SQLite Database Prepare sqlite database for MindsDB ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +Loading Data Into EvaDB +~~~~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: sql + + CREATE TABLE IF NOT EXISTS cnn_news_test( + id TEXT(128), + article TEXT(4096), + highlights TEXT(1024) + ); + +Creating Text Summarization Function in EvaDB +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: sql + + CREATE UDF IF NOT EXISTS TextSummarizer + TYPE HuggingFace + TASK 'summarization' + MODEL 'sshleifer/distilbart-cnn-12-6' + MIN_LENGTH 5 + MAX_LENGTH 100; + + +Tuning EvaDB for Maximum GPU Utilization +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: python + + cursor._evadb.config.update_value("executor", "batch_mem_size", 300000) + cursor._evadb.config.update_value("executor", "gpu_ids", [0,1]) + cursor._evadb.config.update_value("experimental", "ray", True) + + +Text Summarization Query in EvaDB +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. code-block:: sql + + CREATE TABLE IF NOT EXISTS cnn_news_summary AS + SELECT TextSummarizer(article) FROM cnn_news_test; + +Use MindsDB for Text Summarization +----------------------------------- + +Setup SQLite Database +~~~~~~~~~~~~~~~~~~~~~~ +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. code-block:: bash @@ -1060,6 +1221,7 @@ Install MindsDB <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -1095,6 +1257,8 @@ Follow the `MindsDB installation guide >>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Follow the `MindsDB installation guide `_ to install it via ``pip``. ======= ======= @@ -1103,6 +1267,8 @@ Follow the `MindsDB installation guide >>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) Follow the `MindsDB nstallation guide `_ to install it via ``pip``. ======= ======= @@ -1113,6 +1279,12 @@ Follow the `MindsDB nstallation guide >>>>>> 065f25fb (release: merge staging into master (#1032)) Follow the `MindsDB installation guide `_ to install it via ``pip``. >>>>>>> 62080794 (ran spellchecker) +======= +Follow the `MindsDB installation guide `_ to install it via ``pip``. +======= +Follow the `MindsDB nstallation guide `_ to install it via ``pip``. +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) .. note:: @@ -1125,14 +1297,18 @@ Follow the `Setup for Source Code via pip >>>>>> 8c5b63dc (release: merge staging into master (#1032)) ======= +<<<<<<< HEAD ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) Follow the `MindsDB nstallation guide `_ to install it via ``pip``. .. note:: You will need to manually run ``pip install evaluate`` for the ``HuggingFace`` model to work in MindsDB. <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= ======= @@ -1143,6 +1319,9 @@ Follow the `Setup for Source Code via pip >>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 5b27053e (ran spellchecker) ======= @@ -1285,11 +1464,14 @@ After installation, use the ``MySQL`` client for connecting to ``MindsDB``. Upda <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -1304,6 +1486,7 @@ After installation, use the ``MySQL`` client for connecting to ``MindsDB``. Upda >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1335,6 +1518,14 @@ After installation, use the ``MySQL`` client for connecting to ``MindsDB``. Upda >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Benchmark MindsDB ~~~~~~~~~~~~~~~~~ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -1362,18 +1553,25 @@ Run Experiment <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) @@ -1384,6 +1582,8 @@ Run Experiment ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Benchmark MindsDB ~~~~~~~~~~~~~~~~~ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1398,6 +1598,7 @@ Benchmark MindsDB <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -1407,6 +1608,8 @@ Benchmark MindsDB ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1421,6 +1624,7 @@ Benchmark MindsDB >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) @@ -1430,6 +1634,8 @@ Benchmark MindsDB ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= Run Experiment @@ -1458,6 +1664,9 @@ Run Experiment >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= ======= @@ -1467,6 +1676,7 @@ Run Experiment >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -1486,6 +1696,8 @@ Run Experiment ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Connect ``MindsDB`` to the ``sqlite`` database we created before: @@ -1537,11 +1749,14 @@ Use the ``text summarization`` model to summarize the CNN news dataset: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -1556,6 +1771,7 @@ Use the ``text summarization`` model to summarize the CNN news dataset: >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1568,6 +1784,14 @@ Use the ``text summarization`` model to summarize the CNN news dataset: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Benchmarking Results -------------------- >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -1626,6 +1850,7 @@ Below are numbers from a server with 56 Intel(R) Xeon(R) CPU E5-2690 v4 @ 2.60GH <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= @@ -1633,6 +1858,8 @@ Below are numbers from a server with 56 Intel(R) Xeon(R) CPU E5-2690 v4 @ 2.60GH ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -1648,6 +1875,8 @@ Below are numbers from a server with 56 Intel(R) Xeon(R) CPU E5-2690 v4 @ 2.60GH ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -1659,6 +1888,7 @@ Below are numbers from a server with 56 Intel(R) Xeon(R) CPU E5-2690 v4 @ 2.60GH >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) @@ -1675,6 +1905,8 @@ Below are numbers from a server with 56 Intel(R) Xeon(R) CPU E5-2690 v4 @ 2.60GH >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Benchmarking Results -------------------- >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1689,6 +1921,7 @@ Benchmarking Results <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -1698,6 +1931,8 @@ Benchmarking Results ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1716,6 +1951,7 @@ Benchmarking Results ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -1723,6 +1959,10 @@ Benchmarking Results >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) @@ -1741,6 +1981,9 @@ Benchmarking Results >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= ======= @@ -1750,6 +1993,7 @@ Benchmarking Results >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -1768,6 +2012,8 @@ Benchmarking Results ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Here are the key runtime metrics for the ``Text Summarization`` benchmark. diff --git a/docs/source/overview/concepts.rst b/docs/source/overview/concepts.rst index 520a3589a..27c5bd029 100644 --- a/docs/source/overview/concepts.rst +++ b/docs/source/overview/concepts.rst @@ -329,6 +329,7 @@ AI Functions <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -383,6 +384,12 @@ To register an user-defined function, we use the :ref:`CREATE FUNCTION`_. >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +``Functions`` are typically thin wrappers around AI models and are extensively used in queries. Here is an `illustrative AI function for classifying MNIST images `_. +======= +``Functions`` are typically thin wrappers around AI models and are extensively used in queries. Here is an `illustrative AI function for classifying MNIST images `_. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) To register an user-defined function, use the ``CREATE FUNCTION`` statement: >>>>>>> f431fb09 (feat: sync master staging (#1050)) @@ -480,21 +487,28 @@ After registering ``MnistImageClassifier`` function, you can call the function i <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -504,6 +518,8 @@ After registering ``MnistImageClassifier`` function, you can call the function i ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) --- Use the 'MnistImageClassifier' function's output to filter frames --- This query returns the frame ids of the frames with digit 6 --- We limit to the first five frames containing digit 6 @@ -515,6 +531,7 @@ After registering ``MnistImageClassifier`` function, you can call the function i <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -625,6 +642,7 @@ That's it! You can now use the newly registered UDF anywhere in the query -- in ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= @@ -639,6 +657,10 @@ That's it! You can now use the newly registered UDF anywhere in the query -- in >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) AI-Centric Query Optimization ----------------------------- @@ -800,6 +822,8 @@ Query optimization has powered SQL database systems for several decades. It is t ======= ======= ======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= Save time and money ---------------------- @@ -858,6 +882,7 @@ That's it! You can now use the newly registered UDF anywhere in the query -- in >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -877,9 +902,24 @@ That's it! You can now use the newly registered UDF anywhere in the query -- in ======= ======= ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/overview/getting-started.rst b/docs/source/overview/getting-started.rst index a981fc20c..fea160875 100644 --- a/docs/source/overview/getting-started.rst +++ b/docs/source/overview/getting-started.rst @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -18,6 +19,8 @@ ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -45,6 +48,12 @@ ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) .. _getting-started: >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -75,15 +84,21 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. _getting-started: >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -147,6 +162,7 @@ >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -194,9 +210,24 @@ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +.. _getting-started: +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Getting Started ================= @@ -505,7 +536,7 @@ The program runs a SQL query for listing all the built-in functions in EvaDB. It cursor = evadb.connect().cursor() # List all the built-in functions in EvaDB - print(cursor.query("SHOW UDFS;").df()) + print(cursor.query("SHOW FUNCTIONS;").df()) Now, run the Python program: @@ -518,9 +549,9 @@ You should see a list of built-in functions including but not limited to the fol .. code-block:: bash name inputs ... impl metadata - 0 ArrayCount [Input_Array NDARRAY ANYTYPE (), Search_Key ANY] ... /home/jarulraj3/evadb/evadb/udfs/ndarray/array... [] - 1 Crop [Frame_Array NDARRAY UINT8 (3, None, None), bb... ... /home/jarulraj3/evadb/evadb/udfs/ndarray/crop.py [] - 2 ChatGPT [query NDARRAY STR (1,), content NDARRAY STR (... ... /home/jarulraj3/evadb/evadb/udfs/chatgpt.py [] + 0 ArrayCount [Input_Array NDARRAY ANYTYPE (), Search_Key ANY] ... /home/jarulraj3/evadb/evadb/functions/ndarray/array... [] + 1 Crop [Frame_Array NDARRAY UINT8 (3, None, None), bb... ... /home/jarulraj3/evadb/evadb/functions/ndarray/crop.py [] + 2 ChatGPT [query NDARRAY STR (1,), content NDARRAY STR (... ... /home/jarulraj3/evadb/evadb/functions/chatgpt.py [] [3 rows x 6 columns] @@ -577,14 +608,27 @@ The program runs a SQL query for listing all the built-in functions in EvaDB. It ======= EvaDB supports additional installation options for extending its functionality. Go over the :doc:`Installation Options ` for all the available options. -Illustrative AI App -------------------- +Illustrative AI Query +--------------------- +<<<<<<< HEAD Here is a simple, illustrative `MNIST image classification `_ AI app in EvaDB. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +======= +Here is an illustrative `MNIST image classification `_ AI query in EvaDB. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) -.. code-block:: python +.. code-block:: sql + + --- This AI query retrieves images in the loaded MNIST video with label 4 + --- We constrain the query to only search through the first 100 frames + --- We limit the query to only return the first five frames with label 4 + SELECT data, id, MnistImageClassifier(data) + FROM MnistVideo + WHERE MnistImageClassifier(data) = '4' AND id < 100 + LIMIT 5; +<<<<<<< HEAD # Import the EvaDB package import evadb @@ -1398,12 +1442,17 @@ Try out EvaDB by experimenting with this introductory notebook. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD @@ -1554,6 +1603,7 @@ Try out EvaDB by experimenting with the introductory `MNIST notebook on Colab ` to learn more about the functions used in this app. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= ======= @@ -1601,6 +1651,20 @@ Try out EvaDB by experimenting with the complete `sentiment analysis notebook on >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +<<<<<<< HEAD +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/overview/getting-started/installation-options.rst b/docs/source/overview/getting-started/installation-options.rst index 6edd08a7d..9a0f57650 100644 --- a/docs/source/overview/getting-started/installation-options.rst +++ b/docs/source/overview/getting-started/installation-options.rst @@ -197,6 +197,7 @@ This installation option enables more efficient query execution on CPUs and GPUs <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * ``pip install evadb[ludwig]`` for installing the Ludwig model training framework. It enables use-cases related to training and fine-tuning AI models. * ``pip install evadb[forecasting]`` for installing the statsforecast forecasting framework. It enables use-cases related to time series forecasting. @@ -226,6 +227,8 @@ This installation option enables more efficient query execution on CPUs and GPUs ======= ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) * ``pip install evadb[ludwig]`` for installing the Ludwig model training framework. It enables use-cases related to training and fine-tuning AI models. * ``pip install evadb[forecasting]`` for installing the statsforecast forecasting framework. It enables use-cases related to time series forecasting. @@ -233,6 +236,7 @@ This installation option enables more efficient query execution on CPUs and GPUs * ``pip install evadb[ludwig]`` for installing the Ludwig model training framework. It enables use-cases related to training and fine-tunining AI models. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= ======= @@ -315,6 +319,11 @@ This installation option enables more efficient query execution on CPUs and GPUs * ``pip install evadb[ludwig]`` for installing the Ludwig model training framework. It enables use-cases related to training and fine-tunining AI models. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +* ``pip install evadb[ludwig]`` for installing the Ludwig model training framework. It enables use-cases related to training and fine-tuning AI models. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) * ``pip install evadb[ray]`` for installing the Ray compute engine. It enables EvaDB to do more efficient query execution on CPUs and GPUs. diff --git a/docs/source/reference/ai/custom.rst b/docs/source/reference/ai/custom.rst index f2a6d8c4f..b82b2de49 100644 --- a/docs/source/reference/ai/custom.rst +++ b/docs/source/reference/ai/custom.rst @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -33,6 +34,11 @@ >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= + +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Functions ====================== diff --git a/docs/source/reference/ai/model-forecasting.rst b/docs/source/reference/ai/model-forecasting.rst index 695620a16..0cc4b6e3a 100644 --- a/docs/source/reference/ai/model-forecasting.rst +++ b/docs/source/reference/ai/model-forecasting.rst @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -20,6 +21,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -40,6 +43,10 @@ ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) .. _forecast: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -68,6 +75,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= @@ -79,6 +87,12 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= .. _forecast: >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -91,13 +105,23 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -115,6 +139,7 @@ >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -165,6 +190,9 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Time Series Forecasting ======================== @@ -233,6 +261,7 @@ First, we create a table to insert required data. >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -247,11 +276,15 @@ First, we create a table to insert required data. >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -277,6 +310,10 @@ First, we create a table to insert required data. ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Next, we create a function of `TYPE Forecasting`. We must enter the column name on which we wish to forecast using `PREDICT`. .. code-block:: sql @@ -316,6 +353,7 @@ Next, we create a UDF of `TYPE Forecasting`. We must enter the column name on wh <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= @@ -326,6 +364,8 @@ Next, we create a UDF of `TYPE Forecasting`. We must enter the column name on wh ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= @@ -340,9 +380,13 @@ Next, we create a UDF of `TYPE Forecasting`. We must enter the column name on wh >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= Next, we create a function of `TYPE Forecasting`. We must enter the column name on which we wish to forecast using `PREDICT`. .. code-block:: sql @@ -358,7 +402,10 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -371,12 +418,17 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -384,6 +436,9 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -391,6 +446,7 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -425,6 +481,9 @@ Next, we create a function of `TYPE Forecasting`. We must enter the column name ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) (SELECT y FROM AirData) TYPE Forecasting HORIZON 12 @@ -562,6 +621,7 @@ Here, the horizon is `12`. >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -575,11 +635,15 @@ Here, the horizon is `12`. >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -605,6 +669,10 @@ Here, the horizon is `12`. ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SELECT Forecast(12); Here, the horizon is `12`, which represents the forecast 12 steps into the future. @@ -670,10 +738,13 @@ Below is an example query specifying the above parameters: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Below is an example query with `neuralforecast` with `trend` column as exogenous and without automatic hyperparameter optimization: @@ -700,6 +771,8 @@ Below is an example query with `neuralforecast` with `trend` column as exogenous >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= SELECT Forecast(12) FROM AirData; @@ -870,6 +943,8 @@ Below is an example query specifying the above parameters: Frequency 'W'; ======= >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) Below is an example query with `neuralforecast` with `trend` column as exogenous and without automatic hyperparameter optimization: @@ -944,12 +1019,15 @@ Below is an example query with `neuralforecast` with `trend` column as exogenous ======= ======= FREQUENCY 'M'; +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= SELECT Forecast(12) FROM AirData; Here, the horizon is `12`. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -958,6 +1036,8 @@ Here, the horizon is `12`. ======= ======= ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= SELECT Forecast(12); @@ -1017,6 +1097,17 @@ Below is an example query with `neuralforecast` with `trend` column as exogenous AUTO 'f' FREQUENCY 'M'; >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/api.rst b/docs/source/reference/api.rst index 94d353362..07c41a3dd 100644 --- a/docs/source/reference/api.rst +++ b/docs/source/reference/api.rst @@ -13,11 +13,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -32,6 +35,7 @@ >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -42,6 +46,14 @@ >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Python API >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -83,15 +95,21 @@ Basic API <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Python API >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -155,6 +173,7 @@ Basic API >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -202,9 +221,24 @@ Python API >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +Python API +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ========== To begin a querying session in EvaDB, obtain a connection with a cursor using ``connect`` and ``cursor`` functions. After getting the cursor, you can run queries with the ``query`` function in this manner: @@ -512,6 +546,9 @@ EvaDBQuery Interface <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -522,6 +559,7 @@ EvaDBQuery Interface ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -618,6 +656,8 @@ EvaDBQuery Interface ======= ======= ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) <<<<<<< HEAD ======= EvaDBCursor Interface @@ -662,7 +702,21 @@ EvaDBQuery Interface ~evadb.EvaDBQuery.sql_query ~evadb.EvaDBQuery.execute >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/evaql/create.rst b/docs/source/reference/evaql/create.rst index e137fe108..30efd46cf 100644 --- a/docs/source/reference/evaql/create.rst +++ b/docs/source/reference/evaql/create.rst @@ -196,6 +196,7 @@ To register an user-defined function, specify the implementation details of the <<<<<<< HEAD ======= +<<<<<<< HEAD <<<<<<< HEAD CREATE INDEX ------------ @@ -240,6 +241,11 @@ You can check out :ref:`similarity search use case` about how to u CREATE FUNCTION --------------- +======= +CREATE FUNCTION +--------------- + +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) To register an user-defined function, specify the implementation details of the function. .. code-block:: sql @@ -441,9 +447,12 @@ CREATE FUNCTION via Type <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> fb00f6de (ran spellchecker) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 5b27053e (ran spellchecker) <<<<<<< HEAD @@ -538,6 +547,7 @@ CREATE FUNCTION via Type ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= @@ -552,6 +562,8 @@ CREATE FUNCTION via Type >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) CREATE [OR REPALCE] FUNCTION [IF NOT EXISTS] function_name [ FROM ( select ) ] TYPE function_type @@ -569,10 +581,13 @@ Where the `parameter` is ``key value`` pair. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM (SELECT * FROM HomeRentals) @@ -583,6 +598,7 @@ Where the `parameter` is ``key value`` pair. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= @@ -684,6 +700,8 @@ Where the `parameter` is ``key value`` pair. Go over :ref:`hf`, :ref:`ludwig`, and :ref:`forecast` to check examples for creating function via type. >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) CREATE MATERIALIZED VIEW ------------------------ diff --git a/docs/source/reference/evaql/drop.rst b/docs/source/reference/evaql/drop.rst index b4629188f..d0a5ab7f6 100644 --- a/docs/source/reference/evaql/drop.rst +++ b/docs/source/reference/evaql/drop.rst @@ -21,13 +21,18 @@ DROP TABLE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) <<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -49,12 +54,17 @@ DROP FUNCTION >>>>>>> f028c383 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) DROP FUNCTION ------------- ======= @@ -69,12 +79,18 @@ DROP FUNCTION <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= DROP FUNCTION @@ -86,11 +102,15 @@ DROP UDF >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= DROP FUNCTION ------------- @@ -104,6 +124,8 @@ DROP UDF ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. code:: mysql @@ -113,6 +135,9 @@ DROP UDF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= @@ -121,18 +146,24 @@ DROP UDF <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) DROP DATABASE ------------- @@ -144,8 +175,11 @@ DROP DATABASE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) DROP DATABASE IF EXISTS postgres_db; ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -280,5 +314,16 @@ DROP DATABASE DROP DATABASE postgres_db; DROP DATABASE IF EXISTS postgres_db; >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= + DROP DATABASE IF EXISTS postgres_db; +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/evaql/select.rst b/docs/source/reference/evaql/select.rst index b1ae3838c..5827cab18 100644 --- a/docs/source/reference/evaql/select.rst +++ b/docs/source/reference/evaql/select.rst @@ -82,6 +82,7 @@ Search for frames containing greater than 3 cars <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -89,6 +90,8 @@ Search for frames containing greater than 3 cars >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) <<<<<<< HEAD SELECT WITH MULTIPLE FUNCTIONS ------------------------------ @@ -128,10 +131,15 @@ SELECT TUPLES WITH MULTIPLE PREDICATES -------------------------------------- ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SELECT TUPLES WITH MULTIPLE PREDICATES -------------------------------------- >>>>>>> 065f25fb (release: merge staging into master (#1032)) @@ -283,6 +291,8 @@ SELECT TUPLES WITH MULTIPLE PREDICATES -------------------------------------- ======= ======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) SELECT WITH MULTIPLE FUNCTIONS ------------------------------ >>>>>>> 065f25fb (release: merge staging into master (#1032)) @@ -292,6 +302,7 @@ SELECT WITH MULTIPLE UDFS >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7dd70375 (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -314,8 +325,23 @@ SELECT WITH MULTIPLE FUNCTIONS ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +======= +SELECT WITH MULTIPLE FUNCTIONS +------------------------------ +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Compose multiple user-defined functions in a single query to construct semantically complex queries. diff --git a/docs/source/reference/evaql/show.rst b/docs/source/reference/evaql/show.rst index aedd32d6a..cf82ac49a 100644 --- a/docs/source/reference/evaql/show.rst +++ b/docs/source/reference/evaql/show.rst @@ -10,12 +10,15 @@ SHOW <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SHOW FUNCTIONS -------------- ======= @@ -25,13 +28,17 @@ SHOW UDFS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= SHOW FUNCTIONS -------------- >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD ======= SHOW UDFS --------- @@ -54,6 +61,8 @@ SHOW FUNCTIONS >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) List the registered user-defined functions diff --git a/docs/source/reference/evaql/udf.rst b/docs/source/reference/evaql/udf.rst index 8f1df91dd..64606e2a7 100644 --- a/docs/source/reference/evaql/udf.rst +++ b/docs/source/reference/evaql/udf.rst @@ -19,6 +19,7 @@ SHOW FUNCTIONS <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Functions ========= @@ -79,11 +80,23 @@ SHOW FUNCTIONS ======= UDF === +======= +Functions +========= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +<<<<<<< HEAD SHOW UDFS --------- >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +SHOW FUNCTIONS +-------------- +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Here is a list of built-in user-defined functions in EvaDB. @@ -146,6 +159,7 @@ ArrayCount and Crop are utility functions for counting the number of objects in <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD SELECT WITH MULTIPLE FUNCTIONS ------------------------------ ======= @@ -190,12 +204,18 @@ Here is a query that illustrates how to use multiple functions in a single query ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SELECT WITH MULTIPLE FUNCTIONS ------------------------------ ======= SELECT WITH MULTIPLE UDFS ------------------------- >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +======= +SELECT WITH MULTIPLE FUNCTIONS +------------------------------ +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) Here is a query that illustrates how to use multiple functions in a single query. >>>>>>> f431fb09 (feat: sync master staging (#1050)) diff --git a/docs/source/reference/evaql/use.rst b/docs/source/reference/evaql/use.rst index 0075edb98..bc5e36569 100644 --- a/docs/source/reference/evaql/use.rst +++ b/docs/source/reference/evaql/use.rst @@ -85,6 +85,7 @@ USE <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -104,6 +105,8 @@ The USE statement allows us to run arbitrary native queries in the connected dat >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) The USE statement allows us to run arbitary native queries in the connected database. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD @@ -124,6 +127,7 @@ The USE statement allows us to run arbitrary native queries in the connected dat ======= ======= ======= +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= ======= @@ -219,14 +223,33 @@ The USE statement allows us to run arbitrary native queries in the connected dat ======= ======= ======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) The USE statement allows us to run arbitrary native queries in the connected database. ======= The USE statement allows us to run arbitary native queries in the connected database. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +The USE statement allows us to run arbitrary native queries in the connected database. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. code:: text @@ -246,11 +269,14 @@ The USE statement allows us to run arbitary native queries in the connected data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -265,6 +291,7 @@ The USE statement allows us to run arbitary native queries in the connected data >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -275,6 +302,14 @@ The USE statement allows us to run arbitary native queries in the connected data >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) * [native_query] is an arbitrary SQL query supported by the [database_connection]. >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -316,15 +351,21 @@ The USE statement allows us to run arbitary native queries in the connected data <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) * [native_query] is an arbitrary SQL query supported by the [database_connection]. >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -388,6 +429,7 @@ The USE statement allows us to run arbitary native queries in the connected data >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -435,9 +477,24 @@ The USE statement allows us to run arbitary native queries in the connected data >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +* [native_query] is an arbitrary SQL query supported by the [database_connection]. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. warning:: diff --git a/docs/source/reference/udfs/model-train.rst b/docs/source/reference/udfs/model-train.rst deleted file mode 100644 index de6e84eee..000000000 --- a/docs/source/reference/udfs/model-train.rst +++ /dev/null @@ -1,48 +0,0 @@ -Training and Finetuning -======================== - -1. You can train a predication model easily in EvaDB - -.. note:: - - Install Ludwig in your EvaDB virtual environment: ``pip install evadb[ludwig]``. - -.. code-block:: sql - - CREATE UDF IF NOT EXISTS PredictHouseRent FROM - ( SELECT sqft, location, rental_price FROM HomeRentals ) - TYPE Ludwig - 'predict' 'rental_price' - 'time_limit' 120; - -In the above query, you are creating a new customized UDF by automatically training a model from the `HomeRentals` table. The `rental_price` column will be the target column for predication, while `sqft` and `location` are the inputs. - -You can also simply give all other columns in `HomeRentals` as inputs and let the underlying automl framework to figure it out. Below is an example query: - -.. code-block:: sql - - CREATE UDF IF NOT EXISTS PredictHouseRent FROM - ( SELECT * FROM HomeRentals ) - TYPE Ludwig - 'predict' 'rental_price' - 'time_limit' 120; - -.. note:: - - Check :ref:`create-udf-train` for available configurations for training models. - -2. After training completes, you can use the `PredictHouseRent` like all other UDFs in EvaDB - -.. code-block:: sql - - CREATE PredictHouseRent(sqft, location) FROM HomeRentals; - -You can also simply give all columns in `HomeRentals` as inputs for inference. The customized UDF with the underlying model can figure out the proper inference columns via the training columns. - -.. code-block:: sql - - CREATE PredictHouseRent(*) FROM HomeRentals; - -Check out our `Integration Tests `_ for working example. - - diff --git a/docs/source/reference/udfs/openai.rst b/docs/source/reference/udfs/openai.rst deleted file mode 100644 index d229eff44..000000000 --- a/docs/source/reference/udfs/openai.rst +++ /dev/null @@ -1,27 +0,0 @@ -OpenAI Models -===================== - -This section provides an overview of how you can use OpenAI models in EvaDB. - - -Chat Completion UDFs --------------------- - -To create a chat completion UDF in EvaDB, use the following SQL command: - -.. code-block:: sql - - CREATE UDF IF NOT EXISTS OpenAIChatCompletion - IMPL 'evadb/udfs/openai_chat_completion_udf.py' - 'model' 'gpt-3.5-turbo' - -EvaDB supports the following models for chat completion task: - -- "gpt-4" -- "gpt-4-0314" -- "gpt-4-32k" -- "gpt-4-32k-0314" -- "gpt-3.5-turbo" -- "gpt-3.5-turbo-0301" - -The chat completion UDF can be composed in interesting ways with other UDFs. Please check the `Google Colab `_ for an example of combining chat completion task with caption extraction and video summarization models from Hugging Face and feeding it to chat completion to ask questions about the results. diff --git a/docs/source/shared/postgresql.rst b/docs/source/shared/postgresql.rst index 79ad29d24..801a2dab9 100644 --- a/docs/source/shared/postgresql.rst +++ b/docs/source/shared/postgresql.rst @@ -25,6 +25,7 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -69,6 +70,8 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. code-block:: ======= >>>>>>> 63510989 (Remove dimensions from `TEXT` and `FLOAT` (#1261)) @@ -77,6 +80,8 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= .. code-block:: text <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -96,6 +101,8 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) .. code-block:: >>>>>>> aeb9a3be (Remove dimensions from `TEXT` and `FLOAT` (#1261)) >>>>>>> 63510989 (Remove dimensions from `TEXT` and `FLOAT` (#1261)) @@ -292,10 +299,15 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) .. code-block:: text CREATE DATABASE postgres_data @@ -309,6 +321,7 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD @@ -372,10 +385,58 @@ EvaDB lets you connect to your favorite databases, data warehouses, data lakes, >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +======= +.. tab-set:: + + .. tab-item:: Python + + .. code-block:: python + + params = { + "user": "eva", + "password": "password", + "host": "localhost", + "port": "5432", + "database": "evadb", + } + query = f"CREATE DATABASE postgres_data + WITH ENGINE = 'postgres', + PARAMETERS = {params};" + cursor.query(query).df() + + .. tab-item:: SQL + + .. code-block:: text + + CREATE DATABASE postgres_data + WITH ENGINE = 'postgres', + PARAMETERS = { + "user": "eva", + "password": "password", + "host": "localhost", + "port": "5432", + "database": "evadb" + } +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/usecases/emotion-analysis.rst b/docs/source/usecases/emotion-analysis.rst index 2b3736ae4..017402e47 100644 --- a/docs/source/usecases/emotion-analysis.rst +++ b/docs/source/usecases/emotion-analysis.rst @@ -158,9 +158,12 @@ This query returns the faces detected in the first ten frames of the video: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -168,6 +171,9 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -186,6 +192,7 @@ This query returns the faces detected in the first ten frames of the video: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -233,6 +240,10 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +----------+---------------------+-------------------------+ | happy.id | facedetector.bboxes | facedetector.scores | +----------+---------------------+-------------------------+ @@ -255,6 +266,7 @@ This query returns the faces detected in the first ten frames of the video: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -287,12 +299,16 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -311,6 +327,8 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +-----------------------------------------------------------------------------------------------------+ | objectdetectionvideos.id | yolo.labels | +--------------------------+-----------------------------------------------------------------+ @@ -330,6 +348,7 @@ This query returns the faces detected in the first ten frames of the video: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -339,6 +358,8 @@ This query returns the faces detected in the first ten frames of the video: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -357,6 +378,7 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -367,6 +389,10 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -384,10 +410,14 @@ This query returns the faces detected in the first ten frames of the video: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -421,6 +451,13 @@ This query returns the faces detected in the first ten frames of the video: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Chaining Functions in a Single AI Query --------------------------------------- @@ -466,9 +503,12 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -476,6 +516,9 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -494,6 +537,7 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -541,6 +585,10 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +----------+-------------------+------------------------+------------------------+ | happy.id | Face.bbox | emotiondetector.labels | emotiondetector.scores | +----------+-------------------+------------------------+------------------------+ @@ -569,6 +617,7 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -601,12 +650,16 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -625,6 +678,8 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +------------------------------+ | objectdetectionvideos.label | |------------------------------| @@ -644,6 +699,7 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -653,6 +709,8 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -671,6 +729,7 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -681,6 +740,10 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -698,10 +761,14 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -735,5 +802,12 @@ Now, the ``DataFrame`` only contains the emotions of the detected faces: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst diff --git a/docs/source/usecases/food-review.rst b/docs/source/usecases/food-review.rst deleted file mode 100644 index 8f688b0e8..000000000 --- a/docs/source/usecases/food-review.rst +++ /dev/null @@ -1,147 +0,0 @@ -ChatGPT + Postgres Tutorial -=========================== - -.. raw:: html - - - - - - -
- Run on Google Colab - - View source on GitHub - - Download notebook -


- - -In this tutorial, we demonstrate how to use EvaDB + ChatGPT to analyze the tone of food reviews stored in PostgreSQL. Then, based on the analysis, we further use -EvaDB + ChatGPT to address negative reviews by proposing a solution to the customer. - -For this use case, we assume user has a Postgres server running locally. You can also check our notebook above to skip Postgres setup. - -1. Connect to EvaDB ---------------------- - -.. code-block:: python - - import evadb - cursor = evadb.connect().cursor() - -2. Connect to an Existing Postgres Database ---------------------------------------------- - -.. tab-set:: - - .. tab-item:: Python - - .. code-block:: python - - params = { - "user": "eva", - "password": "password", - "host": "localhost", - "port": "5432", - "database": "evadb", - } - query = f"CREATE DATABASE postgres_data WITH ENGINE = 'postgres', PARAMETERS = {params};" - cursor.query(query).df() - - .. tab-item:: SQL - - .. code-block:: text - - CREATE DATABASE postgres_data WITH ENGINE = 'postgres', PARAMETERS = { - "user": "eva", - "password": "password", - "host": "localhost", - "port": "5432", - "database": "evadb" - } - -3. Sentiment Analysis of Food Review using ChatGPT ---------------------------------------------------- - -We then use EvaDB + ChatGPT to analyze whether the review is "positive" or "negative" with customized ChatGPT prompt. For this use case, -we assume reviews have been already loaded into the table inside PostgreSQL. -You can check our `Jupyter Notebook `__ for how to load data. - -.. tab-set:: - - .. tab-item:: Python - - .. code-block:: python - - cursor.query(""" - SELECT ChatGPT( - "Is the review positive or negative. Only reply 'positive' or 'negative'. Here are examples. The food is very bad: negative. The food is very good: postive.", - review) - FROM postgres_data.review_table; - """).df() - - .. tab-item:: SQL - - .. code-block:: sql - - SELECT ChatGPT( - "Is the review positive or negative. Only reply 'positive' or 'negative'. Here are examples. The food is very bad: negative. The food is very good: postive.", - review) - FROM postgres_data.review_table; - -This will return tone analysis results for existing reviews. - -.. code-block:: - - +------------------------------+ - | chatgpt.response | - |------------------------------| - | negative | - | positive | - | negative | - +------------------------------+ - -4. Response to Negative Reviews using ChatGPT ---------------------------------------------- - -.. tab-set:: - - .. tab-item:: Python - - .. code-block:: python - - cursor.query(""" - SELECT ChatGPT( - "Respond the the review with solution to address the review's concern", - review) - FROM postgres_data.review_table - WHERE ChatGPT( - "Is the review positive or negative. Only reply 'positive' or 'negative'. Here are examples. The food is very bad: negative. The food is very good: postive.", - review) = "negative"; - """).df() - - .. tab-item:: SQL - - .. code-block:: sql - - SELECT ChatGPT( - "Respond the the review with solution to address the review's concern", - review) - FROM postgres_data.review_table - WHERE ChatGPT( - "Is the review positive or negative. Only reply 'positive' or 'negative'. Here are examples. The food is very bad: negative. The food is very good: postive.", - review) = "negative"; - -This query will first filter out positive reviews and then apply ChatGPT again to create response to negative reviews. This will give results. - -.. code-block:: - - +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ - | chatgpt.response | - |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - | Dear valued customer, Thank you for bringing this matter to our attention. We apologize for the inconvenience caused by the excessive saltiness of your fried rice. We understand how important it is to have a satisfying dining experience, and we would like to make it right for you ... | - | Dear [Customer's Name], Thank you for bringing this issue to our attention. We apologize for the inconvenience caused by the missing chicken sandwich in your takeout order. We understand how frustrating it can be when an item is missing from your meal. To address this concern, we ... | - +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ - -Check out our `Jupyter Notebook `__ for working example. \ No newline at end of file diff --git a/docs/source/usecases/image-classification.rst b/docs/source/usecases/image-classification.rst index 31c6f8bc1..1fecb9744 100644 --- a/docs/source/usecases/image-classification.rst +++ b/docs/source/usecases/image-classification.rst @@ -3,11 +3,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) .. _image-classification: ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -140,6 +143,8 @@ In the following query, we call the classifier on every image in the video. The >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) .. _image-classification: ======= .. _image classification: @@ -671,6 +676,8 @@ In the following query, we call the classifier on every image in the video. The ======= ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) .. _image-classification: ======= .. _image classification: @@ -749,6 +756,67 @@ In the following query, we call the classifier on every image in the video. The SELECT MnistImageClassifier(data).label FROM mnist_video; +<<<<<<< HEAD +======= +======= +.. _image-classification: + +Image Classification +==================== + +.. raw:: html + + + + + + +
+ Run on Google Colab + + View source on GitHub + + Download notebook +


+ + +Introduction +------------ + +In this tutorial, we present how to use ``PyTorch`` models in EvaDB to classify images. In particular, we focus on classifying images from the ``MNIST`` dataset that contains ``digits``. EvaDB makes it easy to do image classification using its built-in support for ``PyTorch`` models. + +In this tutorial, besides classifying images, we will also showcase a query where the model's output is used to retrieve images with the digit ``6``. + +.. include:: ../shared/evadb.rst + +We will assume that the input ``MNIST`` video is loaded into ``EvaDB``. To download the video and load it into ``EvaDB``, see the complete `image classification notebook on Colab `_. + +Create Image Classification Function +------------------------------------ + +To create a custom ``MnistImageClassifier`` function, use the ``CREATE FUNCTION`` statement. The code for the custom classification model is available `here `_. + +We will assume that the file is downloaded and stored as ``mnist_image_classifier.py``. Now, run the following query to register the AI function: + +.. code-block:: sql + + CREATE FUNCTION + IF NOT EXISTS MnistImageClassifier + IMPL 'mnist_image_classifier.py'; + +Image Classification Queries +---------------------------- + +After the function is registered in ``EvaDB``, you can use it subsequent SQL queries in different ways. + +In the following query, we call the classifier on every image in the video. The output of the function is stored in the ``label`` column (i.e., the digit associated with the given frame) of the output ``DataFrame``. + +.. code-block:: sql + + SELECT MnistImageClassifier(data).label + FROM mnist_video; + +>>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -781,11 +849,14 @@ This query returns the label of all the images: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -800,6 +871,7 @@ This query returns the label of all the images: >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -810,6 +882,14 @@ This query returns the label of all the images: >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +------------------------------+ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -891,6 +971,7 @@ Like normal SQL, you can also specify conditions to filter out some frames of th <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -901,6 +982,8 @@ Like normal SQL, you can also specify conditions to filter out some frames of th >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= +------------------------------+ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -927,6 +1010,7 @@ Like normal SQL, you can also specify conditions to filter out some frames of th ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= ======= ======= @@ -937,6 +1021,8 @@ Like normal SQL, you can also specify conditions to filter out some frames of th >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +------------------------------+ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -964,6 +1050,7 @@ Like normal SQL, you can also specify conditions to filter out some frames of th ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -981,6 +1068,10 @@ Like normal SQL, you can also specify conditions to filter out some frames of th ======= ======= ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +------------------------------+ >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1004,9 +1095,27 @@ Like normal SQL, you can also specify conditions to filter out some frames of th >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= + +------------------------------+ +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Filtering Based on AI Function @@ -1037,6 +1146,7 @@ Now, the ``DataFrame`` only contains images of the digit ``6``. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -1044,6 +1154,8 @@ Now, the ``DataFrame`` only contains images of the digit ``6``. >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst ======= >>>>>>> e867f37e (docs: updated images) @@ -1075,6 +1187,7 @@ Now, the ``DataFrame`` only contains images of the digit ``6``. >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -1087,6 +1200,8 @@ Now, the ``DataFrame`` only contains images of the digit ``6``. ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst .. include:: ../shared/designs/design7.rst @@ -1168,18 +1283,24 @@ Check out our `Jupyter Notebook >>>>>> 5678c9a3 (docs: updated images) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst ======= Check out our `Jupyter Notebook `_ for working example. >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) @@ -1246,7 +1367,23 @@ Check out our `Jupyter Notebook >>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +.. include:: ../shared/footer.rst +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/usecases/object-detection.rst b/docs/source/usecases/object-detection.rst index 834b129bc..7f7d1dd80 100644 --- a/docs/source/usecases/object-detection.rst +++ b/docs/source/usecases/object-detection.rst @@ -145,9 +145,12 @@ This query returns the label of all the images: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -155,6 +158,9 @@ This query returns the label of all the images: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -173,6 +179,7 @@ This query returns the label of all the images: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -220,6 +227,10 @@ This query returns the label of all the images: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +--------------------------+--------------------------------+--------------------------------+--------------------------------+ | objectdetectionvideos.id | yolo.labels | yolo.bboxes | yolo.scores | +--------------------------+--------------------------------+--------------------------------+--------------------------------+ @@ -232,6 +243,7 @@ This query returns the label of all the images: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -264,12 +276,16 @@ This query returns the label of all the images: >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -288,6 +304,8 @@ This query returns the label of all the images: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +-----------------------------------------------------------------------------------------------------+ | objectdetectionvideos.id | yolo.labels | +--------------------------+-----------------------------------------------------------------+ @@ -307,6 +325,7 @@ This query returns the label of all the images: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -316,6 +335,8 @@ This query returns the label of all the images: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -334,6 +355,7 @@ This query returns the label of all the images: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -344,6 +366,10 @@ This query returns the label of all the images: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -361,10 +387,14 @@ This query returns the label of all the images: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -398,6 +428,13 @@ This query returns the label of all the images: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Filtering Based on YOLO Function -------------------------------- @@ -447,6 +484,7 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -461,11 +499,15 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -491,6 +533,10 @@ In the following query, we use the output of the object detector to retrieve a s ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SELECT id, Yolo(data).labels FROM ObjectDetectionVideos WHERE ['person', 'car'] <@ Yolo(data).labels @@ -529,11 +575,14 @@ In the following query, we use the output of the object detector to retrieve a s <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -547,10 +596,13 @@ In the following query, we use the output of the object detector to retrieve a s ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -569,6 +621,10 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SELECT id, Yolo(data).labels FROM ObjectDetectionVideos WHERE ['person', 'car'] <@ Yolo(data).labels @@ -584,6 +640,7 @@ In the following query, we use the output of the object detector to retrieve a s <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -591,6 +648,8 @@ In the following query, we use the output of the object detector to retrieve a s ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -608,11 +667,14 @@ In the following query, we use the output of the object detector to retrieve a s ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -620,6 +682,9 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -627,6 +692,7 @@ In the following query, we use the output of the object detector to retrieve a s >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -651,6 +717,9 @@ In the following query, we use the output of the object detector to retrieve a s ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Now, the ``DataFrame`` only contains frames with the desired objects: @@ -682,9 +751,12 @@ Now, the ``DataFrame`` only contains frames with the desired objects: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -692,6 +764,9 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -710,6 +785,7 @@ Now, the ``DataFrame`` only contains frames with the desired objects: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -757,6 +833,10 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +--------------------------+--------------------------------------------------------------+ | objectdetectionvideos.id | yolo.labels | +--------------------------+--------------------------------------------------------------+ @@ -770,6 +850,9 @@ Now, the ``DataFrame`` only contains frames with the desired objects: <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -812,13 +895,19 @@ Now, the ``DataFrame`` only contains frames with the desired objects: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -833,6 +922,7 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -864,6 +954,9 @@ Now, the ``DataFrame`` only contains frames with the desired objects: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. include:: ../shared/footer.rst diff --git a/docs/source/usecases/qa-video.rst b/docs/source/usecases/qa-video.rst deleted file mode 100644 index 133eefca2..000000000 --- a/docs/source/usecases/qa-video.rst +++ /dev/null @@ -1,89 +0,0 @@ -Q&A Application on Videos -========================= - -1. Connect to EvaDB -------------------- - -.. code-block:: python - - import evadb - cursor = evadb.connect().cursor() - -2. Register Functions ---------------------- - -Register speech-to-text **whisper** model from `HuggingFace` - -.. code-block:: python - - cursor.query(""" - CREATE UDF SpeechRecognizer - TYPE HuggingFace - 'task' 'automatic-speech-recognition' - 'model' 'openai/whisper-base'; - """).execute() - -.. note:: - - EvaDB allows users to register any model in HuggingFace as a function. - -Register **OpenAI** LLM model - -.. code-block:: python - - cursor.query(""" - CREATE UDF ChatGPT - IMPL 'evadb/udfs/chatgpt.py' - """).execute() - - # Set OpenAI token - import os - os.environ["OPENAI_KEY"] = "sk-..." - -.. note:: - - ChatGPT function is a wrapper around OpenAI API call. You can also switch to other LLM models that can run locally. - -3. Summarize Video in Text --------------------------- - -Create a table with text summary of the video. Text summarization is generated by running speech-to-text ``Whisper`` model from ``HuggingFace``. - -.. code-block:: python - - cursor.query(""" - CREATE TABLE text_summary AS - SELECT SpeechRecognizer(audio) FROM ukraine_video; - """).execute() - -This results a table shown below. - -.. code-block:: - - +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ - | text_summary.text | - |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - | The war in Ukraine has been on for 415 days. Who is winning it? Not Russia. Certainly not Ukraine. It is the US oil companies. US oil companies have reached $200 billion in pure profits. The earnings are still on. They are still milking this war and sharing the spoils. Let us look at how Exxon mobile has been doing. In 2022, the company made $56 billion in profits. Oil companies capitalized on instability and they are profiting from pain. American oil companies are masters of this art. You may remember the war in Iraq. The US went to war in Iraq by selling a lie. The Americans did not find any weapons of mass destruction but they did find lots of oil. And in the year since, American officials have admitted this. And this story is not over. It's repeating itself in Ukraine. They are feeding another war and filling the coffers of US oil companies. | - +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ - -4. Q&A using ChatGPT ---------------------- - -We can now embed the ChatGPT prompt inside SQL with text summary from the table as its knowledge base. - -.. code-block:: python - - cursor.query(""" - SELECT ChatGPT('Is this video summary related to Ukraine russia war', text) - FROM text_summary; - """).df() - -This query returns a projected ``DataFrame``. - -.. code-block:: - - +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ - | chatgpt.response | - |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - | Based on the provided context, it seems that the video summary is related to the Ukraine-Russia war. It discusses how US oil companies are allegedly profiting from the war in Ukraine, similar to how they allegedly benefited from the war in Iraq. | - +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ diff --git a/docs/source/usecases/question-answering.rst b/docs/source/usecases/question-answering.rst index f86b1b891..22b85a21e 100644 --- a/docs/source/usecases/question-answering.rst +++ b/docs/source/usecases/question-answering.rst @@ -187,9 +187,12 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -197,6 +200,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -215,6 +221,7 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -262,6 +269,10 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +-------------------------------------------------------------------------------------------------------------------------+ | text_summary.text | +-------------------------------------------------------------------------------------------------------------------------+ @@ -270,6 +281,7 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -302,12 +314,16 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -326,6 +342,8 @@ Here is the query's output ``DataFrame``: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | text_summary.text | |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| @@ -344,6 +362,7 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -353,6 +372,8 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -371,6 +392,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -381,6 +403,10 @@ Here is the query's output ``DataFrame``: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -398,10 +424,14 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -435,6 +465,13 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Question Answering using ChatGPT -------------------------------- @@ -478,9 +515,12 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -488,6 +528,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -506,6 +549,7 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -553,6 +597,10 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +--------------------------------------------------------------------------------------------------------------------------+ | chatgpt.response | +--------------------------------------------------------------------------------------------------------------------------+ @@ -561,6 +609,7 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -593,12 +642,16 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -617,6 +670,8 @@ Here is the query's output ``DataFrame``: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | chatgpt.response | |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| @@ -635,6 +690,7 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -644,6 +700,8 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -662,6 +720,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -672,6 +731,10 @@ Here is the query's output ``DataFrame``: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -689,10 +752,14 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -726,6 +793,13 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. include:: ../shared/nlp.rst diff --git a/docs/source/usecases/sentiment-analysis.rst b/docs/source/usecases/sentiment-analysis.rst index b110f9737..d160f5d3b 100644 --- a/docs/source/usecases/sentiment-analysis.rst +++ b/docs/source/usecases/sentiment-analysis.rst @@ -125,9 +125,12 @@ While running this query, EvaDB first retrieves the negative reviews and then ap <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) .. include:: ../shared/nlp.rst .. include:: ../shared/footer.rst @@ -194,9 +197,12 @@ Check out our `Jupyter Notebook >>>>>> 5678c9a3 (docs: updated images) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -229,9 +235,12 @@ Check out our `Jupyter Notebook >>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 5678c9a3 (docs: updated images) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= @@ -270,6 +279,7 @@ Check out our `Jupyter Notebook >>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) .. include:: ../shared/nlp.rst @@ -329,10 +339,25 @@ Check out our `Jupyter Notebook >>>>>> f75511e6 (feat: sync master staging (#1050)) .. include:: ../shared/nlp.rst .. include:: ../shared/footer.rst +<<<<<<< HEAD >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +Check out our `Jupyter Notebook `__ for working example. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/docs/source/usecases/similar-image-search.rst b/docs/source/usecases/similar-image-search.rst deleted file mode 100644 index 91563cc2c..000000000 --- a/docs/source/usecases/similar-image-search.rst +++ /dev/null @@ -1,83 +0,0 @@ -Image Similarity Search Pipeline using EvaDB on Images -====================================================== - -In this use case, we want to search similar images based on an image provided by the user. To implement this use case, we leverage EvaDB's capability of easily expressing feature extraction pipeline. Additionally, we also leverage EvaDB's capability of building a similarity search index and searching the index to -locate similar images through ``FAISS`` library. - -For this use case, we use a reddit image dataset that can be downloaded from `Here `_. -We populate a table in the database that contains all images. - -1. Connect to EvaDB -------------------- - -.. code-block:: python - - import evadb - cursor = evadb.connect().cursor() - -2. Register SIFT as Function ----------------------------- - -.. code-block:: python - - cursor.query(""" - CREATE UDF IF NOT EXISTS SiftFeatureExtractor - IMPL 'evadb/udfs/sift_feature_extractor.py' - """).execute() - -3. Search Similar Images ------------------------- - -To locate images that have similar appearance, we will first build an index based on embeddings of images. -Then, for the given image, EvaDB can find similar images by searching in the index. - -Build Index using ``FAISS`` -*************************** - -The below query creates a new index on the projected column ``SiftFeatureExtractor(data)`` from the ``reddit_dataset`` table. - -.. code-block:: python - - cursor.query(""" - CREATE INDEX reddit_sift_image_index - ON reddit_dataset (SiftFeatureExtractor(data)) - USING FAISS - """).execute() - -Search Index for a Given Image -******************************* - -EvaDB leverages the ``ORDER BY ... LIMIT ...`` SQL syntax to retrieve the top 5 similar images. -In this example, ``Similarity(x, y)`` is a built-in function to calculate distance between ``x`` and ``y``. -In current version, ``x`` is a single tuple and ``y`` is a column that contains multiple tuples. -By default EvaDB does pairwise distance calculation between ``x`` and all tuples from ``y``. -In this case, EvaDB leverages the index that we have already built. - -.. code-block:: python - - query = cursor.query(""" - SELECT name FROM reddit_dataset ORDER BY - Similarity( - SiftFeatureExtractor(Open('reddit-images/g1074_d4mxztt.jpg')), - SiftFeatureExtractor(data) - ) - LIMIT 5 - """) - query.df() - -The ``DataFrame`` contains the top 5 similar images. - -.. code-block:: - - +---------------------------------+ - | reddit_dataset.name | - |---------------------------------| - | reddit-images/g1074_d4mxztt.jpg | - | reddit-images/g348_d7ju7dq.jpg | - | reddit-images/g1209_ct6bf1n.jpg | - | reddit-images/g1190_cln9xzr.jpg | - | reddit-images/g1190_clna2x2.jpg | - +---------------------------------+ - -Check out our `Jupyter Notebook `_ for working example. -We also demonstrate more complicated features of EvaDB for similarity search. diff --git a/docs/source/usecases/text-summarization.rst b/docs/source/usecases/text-summarization.rst index 92c6ff15c..453c89e97 100644 --- a/docs/source/usecases/text-summarization.rst +++ b/docs/source/usecases/text-summarization.rst @@ -141,9 +141,12 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -151,6 +154,9 @@ Here is the query's output ``DataFrame``: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -169,6 +175,7 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -216,6 +223,10 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +--------------------------------------------------------------+--------------------------------------------------------------+ | mypdfs.data | textsummarizer.summary_text | +--------------------------------------------------------------+--------------------------------------------------------------+ @@ -225,6 +236,7 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -257,12 +269,16 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -281,6 +297,8 @@ Here is the query's output ``DataFrame``: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +--------------------------------------------------------+--------------------------------------------------------+ | mypdfs.data | mypdfs.summary_text | +--------------------------------------------------------+--------------------------------------------------------+ @@ -300,6 +318,7 @@ Here is the query's output ``DataFrame``: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -309,6 +328,8 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -327,6 +348,7 @@ Here is the query's output ``DataFrame``: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -337,6 +359,10 @@ Here is the query's output ``DataFrame``: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -354,10 +380,14 @@ Here is the query's output ``DataFrame``: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -391,6 +421,13 @@ Here is the query's output ``DataFrame``: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) .. include:: ../shared/nlp.rst diff --git a/evadb/binder/statement_binder.py b/evadb/binder/statement_binder.py index 18edecd57..011a040c7 100644 --- a/evadb/binder/statement_binder.py +++ b/evadb/binder/statement_binder.py @@ -101,19 +101,26 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -122,6 +129,8 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.parser.create_statement import ColumnDefinition, CreateTableStatement >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -162,11 +171,16 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= from evadb.parser.create_statement import ColumnDefinition, CreateTableStatement >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -174,11 +188,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -192,12 +209,15 @@ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= from evadb.parser.create_statement import CreateTableStatement @@ -214,12 +234,16 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -266,6 +290,10 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.parser.delete_statement import DeleteTableStatement from evadb.parser.explain_statement import ExplainStatement from evadb.parser.rename_statement import RenameTableStatement @@ -298,6 +326,7 @@ ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -311,6 +340,13 @@ ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -328,6 +364,7 @@ >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -373,6 +410,10 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.utils.generic_utils import ( load_function_class_from_file, string_comparison_case_insensitive, @@ -380,6 +421,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -475,6 +517,8 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= from evadb.utils.generic_utils import load_function_class_from_file >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -483,6 +527,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= ======= @@ -491,16 +536,23 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= ======= from evadb.utils.generic_utils import load_function_class_from_file >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 03a6c555 (feat: sync master staging (#1050)) @@ -511,6 +563,8 @@ >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -520,8 +574,17 @@ ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.utils.logging_manager import logger >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -614,6 +677,7 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -624,8 +688,17 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) inputs, outputs = [], [] if string_comparison_case_insensitive(node.function_type, "ludwig"): assert ( @@ -949,6 +1022,7 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): ) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD @@ -983,6 +1057,9 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): <<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD inputs, outputs = [], [] @@ -1102,8 +1179,36 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +======= + assert ( + "predict" in arg_map + ), f"Creating {node.function_type} functions expects 'predict' metadata." + # We only support a single predict column for now + predict_columns = set([arg_map["predict"]]) + inputs, outputs = [], [] + for column in all_column_list: + if column.name in predict_columns: + if node.function_type != "Forecasting": + column.name = column.name + "_predictions" + else: + column.name = column.name + outputs.append(column) + else: + inputs.append(column) +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) assert ( len(node.inputs) == 0 and len(node.outputs) == 0 ), f"{node.function_type} functions' input and output are auto assigned" @@ -1121,6 +1226,9 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= @@ -1145,6 +1253,10 @@ def _bind_create_function_statement(self, node: CreateFunctionStatement): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -1238,6 +1350,7 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -1247,6 +1360,8 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1265,6 +1380,7 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -1275,6 +1391,10 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -1292,10 +1412,14 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -1329,6 +1453,13 @@ def _bind_create_index_statement(self, node: CreateIndexStatement): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) @bind.register(SelectStatement) def _bind_select_statement(self, node: SelectStatement): if node.from_table: @@ -1561,6 +1692,7 @@ def _bind_func_expr(self, node: FunctionExpression): ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -1572,8 +1704,17 @@ def _bind_func_expr(self, node: FunctionExpression): ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if string_comparison_case_insensitive(function_obj.type, "HuggingFace"): node.function = assign_hf_function(function_obj) @@ -1611,6 +1752,7 @@ def _bind_func_expr(self, node: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= @@ -1621,6 +1763,8 @@ def _bind_func_expr(self, node: FunctionExpression): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= @@ -1635,8 +1779,12 @@ def _bind_func_expr(self, node: FunctionExpression): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= if string_comparison_case_insensitive(function_obj.type, "HuggingFace"): node.function = assign_hf_function(function_obj) @@ -1652,8 +1800,11 @@ def _bind_func_expr(self, node: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -1665,12 +1816,17 @@ def _bind_func_expr(self, node: FunctionExpression): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -1678,6 +1834,9 @@ def _bind_func_expr(self, node: FunctionExpression): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -1685,6 +1844,7 @@ def _bind_func_expr(self, node: FunctionExpression): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -1721,6 +1881,9 @@ def _bind_func_expr(self, node: FunctionExpression): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) function_class = load_function_class_from_file( function_obj.impl_file_path, "GenericLudwigModel", diff --git a/evadb/executor/create_function_executor.py b/evadb/executor/create_function_executor.py index 78b88bddd..0daa68672 100644 --- a/evadb/executor/create_function_executor.py +++ b/evadb/executor/create_function_executor.py @@ -24,6 +24,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import contextlib ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -32,6 +33,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -84,6 +87,10 @@ ======= <<<<<<< HEAD ======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) import hashlib import os import pickle @@ -105,6 +112,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= @@ -116,6 +124,12 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= import hashlib import os import pickle @@ -129,13 +143,23 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= import os @@ -154,6 +178,7 @@ >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -199,6 +224,9 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from pathlib import Path from typing import Dict, List @@ -270,9 +298,12 @@ <<<<<<< HEAD ======= <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -287,13 +318,17 @@ ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= @@ -339,6 +374,8 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) string_comparison_case_insensitive, try_to_import_ludwig, try_to_import_neuralforecast, @@ -428,12 +465,25 @@ ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) string_comparison_case_insensitive, try_to_import_ludwig, try_to_import_neuralforecast, try_to_import_sklearn, +<<<<<<< HEAD try_to_import_statsforecast, +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -445,8 +495,21 @@ ======= try_to_import_statsforecast, >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) +<<<<<<< HEAD >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) +<<<<<<< HEAD >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +======= +======= +======= +======= + try_to_import_ludwig, +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) try_to_import_torch, try_to_import_ultralytics, try_to_import_xgboost, @@ -575,6 +638,7 @@ def handle_huggingface_function(self): >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -589,11 +653,15 @@ def handle_huggingface_function(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -619,6 +687,10 @@ def handle_huggingface_function(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """Handle HuggingFace functions HuggingFace functions are special functions that are not loaded from a file. @@ -658,11 +730,14 @@ def handle_huggingface_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -676,10 +751,13 @@ def handle_huggingface_function(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -698,6 +776,10 @@ def handle_huggingface_function(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """Handle HuggingFace functions HuggingFace functions are special functions that are not loaded from a file. @@ -713,6 +795,7 @@ def handle_huggingface_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -720,6 +803,8 @@ def handle_huggingface_function(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -737,11 +822,14 @@ def handle_huggingface_function(self): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -749,6 +837,9 @@ def handle_huggingface_function(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -756,6 +847,7 @@ def handle_huggingface_function(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -780,6 +872,9 @@ def handle_huggingface_function(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """ # We need at least one deep learning framework for HuggingFace # Torch or Tensorflow @@ -807,19 +902,26 @@ def handle_ludwig_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -830,6 +932,8 @@ def handle_ludwig_function(self): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """Handle ludwig functions Use Ludwig's auto_train engine to train/tune models. @@ -890,11 +994,14 @@ def handle_ludwig_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -908,10 +1015,13 @@ def handle_ludwig_function(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -930,6 +1040,10 @@ def handle_ludwig_function(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """Handle ludwig functions Use Ludwig's auto_train engine to train/tune models. @@ -944,6 +1058,7 @@ def handle_ludwig_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -951,6 +1066,8 @@ def handle_ludwig_function(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -968,11 +1085,14 @@ def handle_ludwig_function(self): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -980,6 +1100,9 @@ def handle_ludwig_function(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -987,6 +1110,7 @@ def handle_ludwig_function(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -1011,6 +1135,9 @@ def handle_ludwig_function(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """ try_to_import_ludwig() from ludwig.automl import auto_train @@ -1239,11 +1366,20 @@ def handle_ultralytics_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master ======= @@ -1259,6 +1395,7 @@ def handle_ultralytics_function(self): ======= ======= ======= +<<<<<<< HEAD >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1312,6 +1449,11 @@ def handle_ultralytics_function(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def handle_sklearn_function(self): """Handle sklearn functions @@ -1573,12 +1715,15 @@ def handle_ultralytics_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -1638,6 +1783,8 @@ def handle_ultralytics_function(self): ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= def handle_ultralytics_function(self): """Handle Ultralytics functions""" @@ -1646,6 +1793,7 @@ def handle_ultralytics_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c5f43c65 (Bump v0.3.4+ dev) ======= ======= @@ -1657,6 +1805,8 @@ def handle_ultralytics_function(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -1666,6 +1816,8 @@ def handle_ultralytics_function(self): ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master ======= def handle_ultralytics_function(self): @@ -1680,8 +1832,18 @@ def handle_ultralytics_function(self): ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) try_to_import_ultralytics() impl_path = ( @@ -1711,12 +1873,23 @@ def handle_ultralytics_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +<<<<<<< HEAD +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -1747,6 +1920,9 @@ def handle_ultralytics_function(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def handle_forecasting_function(self): """Handle forecasting functions""" os.environ["CUDA_VISIBLE_DEVICES"] = "" @@ -2569,6 +2745,7 @@ def handle_generic_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -2610,6 +2787,8 @@ def handle_generic_function(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -2627,6 +2806,10 @@ def handle_generic_function(self): ======= ======= ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> eva-master ======= ======= @@ -2899,6 +3082,7 @@ def handle_generic_function(self): ======= ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -2911,8 +3095,18 @@ def handle_generic_function(self): ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """ impl_path = self.node.impl_path.absolute().as_posix() function = self._try_initializing_function(impl_path) @@ -2957,9 +3151,12 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -2967,6 +3164,9 @@ def exec(self, *args, **kwargs): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -2985,6 +3185,7 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -3032,6 +3233,10 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) assert ( self.node.if_not_exists and self.node.or_replace ) is False, ( @@ -3042,6 +3247,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3071,6 +3277,7 @@ def exec(self, *args, **kwargs): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -3087,6 +3294,10 @@ def exec(self, *args, **kwargs): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -3100,6 +3311,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -3109,6 +3321,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -3123,6 +3337,7 @@ def exec(self, *args, **kwargs): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -3131,6 +3346,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -3147,10 +3364,14 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -3184,6 +3405,13 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) # check catalog if it already has this function entry if self.catalog().get_function_catalog_entry_by_name(self.node.name): if self.node.if_not_exists: @@ -3216,9 +3444,12 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -3226,6 +3457,9 @@ def exec(self, *args, **kwargs): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -3244,6 +3478,7 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -3291,6 +3526,10 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif self.node.or_replace: # We use DropObjectExecutor to avoid bookkeeping the code. The drop function should be moved to catalog. from evadb.executor.drop_object_executor import DropObjectExecutor @@ -3351,6 +3590,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -3378,6 +3618,7 @@ def exec(self, *args, **kwargs): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -3394,6 +3635,10 @@ def exec(self, *args, **kwargs): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -3407,6 +3652,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -3416,6 +3662,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -3430,6 +3678,7 @@ def exec(self, *args, **kwargs): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -3438,6 +3687,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -3454,10 +3705,14 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -3491,6 +3746,13 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) else: msg = f"Function {self.node.name} already exists." logger.error(msg) @@ -3509,19 +3771,26 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -3530,6 +3799,8 @@ def exec(self, *args, **kwargs): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if string_comparison_case_insensitive(self.node.function_type, "HuggingFace"): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -3570,10 +3841,15 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= if string_comparison_case_insensitive(self.node.function_type, "HuggingFace"): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -3582,11 +3858,14 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -3600,12 +3879,15 @@ def exec(self, *args, **kwargs): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= if self.node.function_type == "HuggingFace": @@ -3622,12 +3904,16 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -3674,6 +3960,10 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ( name, impl_path, @@ -3693,19 +3983,26 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -3714,6 +4011,8 @@ def exec(self, *args, **kwargs): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif string_comparison_case_insensitive(self.node.function_type, "ultralytics"): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -3754,10 +4053,15 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= elif string_comparison_case_insensitive(self.node.function_type, "ultralytics"): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -3766,11 +4070,14 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -3784,12 +4091,15 @@ def exec(self, *args, **kwargs): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= elif self.node.function_type == "ultralytics": @@ -3806,12 +4116,16 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -3858,6 +4172,10 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ( name, impl_path, @@ -3877,19 +4195,26 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -3898,6 +4223,8 @@ def exec(self, *args, **kwargs): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif string_comparison_case_insensitive(self.node.function_type, "Ludwig"): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -3938,10 +4265,15 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= elif string_comparison_case_insensitive(self.node.function_type, "Ludwig"): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -3950,11 +4282,14 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -3968,12 +4303,15 @@ def exec(self, *args, **kwargs): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= elif self.node.function_type == "Ludwig": @@ -3990,12 +4328,16 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -4042,6 +4384,10 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ( name, impl_path, @@ -4068,6 +4414,7 @@ def exec(self, *args, **kwargs): >>>>>>> 70850a8b (feat: sync master staging (#1050)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -4096,6 +4443,7 @@ def exec(self, *args, **kwargs): ======= ======= ======= +<<<<<<< HEAD >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -4146,6 +4494,11 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif string_comparison_case_insensitive(self.node.function_type, "Sklearn"): ( name, @@ -4212,6 +4565,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4243,13 +4597,19 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -4295,7 +4655,12 @@ def exec(self, *args, **kwargs): ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -4312,10 +4677,14 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) @@ -4355,6 +4724,13 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) else: ( name, @@ -4393,9 +4769,12 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -4403,6 +4782,9 @@ def exec(self, *args, **kwargs): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -4421,6 +4803,7 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -4468,6 +4851,10 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if overwrite: msg = f"Function {self.node.name} overwritten." @@ -4492,6 +4879,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -4547,6 +4935,10 @@ def exec(self, *args, **kwargs): >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= yield Batch( pd.DataFrame( @@ -4564,6 +4956,9 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= <<<<<<< HEAD yield Batch(pd.DataFrame([msg])) @@ -4583,6 +4978,15 @@ def exec(self, *args, **kwargs): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +<<<<<<< HEAD +======= +======= +>>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -4598,6 +5002,7 @@ def exec(self, *args, **kwargs): ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) @@ -4661,6 +5066,13 @@ def exec(self, *args, **kwargs): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def _try_initializing_function( self, impl_path: str, function_args: Dict = {} @@ -4710,6 +5122,7 @@ def _try_initializing_function( >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -4724,11 +5137,15 @@ def _try_initializing_function( >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -4754,6 +5171,10 @@ def _try_initializing_function( ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) function_args (Dict, optional): Dictionary of arguments to pass to the function. Defaults to {}. Returns: @@ -4779,6 +5200,7 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -4787,6 +5209,10 @@ def _try_initializing_function( >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= function_args (Dict, optional): Dictionary of arguments to pass to the function. Defaults to {}. >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -4805,9 +5231,12 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= ======= function_args (Dict, optional): Dictionary of arguments to pass to the function. Defaults to {}. @@ -4830,10 +5259,15 @@ def _try_initializing_function( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -4866,6 +5300,7 @@ def _try_initializing_function( ======= ======= ======= +<<<<<<< HEAD ======= ======= function_args (Dict, optional): Dictionary of arguments to pass to the function. Defaults to {}. @@ -4970,6 +5405,18 @@ def _try_initializing_function( >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= + + Returns: + FunctionCatalogEntry: A FunctionCatalogEntry object that represents the initialized Function. + + Raises: + RuntimeError: If an error occurs while initializing the Function. +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """ # load the function class from the file @@ -4991,19 +5438,26 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -5012,6 +5466,8 @@ def _try_initializing_function( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) err_msg = f"Error creating function {self.node.name}: {str(e)}" >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -5052,10 +5508,15 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= err_msg = f"Error creating function {self.node.name}: {str(e)}" >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -5064,11 +5525,14 @@ def _try_initializing_function( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -5082,12 +5546,15 @@ def _try_initializing_function( >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= err_msg = f"Error creating Function: {str(e)}" @@ -5104,12 +5571,16 @@ def _try_initializing_function( >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -5156,6 +5627,10 @@ def _try_initializing_function( ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) # logger.error(err_msg) raise RuntimeError(err_msg) @@ -5176,19 +5651,26 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -5197,6 +5679,8 @@ def _resolve_function_io( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """Private method that resolves the input/output definitions for a given function. >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -5237,10 +5721,15 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= """Private method that resolves the input/output definitions for a given function. >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -5249,11 +5738,14 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -5267,12 +5759,15 @@ def _resolve_function_io( >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= """Private method that resolves the input/output definitions for a given Function. @@ -5289,12 +5784,16 @@ def _resolve_function_io( >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -5341,6 +5840,10 @@ def _resolve_function_io( ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) It first searches for the input/outputs in the CREATE statement. If not found, it resolves them using decorators. If not found there as well, it raises an error. Args: @@ -5360,19 +5863,26 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -5381,6 +5891,8 @@ def _resolve_function_io( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) output definitions for the function. >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -5421,10 +5933,15 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= output definitions for the function. >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -5433,11 +5950,14 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -5451,12 +5971,15 @@ def _resolve_function_io( >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= output definitions for the Function. @@ -5473,12 +5996,16 @@ def _resolve_function_io( >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -5525,6 +6052,10 @@ def _resolve_function_io( ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Raises: RuntimeError: If an error occurs while resolving the function input/output @@ -5562,19 +6093,26 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -5583,6 +6121,8 @@ def _resolve_function_io( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) f"Error creating function, input/output definition incorrect: {str(e)}" >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -5623,10 +6163,15 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= f"Error creating function, input/output definition incorrect: {str(e)}" >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -5635,11 +6180,14 @@ def _resolve_function_io( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -5653,12 +6201,15 @@ def _resolve_function_io( >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= f"Error creating Function, input/output definition incorrect: {str(e)}" @@ -5675,12 +6226,16 @@ def _resolve_function_io( >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -5727,6 +6282,10 @@ def _resolve_function_io( ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ) logger.error(err_msg) raise RuntimeError(err_msg) diff --git a/evadb/executor/create_udf_executor.py b/evadb/executor/create_udf_executor.py index fea263f8e..2a77dd351 100644 --- a/evadb/executor/create_udf_executor.py +++ b/evadb/executor/create_udf_executor.py @@ -25,11 +25,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> f028c383 (release: merge staging into master (#1032)) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -42,12 +45,16 @@ >>>>>>> 065f25fb (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -60,6 +67,8 @@ >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) import hashlib import os import pickle @@ -101,6 +110,7 @@ >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -143,9 +153,24 @@ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +import hashlib +import os +import pickle +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from pathlib import Path from typing import Dict, List @@ -181,6 +206,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -189,6 +215,8 @@ >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) try_to_import_forecast, ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) @@ -210,6 +238,7 @@ ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -217,6 +246,10 @@ >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) try_to_import_forecast, ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) @@ -237,6 +270,9 @@ >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= ======= @@ -248,6 +284,7 @@ >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -268,6 +305,8 @@ ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) try_to_import_ludwig, try_to_import_torch, try_to_import_ultralytics, @@ -315,6 +354,7 @@ def handle_ludwig_udf(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -325,6 +365,8 @@ def handle_ludwig_udf(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Use Ludwig's auto_train engine to train/tune models. ======= Use ludwig's auto_train engine to train/tune models. @@ -342,6 +384,7 @@ def handle_ludwig_udf(self): ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -352,6 +395,10 @@ def handle_ludwig_udf(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Use Ludwig's auto_train engine to train/tune models. ======= Use ludwig's auto_train engine to train/tune models. @@ -374,17 +421,21 @@ def handle_ludwig_udf(self): ======= ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Use Ludwig's auto_train engine to train/tune models. ======= Use ludwig's auto_train engine to train/tune models. >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -415,9 +466,22 @@ def handle_ludwig_udf(self): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= + Use Ludwig's auto_train engine to train/tune models. +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) """ try_to_import_ludwig() from ludwig.automl import auto_train @@ -489,6 +553,7 @@ def handle_ultralytics_udf(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) ======= @@ -496,6 +561,8 @@ def handle_ultralytics_udf(self): ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> f028c383 (release: merge staging into master (#1032)) @@ -539,11 +606,23 @@ def handle_ultralytics_udf(self): ======= ======= ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) ======= >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def handle_forecasting_udf(self): """Handle forecasting UDFs""" aggregated_batch_list = [] @@ -668,6 +747,7 @@ def handle_forecasting_udf(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -677,6 +757,8 @@ def handle_forecasting_udf(self): ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -716,6 +798,7 @@ def handle_forecasting_udf(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -748,6 +831,8 @@ def handle_forecasting_udf(self): >>>>>>> 065f25fb (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def handle_generic_udf(self): """Handle generic UDFs @@ -801,6 +886,7 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -811,6 +897,8 @@ def exec(self, *args, **kwargs): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif self.node.udf_type == "Forecasting": name, impl_path, udf_type, io_list, metadata = self.handle_forecasting_udf() ======= @@ -834,6 +922,7 @@ def exec(self, *args, **kwargs): >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) @@ -843,6 +932,8 @@ def exec(self, *args, **kwargs): ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif self.node.udf_type == "Forecasting": name, impl_path, udf_type, io_list, metadata = self.handle_forecasting_udf() ======= @@ -866,17 +957,21 @@ def exec(self, *args, **kwargs): ======= ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif self.node.udf_type == "Forecasting": name, impl_path, udf_type, io_list, metadata = self.handle_forecasting_udf() ======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -905,9 +1000,23 @@ def exec(self, *args, **kwargs): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= + elif self.node.udf_type == "Forecasting": + name, impl_path, udf_type, io_list, metadata = self.handle_forecasting_udf() +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) else: name, impl_path, udf_type, io_list, metadata = self.handle_generic_udf() diff --git a/evadb/executor/drop_object_executor.py b/evadb/executor/drop_object_executor.py index 553fd1e35..4c3f8a1a4 100644 --- a/evadb/executor/drop_object_executor.py +++ b/evadb/executor/drop_object_executor.py @@ -48,9 +48,12 @@ def exec(self, *args, **kwargs): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -117,15 +120,24 @@ def exec(self, *args, **kwargs): >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) elif self.node.object_type == ObjectType.DATABASE: yield self._handle_drop_database(self.node.name, self.node.if_exists) ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) elif self.node.object_type == ObjectType.DATABASE: yield self._handle_drop_database(self.node.name, self.node.if_exists) +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) def _handle_drop_table(self, table_name: str, if_exists: bool): if not self.catalog().check_table_exists(table_name): diff --git a/evadb/functions/chatgpt.py b/evadb/functions/chatgpt.py index f24d97311..3d9a05052 100644 --- a/evadb/functions/chatgpt.py +++ b/evadb/functions/chatgpt.py @@ -95,19 +95,26 @@ def name(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -116,6 +123,8 @@ def name(self) -> str: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) @setup(cacheable=True, function_type="chat-completion", batchable=True) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -156,10 +165,15 @@ def name(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= @setup(cacheable=True, function_type="chat-completion", batchable=True) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -168,11 +182,14 @@ def name(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -186,12 +203,15 @@ def name(self) -> str: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= @setup(cacheable=False, function_type="chat-completion", batchable=True) @@ -208,12 +228,16 @@ def name(self) -> str: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -260,6 +284,10 @@ def name(self) -> str: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def setup( self, model="gpt-3.5-turbo", diff --git a/evadb/functions/forecast.py b/evadb/functions/forecast.py index 8f1856ffd..f59b67782 100644 --- a/evadb/functions/forecast.py +++ b/evadb/functions/forecast.py @@ -63,6 +63,7 @@ >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -77,11 +78,15 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -107,6 +112,10 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.functions.abstract.abstract_function import AbstractFunction from evadb.functions.decorators.decorators import setup @@ -150,11 +159,14 @@ class ForecastModel(AbstractUDF): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -168,10 +180,13 @@ class ForecastModel(AbstractUDF): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -190,6 +205,10 @@ class ForecastModel(AbstractUDF): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.functions.abstract.abstract_function import AbstractFunction from evadb.functions.decorators.decorators import setup @@ -206,6 +225,7 @@ class ForecastModel(AbstractFunction): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -213,6 +233,8 @@ class ForecastModel(AbstractFunction): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -230,11 +252,14 @@ class ForecastModel(AbstractFunction): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -242,6 +267,9 @@ class ForecastModel(AbstractFunction): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -249,6 +277,7 @@ class ForecastModel(AbstractFunction): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -273,6 +302,9 @@ class ForecastModel(AbstractFunction): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) @property def name(self) -> str: return "ForecastModel" @@ -303,9 +335,12 @@ def name(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -313,6 +348,9 @@ def name(self) -> str: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -331,6 +369,7 @@ def name(self) -> str: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -378,6 +417,10 @@ def name(self) -> str: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) @setup(cacheable=False, function_type="Forecasting", batchable=True) def setup( self, @@ -399,9 +442,15 @@ def setup( ======= ): <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= @@ -551,6 +600,7 @@ def setup(self, model_name: str, model_path: str): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -583,6 +633,8 @@ def setup(self, model_name: str, model_path: str): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -599,12 +651,15 @@ def setup(self, model_name: str, model_path: str): ======= ======= ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD horizon: int, library: str, ): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) @@ -635,6 +690,8 @@ def setup(self, model_name: str, model_path: str): >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master ======= @setup(cacheable=False, udf_type="Forecasting", batchable=True) @@ -650,8 +707,18 @@ def setup(self, model_name: str, model_path: str): ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) f = open(model_path, "rb") loaded_model = pickle.load(f) f.close() @@ -666,9 +733,12 @@ def setup(self, model_name: str, model_path: str): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -701,14 +771,27 @@ def setup(self, model_name: str, model_path: str): >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) self.predict_column_rename = predict_column_rename self.time_column_rename = time_column_rename self.id_column_rename = id_column_rename @@ -740,6 +823,7 @@ def setup(self, model_name: str, model_path: str): def forward(self, data) -> pd.DataFrame: <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD horizon = list(data.iloc[:, -1])[0] assert ( @@ -979,6 +1063,8 @@ def forward(self, data) -> pd.DataFrame: >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if self.library == "statsforecast": forecast_df = self.model.predict(h=self.horizon) else: @@ -986,6 +1072,8 @@ def forward(self, data) -> pd.DataFrame: ======= ======= >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) horizon = list(data.iloc[:, -1])[0] assert ( type(horizon) is int @@ -1011,6 +1099,8 @@ def forward(self, data) -> pd.DataFrame: def forward(self, data) -> pd.DataFrame: ======= >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) if self.library == "statsforecast": forecast_df = self.model.predict(h=self.horizon) else: @@ -1021,12 +1111,26 @@ def forward(self, data) -> pd.DataFrame: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) +<<<<<<< HEAD >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) +======= +======= +======= + horizon = list(data.iloc[:, -1])[0] + assert ( + type(horizon) is int + ), "Forecast UDF expects integral horizon in parameter." + forecast_df = self.model.predict(h=horizon) +<<<<<<< HEAD +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) forecast_df.reset_index(inplace=True) forecast_df = forecast_df.rename( columns={ @@ -1040,6 +1144,7 @@ def forward(self, data) -> pd.DataFrame: ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ) <<<<<<< HEAD @@ -1087,6 +1192,8 @@ def forward(self, data) -> pd.DataFrame: ======= ======= ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) @@ -1102,11 +1209,19 @@ def forward(self, data) -> pd.DataFrame: ), "Forecast UDF expects integral horizon in parameter." forecast_df = self.model.predict(h=horizon) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +>>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) forecast_df = forecast_df.rename(columns={self.model_name: "y"}) return pd.DataFrame( forecast_df, @@ -1120,6 +1235,7 @@ def forward(self, data) -> pd.DataFrame: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= ======= @@ -1130,6 +1246,8 @@ def forward(self, data) -> pd.DataFrame: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= if self.library == "statsforecast": forecast_df = self.model.predict(h=self.horizon) @@ -1158,6 +1276,8 @@ def forward(self, data) -> pd.DataFrame: >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= )[: self.horizon * forecast_df["unique_id"].nunique()] return forecast_df @@ -1178,6 +1298,8 @@ def forward(self, data) -> pd.DataFrame: ======= ======= ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= if self.library == "statsforecast": forecast_df = self.model.predict(h=self.horizon) @@ -1193,6 +1315,17 @@ def forward(self, data) -> pd.DataFrame: )[: self.horizon * forecast_df["unique_id"].nunique()] return forecast_df >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/evadb/functions/function_bootstrap_queries.py b/evadb/functions/function_bootstrap_queries.py index f4d8c1832..40b8ff1cb 100644 --- a/evadb/functions/function_bootstrap_queries.py +++ b/evadb/functions/function_bootstrap_queries.py @@ -75,9 +75,12 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -85,6 +88,9 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -103,6 +109,7 @@ ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -150,6 +157,10 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) DummyNoInputFunction_function_query = """CREATE FUNCTION IF NOT EXISTS DummyNoInputFunction IMPL '{}/../test/util.py'; @@ -167,6 +178,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -194,6 +206,7 @@ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -210,6 +223,10 @@ ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -223,6 +240,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -232,6 +250,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -246,6 +266,7 @@ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -254,6 +275,8 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -270,10 +293,14 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -307,6 +334,13 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) fuzzy_function_query = """CREATE FUNCTION IF NOT EXISTS FuzzDistance INPUT (Input_Array1 NDARRAY ANYTYPE, Input_Array2 NDARRAY ANYTYPE) OUTPUT (distance FLOAT(32, 7)) @@ -524,19 +558,26 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -545,6 +586,8 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Args:G >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -585,10 +628,15 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= Args:G >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -597,11 +645,14 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -615,12 +666,15 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= Args: @@ -637,12 +691,16 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -689,6 +747,10 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) mode (str, optional): The mode for loading functions, either 'debug' or 'release'. Defaults to 'debug'. @@ -792,19 +854,26 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -815,6 +884,8 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) DummyNoInputFunction_function_query, DummyLLM_function_query, >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -854,11 +925,15 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -871,6 +946,8 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) DummyNoInputFunction_function_query, DummyLLM_function_query, >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -884,6 +961,7 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -891,6 +969,8 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -900,6 +980,7 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -909,6 +990,10 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -924,6 +1009,9 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -931,6 +1019,7 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -960,6 +1049,9 @@ def init_builtin_functions(db: EvaDBDatabase, mode: str = "debug") -> None: ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ] ) diff --git a/evadb/optimizer/operators.py b/evadb/optimizer/operators.py index cf8a36386..2715d6c42 100644 --- a/evadb/optimizer/operators.py +++ b/evadb/optimizer/operators.py @@ -34,13 +34,17 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -49,6 +53,10 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.catalog.models.utils import IndexCatalogEntry >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -90,6 +98,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -99,6 +108,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -114,6 +125,7 @@ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -122,6 +134,8 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -137,17 +151,24 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -176,6 +197,10 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.expression.abstract_expression import AbstractExpression from evadb.expression.constant_value_expression import ConstantValueExpression from evadb.expression.function_expression import FunctionExpression @@ -836,6 +861,7 @@ class LogicalCreateFunction(Operator): >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -850,11 +876,15 @@ class LogicalCreateFunction(Operator): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -880,6 +910,10 @@ class LogicalCreateFunction(Operator): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool @@ -918,11 +952,14 @@ class LogicalCreateFunction(Operator): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -936,10 +973,13 @@ class LogicalCreateFunction(Operator): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -958,6 +998,10 @@ class LogicalCreateFunction(Operator): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool @@ -973,6 +1017,7 @@ class LogicalCreateFunction(Operator): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -980,6 +1025,8 @@ class LogicalCreateFunction(Operator): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -997,11 +1044,14 @@ class LogicalCreateFunction(Operator): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -1009,6 +1059,9 @@ class LogicalCreateFunction(Operator): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -1016,6 +1069,7 @@ class LogicalCreateFunction(Operator): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -1040,6 +1094,9 @@ class LogicalCreateFunction(Operator): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) inputs: List[FunctionIOCatalogEntry] function inputs, annotated list similar to table columns outputs: List[FunctionIOCatalogEntry] diff --git a/evadb/optimizer/optimizer_utils.py b/evadb/optimizer/optimizer_utils.py index 43fc13ebb..2fb39f977 100644 --- a/evadb/optimizer/optimizer_utils.py +++ b/evadb/optimizer/optimizer_utils.py @@ -333,9 +333,12 @@ def check_expr_validity_for_cache(expr: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -343,6 +346,9 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -361,6 +367,7 @@ def check_expr_validity_for_cache(expr: FunctionExpression): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -408,6 +415,10 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) valid = expr.name in CACHEABLE_FUNCTIONS and not expr.has_cache() if len(expr.children) == 1: # Normal function that only takes one parameter. @@ -421,6 +432,7 @@ def check_expr_validity_for_cache(expr: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -453,12 +465,16 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -477,6 +493,8 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) return ( expr.name in CACHEABLE_FUNCTIONS and not expr.has_cache() @@ -496,6 +514,7 @@ def check_expr_validity_for_cache(expr: FunctionExpression): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -505,6 +524,8 @@ def check_expr_validity_for_cache(expr: FunctionExpression): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -523,6 +544,7 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -533,6 +555,10 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -550,10 +576,14 @@ def check_expr_validity_for_cache(expr: FunctionExpression): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -587,6 +617,13 @@ def check_expr_validity_for_cache(expr: FunctionExpression): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def get_expression_execution_cost( diff --git a/evadb/optimizer/rules/rules.py b/evadb/optimizer/rules/rules.py index b52abd035..f795f3309 100644 --- a/evadb/optimizer/rules/rules.py +++ b/evadb/optimizer/rules/rules.py @@ -30,13 +30,17 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -45,6 +49,10 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.catalog.models.utils import IndexCatalogEntry >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -86,6 +94,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -95,6 +104,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -110,6 +121,7 @@ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -118,6 +130,8 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -133,17 +147,24 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.catalog.models.utils import IndexCatalogEntry ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -172,6 +193,10 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.constants import CACHEABLE_FUNCTIONS from evadb.executor.execution_context import Context from evadb.expression.expression_utils import ( @@ -765,6 +790,7 @@ def _exists_predicate(opr): >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -778,11 +804,15 @@ def _exists_predicate(opr): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -808,6 +838,10 @@ def _exists_predicate(opr): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) # Only check the index existence when building on EvaDB data. if not is_postgres_data_source: @@ -849,20 +883,27 @@ def _exists_predicate(opr): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) @@ -875,6 +916,8 @@ def _exists_predicate(opr): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) # Only check the index existence when building on EvaDB data. @@ -888,6 +931,7 @@ def _exists_predicate(opr): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= ======= @@ -933,6 +977,8 @@ def _exists_predicate(opr): ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -1002,7 +1048,23 @@ def _exists_predicate(opr): type=VectorStoreType.PGVECTOR, feat_column=column_catalog_entry, ) +<<<<<<< HEAD >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +======= +======= +======= + + # Get index catalog. Check if an index exists for matching + # function signature and table columns. + index_catalog_entry = ( + catalog_manager().get_index_catalog_entry_by_column_and_function_signature( + column_catalog_entry, function_signature +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) + ) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) # Get index catalog. Check if an index exists for matching # function signature and table columns. diff --git a/evadb/optimizer/statement_to_opr_converter.py b/evadb/optimizer/statement_to_opr_converter.py index 536455413..10345fec1 100644 --- a/evadb/optimizer/statement_to_opr_converter.py +++ b/evadb/optimizer/statement_to_opr_converter.py @@ -67,19 +67,26 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -109,6 +116,8 @@ >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.parser.table_ref import JoinNode, TableRef, TableValuedExpression from evadb.parser.types import FunctionType, JoinType >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -135,11 +144,15 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -152,6 +165,8 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.parser.table_ref import JoinNode, TableRef, TableValuedExpression from evadb.parser.types import FunctionType, JoinType >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -165,6 +180,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -172,6 +188,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -181,6 +199,7 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -190,6 +209,10 @@ >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= from evadb.parser.table_ref import TableRef @@ -207,6 +230,9 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -214,6 +240,7 @@ >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -239,6 +266,9 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.utils.logging_manager import logger diff --git a/evadb/parser/create_function_statement.py b/evadb/parser/create_function_statement.py index 115b227fe..2847d85bd 100644 --- a/evadb/parser/create_function_statement.py +++ b/evadb/parser/create_function_statement.py @@ -96,9 +96,12 @@ def __str__(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -106,6 +109,9 @@ def __str__(self) -> str: >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -124,6 +130,7 @@ def __str__(self) -> str: ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -171,6 +178,10 @@ def __str__(self) -> str: >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) s = "CREATE" if self._or_replace: @@ -180,6 +191,7 @@ def __str__(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -207,6 +219,7 @@ def __str__(self) -> str: >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -223,6 +236,10 @@ def __str__(self) -> str: ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) s = "CREATE FUNCTION" >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -237,6 +254,7 @@ def __str__(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -258,12 +276,18 @@ def __str__(self) -> str: ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= ======= s = "CREATE FUNCTION" >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -271,6 +295,7 @@ def __str__(self) -> str: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -312,10 +337,14 @@ def __str__(self) -> str: ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -325,8 +354,17 @@ def __str__(self) -> str: ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if self._if_not_exists: s += " IF NOT EXISTS" diff --git a/evadb/parser/evadb.lark b/evadb/parser/evadb.lark index a96966b85..c6e7c0315 100644 --- a/evadb/parser/evadb.lark +++ b/evadb/parser/evadb.lark @@ -85,9 +85,12 @@ rename_table: RENAME TABLE table_name TO table_name <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -95,6 +98,9 @@ rename_table: RENAME TABLE table_name TO table_name >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -113,6 +119,7 @@ rename_table: RENAME TABLE table_name TO table_name ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -160,6 +167,10 @@ rename_table: RENAME TABLE table_name TO table_name >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) create_function: CREATE or_replace? FUNCTION if_not_exists? function_name INPUT create_definitions OUTPUT create_definitions TYPE function_type IMPL function_impl function_metadata* | CREATE or_replace? FUNCTION if_not_exists? function_name IMPL function_impl function_metadata* | CREATE or_replace? FUNCTION if_not_exists? function_name TYPE function_type function_metadata* @@ -167,6 +178,7 @@ create_function: CREATE or_replace? FUNCTION if_not_exists? function_name INPUT <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -199,12 +211,16 @@ create_function: CREATE or_replace? FUNCTION if_not_exists? function_name INPUT >>>>>>> 7cac771f (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> b87af508 (feat: sync master staging (#1050)) @@ -223,6 +239,8 @@ create_function: CREATE or_replace? FUNCTION if_not_exists? function_name INPUT >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_definitions OUTPUT create_definitions TYPE function_type IMPL function_impl function_metadata* | CREATE FUNCTION if_not_exists? function_name IMPL function_impl function_metadata* | CREATE FUNCTION if_not_exists? function_name TYPE function_type function_metadata* @@ -240,6 +258,7 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -249,6 +268,8 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -267,6 +288,7 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -277,6 +299,10 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -294,10 +320,14 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -331,6 +361,13 @@ create_function: CREATE FUNCTION if_not_exists? function_name INPUT create_defin ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) // Details function_name: uid @@ -639,19 +676,26 @@ function_call: function ->function_call <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -660,6 +704,8 @@ function_call: function ->function_call >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) function: simple_id "(" (STAR | function_args)? ")" dotted_id? >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -700,11 +746,16 @@ function: simple_id "(" (STAR | function_args) ")" dotted_id? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= function: simple_id "(" (STAR | function_args)? ")" dotted_id? >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -712,11 +763,14 @@ function: simple_id "(" (STAR | function_args)? ")" dotted_id? <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -730,12 +784,15 @@ function: simple_id "(" (STAR | function_args)? ")" dotted_id? >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= function: simple_id "(" (STAR | function_args) ")" dotted_id? @@ -752,12 +809,16 @@ function: simple_id "(" (STAR | function_args) ")" dotted_id? >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -804,6 +865,10 @@ function: simple_id "(" (STAR | function_args)? ")" dotted_id? ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) aggregate_windowed_function: aggregate_function_name "(" function_arg ")" | COUNT "(" (STAR | function_arg) ")" diff --git a/evadb/parser/lark_visitor/_create_statements.py b/evadb/parser/lark_visitor/_create_statements.py index cc7849aeb..2b3e75c64 100644 --- a/evadb/parser/lark_visitor/_create_statements.py +++ b/evadb/parser/lark_visitor/_create_statements.py @@ -420,6 +420,7 @@ def create_index(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -465,6 +466,7 @@ def create_index(self, tree): ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) @@ -498,6 +500,10 @@ def create_index(self, tree): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -600,6 +606,7 @@ def create_index(self, tree): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -651,9 +658,25 @@ def create_index(self, tree): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= + index_name, if_not_exists, table_ref, col_list, vector_store_type, function +======= + index_name, table_ref, col_list, vector_store_type, function +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ) def vector_store_type(self, tree): diff --git a/evadb/parser/lark_visitor/_drop_statement.py b/evadb/parser/lark_visitor/_drop_statement.py index 95dabc0da..b521e6245 100644 --- a/evadb/parser/lark_visitor/_drop_statement.py +++ b/evadb/parser/lark_visitor/_drop_statement.py @@ -85,9 +85,12 @@ def drop_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -95,6 +98,9 @@ def drop_function(self, tree): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -113,6 +119,7 @@ def drop_function(self, tree): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -160,6 +167,10 @@ def drop_function(self, tree): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) # Drop Database def drop_database(self, tree): @@ -177,6 +188,7 @@ def drop_database(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -218,6 +230,7 @@ def drop_job(self, tree): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -234,6 +247,10 @@ def drop_job(self, tree): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -247,6 +264,7 @@ def drop_job(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -256,6 +274,8 @@ def drop_job(self, tree): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -270,6 +290,7 @@ def drop_job(self, tree): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -278,6 +299,8 @@ def drop_job(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -294,10 +317,14 @@ def drop_job(self, tree): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -331,3 +358,10 @@ def drop_job(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/evadb/parser/lark_visitor/_functions.py b/evadb/parser/lark_visitor/_functions.py index 23e0e0da8..a1f03ced2 100644 --- a/evadb/parser/lark_visitor/_functions.py +++ b/evadb/parser/lark_visitor/_functions.py @@ -42,19 +42,26 @@ def function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -63,6 +70,8 @@ def function(self, tree): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) function_args = [] >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -103,10 +112,15 @@ def function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= function_args = [] >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -115,11 +129,14 @@ def function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -133,12 +150,15 @@ def function(self, tree): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= function_args = None @@ -155,12 +175,16 @@ def function(self, tree): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -207,6 +231,10 @@ def function(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) for child in tree.children: if isinstance(child, Token): @@ -248,13 +276,17 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -263,6 +295,10 @@ def create_function(self, tree): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace = False >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -304,6 +340,7 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -312,6 +349,8 @@ def create_function(self, tree): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= or_replace = False ======= @@ -328,6 +367,7 @@ def create_function(self, tree): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -336,6 +376,8 @@ def create_function(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -351,17 +393,24 @@ def create_function(self, tree): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace = False ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -390,6 +439,10 @@ def create_function(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if_not_exists = False input_definitions = [] output_definitions = [] @@ -415,19 +468,26 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -438,6 +498,8 @@ def create_function(self, tree): >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif child.data == "or_replace": or_replace = True >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -477,11 +539,15 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -494,6 +560,8 @@ def create_function(self, tree): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif child.data == "or_replace": or_replace = True >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -507,6 +575,7 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -514,6 +583,8 @@ def create_function(self, tree): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -523,6 +594,7 @@ def create_function(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -532,6 +604,10 @@ def create_function(self, tree): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -547,6 +623,9 @@ def create_function(self, tree): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -554,6 +633,7 @@ def create_function(self, tree): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -583,6 +663,9 @@ def create_function(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) elif child.data == "if_not_exists": if_not_exists = True elif child.data == "create_definitions": @@ -625,13 +708,17 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -640,6 +727,10 @@ def create_function(self, tree): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace, >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -681,6 +772,7 @@ def create_function(self, tree): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -689,6 +781,8 @@ def create_function(self, tree): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= or_replace, ======= @@ -705,6 +799,7 @@ def create_function(self, tree): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -713,6 +808,8 @@ def create_function(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -728,17 +825,24 @@ def create_function(self, tree): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -767,6 +871,10 @@ def create_function(self, tree): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if_not_exists, impl_path, input_definitions, diff --git a/evadb/plan_nodes/create_function_plan.py b/evadb/plan_nodes/create_function_plan.py index ed5d88cf9..f9500a30f 100644 --- a/evadb/plan_nodes/create_function_plan.py +++ b/evadb/plan_nodes/create_function_plan.py @@ -69,6 +69,7 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -83,11 +84,15 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -113,6 +118,10 @@ class CreateFunctionPlan(AbstractPlan): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool @@ -151,11 +160,14 @@ class CreateFunctionPlan(AbstractPlan): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -169,10 +181,13 @@ class CreateFunctionPlan(AbstractPlan): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -191,6 +206,10 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace: bool if true should overwrite if function with same name exists if_not_exists: bool @@ -206,6 +225,7 @@ class CreateFunctionPlan(AbstractPlan): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -213,6 +233,8 @@ class CreateFunctionPlan(AbstractPlan): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -230,11 +252,14 @@ class CreateFunctionPlan(AbstractPlan): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -242,6 +267,9 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -249,6 +277,7 @@ class CreateFunctionPlan(AbstractPlan): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -273,6 +302,9 @@ class CreateFunctionPlan(AbstractPlan): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) inputs: List[FunctionIOCatalogEntry] function inputs, annotated list similar to table columns outputs: List[FunctionIOCatalogEntry] @@ -350,13 +382,17 @@ def __str__(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -365,6 +401,10 @@ def __str__(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace={}, \ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -406,6 +446,7 @@ def __str__(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -414,6 +455,8 @@ def __str__(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= or_replace={}, \ ======= @@ -430,6 +473,7 @@ def __str__(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -438,6 +482,8 @@ def __str__(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -453,17 +499,24 @@ def __str__(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace={}, \ ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -492,6 +545,10 @@ def __str__(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if_not_exists={}, \ inputs={}, \ outputs={}, \ diff --git a/evadb/third_party/databases/mariadb/__init__.py b/evadb/third_party/databases/mariadb/__init__.py index fb0afee81..a2e879d5a 100644 --- a/evadb/third_party/databases/mariadb/__init__.py +++ b/evadb/third_party/databases/mariadb/__init__.py @@ -17,14 +17,19 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) <<<<<<< HEAD """mariadb integrations""" ======= <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -32,6 +37,9 @@ >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) <<<<<<<< HEAD:evadb/third_party/databases/mariadb/__init__.py """mariadb integrations""" ======== @@ -43,9 +51,13 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= <<<<<<<< HEAD:evadb/third_party/databases/mariadb/__init__.py @@ -55,6 +67,7 @@ >>>>>>>> 2dacff69 (feat: sync master staging (#1050)):test/integration_tests/long/functions/ndarray/__init__.py >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -69,3 +82,6 @@ >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/evadb/utils/generic_utils.py b/evadb/utils/generic_utils.py index 27f3b4c87..933ed0720 100644 --- a/evadb/utils/generic_utils.py +++ b/evadb/utils/generic_utils.py @@ -622,6 +622,7 @@ def is_forecast_available() -> bool: return False +<<<<<<< HEAD def try_to_import_sklearn(): try: import sklearn # noqa: F401 @@ -849,9 +850,12 @@ def is_xgboost_available() -> bool: <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD ======= @@ -860,6 +864,9 @@ def is_xgboost_available() -> bool: >>>>>>> 201f901b (Starting the change for XGBoost integration into EVADb. (#1232)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) ======= ======= @@ -867,6 +874,7 @@ def is_xgboost_available() -> bool: >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -874,6 +882,8 @@ def is_xgboost_available() -> bool: ======= >>>>>>> 4771bdec (Starting the change for XGBoost integration into EVADb. (#1232)) >>>>>>> dda3558c (Starting the change for XGBoost integration into EVADb. (#1232)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ############################## ## VISION ############################## diff --git a/script/formatting/spelling.txt b/script/formatting/spelling.txt index 5dd645a4a..e7e3754f4 100644 --- a/script/formatting/spelling.txt +++ b/script/formatting/spelling.txt @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 061e9d6d (docs: updates) @@ -13,6 +14,8 @@ >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) <<<<<<< HEAD personal_ws-1.1 en 1563 ======= @@ -58,6 +61,8 @@ personal_ws-1.1 en 1845 personal_ws-1.1 en 1776 >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) personal_ws-1.1 en 1776 >>>>>>> 065f25fb (release: merge staging into master (#1032)) ======= @@ -150,18 +155,24 @@ personal_ws-1.1 en 1563 ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> fb00f6de (ran spellchecker) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) personal_ws-1.1 en 1563 ======= personal_ws-1.1 en 1467 >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) @@ -228,10 +239,26 @@ personal_ws-1.1 en 1563 >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> c63abee7 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +personal_ws-1.1 en 1563 +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ABCD ABCMeta ANYDIM @@ -1249,6 +1276,7 @@ MydbHandler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -1261,6 +1289,8 @@ MydbHandler >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) MysqlHandler NBEATS NCHAR @@ -1279,6 +1309,7 @@ MysqlHandler ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -1287,6 +1318,10 @@ MysqlHandler >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) MysqlHandler <<<<<<< HEAD ======= @@ -1369,6 +1404,7 @@ MysqlHandler <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -1418,9 +1454,27 @@ MysqlHandler >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +MysqlHandler +======= +>>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +======= +MysqlHandler +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) NEQ NHITS NLP @@ -1697,11 +1751,14 @@ SamplePlan <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -1716,6 +1773,7 @@ SamplePlan >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1728,6 +1786,14 @@ SamplePlan >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SampleTable SampleVideoTable >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -1768,18 +1834,25 @@ SampleVideoTable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> b87af508 (feat: sync master staging (#1050)) ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) @@ -1790,6 +1863,8 @@ SampleVideoTable ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SampleTable SampleVideoTable >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -1804,6 +1879,7 @@ SampleVideoTable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -1813,6 +1889,8 @@ SampleVideoTable ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1827,6 +1905,7 @@ SampleVideoTable >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= >>>>>>> 54907d3e (release: merge staging into master (#1032)) @@ -1836,6 +1915,8 @@ SampleVideoTable ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -1862,6 +1943,9 @@ SampleVideoTable >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= ======= @@ -1871,6 +1955,7 @@ SampleVideoTable >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= SampleTable SampleVideoTable @@ -1894,6 +1979,8 @@ SampleVideoTable ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) Scalability ScanPlan SchemaUtils @@ -2548,11 +2635,14 @@ feedstock <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= @@ -2563,6 +2653,7 @@ feedstock ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -2570,6 +2661,10 @@ feedstock ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) fetchall >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -2612,6 +2707,7 @@ fetchall <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -2623,6 +2719,8 @@ fetchall ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= fetchall ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -2639,6 +2737,7 @@ fetchall ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -2649,6 +2748,10 @@ fetchall >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -2672,16 +2775,22 @@ fetchall ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) fetchall ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -2711,9 +2820,21 @@ fetchall >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ffill ffmpeg fileFormat @@ -3302,6 +3423,7 @@ sk <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> a9124e1e (release: merge staging into master (#1032)) ======= @@ -3349,6 +3471,8 @@ smallint >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) sklearn ======= ======= @@ -3358,6 +3482,8 @@ sklearn ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= ======= >>>>>>> 7dd70375 (release: merge staging into master (#1032)) ======= @@ -3384,8 +3510,19 @@ sklearn <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> f028c383 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 54907d3e (release: merge staging into master (#1032)) +======= +======= +======= +sklearn +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) smallint ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -3403,6 +3540,7 @@ smallint <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 30d7834d (release: merge staging into master (#1032)) ======= @@ -3414,6 +3552,8 @@ smallint ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= smallint ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -3430,6 +3570,7 @@ smallint ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -3440,6 +3581,10 @@ smallint >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) @@ -3463,16 +3608,22 @@ smallint ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) smallint ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -3501,9 +3652,21 @@ smallint >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) smi softmax spacy diff --git a/setup.py b/setup.py index 793bc47cf..740d94dc0 100644 --- a/setup.py +++ b/setup.py @@ -378,6 +378,10 @@ def read(path, encoding="utf-8"): ======= >>>>>>> 8c5b63dc (release: merge staging into master (#1032)) +forecasting_libs = [ + "statsforecast" # MODEL TRAIN AND FINE TUNING +] + ### NEEDED FOR DEVELOPER TESTING ONLY dev_libs = [ @@ -428,6 +432,7 @@ def read(path, encoding="utf-8"): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -466,11 +471,15 @@ def read(path, encoding="utf-8"): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eva-master @@ -484,8 +493,16 @@ def read(path, encoding="utf-8"): ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) "sklearn": sklearn_libs, "xgboost": xgboost_libs, "forecasting": forecasting_libs, @@ -557,6 +574,7 @@ def read(path, encoding="utf-8"): >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD @@ -590,6 +608,8 @@ def read(path, encoding="utf-8"): ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -597,7 +617,22 @@ def read(path, encoding="utf-8"): ======= <<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) + "sklearn": sklearn_libs, + "forecasting": forecasting_libs, + # everything except ray, qdrant, ludwig and postgres. The first three fail on pyhton 3.11. + "dev": dev_libs + vision_libs + document_libs + function_libs + notebook_libs + forecasting_libs + sklearn_libs, +<<<<<<< HEAD +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= "dev": dev_libs + vision_libs + document_libs + function_libs + notebook_libs + forecasting_libs + sklearn_libs + imagegen_libs, @@ -616,6 +651,7 @@ def read(path, encoding="utf-8"): ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -685,11 +721,14 @@ def read(path, encoding="utf-8"): ======= ======= ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= "forecasting": forecasting_libs, # everything except ray, qdrant, ludwig and postgres. The first three fail on pyhton 3.11. "dev": dev_libs + vision_libs + document_libs + function_libs + notebook_libs + forecasting_libs, >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +<<<<<<< HEAD >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -699,8 +738,17 @@ def read(path, encoding="utf-8"): ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) } setup( diff --git a/test/integration_tests/long/test_function_executor.py b/test/integration_tests/long/test_function_executor.py index 9bffeb840..87a675e55 100644 --- a/test/integration_tests/long/test_function_executor.py +++ b/test/integration_tests/long/test_function_executor.py @@ -193,9 +193,12 @@ def test_create_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -203,6 +206,9 @@ def test_create_function(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -221,6 +227,7 @@ def test_create_function(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -268,6 +275,10 @@ def test_create_function(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_create_or_replace(self): function_name = "DummyObjectDetector" execute_query_fetch_all(self.evadb, f"DROP FUNCTION IF EXISTS {function_name};") @@ -295,6 +306,7 @@ def test_create_or_replace(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -322,6 +334,7 @@ def test_create_or_replace(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -338,6 +351,10 @@ def test_create_or_replace(self): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -351,6 +368,7 @@ def test_create_or_replace(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -360,6 +378,8 @@ def test_create_or_replace(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -374,6 +394,7 @@ def test_create_or_replace(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -382,6 +403,8 @@ def test_create_or_replace(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -398,10 +421,14 @@ def test_create_or_replace(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -435,6 +462,13 @@ def test_create_or_replace(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_should_create_function_with_metadata(self): function_name = "DummyObjectDetector" execute_query_fetch_all(self.evadb, f"DROP FUNCTION {function_name};") diff --git a/test/integration_tests/long/test_model_forecasting.py b/test/integration_tests/long/test_model_forecasting.py index 8dade3723..a3834e4da 100644 --- a/test/integration_tests/long/test_model_forecasting.py +++ b/test/integration_tests/long/test_model_forecasting.py @@ -167,6 +167,8 @@ def setUpClass(cls): ylagged INTEGER);""" execute_query_fetch_all(cls.evadb, create_table_query) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) create_table_query = """ CREATE TABLE HomeData (\ saledate TEXT(30),\ @@ -178,6 +180,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -205,6 +208,7 @@ def setUpClass(cls): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -221,6 +225,10 @@ def setUpClass(cls): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -234,6 +242,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -243,6 +252,8 @@ def setUpClass(cls): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -257,6 +268,7 @@ def setUpClass(cls): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -265,6 +277,8 @@ def setUpClass(cls): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -281,10 +295,14 @@ def setUpClass(cls): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -318,6 +336,13 @@ def setUpClass(cls): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) path = f"{EvaDB_ROOT_DIR}/data/forecasting/air-passengers.csv" load_query = f"LOAD CSV '{path}' INTO AirData;" execute_query_fetch_all(cls.evadb, load_query) @@ -338,6 +363,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -349,6 +375,8 @@ def setUpClass(cls): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= ======= @@ -361,6 +389,8 @@ def setUpClass(cls): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -399,6 +429,7 @@ def setUpClass(cls): ======= ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -429,6 +460,10 @@ def setUpClass(cls): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -444,9 +479,12 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -465,6 +503,7 @@ def setUpClass(cls): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -493,6 +532,9 @@ def setUpClass(cls): >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) >>>>>>> 8eeef957 (Add support for Neuralforecast (#1115)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) path = f"{EvaDB_ROOT_DIR}/data/forecasting/home_sales.csv" load_query = f"LOAD CSV '{path}' INTO HomeData;" execute_query_fetch_all(cls.evadb, load_query) @@ -500,6 +542,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -527,6 +570,7 @@ def setUpClass(cls): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -543,6 +587,10 @@ def setUpClass(cls): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -556,6 +604,7 @@ def setUpClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -565,6 +614,8 @@ def setUpClass(cls): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -579,6 +630,7 @@ def setUpClass(cls): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -587,6 +639,8 @@ def setUpClass(cls): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -603,10 +657,14 @@ def setUpClass(cls): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -640,6 +698,13 @@ def setUpClass(cls): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) @classmethod def tearDownClass(cls): shutdown_ray() @@ -671,9 +736,12 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -681,6 +749,9 @@ def tearDownClass(cls): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -699,6 +770,7 @@ def tearDownClass(cls): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -746,6 +818,10 @@ def tearDownClass(cls): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) execute_query_fetch_all(cls.evadb, "DROP TABLE IF EXISTS AirData;") execute_query_fetch_all(cls.evadb, "DROP TABLE IF EXISTS HomeData;") @@ -754,6 +830,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -781,6 +858,7 @@ def tearDownClass(cls): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -797,6 +875,10 @@ def tearDownClass(cls): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) execute_query_fetch_all(cls.evadb, "DROP TABLE IF EXISTS HomeRentals;") >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -811,6 +893,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -832,12 +915,18 @@ def tearDownClass(cls): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= ======= execute_query_fetch_all(cls.evadb, "DROP TABLE IF EXISTS HomeRentals;") >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -845,6 +934,7 @@ def tearDownClass(cls): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -886,10 +976,14 @@ def tearDownClass(cls): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -899,8 +993,17 @@ def tearDownClass(cls): ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) @forecast_skip_marker def test_forecast(self): @@ -917,6 +1020,7 @@ def test_forecast(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> c5f43c65 (Bump v0.3.4+ dev) @@ -966,6 +1070,8 @@ def test_forecast(self): ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= CREATE FUNCTION AirForecast FROM >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -974,6 +1080,15 @@ def test_forecast(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) + CREATE FUNCTION AirForecast FROM +======= +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> 70850a8b (feat: sync master staging (#1050)) CREATE FUNCTION AirForecast FROM ======= CREATE FUNCTION Forecast FROM @@ -984,7 +1099,18 @@ def test_forecast(self): ======= CREATE FUNCTION AirForecast FROM >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> ae08f806 (Bump v0.3.4+ dev) +======= +<<<<<<< HEAD +======= +>>>>>>> eva-master +======= + CREATE FUNCTION Forecast FROM +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) (SELECT unique_id, ds, y FROM AirData) TYPE Forecasting HORIZON 12 @@ -1092,6 +1218,7 @@ def test_forecast(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD SELECT AirForecast() order by y; ======= @@ -1270,8 +1397,12 @@ def test_forecast_with_column_rename(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) SELECT AirForecast() order by y; ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -1289,7 +1420,16 @@ def test_forecast_with_column_rename(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) SELECT AirForecast() order by y; >>>>>>> e8a181c5 (Add support for Neuralforecast (#1115)) +<<<<<<< HEAD >>>>>>> ca239aea (Add support for Neuralforecast (#1115)) +======= +======= + SELECT AirForecast() order by y; +======= + SELECT AirForecast(12) order by y; +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) """ result = execute_query_fetch_all(self.evadb, predict_query) self.assertEqual(len(result), 12) @@ -1364,6 +1504,7 @@ def test_forecast_with_column_rename(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -1404,6 +1545,8 @@ def test_forecast_with_column_rename(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) >>>>>>> 8da6decc (Bump v0.3.4+ dev) >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -1419,6 +1562,8 @@ def test_forecast_with_column_rename(self): ======= <<<<<<< HEAD ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> eva-master ======= @@ -1510,6 +1655,7 @@ def test_forecast_with_column_rename(self): ======= ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> eva-master ======= ======= @@ -1528,8 +1674,18 @@ def test_forecast_with_column_rename(self): ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if __name__ == "__main__": diff --git a/test/integration_tests/long/test_model_train.py b/test/integration_tests/long/test_model_train.py index c7b477603..9087b383b 100644 --- a/test/integration_tests/long/test_model_train.py +++ b/test/integration_tests/long/test_model_train.py @@ -150,19 +150,26 @@ def test_ludwig_automl(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -171,6 +178,8 @@ def test_ludwig_automl(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) CREATE OR REPLACE FUNCTION PredictHouseRentLudwig FROM >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -211,10 +220,15 @@ def test_ludwig_automl(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= CREATE OR REPLACE FUNCTION PredictHouseRentLudwig FROM >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -223,11 +237,14 @@ def test_ludwig_automl(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -241,12 +258,15 @@ def test_ludwig_automl(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= CREATE FUNCTION IF NOT EXISTS PredictHouseRent FROM @@ -263,12 +283,16 @@ def test_ludwig_automl(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -315,6 +339,10 @@ def test_ludwig_automl(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ( SELECT * FROM HomeRentals ) TYPE Ludwig PREDICT 'rental_price' diff --git a/test/integration_tests/long/test_reuse.py b/test/integration_tests/long/test_reuse.py index 4d4564b9e..16265077e 100644 --- a/test/integration_tests/long/test_reuse.py +++ b/test/integration_tests/long/test_reuse.py @@ -81,9 +81,12 @@ def setUp(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -91,6 +94,9 @@ def setUp(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -109,6 +115,7 @@ def setUp(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -156,6 +163,10 @@ def setUp(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) execute_query_fetch_all(self.evadb, "CREATE TABLE fruitTable (data TEXT(100))") data_list = [ "The color of apple is red", @@ -168,6 +179,7 @@ def setUp(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -195,6 +207,7 @@ def setUp(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -211,6 +224,10 @@ def setUp(self): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -224,6 +241,7 @@ def setUp(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -233,6 +251,8 @@ def setUp(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -247,6 +267,7 @@ def setUp(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -255,6 +276,8 @@ def setUp(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -271,10 +294,14 @@ def setUp(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -308,6 +335,13 @@ def setUp(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) load_functions_for_testing(self.evadb) self._load_hf_model() diff --git a/test/integration_tests/short/test_drop_executor.py b/test/integration_tests/short/test_drop_executor.py index 977991045..ae6ccc1f8 100644 --- a/test/integration_tests/short/test_drop_executor.py +++ b/test/integration_tests/short/test_drop_executor.py @@ -138,9 +138,12 @@ def test_should_drop_table(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -148,6 +151,9 @@ def test_should_drop_table(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -166,6 +172,7 @@ def test_should_drop_table(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -213,6 +220,10 @@ def test_should_drop_table(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) # we should be able to re-create the table execute_query_fetch_all(self.evadb, query) # clean up @@ -221,6 +232,7 @@ def test_should_drop_table(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -248,6 +260,7 @@ def test_should_drop_table(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -264,6 +277,10 @@ def test_should_drop_table(self): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -277,6 +294,7 @@ def test_should_drop_table(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -286,6 +304,8 @@ def test_should_drop_table(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -300,6 +320,7 @@ def test_should_drop_table(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -308,6 +329,8 @@ def test_should_drop_table(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -324,10 +347,14 @@ def test_should_drop_table(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -361,6 +388,13 @@ def test_should_drop_table(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def run_create_function_query(self): create_function_query = """CREATE FUNCTION DummyObjectDetector INPUT (Frame_Array NDARRAY UINT8(3, 256, 256)) @@ -411,9 +445,12 @@ def test_should_drop_function(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -421,6 +458,9 @@ def test_should_drop_function(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -439,6 +479,7 @@ def test_should_drop_function(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -486,6 +527,10 @@ def test_should_drop_function(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) # We should be able to re-create the function self.run_create_function_query() # clean up diff --git a/test/integration_tests/short/test_select_executor.py b/test/integration_tests/short/test_select_executor.py index 7b53d6be0..b947cbf71 100644 --- a/test/integration_tests/short/test_select_executor.py +++ b/test/integration_tests/short/test_select_executor.py @@ -446,19 +446,26 @@ def test_expression_tree_signature(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -467,6 +474,8 @@ def test_expression_tree_signature(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) signature = next(plan.find_all(LogicalFilter)).predicate.children[0].signature() >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -507,10 +516,15 @@ def test_expression_tree_signature(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= signature = next(plan.find_all(LogicalFilter)).predicate.children[0].signature() >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -519,11 +533,14 @@ def test_expression_tree_signature(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -537,12 +554,15 @@ def test_expression_tree_signature(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= signature = plan.target_list[0].signature() @@ -559,12 +579,16 @@ def test_expression_tree_signature(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -611,6 +635,10 @@ def test_expression_tree_signature(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) function_id = ( self.evadb.catalog() .get_function_catalog_entry_by_name("DummyMultiObjectDetector") diff --git a/test/markers.py b/test/markers.py index 66d342814..2240a1212 100644 --- a/test/markers.py +++ b/test/markers.py @@ -31,6 +31,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -39,6 +40,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -63,6 +66,8 @@ ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) is_chromadb_available, >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -96,13 +101,26 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +======= + is_chromadb_available, +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +======= +>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -117,6 +135,7 @@ ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) @@ -127,6 +146,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) is_chromadb_available, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -134,6 +155,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -175,6 +197,10 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) is_forecast_available, is_gpu_available, is_ludwig_available, diff --git a/test/unit_tests/binder/test_statement_binder.py b/test/unit_tests/binder/test_statement_binder.py index 2a464c304..c5d4cb4a6 100644 --- a/test/unit_tests/binder/test_statement_binder.py +++ b/test/unit_tests/binder/test_statement_binder.py @@ -663,6 +663,7 @@ def test_bind_create_index(self): >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -677,11 +678,15 @@ def test_bind_create_index(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -707,6 +712,10 @@ def test_bind_create_index(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_bind_create_function_should_raise_without_predict_for_ludwig(self): with patch.object(StatementBinder, "bind"): create_function_statement = MagicMock() @@ -745,11 +754,14 @@ def test_bind_create_function_should_raise(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -763,10 +775,13 @@ def test_bind_create_function_should_raise(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -785,6 +800,10 @@ def test_bind_create_function_should_raise(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_bind_create_function_should_raise_without_predict_for_ludwig(self): with patch.object(StatementBinder, "bind"): create_function_statement = MagicMock() @@ -800,6 +819,7 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -807,6 +827,8 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -824,11 +846,14 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -836,6 +861,9 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -843,6 +871,7 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -867,6 +896,9 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) create_function_statement.query.target_list = [] create_function_statement.metadata = [] binder = StatementBinder(StatementBinderContext(MagicMock())) @@ -914,6 +946,7 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -928,11 +961,15 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -958,6 +995,10 @@ def test_bind_create_function_should_raise_without_predict_for_ludwig(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_bind_create_function_should_drop_row_id_for_select_star(self): with patch.object(StatementBinder, "bind"): create_function_statement = MagicMock() @@ -996,11 +1037,14 @@ def test_bind_create_function_should_drop_row_id(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -1014,10 +1058,13 @@ def test_bind_create_function_should_drop_row_id(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -1036,6 +1083,10 @@ def test_bind_create_function_should_drop_row_id(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_bind_create_function_should_drop_row_id_for_select_star(self): with patch.object(StatementBinder, "bind"): create_function_statement = MagicMock() @@ -1051,6 +1102,7 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -1058,6 +1110,8 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -1075,11 +1129,14 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -1087,6 +1144,9 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -1094,6 +1154,7 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -1118,6 +1179,9 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) row_id_col_obj = ColumnCatalogEntry( name=IDENTIFIER_COLUMN, type=MagicMock(), @@ -1209,9 +1273,12 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -1219,6 +1286,9 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -1237,6 +1307,7 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -1284,6 +1355,10 @@ def test_bind_create_function_should_drop_row_id_for_select_star(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_bind_create_function_should_bind_forecast_with_default_columns(self): with patch.object(StatementBinder, "bind"): @@ -1578,6 +1653,7 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -1605,6 +1681,7 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -1621,6 +1698,10 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -1634,6 +1715,7 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -1643,6 +1725,8 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -1657,6 +1741,7 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -1665,6 +1750,8 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -1681,10 +1768,14 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -1718,3 +1809,10 @@ def test_bind_create_function_should_raise_forecast_missing_required_columns(sel ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/test/unit_tests/executor/test_create_udf_executor.py b/test/unit_tests/executor/test_create_udf_executor.py index f749710a2..99e515690 100644 --- a/test/unit_tests/executor/test_create_udf_executor.py +++ b/test/unit_tests/executor/test_create_udf_executor.py @@ -83,9 +83,12 @@ def test_should_create_function(self, load_function_class_from_file_mock): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -93,6 +96,9 @@ def test_should_create_function(self, load_function_class_from_file_mock): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -111,6 +117,7 @@ def test_should_create_function(self, load_function_class_from_file_mock): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -158,6 +165,10 @@ def test_should_create_function(self, load_function_class_from_file_mock): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_should_raise_or_replace_if_not_exists(self): plan = type( "CreateFunctionPlan", @@ -192,6 +203,9 @@ def test_should_skip_if_not_exists(self, load_function_class_from_file_mock): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= @@ -216,6 +230,10 @@ def test_should_skip_if_not_exists(self, load_function_class_from_file_mock): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -267,6 +285,7 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -276,6 +295,8 @@ def test_should_raise_error_on_incorrect_io_definition( ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -294,6 +315,7 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) @@ -304,6 +326,10 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -321,10 +347,14 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -358,6 +388,13 @@ def test_should_raise_error_on_incorrect_io_definition( ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) catalog_instance().insert_function_catalog_entry.return_value = "function" impl_path = MagicMock() abs_path = impl_path.absolute.return_value = MagicMock() @@ -389,9 +426,12 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -399,6 +439,9 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -417,6 +460,7 @@ def test_should_raise_error_on_incorrect_io_definition( ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -464,6 +508,10 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) plan = type( "CreateFunctionPlan", (), @@ -686,19 +734,26 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -707,6 +762,8 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) "Error creating function, input/output definition incorrect:", >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -747,10 +804,15 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= "Error creating function, input/output definition incorrect:", >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -759,11 +821,14 @@ def test_should_raise_error_on_incorrect_io_definition( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -777,12 +842,15 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= "Error creating Function, input/output definition incorrect:", @@ -799,12 +867,16 @@ def test_should_raise_error_on_incorrect_io_definition( >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -851,6 +923,10 @@ def test_should_raise_error_on_incorrect_io_definition( ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) str(exc.exception), ) diff --git a/test/unit_tests/executor/test_plan_executor.py b/test/unit_tests/executor/test_plan_executor.py index 6ce279dfc..1a85088eb 100644 --- a/test/unit_tests/executor/test_plan_executor.py +++ b/test/unit_tests/executor/test_plan_executor.py @@ -193,19 +193,26 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -214,6 +221,8 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) tree = MagicMock(node=CreateFunctionPlan(None, False, False, [], [], None)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -254,10 +263,15 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= tree = MagicMock(node=CreateFunctionPlan(None, False, False, [], [], None)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -266,11 +280,14 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -284,12 +301,15 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= tree = MagicMock(node=CreateFunctionPlan(None, False, [], [], None)) @@ -306,12 +326,16 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -358,6 +382,10 @@ def test_execute_plan_for_create_insert_load_upload_plans(self, mock_build): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) mock_build.return_value = tree actual = list(PlanExecutor(MagicMock(), None).execute_plan()) tree.exec.assert_called_once() diff --git a/test/unit_tests/optimizer/test_statement_to_opr_converter.py b/test/unit_tests/optimizer/test_statement_to_opr_converter.py index 0c0605b64..ce5f9323a 100644 --- a/test/unit_tests/optimizer/test_statement_to_opr_converter.py +++ b/test/unit_tests/optimizer/test_statement_to_opr_converter.py @@ -163,9 +163,12 @@ def test_visit_select_should_not_call_visits_for_null_values(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -173,6 +176,9 @@ def test_visit_select_should_not_call_visits_for_null_values(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -191,6 +197,7 @@ def test_visit_select_should_not_call_visits_for_null_values(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -238,6 +245,10 @@ def test_visit_select_should_not_call_visits_for_null_values(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_visit_select_without_table_ref(self): converter = StatementToPlanConverter() converter.visit_table_ref = MagicMock() @@ -262,6 +273,7 @@ def test_visit_select_without_table_ref(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -289,6 +301,7 @@ def test_visit_select_without_table_ref(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -305,6 +318,10 @@ def test_visit_select_without_table_ref(self): ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -318,6 +335,7 @@ def test_visit_select_without_table_ref(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -327,6 +345,8 @@ def test_visit_select_without_table_ref(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) @@ -341,6 +361,7 @@ def test_visit_select_without_table_ref(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -349,6 +370,8 @@ def test_visit_select_without_table_ref(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= ======= @@ -365,10 +388,14 @@ def test_visit_select_without_table_ref(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= ======= @@ -402,6 +429,13 @@ def test_visit_select_without_table_ref(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) @patch("evadb.optimizer.statement_to_opr_converter.LogicalCreateFunction") @patch( "evadb.optimizer.\ @@ -663,13 +697,17 @@ def test_check_plan_equality(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -678,6 +716,10 @@ def test_check_plan_equality(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -719,6 +761,7 @@ def test_check_plan_equality(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -728,6 +771,8 @@ def test_check_plan_equality(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -743,6 +788,7 @@ def test_check_plan_equality(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -751,6 +797,8 @@ def test_check_plan_equality(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -766,17 +814,24 @@ def test_check_plan_equality(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -805,6 +860,10 @@ def test_check_plan_equality(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) create_plan.append_child(create_function_plan) plans.append(dummy_plan) diff --git a/test/unit_tests/parser/test_parser.py b/test/unit_tests/parser/test_parser.py index 095c17e6e..0a59e3068 100644 --- a/test/unit_tests/parser/test_parser.py +++ b/test/unit_tests/parser/test_parser.py @@ -165,6 +165,7 @@ def test_create_index_statement(self): ======= ======= +<<<<<<< HEAD # create if_not_exists expected_stmt = CreateIndexStatement( "testindex", @@ -187,6 +188,7 @@ def test_create_index_statement(self): >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD <<<<<<< HEAD # create if_not_exists expected_stmt = CreateIndexStatement( @@ -1014,19 +1016,26 @@ def test_select_function_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -1035,6 +1044,8 @@ def test_select_function_star(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) query = "SELECT DemoFunc(*) FROM DemoDB.DemoTable;" >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -1075,10 +1086,15 @@ def test_select_function_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= query = "SELECT DemoFunc(*) FROM DemoDB.DemoTable;" >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) @@ -1087,11 +1103,14 @@ def test_select_function_star(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -1105,12 +1124,15 @@ def test_select_function_star(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= query = "SELECT DemoFunc(*) FROM DemoDB.DemoTable" @@ -1127,12 +1149,16 @@ def test_select_function_star(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -1179,6 +1205,10 @@ def test_select_function_star(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) evadb_stmt_list = parser.parse(query) # check stmt itself @@ -1316,9 +1346,12 @@ def test_delete_statement(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -1326,6 +1359,9 @@ def test_delete_statement(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -1344,6 +1380,7 @@ def test_delete_statement(self): ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -1391,6 +1428,10 @@ def test_delete_statement(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def test_set_statement(self): parser = Parser() set_statement = """SET OPENAIKEY = 'ABCD'""" @@ -1684,9 +1725,12 @@ def test_should_return_false_for_unequal_expression(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -1738,11 +1782,20 @@ def test_should_return_false_for_unequal_expression(self): >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) +<<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) +======= +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) False, ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) False, +======= +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) False, Path("data/fastrcnn.py"), [ @@ -1910,6 +1963,7 @@ def test_class_equality(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD def test_create_job(self): @@ -1943,6 +1997,8 @@ def test_create_job(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -1976,6 +2032,10 @@ def test_create_job(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -2022,10 +2082,13 @@ def test_lark(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) @@ -2042,6 +2105,7 @@ def test_lark(self): ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= @@ -2050,6 +2114,8 @@ def test_lark(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) >>>>>>> eva-master ======= @@ -2067,10 +2133,14 @@ def test_lark(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) @@ -2117,3 +2187,10 @@ def test_lark(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 40a10ce1 (Bump v0.3.4+ dev) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) diff --git a/test/unit_tests/plan_nodes/test_plan.py b/test/unit_tests/plan_nodes/test_plan.py index 9b41f250f..4524c1803 100644 --- a/test/unit_tests/plan_nodes/test_plan.py +++ b/test/unit_tests/plan_nodes/test_plan.py @@ -84,13 +84,17 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= @@ -99,6 +103,10 @@ def test_create_function_plan(self): >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) <<<<<<< HEAD >>>>>>> 22e78346 (Bump v0.3.4+ dev) +======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace = False >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= @@ -140,6 +148,7 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) ======= @@ -148,6 +157,8 @@ def test_create_function_plan(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= or_replace = False ======= @@ -164,6 +175,7 @@ def test_create_function_plan(self): >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= @@ -172,6 +184,8 @@ def test_create_function_plan(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -187,17 +201,24 @@ def test_create_function_plan(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= ======= +<<<<<<< HEAD >>>>>>> 8da6decc (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) or_replace = False ======= >>>>>>> 2dacff69 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -226,6 +247,10 @@ def test_create_function_plan(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) if_not_exists = True functionIO = "functionIO" inputs = [functionIO, functionIO] @@ -274,6 +299,7 @@ def test_create_function_plan(self): >>>>>>> bf18bc80 (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -288,11 +314,15 @@ def test_create_function_plan(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -318,6 +348,10 @@ def test_create_function_plan(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) function_name, or_replace, if_not_exists, inputs, outputs, impl_path, ty ) self.assertEqual(node.opr_type, PlanOprType.CREATE_FUNCTION) @@ -358,11 +392,14 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -376,10 +413,13 @@ def test_create_function_plan(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -398,6 +438,10 @@ def test_create_function_plan(self): >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) function_name, or_replace, if_not_exists, inputs, outputs, impl_path, ty ) self.assertEqual(node.opr_type, PlanOprType.CREATE_FUNCTION) @@ -414,6 +458,7 @@ def test_create_function_plan(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= @@ -421,6 +466,8 @@ def test_create_function_plan(self): ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -438,11 +485,14 @@ def test_create_function_plan(self): ======= ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) +<<<<<<< HEAD ======= >>>>>>> 22e78346 (Bump v0.3.4+ dev) ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> eva-master ======= >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) @@ -450,6 +500,9 @@ def test_create_function_plan(self): >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= @@ -457,6 +510,7 @@ def test_create_function_plan(self): >>>>>>> 53dafecf (feat: sync master staging (#1050)) >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -481,6 +535,9 @@ def test_create_function_plan(self): ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) self.assertEqual(node.inputs, [functionIO, functionIO]) self.assertEqual(node.outputs, [functionIO]) self.assertEqual(node.impl_path, impl_path) diff --git a/test/unit_tests/storage/test_sqlite_native_storage_engine.py b/test/unit_tests/storage/test_sqlite_native_storage_engine.py index a480c8bba..3211968a3 100644 --- a/test/unit_tests/storage/test_sqlite_native_storage_engine.py +++ b/test/unit_tests/storage/test_sqlite_native_storage_engine.py @@ -43,11 +43,14 @@ def __init__(self): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD >>>>>>> c63abee7 (release: merge staging into master (#1032)) ======= @@ -62,6 +65,7 @@ def __init__(self): >>>>>>> c63abee7 (release: merge staging into master (#1032)) >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) <<<<<<< HEAD +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -72,6 +76,14 @@ def __init__(self): >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +>>>>>>> c63abee7 (release: merge staging into master (#1032)) +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) class SQLiteNativeStorageEngineTest(unittest.TestCase): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) ======= @@ -113,15 +125,21 @@ class SQLiiteNativeStorageEngineTest(unittest.TestCase): <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= +<<<<<<< HEAD ======= >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) class SQLiteNativeStorageEngineTest(unittest.TestCase): >>>>>>> 2dacff69 (feat: sync master staging (#1050)) <<<<<<< HEAD @@ -185,6 +203,7 @@ class SQLiiteNativeStorageEngineTest(unittest.TestCase): >>>>>>> c63abee7 (release: merge staging into master (#1032)) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 065f25fb (release: merge staging into master (#1032)) <<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) @@ -232,9 +251,24 @@ class SQLiteNativeStorageEngineTest(unittest.TestCase): >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 065f25fb (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 28d8bad1 (release: merge staging into master (#1032)) +<<<<<<< HEAD >>>>>>> 66bd4f55 (release: merge staging into master (#1032)) +======= +======= +======= +======= +======= +class SQLiteNativeStorageEngineTest(unittest.TestCase): +>>>>>>> 2dacff69 (feat: sync master staging (#1050)) +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/test/util.py b/test/util.py index 53ddc692e..a84bd72cc 100644 --- a/test/util.py +++ b/test/util.py @@ -64,9 +64,12 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= ======= @@ -74,6 +77,9 @@ >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master @@ -92,6 +98,7 @@ ======= >>>>>>> 53dafecf (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) @@ -139,6 +146,10 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.functions.abstract.abstract_function import ( AbstractClassifierFunction, AbstractFunction, @@ -146,6 +157,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -173,6 +185,7 @@ >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= ======= @@ -189,6 +202,10 @@ ======= ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.functions.abstract.abstract_function import AbstractClassifierFunction >>>>>>> 2dacff69 (feat: sync master staging (#1050)) ======= @@ -203,6 +220,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) @@ -224,12 +242,18 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> eva-master >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) >>>>>>> f431fb09 (feat: sync master staging (#1050)) ======= +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +======= ======= from evadb.functions.abstract.abstract_function import AbstractClassifierFunction >>>>>>> 2dacff69 (feat: sync master staging (#1050)) @@ -237,6 +261,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) @@ -278,10 +303,14 @@ ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 53dafecf (feat: sync master staging (#1050)) ======= >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev) ======= +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) >>>>>>> 5d9d82f0 (feat: sync master staging (#1050)) <<<<<<< HEAD >>>>>>> 9fe75f29 (feat: sync master staging (#1050)) @@ -291,8 +320,17 @@ ======= ======= >>>>>>> 7cac771f (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) +<<<<<<< HEAD >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +======= +======= +>>>>>>> 53dafecf (feat: sync master staging (#1050)) +>>>>>>> 2eef5e8f (feat: sync master staging (#1050)) +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) from evadb.functions.decorators import decorators from evadb.functions.decorators.io_descriptors.data_types import ( NumpyArray, diff --git a/tutorials/11-similarity-search-for-motif-mining.ipynb b/tutorials/11-similarity-search-for-motif-mining.ipynb index 98dbc9533..1269c1ccb 100644 --- a/tutorials/11-similarity-search-for-motif-mining.ipynb +++ b/tutorials/11-similarity-search-for-motif-mining.ipynb @@ -690,6 +690,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD ======= @@ -699,6 +700,8 @@ ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) +======= <<<<<<< HEAD ======= <<<<<<< HEAD @@ -713,11 +716,15 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -736,6 +743,9 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) "cursor.query(\"DROP FUNCTION IF EXISTS SiftFeatureExtractor;\").df()\n", "cursor.query(\"\"\"\n", " CREATE FUNCTION SiftFeatureExtractor\n", @@ -749,11 +759,15 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> bf18bc80 (Bump v0.3.4+ dev) ======= >>>>>>> ae08f806 (Bump v0.3.4+ dev) ======= +======= +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) <<<<<<< HEAD ======= <<<<<<< HEAD @@ -761,6 +775,7 @@ >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) ======= <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= >>>>>>> 8da6decc (Bump v0.3.4+ dev) @@ -769,6 +784,9 @@ ======= ======= >>>>>>> 03a6c555 (feat: sync master staging (#1050)) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) "cursor.query(\"DROP UDF IF EXISTS SiftFeatureExtractor;\").df()\n", "cursor.query(\"\"\"CREATE UDF IF NOT EXISTS SiftFeatureExtractor\n", " IMPL '../evadb/functions/sift_feature_extractor.py'\"\"\").df()" @@ -777,6 +795,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ======= >>>>>>> 40a10ce1 (Bump v0.3.4+ dev) <<<<<<< HEAD @@ -798,11 +819,15 @@ >>>>>>> 7cac771f (Bump v0.3.4+ dev) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> f75511e6 (feat: sync master staging (#1050)) >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) ======= ======= >>>>>>> 2eef5e8f (feat: sync master staging (#1050)) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 70850a8b (feat: sync master staging (#1050)) ======= ======= @@ -829,6 +854,9 @@ ======= >>>>>>> 2170a7a9 (Bump v0.3.4+ dev) >>>>>>> bf18bc80 (Bump v0.3.4+ dev) +======= +>>>>>>> 70850a8b (feat: sync master staging (#1050)) +>>>>>>> f75511e6 (feat: sync master staging (#1050)) ] }, {